diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index ef4b6b46e29b58b968541b790c45a2325277ab72..0a8ea8f70d51e2122f9b79099e13b0e4fe3fc4c3 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -94,7 +94,7 @@ Ready to contribute? Here's how to set up `flatland` for local development.
 7. Submit a merge request through the Gitlab repository website.
 
 Merge Request Guidelines
------------------------
+-------------------------
 
 Before you submit a merge request, check that it meets these guidelines:
 
diff --git a/docs/FAQ.rst b/docs/FAQ.rst
index b32440e30f1b99221f5226e536d69b33b194822c..b7055321a710e3b3f47cbf5084f18eee083cf291 100644
--- a/docs/FAQ.rst
+++ b/docs/FAQ.rst
@@ -6,7 +6,10 @@ Frequently Asked Questions (FAQs)
 
     .. code-block:: python
 
-        RuntimeError('Click will abort further execution because Python 3 was configured to use ASCII as encoding for ...sk_SK.UTF-8, sl_SI.UTF-8, sr_YU.UTF-8, sv_SE.UTF-8, tr_TR.UTF-8, uk_UA.UTF-8, zh_CN.UTF-8, zh_HK.UTF-8, zh_TW.UTF-8')
+        RuntimeError('Click will abort further execution because Python 3 \
+        was configured to use ASCII as encoding for ...sk_SK.UTF-8, \
+        sl_SI.UTF-8, sr_YU.UTF-8, sv_SE.UTF-8, tr_TR.UTF-8, \
+        uk_UA.UTF-8, zh_CN.UTF-8, zh_HK.UTF-8, zh_TW.UTF-8')
 
     This can be solved by :
 
diff --git a/docs/index.rst b/docs/index.rst
index b6b2ac846a870ad1a3aeddbbc829859796ec22d1..96b9ee3bd7ecb2b6cb0d5642e00d099db9b549ef 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -9,6 +9,7 @@ Welcome to flatland's documentation!
    installation
    usage
    modules
+   FAQ
    contributing
    authors
    history