Merge branch 'master' into soitora-slight-styling

src/.vuepress/styles/index.scss

@@ -10,6 +10,7 @@
 	border-color: #2E84BF !important;
 }
 
+
 .home .hero img {
 	max-height: 120px !important;
 }
@@ -69,3 +70,11 @@ html {
 .expander_summary:focus {
 	outline: none !important;
 }
+
+.badge.default-indicator {
+	background-color: #2E84BF !important;
+}
+
+.badge.version-indicator {
+	background-color: #000000 !important;
+}

src/help/guides/backup.md

@@ -6,17 +6,18 @@ lang: en-US
 # Backup
 :construction: :construction_worker_man: W.I.P. Description, help us improve through [here](https://github.com/tachiyomiorg/website/edit/master/src/help/guides/backup.md)!
 
+
 ## Create backup
-:construction: :construction_worker_man: W.I.P.
+Create backup lets you backup your library, tracking settings, and reading history. To create a backup go to `Settings > Backup` and then select `Create backup`, this will bring up a dialog letting you choose what to backup. Manga is greyed out because it will always be backed up.
 
 ## Restore backup
-:construction: :construction_worker_man: W.I.P.
+Restore backup lets you restore your previously created backup. To restore a backup go to `Settings > Backup` and then select `Restore backup`, this will bring up a file explorer. Proceed by navigating to where your stored backup is located then select it.
 
 ## Backup frequency
-:construction: :construction_worker_man: W.I.P.
+Backup frequency lets you select a frequency in which Tachiyomi will automatically backup your library. To setup Backup frequency go to `Settings > Backup` and the select `Backup frequency`, this will bring up a dialog letting you choose between preset backup frequencies.
 
 ## Backup directory
-:construction: :construction_worker_man: W.I.P.
+Backup directory lets you choose where your automatic backup is stored.
 
-## Mac automatic backups
+## Max automatic backups
-:construction: :construction_worker_man: W.I.P.
+Max automatic backups lets you choose how many backups will be stored before deleting the oldest one.

src/help/guides/downloads.md

@@ -4,22 +4,24 @@ lang: en-US
 ---
 
 # Downloads
-:construction: :construction_worker_man: W.I.P. Description, help us improve through [here](https://github.com/tachiyomiorg/website/edit/master/src/help/guides/downloads.md)!
+This category of settings allows you to change the limitations and behaviour of downloads as well as enabling automatic downloads.
 
-## Downloads directory
+The blue badges next to titles is how we indicate the default option, a yellow badge can be used to indicate if for example the feature isn't yet available in the public release.
-:construction: :construction_worker_man: W.I.P.
 
-## Only download over Wi-Fi
+## Downloads directory <Badge text="/storage/emulated/0/Tachiyomi/downloads" type="default-indicator" vertical="middle"/>
-:construction: :construction_worker_man: W.I.P.
+This setting allows you to set where downloads are to be read from and downloaded to. There are some premade locations to download to, and also a custom option that allows you to select a folder that the download folder will be placed, but is only supported on Android 5 and newer.
 
-## Remove when marked as read
+## Only download over Wi-Fi <Badge text="True" type="default-indicator" vertical="middle"/>
-:construction: :construction_worker_man: W.I.P.
+This setting makes the [Download new chapters](#download-new-chapters) option only download when you're connected to Wi-Fi, and not data.
 
-## Remove after read
+## Remove when marked as read <Badge text="False" type="default-indicator" vertical="middle"/>
-:construction: :construction_worker_man: W.I.P.
+This setting removes a downloaded chapter after you've used the overflow (3 dot menu next to each chapter) and marked it as read.
 
-## Download new chapters
+## Remove after read <Badge text="Disabled" type="default-indicator" vertical="middle"/>
-:construction: :construction_worker_man: W.I.P.
+This setting removes a downloaded chapter after you've reached the last page and exited the reader.
 
-## Categories to include in download
+## Download new chapters <Badge text="False" type="default-indicator" vertical="middle"/>
-:construction: :construction_worker_man: W.I.P.
+This setting downloads new chapters as they show up in library updates.
+
+## Categories to include in download <Badge text="All" type="default-indicator" vertical="middle"/>
+If there are categories that you would like to exclude from being downloaded, use this setting to check the ones you only want included for downloads. Defaults to all categories being included for downloads.

src/help/guides/general.md

@@ -4,34 +4,76 @@ lang: en-US
 ---
 
 # General
-:construction: :construction_worker_man: W.I.P. Description, help us improve through [here](https://github.com/tachiyomiorg/website/edit/master/src/help/guides/general.md)!
+This category of settings allows you to change the look of the app, and the update schedule and how the app updates.
+The blue badges next to titles is how we indicate the default option, a yellow badge can be used to indicate if for example the feature isn't yet available in the public release.
 
-## Language
-:construction: :construction_worker_man: W.I.P.
 
-## Application theme
+## Language <Badge text="System default" type="default-indicator" vertical="middle"/>
-:construction: :construction_worker_man: W.I.P.
+The language of the app. If changed, all parts of the app change to the language. Defaults to system language. Does not affect which catalog languages are enabled
 
-## Library manga per row
+## Application theme <Badge text="Main theme" type="default-indicator" vertical="middle"/>
-:construction: :construction_worker_man: W.I.P.
+How the app looks and what colors are used through the app. There are four themes included, consisting of a light theme and three dark themes.
+- `Main` is the default white theme with blue accents.
+- `Dark` is themed to completely to material grey.
+- `AMOLED` is pitch black in most places and suitable for OLED screens.
+- `Dark Blue` is like the main theme as it keeps the blue accents but it's dark instead of white.
 
-## Start screen
+### Light themes
-:construction: :construction_worker_man: W.I.P.
 
-## Library update frequency
+#### Main
-:construction: :construction_worker_man: W.I.P.
+::: expander <strong>Click to expand!</strong>
+<figure class="centered">
+	<img width="100%"
+	  :src="$withBase('/assets/media/main-theme.png')">
+</figure>
+:::
 
-## Library update restrictions
+### Dark themes
-:construction: :construction_worker_man: W.I.P.
 
-## Only update ongoing manga
+#### Dark
-:construction: :construction_worker_man: W.I.P.
+::: expander <strong>Click to expand!</strong>
+<figure class="centered">
+	<img width="100%"
+	  :src="$withBase('/assets/media/dark-theme.png')">
+</figure>
+:::
 
-## Categories to include in global update
+#### AMOLED
-:construction: :construction_worker_man: W.I.P.
+::: expander <strong>Click to expand!</strong>
+<figure class="centered">
+	<img width="100%"
+	  :src="$withBase('/assets/media/amoled-theme.png')">
+</figure>
+:::
 
-## Library update order
+#### Dark Blue
-:construction: :construction_worker_man: W.I.P.
+::: expander <strong>Click to expand!</strong>
+<figure class="centered">
+	<img width="100%"
+	  :src="$withBase('/assets/media/dark-blue.png')">
+</figure>
+:::
 
-## Default category
+## Library manga per row <Badge text="Portrait: 3" type="default-indicator" vertical="middle"/> <Badge text="Landscape: 4" type="default-indicator" vertical="middle"/>
-:construction: :construction_worker_man: W.I.P.
+This setting allows you to set how many manga show up per row. It can be between 1 and 10 and can be set to differing amounts depending on the orientation you want.
+
+## Start screen <Badge text="My library" type="default-indicator" vertical="middle"/>
+This setting changes what screen the app opens up to. It can be changed between `My library`, `Recently read`, and `Library updates`.
+
+## Library update frequency <Badge text="Manual" type="default-indicator" vertical="middle"/>
+This setting changes how often the app automatically scans for manga updates. It can be changed from preset values between hourly and every 2 days.
+
+## Library update restrictions <Badge text="False" type="default-indicator" vertical="middle"/>
+This setting allows you to keep certain categories from updating. If you have categories you don't want to update, because you have a category that you would not like to update, then you can use this setting to save time from updating. If you would like to update manga while this setting is on, pull down in the manga or chapters view to manually update
+
+## Only update ongoing manga <Badge text="False" type="default-indicator" vertical="middle"/>
+This setting allows you to keep manga that sources have mark as finished from updating. If you would like to update manga while this setting is on, pull down in the manga or chapters view to manually update.
+
+## Categories to include in global update <Badge text="All" type="default-indicator" vertical="middle"/>
+This setting allows you to change which categories are updated when a manual (pull down in library) or automatic update occurs.
+
+## Library update order <Badge text="Alphabetically" type="default-indicator" vertical="middle"/> <Badge text="Dev" type="version-indicator" vertical="middle"/>
+This setting allows you to update in different orders, in alphabetical or in the order of the last updated manga.
+
+## Default category <Badge text="Always ask" type="default-indicator" vertical="middle"/>
+This setting allows you to change the category that a manga is added to when the bookmark button is tapped and no category is selected.