From c98dacdfabc57d50d52fb5cf90c6681ac6a17802 Mon Sep 17 00:00:00 2001
From: Ivan Korunkov <ivankorunkov@yandex.ru>
Date: Sun, 19 Jul 2015 17:23:49 +0300
Subject: [PATCH 1/2] Default home page: fix indent level; fix indentation
 level for configuration message block to make it looks like other blocks.

---
 app/views/home/default.haml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/views/home/default.haml b/app/views/home/default.haml
index 919a81185..041cadad0 100644
--- a/app/views/home/default.haml
+++ b/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.
 
     .span4
       %h2 Try it out

From 5ca9ca9844f5308bb0669c4d7a5675b958fa5984 Mon Sep 17 00:00:00 2001
From: Ivan Korunkov <ivankorunkov@yandex.ru>
Date: Sun, 19 Jul 2015 17:29:06 +0300
Subject: [PATCH 2/2] Default home page: fix wiki link title; GitHub wiki is
 obsolete, because it has been moved from GitHub to independent resource.

closes #6212
---
 Changelog.md                | 1 +
 app/views/home/default.haml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index c8429fe36..816fea05b 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,7 @@
 ## Refactor
 
 ## Bug fixes
+* Fix indentation and a link title on the default home page [#6212](https://github.com/diaspora/diaspora/pull/6212)
 
 ## Features
 
diff --git a/app/views/home/default.haml b/app/views/home/default.haml
index 041cadad0..c08fa9f65 100644
--- a/app/views/home/default.haml
+++ b/app/views/home/default.haml
@@ -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"