Merge 7a56282b48 into 0e1593595b

* fix: Some small typos
* rm: Wiki Engine Ref - Dead link

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,31 +1,48 @@
-<!-- DO NOT DELETE THE TEXT BELOW if you are adding new software to the list. Please make sure relevant boxes are checked [x] -->
+<!-- DO NOT DELETE THE TEXT BELOW if you are adding new software to the list. -->
 
 Thank you for taking the time to work on a PR for Awesome-Selfhosted!
 
 To ensure your PR is dealt with swiftly please check the following:
 
-- [ ] Submit one item per pull request. This eases reviewing and speeds up inclusion.
-- [ ] Format your submission as follows, where `Demo` and `Clients` are optional.
-  Do not add a duplicate `Source code` link if it is the same as the main link.
-  Keep the short description under 250 characters and use [sentence case](https://en.wikipedia.org/wiki/Letter_case#Sentence_case)
-  for it, even if the project's webpage or readme uses another capitalisation
-  such as title case, all caps, small caps or all lowercase.
-  `Demo` links should only be used for interactive demos, i.e. not video demonstrations.
-  ``- [Name](http://homepage/) - Short description, under 250 characters, sentence case. ([Demo](http://url.to/demo), [Source Code](http://url.of/source/code), [Clients](https://url.to/list/of/related/clients-or-apps)) `License` `Language` ``
-- [ ] Additions that depend on proprietary services outside the user's control must be marked `⚠`.
-  ``- [Name](http://homepage/) `⚠` - Short description, under 250 characters, sentence case. ([Demo](http://url.to/demo), [Source Code](http://url.of/source/code), [Clients](https://url.to/list/of/related/clients-or-apps)) `License` `Language` ``
-- [ ] Additions that are not [Free software](https://en.wikipedia.org/wiki/Free_software) must be added to `non-free.md` and have the license set to `⊘ Proprietary`
-- [ ] Additions are inserted preserving alphabetical order.
-- [ ] Additions are not already listed at any of [awesome-sysadmin](https://github.com/n1trux/awesome-sysadmin), [staticgen.com](https://www.staticgen.com/), [staticsitegenerators.net](https://staticsitegenerators.net/), [dbdb.io](https://dbdb.io/browse).
-- [ ] The `Language` tag is the main **server-side** requirement for the software. Don't include frameworks or specific dialects.
-- [ ] Any license you add is in our [list of licenses](https://github.com/awesome-selfhosted/awesome-selfhosted/blob/master/README.md#list-of-licenses).
-- [ ] You have searched the repository for any relevant [issues](https://github.com/awesome-selfhosted/awesome-selfhosted/issues) or [PRs](https://github.com/awesome-selfhosted/awesome-selfhosted/pulls), including closed ones.
-- [ ] Any category you are creating has the minimum requirement of 3 items.
-  If not, your addition may be inserted into `Miscellaneous`.
-- [ ] Any software project you are adding to the list is actively maintained.
-- [ ] Any software project you are adding was first released more than 4 months ago.
-- [ ] Any software project you are adding has working installation instructions.
+**General**
+<!-- All checkboxes here must be checked (replace [ ] with [x]) -->
+
+- [ ] Submit one item per pull request.
 - [ ] If you are adding software forked from another project, please provide/link to a clear list of differences between both.
+- [ ] You have searched the repository for any relevant [issues](https://github.com/awesome-selfhosted/awesome-selfhosted/issues) or [PRs](https://github.com/awesome-selfhosted/awesome-selfhosted/pulls), including closed ones.
+- [ ] Additions are not already listed at any of [awesome-sysadmin](https://github.com/n1trux/awesome-sysadmin), [staticgen.com](https://www.staticgen.com/), [staticsitegenerators.net](https://staticsitegenerators.net/), [dbdb.io](https://dbdb.io/browse).
 - [ ] The pull request title is informative, unlike "Update README.md".
       Suggested titles: "Add aaa to bbb" for adding software aaa to section bbb,
       "Remove aaa from bbb" for removing, "Fix license for aaa", etc.
+
+**Requirements**
+<!-- All checkboxes here must be checked (replace [ ] with [x]) -->
+
+- [ ] Any software project you are adding to the list is actively maintained.
+- [ ] Any software project you are adding was first released more than 4 months ago.
+- [ ] Any software project you are adding has working installation instructions.
+
+**Formatting and description** 
+<!-- All checkboxes here must be checked (replace [ ] with [x]) -->
+
+- [ ] Additions are inserted preserving alphabetical order.
+- [ ] Format your submission as follows, where `Demo` and `Clients` are optional.
+      ``- [Name](http://homepage/) - Short description, under 250 characters, sentence case. ([Demo](http://url.to/demo), [Source Code](http://url.of/source/code), [Clients](https://url.to/list/of/related/clients-or-apps)) `License` `Language` ``
+  - [ ] Do not add a duplicate `Source code` link if it is the same as the main link.
+  - [ ] Keep the short description under 250 characters and use [sentence case](https://en.wikipedia.org/wiki/Letter_case#Sentence_case) for it, even if the project's webpage or readme uses another capitalisation such as title case, all caps, small caps or all lowercase.
+  - [ ] `Demo` links should only be used for interactive demos, i.e. not video demonstrations.
+- [ ] The `Language` tag is the main **server-side** requirement for the software. Don't include frameworks or specific dialects.
+- [ ] Any license you add is in our [list of licenses](https://github.com/awesome-selfhosted/awesome-selfhosted/blob/master/README.md#list-of-licenses).
+
+**Proprietary & non-free Software**
+<!-- Only check the checkboxes applicable to your software (replace [ ] with [x]) -->
+
+- [ ] Additions that depend on proprietary services outside the user's control must be marked `⚠`.
+ ``- [Name](http://homepage/) `⚠` - Short description, under 250 characters, sentence case. ([Demo](http://url.to/demo), [Source Code](http://url.of/source/code), [Clients](https://url.to/list/of/related/clients-or-apps)) `License` `Language` ``
+- [ ] Additions that are not [Free software](https://en.wikipedia.org/wiki/Free_software) must be added to `non-free.md` and have the license set to `⊘ Proprietary`
+
+**Other**
+<!-- Only check the checkboxes applicable to your software (replace [ ] with [x]) -->
+
+- [ ] Any category you create has the minimum requirement of 3 items.
+      If not, your addition may be inserted into `Miscellaneous`.

README.md

@@ -747,7 +747,7 @@ _See also: [dbdb.io - Database of Databases](https://dbdb.io/)_
 
 **[`^        back to top        ^`](#awesome-selfhosted)**
 
-[DNS](https://en.wikipedia.org/wiki/Domain_Name_System) servers and management tools with advertisement blocking funtionality, primarly aimed at home or small networks.
+[DNS](https://en.wikipedia.org/wiki/Domain_Name_System) servers and management tools with advertisement blocking funtionality, primarily aimed at home or small networks.
 
 _See also: [awesome-sysadmin/DNS - Servers](https://github.com/awesome-foss/awesome-sysadmin#dns---servers), [awesome-sysadmin/DNS - Control Panels & Domain Management](https://github.com/awesome-foss/awesome-sysadmin#dns---control-panels--domain-management)_
 
@@ -1390,7 +1390,7 @@ Software that does not fit in another section.
 
 **[`^        back to top        ^`](#awesome-selfhosted)**
 
-[Money management](https://en.wikipedia.org/wiki/Money_management) and budgeting sofware.
+[Money management](https://en.wikipedia.org/wiki/Money_management) and budgeting software.
 
 _Related: [Inventory Management](#inventory-management), [Resource Planning - Enterprise Resource Planning](#resource-planning---enterprise-resource-planning)_
 
@@ -1862,7 +1862,7 @@ _Related: [Software Development - Low Code](#software-development---low-code)_
 
 **[`^        back to top        ^`](#awesome-selfhosted)**
 
-[Localization](https://en.wikipedia.org/wiki/Internationalization_and_localization) is the proccess of adapting code and software to other languages.
+[Localization](https://en.wikipedia.org/wiki/Internationalization_and_localization) is the process of adapting code and software to other languages.
 
 - [Accent](https://www.accent.reviews/) - Open-source, self-hosted, developer-oriented translation tool. ([Source Code](https://github.com/mirego/accent)) `BSD-3-Clause` `Elixir`
 - [Pootle](https://pootle.translatehouse.org) - Online translation and localization tool. ([Source Code](https://github.com/translate/pootle)) `GPL-3.0` `Python`
@@ -2091,7 +2091,7 @@ A [wiki](https://en.wikipedia.org/wiki/Wiki) is a publication collaboratively ed
 
 _Related: [Static Site Generators](#static-site-generators)_
 
-_See also: [Wikimatrix](https://www.wikimatrix.org/), [Wiki Engines - WikiIndex](https://wikiindex.org/Category:Wiki_Engine), [List of wiki software - Wikipedia](https://en.wikipedia.org/wiki/List_of_wiki_software), [Comparison of wiki software - Wikipedia](https://en.wikipedia.org/wiki/Comparison_of_wiki_software)_
+_See also: [Wikimatrix](https://www.wikimatrix.org/), [List of wiki software - Wikipedia](https://en.wikipedia.org/wiki/List_of_wiki_software), [Comparison of wiki software - Wikipedia](https://en.wikipedia.org/wiki/Comparison_of_wiki_software)_
 
 - [AmuseWiki](https://amusewiki.org/) - Amusewiki is based on the Emacs Muse markup, remaining mostly compatible with the original implementation. It can work as a read-only site, as a moderated wiki, or as a fully open wiki or even as a private site. ([Demo](https://sandbox.amusewiki.org), [Source Code](https://github.com/melmothx/amusewiki)) `GPL-1.0` `Perl/Docker`
 - [BookStack](https://www.bookstackapp.com/) - BookStack is a simple, self-hosted, easy-to-use platform for organizing and storing information. It allows for documentation to be stored in a book like fashion. ([Demo](https://www.bookstackapp.com/#demo), [Source Code](https://github.com/BookStackApp/BookStack)) `MIT` `PHP`