fixed redirects

docs/.htaccess

@@ -10,3 +10,6 @@ RewriteBase /
 # legacy redirects
 RewriteRule ^Changelog(.html)?$ "https://tinylifegame.com/changelog" [R=301,L]
 RewriteRule ^InGameNews(.html)?$ "https://tinylifegame.com/ingamenews" [R=301,L]
+RewriteRule ^articles/content_policy(.html)?$ "https://tinylifegame.com/content_policy" [R=301,L]
+RewriteRule ^articles/common_issues(.html)?$ "https://tinylifegame.com/common_issues" [R=301,L]
+RewriteRule ^articles/preview(.html)?$ "https://tinylifegame.com/preview" [R=301,L]

docs/articles/toc.yml

@@ -1,16 +1,10 @@
-- name: Playing Tiny Life
+- name: Advanced Playing
-- name: Troubleshooting Common Issues
-  href: common_issues.md
-- name: About Preview Versions
-  href: preview.md
 - name: Tiny Life's Data Folder
   href: game_dir.md
 - name: Cheats
   href: cheats.md
 
 - name: Community
-- name: Content and Community Policy
-  href: content_policy.md
 - name: Contributing Localizations
   href: localization.md
 

web/_includes/common_issues.md

@@ -1,21 +1,20 @@
-# Troubleshooting Common Issues
+This is a list of commonly faced problems when downloading, installing and playing the game. Please read this list carefully before reporting an issue. 
-This is a list of commonly faced problems when downloading, installing and playing the game. Please read this list carefully before reporting an issue. 
 
 If you're struggling with solving any of these issues yourself, feel free to ask for help in [the Discord server](https://link.tinylifegame.com/discordweb).
 
-## My save files aren't synchronized through Steam Cloud
+# My save files aren't synchronized through Steam Cloud
 Cloud storage in Tiny Life has to be enabled individually for each save file that you want to back up and synchronize.
 
 To do so, make sure that you have Steam running, and then go into the Load Game menu on the game's title screen. From there, simply press the button that has a little cloud icon on it for each save file that you want to store in the cloud. If you ever want to stop saving a file to the cloud, just press the button again.
 
 While Steam Cloud storage is enabled for a save file, it will automatically be uploaded whenever the game is saved, and newer versions will automatically be downloaded every time you launch the game.
 
-## I get an error or crash with mods installed
+# I get an error or crash with mods installed
-**For issues that only happen with mods, please contact the mods' developers.** You can narrow down which mod is causing an issue by looking at the [log file](game_dir.md) or by uninstalling mods until the issue stops happening. Most mods have a button to open their issue tracker in their description, which you can find in the rightmost tab of the game's options menu.
+**For issues that only happen with mods, please contact the mods' developers.** You can narrow down which mod is causing an issue by looking at the [log file](https://docs.tinylifegame.com/articles/game_dir.html) or by uninstalling mods until the issue stops happening. Most mods have a button to open their issue tracker in their description, which you can find in the rightmost tab of the game's options menu.
 
 When reporting an issue to Tiny Life developers, please make sure that you have **no mods installed** at the time that the issues occur. You can also disable the loading of mods in the rightmost tab of the game's options menu if you don't want to uninstall your mods to reproduce an issue.
 
-## The game won't start correctly
+# The game won't start correctly
 This can have multiple reasons:
 - When downloading the game from itch, make sure to **extract the zip archive** before starting the game executable within it.
 - Some ARM-based distributions of Linux and Mac (like newer MacBooks that use Apple Silicon) don't support Tiny Life without installing additional tools (like [Rosetta](https://en.wikipedia.org/wiki/Rosetta_(software)) or [QEMU](https://www.qemu.org/)) to translate instructions correctly. You might have to do additional research to figure out what these are for your device.
@@ -23,10 +22,10 @@ This can have multiple reasons:
 - When downloading the game from itch on a Mac, your device might warn you about the application's **security**, since Tiny Life is not signed by Apple. If you want to run the game anyway, hold the Option key, then right-click and select Open.
 - If the game briefly starts up but crashes during the loading screen, there may be issues with your graphics or audio drivers. Please make sure that all of your graphics and audio drivers are on the latest stable versions and that you do not have any extraneous device drivers installed. Specifically, a device driver that seems to be causing problems for a small set of players is "Asus utility" under the "Sound, video and game controllers" section in Windows' Device Manager, disabling which should fix this issue.
 
-## There's no log file to attach to my bug report
+# There's no log file to attach to my bug report
-If the game is crashing when you try to launch it, but there's no log file in [the logs folder](game_dir.md), the game might be crashing too early or it might be unable to create a log file due to permission issues.
+If the game is crashing when you try to launch it, but there's no log file in [the logs folder](https://docs.tinylifegame.com/articles/game_dir.html), the game might be crashing too early or it might be unable to create a log file due to permission issues.
 
 If this happens, the game will create a file next to the game's executable called `_UnhandledException.txt` instead. Please include this file's content in your report.
 
-## My Tinies automatically get assigned wrong genealogies
+# My Tinies automatically get assigned wrong genealogies
-Transitive genealogies are automatically calculated in the character creator. For example, adding a parent and a child for a Tiny automatically causes them to have a grandparent/grandchild relationship. The current implementation of this system may contain some oversights causing incorrect transitive genealogies to be calculated automatically. To fix this issue temporarily and be able to set your own genealogies manually, you can enable the `IgnoreTransitive` [cheat](cheats.md).
+Transitive genealogies are automatically calculated in the character creator. For example, adding a parent and a child for a Tiny automatically causes them to have a grandparent/grandchild relationship. The current implementation of this system may contain some oversights causing incorrect transitive genealogies to be calculated automatically. To fix this issue temporarily and be able to set your own genealogies manually, you can enable the `IgnoreTransitive` [cheat](https://docs.tinylifegame.com/articles/cheats.html).

web/_includes/content_policy.md

@@ -1,24 +1,22 @@
-# Tiny Life Content and Community Policy
-
 *Please read this document carefully before posting or sharing comments, opinions, videos, livestreams, mods, custom maps, households, or lots. By sharing content on any of the officially supported platforms, you also agree that you have read all the information below.*
 
 As part of the goal of Tiny Life's design, we want to foster a community of players that are accepting, kind and have the ability to **express their creativity**, **explore their identity**, and **share their feedback**. As such, the following rules are very permissive of custom content and community interaction of any kind, with restrictions that aim to minimize unease or harm in the community.
 
 All content that does not follow these rules will be removed from the official platforms, and their authors may be banned or restricted for a period of time at the moderators' discretion.
 
-## Tiny Life Content on the Internet
+# Tiny Life Content on the Internet
 - ✔️ You are free (and encouraged!) to create and share or post comments, opinions, videos, livestreams, blog posts, and other content that shows off or relates to Tiny Life and its gameplay. When doing so, be sure to make it sufficiently clear that the content you are showing off is associated with Tiny Life. For example, when posting a video about the game, Tiny Life's name should be included in the title, description or video content.
 - ✔️ You are free to **monetize** and otherwise earn revenue from videos, livestreams, blog posts, and other content that shows off or relates to Tiny Life and its gameplay. This includes content about or featuring Tiny Life that contains the game's soundtrack as background or prominently featured music.
 - ✔️ You are free to share any custom content of any kind for Tiny Life outside the official platforms. When doing so, be sure to make it sufficiently clear what parts are your creations, and what parts are Tiny Life's original content.
 - ❌ You are not allowed to **reupload or otherwise redistribute** the Tiny Life binary, assets, or code. If you want people to be able to find the game easily, it is recommended that you link to its website https://tinylifegame.com.
 
-## Tiny Life Content on Official Platforms
+# Tiny Life Content on Official Platforms
-Tiny Life's official platforms include [the itch community](https://ellpeck.itch.io/tiny-life/community), [the Steam community](https://steamcommunity.com/app/1651490), [the Steam workshop](https://steamcommunity.com/app/1651490/workshop/), [the Discord server](https://link.tinylifegame.com/discordweb), and [the Twitter page](https://twitter.com/TinyLifeGame). For these platforms, there are a multitude of additional rules.
+Tiny Life's official platforms include [the wiki](https://wiki.tinylifegame.com), [the itch community](https://ellpeck.itch.io/tiny-life/community), [the Steam community](https://steamcommunity.com/app/1651490), [the Steam workshop](https://steamcommunity.com/app/1651490/workshop/), [the Discord server](https://link.tinylifegame.com/discordweb), and [the Twitter page](https://twitter.com/TinyLifeGame). For these platforms, there are a multitude of additional rules.
 - ✔️ You are free (and encouraged!) to create and share or post comments, opinions, videos, livestreams, blog posts, and other content that shows off or relates to Tiny Life and its features, with the community through the official platforms.
 - ❌ You are not allowed to post comments or share mods or other types of custom content that suggest or attempt **removing or hiding** features from the game that support **body positivity**, **bodily autonomy**, **queer representation**, **gender equality**, and **racial diversity**.
 - ❌ You are not allowed to post messages or share mods or other types of custom content that promote or engage in **criminal activity**, including but not limited to illegal drug use and abuse of minors or adults.
 - ❌ Due to the game's age rating and target audience, you are not allowed to share mods or other types of custom content that depict activities and situations **not suitable for all ages**. This includes **explicit sexual activity**, **excessive nudity**, **abuse of drugs or alcohol**, as well as possibly **triggering topics** like references to intense emotional trauma.
 
-## About this Policy
+# About this Policy
 
-This policy may be updated from time to time. Its change history can be found on the [GitHub repository](https://github.com/Ellpeck/TinyLifeWeb/commits/main/docs/articles/content_policy.md). If you have any questions about this policy, please don't hesitate to ask on [the Discord server](https://link.tinylifegame.com/discordweb).
+This policy may be updated from time to time. Its change history can be found on the [GitHub repository](https://github.com/Ellpeck/TinyLifeWeb/commits/main/web/_includes/content_policy.md). If you have any questions about this policy, please don't hesitate to ask on [the Discord server](https://link.tinylifegame.com/discordweb).

web/_includes/preview.md

@@ -1,12 +1,10 @@
-# About Preview Versions
+Occasionally, we publish preview versions of upcoming Tiny Life versions on a different Steam branch, as well as on itch. We use previews to test upcoming features and changes publicly, while still allowing players to easily revert to a more stable version.
-
-Occasionally, we publish preview versions of upcoming Tiny Life versions on a different Steam branch, as well as on itch. We use previews to test upcoming features and changes publicly, while still allowing players to easily revert to a more stable version.
 
 When deciding to try out a Tiny Life preview version, please keep in mind that they contain **unfinished** and possibly **buggy content** that might change before the version is officially released. This means that we recommend using a **separate save file** when playing with a preview version.
 
 If you encounter any issues or have feedback about any of the preview's new features, you can let us know through the usual channels, including the [feedback form](https://tinylifegame.com/feedback) (which you can also reach from in-game as usual) or [the Discord](https://link.tinylifegame.com/discordweb).
 
-## Previews on Steam
+# Previews on Steam
 To select the preview branch on Steam for the demo or the Early Access version, simply right-click the game in your library and select Properties. Then go to the Betas tab, and select the preview branch from the dropdown menu. If you want to revert to the regular release, you can do so using the same process.
 
 ![](../media/previews_steam_1.png)
@@ -15,7 +13,7 @@ To select the preview branch on Steam for the demo or the Early Access version,
 
 The preview branch will always have the most up-to-date version of the game, including full releases. This means that you can stay on this branch permanently if you always want to play with preview versions.
 
-## Previews on itch
+# Previews on itch
 Preview versions are available as normal Tiny Life builds on itch.
 
 For managing what version you want to use when playing, we recommend installing the [itch app](https://itch.io/app), which allows selecting a game version to use.

web/common_issues.html

@@ -0,0 +1,14 @@
+---
+layout: default
+nav: basicnav.html
+title: Troubleshooting Common Issues with Tiny Life
+summary: Information on commonly faced issues in and around Tiny Life, and how to fix them
+---
+
+<div class="section isolated-site">
+    <h1>Troubleshooting Common Issues</h1>
+
+    {% capture raw_content %}{% include common_issues.md %}{% endcapture %}
+    {% assign content = raw_content | markdownify %}
+    {% include anchor_headings.html html=content anchorBody="#" anchorClass="anchor-heading" %}
+</div>

web/content_policy.html

@@ -0,0 +1,14 @@
+---
+layout: default
+nav: basicnav.html
+title: Tiny Life Content and Community Policy
+summary: Rules for custom content and community engagement for Tiny Life
+---
+
+<div class="section isolated-site">
+    <h1>Tiny Life Content and Community Policy</h1>
+
+    {% capture raw_content %}{% include content_policy.md %}{% endcapture %}
+    {% assign content = raw_content | markdownify %}
+    {% include anchor_headings.html html=content anchorBody="#" anchorClass="anchor-heading" %}
+</div>

web/preview.html

@@ -0,0 +1,14 @@
+---
+layout: default
+nav: basicnav.html
+title: About Tiny Life Preview Versions
+summary: Information on preview versions of Tiny Life and how to access them
+---
+
+<div class="section isolated-site">
+    <h1>About Preview Versions</h1>
+
+    {% capture raw_content %}{% include preview.md %}{% endcapture %}
+    {% assign content = raw_content | markdownify %}
+    {% include anchor_headings.html html=content anchorBody="#" anchorClass="anchor-heading" %}
+</div>