From cffb312b446b41a090592becb14d6a666f4c1c5d Mon Sep 17 00:00:00 2001
From: SP Mohanty <spmohanty91@gmail.com>
Date: Wed, 3 Apr 2019 05:47:49 +0200
Subject: [PATCH] Update docs
---
CONTRIBUTING.rst | 2 +-
docs/FAQ.rst | 5 ++++-
docs/index.rst | 1 +
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index ef4b6b46..0a8ea8f7 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 b32440e3..b7055321 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 b6b2ac84..96b9ee3b 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
--
GitLab