From 63a18efb27e4446f453af420a4a6a1c5308ee2d0 Mon Sep 17 00:00:00 2001
From: shel <Yiskah.Raphen@gmail.com>
Date: Fri, 10 Feb 2017 11:37:35 -0500
Subject: [PATCH 1/4] Change List of Instances to Table
Change list of known instances to a table with additional information per instance. Add awoo.space and gay.crime.team
---
.../List-of-Mastodon-instances.md | 24 ++++++++++++-------
1 file changed, 15 insertions(+), 9 deletions(-)
diff --git a/docs/Using-Mastodon/List-of-Mastodon-instances.md b/docs/Using-Mastodon/List-of-Mastodon-instances.md
index 2f15df083..43ddd7f96 100644
--- a/docs/Using-Mastodon/List-of-Mastodon-instances.md
+++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md
@@ -1,12 +1,18 @@
-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)
-Let me know if you start running one so I can add it to the list!
+| 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) | Technology | $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! (Alternatively, add it yourself as a pull request).
From a0e6c80b60375497c7770e8ac22d125317ff3e48 Mon Sep 17 00:00:00 2001
From: shel <Yiskah.Raphen@gmail.com>
Date: Fri, 10 Feb 2017 12:14:49 -0500
Subject: [PATCH 2/4] Clean up markdown
There were some markdown processing errors which I've cleaned up
---
.../List-of-Mastodon-instances.md | 22 +++++++++----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/docs/Using-Mastodon/List-of-Mastodon-instances.md b/docs/Using-Mastodon/List-of-Mastodon-instances.md
index 43ddd7f96..39e34b8a0 100644
--- a/docs/Using-Mastodon/List-of-Mastodon-instances.md
+++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md
@@ -2,17 +2,17 @@ List of Known Mastodon instances
==========================
-| 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) | Technology | $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(?) |
+| 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! (Alternatively, add it yourself as a pull request).
From 3f1f3d0827969a7bc46c3f905cf6a65b9eed621e Mon Sep 17 00:00:00 2001
From: shel <Yiskah.Raphen@gmail.com>
Date: Fri, 10 Feb 2017 13:06:38 -0500
Subject: [PATCH 3/4] Add link to other instances list
This should help federation
---
app/views/about/index.html.haml | 1 +
1 file changed, 1 insertion(+)
diff --git a/app/views/about/index.html.haml b/app/views/about/index.html.haml
index 88bfe3d61..022a3a9e4 100644
--- a/app/views/about/index.html.haml
+++ b/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'
From 2d6f603c2bc3ec34c2e50ebacaccc6676bf1fa55 Mon Sep 17 00:00:00 2001
From: shel <Yiskah.Raphen@gmail.com>
Date: Fri, 10 Feb 2017 13:08:47 -0500
Subject: [PATCH 4/4] Add link to other instances text
Text for link to other instances
---
config/locales/en.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/config/locales/en.yml b/config/locales/en.yml
index b1b1e7995..018c923df 100644
--- a/config/locales/en.yml
+++ b/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