Merge branch 'stable' into develop

Changelog.md

@@ -54,6 +54,7 @@ With the port to Bootstrap 3, app/views/terms/default.haml has a new structure.
 ## Refactor
 
 ## Bug fixes
+* Fix indentation and a link title on the default home page [#6212](https://github.com/diaspora/diaspora/pull/6212)
 
 ## Features
 

app/views/home/default.haml

@@ -18,13 +18,13 @@
       = image_tag "landing/cog.png"
 
       %p
-      Look at
-      %code.helpful{title: "General pod configuration (location to upload photos, SSL certs, etc.)"}
-        config/diaspora.yml.example
-      and
-      %code.helpful{title: "MySQL username/password"}
-        config/database.yml.example
-      for help.
+        Look at
+        %code.helpful{title: "General pod configuration (location to upload photos, SSL certs, etc.)"}
+          config/diaspora.yml.example
+        and
+        %code.helpful{title: "MySQL username/password"}
+          config/database.yml.example
+        for help.
 
     .col-md-4
       %h2 Try it out
@@ -48,7 +48,7 @@
     %ul#links
       %ul.section
         %li= link_to "Codebase", "http://github.com/diaspora/diaspora", title: "Git repository"
-        %li= link_to "Documentation", "http://wiki.diasporafoundation.org", title: "Wiki on github"
+        %li= link_to "Documentation", "http://wiki.diasporafoundation.org", title: "Project wiki"
       %ul.section
         %li= link_to "IRC - General", "http://webchat.freenode.net/?channels=diaspora", title: "#diaspora"
         %li= link_to "IRC - Development", "http://webchat.freenode.net/?channels=diaspora-dev", title: "#diaspora-dev"