Merge pull request #618 from yiskah/patch-3

Small Changes for Promotion of Other Instances

app/views/about/index.html.haml

@@ -32,6 +32,7 @@
       = link_to t('about.learn_more'), about_more_path
       = link_to t('about.terms'), terms_path
       = link_to t('about.source_code'), 'https://github.com/tootsuite/mastodon'
+      = link_to t('about.other_instances'), 'https://github.com/tootsuite/mastodon/blob/master/docs/Using-Mastodon/List-of-Mastodon-instances.md'
 
     = link_to t('about.get_started'), new_user_registration_path, class: 'button webapp-btn'
     = link_to t('auth.login'), new_user_session_path, class: 'button webapp-btn'

config/locales/en.yml

@@ -10,6 +10,7 @@ en:
     get_started: Get started
     learn_more: Learn more
     links: Links
+    other_instances: Other Instances
     source_code: Source code
     status_count_after: statuses
     status_count_before: Who authored

docs/Using-Mastodon/List-of-Mastodon-instances.md

-List of Mastodon instances
+List of Known Mastodon instances
 ==========================
 
-* [mastodon.social](https://mastodon.social)
-* [social.tchncs.de](https://social.tchncs.de)
-* [on.vu](https://on.vu)
-* [animalliberation.social](https://animalliberation.social)
-* [socially.constructed.space](https://socially.constructed.space)
-* [epiktistes.com](https://epiktistes.com)
-* [toot.zone](https://toot.zone)
-* [awoo.space](https://awoo.space/)
+| Name | Theme/Notes, if applicable | Open Registrations |
+| -------------|-------------|---|
+| [mastodon.social](https://mastodon.social) |Flagship, quick updates|Yes|
+| [awoo.space](https://awoo.space) |Intentionally moderated, only federates with mastodon.social|Yes|
+| [social.tchncs.de](https://social.tchncs.de)|N/A|Yes|
+| [animalliberation.social](https://animalliberation.social) |Animal Rights|Yes|
+| [socially.constructed.space](https://socially.constructed.space) |Single user|No|
+| [epiktistes.com](https://epiktistes.com) |N/A|Yes|
+| [toot.zone](https://toot.zone) |N/A|Yes|
+| [on.vu](https://on.vu) | Appears defunct|No|
+| [gay.crime.team](https://gay.crime.team) |N/A|Yes(?)|
 
-Let me know if you start running one so I can add it to the list!
+
+Let me know if you start running one so I can add it to the list! (Alternatively, add it yourself as a pull request).