From 73c28eb9674de975af2c9506ca1976e4a1781698 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Thu, 25 Jun 2015 12:44:42 +0200
Subject: [PATCH 1/2] initial help page

---
 source/help/help.markdown | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 source/help/help.markdown

diff --git a/source/help/help.markdown b/source/help/help.markdown
new file mode 100644
index 00000000000..618bd2e6587
--- /dev/null
+++ b/source/help/help.markdown
@@ -0,0 +1,29 @@
+---
+layout: page
+title: "Help"
+description: "If you need help or have a question..."
+date: 2015-06-25 12:30
+sidebar: false
+comments: false
+sharing: true
+footer: true
+---
+
+There are various ways to get in touch with the Home Assistant community. It doesn't matter if you have a question, need help, want to request a feature, or just say 'Hi'.
+
+## Communication channels
+
+- [Mailing list](https://groups.google.com/forum/#!forum/home-assistant-dev)
+- [Real-time messaging](https://gitter.im/balloob/home-assistant)
+
+## Bugs, Feature requests, and alike
+
+Have you found an issue in your Home Assistant installation? Please report it in one of the issue trackers. Reporting it here makes it easier to track than in the Mailing list and ensures that it get fixed.
+
+- [Issue tracker Home Assistant](https://github.com/balloob/home-assistant/issues)
+- [Issue tracker home-assistant.io](https://github.com/balloob/home-assistant.io/issues) (Website and documentation)
+
+## Commerical vendors
+
+If you are a commerical vendor and would like to get your product integrated in Home Assistant, please submit a [Pull request](https://github.com/balloob/home-assistant/pulls) or get in touch with us.
+

From af7d9159f359d457075b226d75781f5d3f031a4f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Thu, 25 Jun 2015 12:45:42 +0200
Subject: [PATCH 2/2] add help page

---
 source/_includes/custom/navigation.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/_includes/custom/navigation.html b/source/_includes/custom/navigation.html
index 547b77d4e41..5e0ca259357 100644
--- a/source/_includes/custom/navigation.html
+++ b/source/_includes/custom/navigation.html
@@ -24,5 +24,5 @@
     </ul>
   </li>
   <li><a href="{{ root_url }}/blog/">Blog</a></li>
-  <li><a href="https://groups.google.com/forum/#!forum/home-assistant-dev">Need help?</a></li>
+  <li><a href="{{ root_url }}/help/help.html">Need help?</a></li>
 </ul>