diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 4fd5e866..11ef0018 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,3 +1,3 @@
-Please use https://discuss.mopidy.com/ for support questions.
+Please use https://discourse.mopidy.com/ for support questions.
GitHub Issues should only be used for confirmed problems with Mopidy and well-defined feature requests.
diff --git a/README.rst b/README.rst
index f7989a3f..851c4163 100644
--- a/README.rst
+++ b/README.rst
@@ -50,7 +50,7 @@ To get started with Mopidy, check out
`the installation docs `_.
- `Documentation `_
-- `Discussion forum `_
+- `Discussion forum `_
- `Source code `_
- `Issue tracker `_
- IRC: ``#mopidy`` at `irc.freenode.net `_
diff --git a/docs/audio.rst b/docs/audio.rst
index a5447583..920bd45f 100644
--- a/docs/audio.rst
+++ b/docs/audio.rst
@@ -84,6 +84,13 @@ simultaneously. To use the Icecast output, do the following:
[audio]
output = audioresample ! audioconvert ! vorbisenc ! oggmux ! shout2send mount=mopidy ip=127.0.0.1 port=8000 password=hackme
+
+ Example for MP3 streaming and local audio (multiple outputs):
+
+ .. code-block:: ini
+
+ [audio]
+ output = tee name=t ! queue ! audioresample ! autoaudiosink t. ! queue ! lamemp3enc ! shout2send mount=mopidy ip=127.0.0.1 port=8000 password=hackme
Other advanced setups are also possible for outputs. Basically, anything you
can use with the ``gst-launch-1.0`` command can be plugged into
diff --git a/docs/conf.py b/docs/conf.py
index d504989c..20bed432 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -136,7 +136,8 @@ extlinks = {
'js': ('https://github.com/mopidy/mopidy.js/issues/%s', 'mopidy.js#'),
'mpris': (
'https://github.com/mopidy/mopidy-mpris/issues/%s', 'mopidy-mpris#'),
- 'discuss': ('https://discuss.mopidy.com/t/%s', 'discuss.mopidy.com/t/'),
+ 'discuss': (
+ 'https://discourse.mopidy.com/t/%s', 'discourse.mopidy.com/t/'),
}
diff --git a/docs/contributing.rst b/docs/contributing.rst
index 199c6b2a..7c6f922b 100644
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -15,7 +15,7 @@ Asking questions
Please get in touch with us in one of these ways when requesting help with
Mopidy and its extensions:
-- Our discussion forum: `discuss.mopidy.com `_.
+- Our discussion forum: `discourse.mopidy.com `_.
Just sign in and fire away.
- Our IRC channel: `#mopidy `_
@@ -51,8 +51,8 @@ Issue guidelines
tracker is not a support forum.
#. If you are not sure if what you're experiencing is a bug or not, post in the
- `discussion forum `__ first to verify that it's
- a bug.
+ `discussion forum `__ first to verify that
+ it's a bug.
#. If you are sure that you've found a bug or have a feature request, check if
there's already an issue in the `issue tracker
diff --git a/docs/ext/backends.rst b/docs/ext/backends.rst
index 165b7642..b267efb6 100644
--- a/docs/ext/backends.rst
+++ b/docs/ext/backends.rst
@@ -48,6 +48,15 @@ Provides a backend for playing music from your `Beets
`_ music library through Beets' web extension.
+Mopidy-Deezer
+=============
+
+https://github.com/rusty-dev/mopidy-deezer
+
+Extension for playing music from the `Deezer `_ music
+streaming service.
+
+
Mopidy-Dirble
=============
@@ -65,6 +74,15 @@ https://github.com/tkem/mopidy-dleyna
Provides a backend for playing music from Digital Media Servers using
the `dLeyna `_ D-Bus interface.
+
+Mopidy-Emby
+===========
+
+https://github.com/xsteadfastx/mopidy-emby
+
+Provides a backend for playing music from `Emby Media Servers `_.
+
+
Mopidy-File
===========
diff --git a/docs/index.rst b/docs/index.rst
index b9b65c80..d32dcd33 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -59,9 +59,9 @@ To get started with Mopidy, start by reading :ref:`installation`.
**Getting help**
If you get stuck, you can get help at the `Mopidy discussion forum
-`_. We also hang around at IRC on the ``#mopidy``
-channel at `irc.freenode.net `_. The IRC channel has
-`public searchable logs `_.
+`_. We also hang around at IRC on the
+``#mopidy`` channel at `irc.freenode.net `_. The IRC
+channel has `public searchable logs `_.
If you stumble into a bug or have a feature request, please create an issue in
the `issue tracker `_. If you're
diff --git a/docs/sponsors.rst b/docs/sponsors.rst
index 2528247b..84fb224f 100644
--- a/docs/sponsors.rst
+++ b/docs/sponsors.rst
@@ -16,7 +16,7 @@ for free. We use their services for the following sites:
- Hosting of the APT package repository at https://apt.mopidy.com.
-- Hosting of the Discourse forum at https://discuss.mopidy.com.
+- Hosting of the Discourse forum at https://discourse.mopidy.com.
- Mailgun for sending emails from the Discourse forum.
diff --git a/docs/troubleshooting.rst b/docs/troubleshooting.rst
index b7ff3c03..5cc23d65 100644
--- a/docs/troubleshooting.rst
+++ b/docs/troubleshooting.rst
@@ -6,7 +6,7 @@ Troubleshooting
If you run into problems with Mopidy, we usually hang around at ``#mopidy`` on
`irc.freenode.net `_ and also have a `discussion forum
-`_.
+`_.
If you stumble into a bug or have a feature request, please create an issue in
the `issue tracker `_.