From 333da5befd82159ec92c81532e084d3983e6114a Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Thu, 4 Sep 2014 23:35:02 +0200
Subject: [PATCH 1/3] docs: Fix syntax error

(cherry picked from commit cf5660e8e5b4be902d8697ea0f4843356efb9359)
---
 docs/changelog.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 962abe88..ad707948 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -23,7 +23,7 @@ Bug fix release.
   :issue:`833`)
 
 - Local library API: Add :attr:`mopidy.local.Library.ROOT_DIRECTORY_URI`
-  constant for use by implementors of :method:`mopidy.local.Library.browse`.
+  constant for use by implementors of :meth:`mopidy.local.Library.browse`.
   (Related to: :issue:`833`)
 
 - HTTP frontend: Guard against double close of WebSocket, which causes an

From b11ea225d8e34106ff87c58cfc96b7a2719b2ec8 Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Fri, 5 Sep 2014 17:34:23 +0200
Subject: [PATCH 2/3] docs: Add Discuss link to readme

(cherry picked from commit 61e724eb0e314e5ec5d8e39f2319a1d8a7e193c1)
---
 README.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.rst b/README.rst
index 10ad4d3c..46880c9d 100644
--- a/README.rst
+++ b/README.rst
@@ -50,6 +50,7 @@ To get started with Mopidy, check out
 `the installation docs <http://docs.mopidy.com/en/latest/installation/>`_.
 
 - `Documentation <http://docs.mopidy.com/>`_
+- `Discuss <https://discuss.mopidy.com/>`_
 - `Source code <https://github.com/mopidy/mopidy>`_
 - `Issue tracker <https://github.com/mopidy/mopidy/issues>`_
 - `Development branch tarball <https://github.com/mopidy/mopidy/archive/develop.tar.gz#egg=mopidy-dev>`_

From b269694f80e0b62967ad28dcbeaaf2cb49321123 Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Sat, 6 Sep 2014 23:39:10 +0200
Subject: [PATCH 3/3] docs: Rewrite 'getting help' section

(cherry picked from commit 13c92dae65ac86cea64e21009a02499801a7e40a)
---
 docs/index.rst | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/docs/index.rst b/docs/index.rst
index 9653a5dd..bd324af7 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -56,15 +56,20 @@ To get started with Mopidy, start by reading :ref:`installation`.
 
 **Getting help**
 
-If you get stuck, we usually hang around at ``#mopidy`` at `irc.freenode.net
-<http://freenode.net/>`_ (with `searchable logs
-<https://botbot.me/freenode/mopidy/>`_) and also have a `mailing list at Google
-Groups <https://groups.google.com/forum/?fromgroups=#!forum/mopidy>`_. If you
-stumble into a bug or got a feature request, please create an issue in the
-`issue tracker <https://github.com/mopidy/mopidy/issues>`_. The `source code
-<https://github.com/mopidy/mopidy>`_ may also be of help. If you want to stay
-up to date on Mopidy developments, you can follow `@mopidy
-<https://twitter.com/mopidy/>`_ on Twitter.
+If you get stuck, you can get help at the `Mopidy discussion forum
+<https://discuss.mopidy.com/>`_. We also hang around at IRC on the ``#mopidy``
+channel at `irc.freenode.net <http://freenode.net/>`_. The IRC channel has
+`public searchable logs <https://botbot.me/freenode/mopidy/>`_.
+
+If you stumble into a bug or have a feature request, please create an issue in
+the `issue tracker <https://github.com/mopidy/mopidy/issues>`_. If you're
+unsure if its a bug or not, ask for help in the forum or at IRC first. The
+`source code <https://github.com/mopidy/mopidy>`_ may also be of help.
+
+If you want to stay up to date on Mopidy developments, you can follow `@mopidy
+<https://twitter.com/mopidy/>`_ on Twitter. There's also a `mailing list
+<https://groups.google.com/forum/?fromgroups=#!forum/mopidy>`_ used for
+announcements related to Mopidy and Mopidy extensions.
 
 
 Usage