diff --git a/docs/installation/index.rst b/docs/installation/index.rst
index 198ac9e8..8fd3e840 100644
--- a/docs/installation/index.rst
+++ b/docs/installation/index.rst
@@ -46,6 +46,9 @@ Otherwise, make sure you got the required dependencies installed.
   - To use the Last.FM scrobbler, see :mod:`mopidy.frontends.lastfm` for
     additional requirements.
 
+  - To use the MPRIS frontend, e.g. using the Ubuntu Sound Menu, see
+    :mod:`mopidy.frontends.mpris` for additional requirements.
+
 
 Install latest stable release
 =============================
diff --git a/docs/running.rst b/docs/running.rst
index 4912512f..6c8d0ede 100644
--- a/docs/running.rst
+++ b/docs/running.rst
@@ -10,4 +10,11 @@ When Mopidy says ``MPD server running at [127.0.0.1]:6600`` it's ready to
 accept connections by any MPD client. Check out our non-exhaustive
 :doc:`/clients/mpd` list to find recommended clients.
 
-To stop Mopidy, press ``CTRL+C``.
+To stop Mopidy, press ``CTRL+C`` in the terminal where you started Mopidy.
+
+Mopidy will also shut down properly if you send it the TERM signal, e.g. by
+using ``kill``::
+
+    kill `ps ax | grep mopidy | grep -v grep | cut -d' ' -f1`
+
+This can be useful e.g. if you create init script for managing Mopidy.
diff --git a/docs/settings.rst b/docs/settings.rst
index 76eb6315..a6ad3693 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -10,10 +10,10 @@ changes you may want to do, and a complete listing of available settings.
 Changing settings
 =================
 
-Mopidy reads settings from the file ``~/.mopidy/settings.py``, where ``~``
-means your *home directory*. If your username is ``alice`` and you are running
-Linux, the settings file should probably be at
-``/home/alice/.mopidy/settings.py``.
+Mopidy reads settings from the file ``~/.config/mopidy/settings.py``, where
+``~`` means your *home directory*. If your username is ``alice`` and you are
+running Linux, the settings file should probably be at
+``/home/alice/.config/mopidy/settings.py``.
 
 You can either create the settings file yourself, or run the ``mopidy``
 command, and it will create an empty settings file for you.
@@ -22,7 +22,7 @@ When you have created the settings file, open it in a text editor, and add
 settings you want to change. If you want to keep the default value for setting,
 you should *not* redefine it in your own settings file.
 
-A complete ``~/.mopidy/settings.py`` may look as simple as this::
+A complete ``~/.config/mopidy/settings.py`` may look as simple as this::
 
     MPD_SERVER_HOSTNAME = u'::'
     SPOTIFY_USERNAME = u'alice'
@@ -77,7 +77,7 @@ To make a ``tag_cache`` of your local music available for Mopidy:
 
     mopidy --list-settings
 
-#. Scan your music library. Currently the command outputs the ``tag_cache`` to
+#. Scan your music library. The command outputs the ``tag_cache`` to
    ``stdout``, which means that you will need to redirect the output to a file
    yourself::