diff --git a/docs/changelog.rst b/docs/changelog.rst
index 05b450019..8b0857e06 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -207,6 +207,9 @@ Other changes:
 * :doc:`/plugins/lyrics`: Remove Musixmatch from default enabled sources as
   they are currently blocking requests from the beets user agent.
   :bug:`4585`
+* :doc:`/faq`: :ref:`multidisc`: Elaborated the multi-disc FAQ :discussions:`4806`
+* :doc:`/faq`: :ref:`src`: Removed some long lines.
+* /conf.py: Added extlink for github discussions.
 
 1.6.0 (November 27, 2021)
 -------------------------
diff --git a/docs/conf.py b/docs/conf.py
index cb7596c55..4f7d6880b 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -19,6 +19,7 @@ pygments_style = 'sphinx'
 # External links to the bug tracker and other sites.
 extlinks = {
     'bug': ('https://github.com/beetbox/beets/issues/%s', '#%s'),
+    'discussions': ('https://github.com/beetbox/beets/discussions/%s', '#%s'),
     'user': ('https://github.com/%s', '%s'),
     'pypi': ('https://pypi.org/project/%s/', '%s'),
     'stdlib': ('https://docs.python.org/3/library/%s.html', '%s'),
diff --git a/docs/faq.rst b/docs/faq.rst
index e7f5cc600..6b987dd19 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -59,6 +59,12 @@ with the ``%if{}`` function to accomplish this::
     item_fields:
         multidisc: 1 if disctotal > 1 else 0
 
+Note that the ``paths`` specification above only contains the
+``default`` key and leaves the ``comp`` and ``singleton`` keys to their
+default values as documented in :ref:`path-format-config`. The spec above
+will therefore not create "Disc N" directories for compilations or singletons
+unless you override those respective keys as well.
+
 
 .. _multidisc:
 
@@ -138,7 +144,9 @@ it's helpful to run on the "bleeding edge". To run the latest source:
 2. Install from source. Choose one of these methods:
 
    -  Directly from GitHub using
-      ``python -m pip install git+https://github.com/beetbox/beets.git`` command. Depending on your system, you may need to use ``pip3`` and ``python3`` instead of ``pip`` and ``python`` respectively.
+      ``python -m pip install git+https://github.com/beetbox/beets.git``
+      command. Depending on your system, you may need to use ``pip3``
+      and ``python3`` instead of ``pip`` and ``python`` respectively.
    -  Use ``pip`` to install the latest snapshot tarball. Type:
       ``pip install https://github.com/beetbox/beets/tarball/master``
    -  Grab the source using git. First, clone the repository: