Merge branch 'master' into Radarr-CF-Block-Extras

docs/.pages

@@ -7,4 +7,4 @@ nav:
     - Plex
     - Misc
     - Hardlinks
-    - How-to-setup-for
+    - How-to-setup-for: Hardlinks/How-to-setup-for

docs/How-to-setup-for

@@ -1 +0,0 @@
-Hardlinks/How-to-setup-for

docs/Sonarr/Tips/Merge-quality.md

@@ -1,75 +1,4 @@
-# How to Merge Quality
-
-The current logic on how downloads are compared is **Quality Trumps All** :bangbang:
-
-In some cases it might be preferred to not have Quality Trump All, and let it be handled via Preferred Words / Custom Formats.
-
-To accomplish this you will need to merge the qualities with each other.
-
-## Current Logic
-
-Here you will see the current logic so you understand how the possible downloads are compared.
-
-As of 2021-11-06 the logic is as follows:
-
-### Radarr current logic
-
-??? summary "Radarr current logic- [CLICK TO EXPAND]"
-
-    1. Quality
-    1. Custom Format Score
-    1. Protocol
-    1. Indexer Priority
-    1. Indexer Flags
-    1. Seeds/Peers (If Torrent)
-    1. Age (If Usenet)
-    1. Size
-
-    [Source: Wiki Servarr](https://wiki.servarr.com/radarr/faq#how-are-possible-downloads-compared){:target="_blank" rel="noopener noreferrer"}
-
-    !!! attention ""
-        REPACKS and PROPERs are v2 of Qualities and thus rank above a non-repack of the same quality.
-
-         `Settings` => `Media Management` => `File Management` => `Proper & Repacks` Change to `Do Not Prefer` and use the [Repack/Proper Custom Format](/Radarr/Radarr-collection-of-custom-formats/#repack-proper){:target="_blank" rel="noopener noreferrer"}
-
-### Sonarr current logic
-
-??? summary "Sonarr current logic- [CLICK TO EXPAND]"
-
-    1. Quality
-    1. Language
-    1. Preferred Word Score
-    1. Protocol
-    1. Episode Count
-    1. Episode Number
-    1. Indexer Priority
-    1. Seeds/Peers (If Torrent)
-    1. Age (If Usenet)
-    1. Size
-
-    [Source: Wiki Servarr](https://wiki.servarr.com/sonarr/faq#how-are-possible-downloads-compared){:target="_blank" rel="noopener noreferrer"}
-
-    !!! attention ""
-        REPACKS and PROPERs are v2 of Qualities and thus rank above a non-repack of the same quality.
-
-         `Settings` => `Media Management` => `File Management` => `Proper & Repacks` Change to `Do Not Prefer` and use a preferred word regex of `/\b(repack|proper)\b/i`
-
-## Merge the Qualities
-
-Go to your preferred Quality Profile or create a new one.
-
-`Settings` => `Profiles`
-
-In this example we will merge the following qualities together:
-
-- Bluray-720p
-- Bluray-1080p
-- WEBDL/WEBRip-1080p
-
-To merge them you need to click on Edit Groups.
-
-![!Merge Qualities](images/merge.gif)
-
-When done Sonarr/Radarr upgrades will be handled via Preferred Words / Custom Formats.
-
---8<-- "includes/support.md"
+{%
+    include-markdown '../../Radarr/Tips/Merge-quality.md'
+    rewrite_relative_urls=true
+%}

docs/Sonarr/Tips/Sync-2-radarr-sonarr.md

@@ -1 +0,0 @@
-../../Radarr/Tips/Sync-2-radarr-sonarr.md

docs/Sonarr/Tips/Sync-2-radarr-sonarr.md

@@ -0,0 +1,4 @@
+{%
+    include-markdown '../../Radarr/Tips/Sync-2-radarr-sonarr.md'
+    rewrite_relative_urls=true
+%}

docs/Sonarr/Tips/images

@@ -1 +0,0 @@
-../../Radarr/Tips/images

docs/requirements.txt

@@ -5,4 +5,4 @@ mkdocs-macros-plugin==0.7.0
 mkdocs-material==8.3.9
 mkdocs-minify-plugin==0.5.0
 mkdocs-redirects==1.0.5
-
+mkdocs-include-markdown-plugin==3.6.1

mkdocs.yml

@@ -42,8 +42,8 @@ markdown_extensions:
       emoji_index: !!python/name:materialx.emoji.twemoji
       emoji_generator: !!python/name:materialx.emoji.to_svg
 
-
 plugins:
+  - include-markdown:
   - search
   - git-revision-date-localized:
       type: datetime