diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 62b72657a..0e9a7ddf8 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,9 +1,12 @@
 Version 2.2.0
 -----------------------------------------------------------
 **NOTE: Supports python 3.7, async client is now moved to pymodbus/client/asychronous**
-```
-from pymodbus.client.asynchronous import ModbusTcpClient
-```
+
+
+.. code-block:: python
+
+    from pymodbus.client.asynchronous import ModbusTcpClient
+
 
 * Support Python 3.7
 * Fix to task cancellations and CRC errors for async serial clients.
@@ -25,13 +28,13 @@ from pymodbus.client.asynchronous import ModbusTcpClient
 * Fix regression introduced in 2.2.0rc2 (Modbus sync client transaction failing)
 * Minor update in factory.py, now server logs prints received request instead of only function code
 
-```
-# Now
-DEBUG:pymodbus.factory:Factory Request[ReadInputRegistersRequest: 4]
-# Before
-DEBUG:pymodbus.factory:Factory Request[4]
+.. code-block:: bash
+
+   # Now
+   # DEBUG:pymodbus.factory:Factory Request[ReadInputRegistersRequest: 4]
+   # Before
+   # DEBUG:pymodbus.factory:Factory Request[4]
 
-```
 
 
 Version 2.1.0
diff --git a/doc/conf.py b/doc/conf.py
index 6649ec91c..294b41b79 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -45,7 +45,9 @@
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
-extensions = ['sphinx.ext.autodoc', 'm2r', 'recommonmark']
+
+#extensions = ['sphinx.ext.autodoc', 'm2r', 'recommonmark']
+extensions = ['sphinx.ext.autodoc', 'm2r']
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
@@ -53,9 +55,9 @@
 # The suffix(es) of source filenames.
 # You can specify multiple suffix as a list of string:
 #
-source_parsers = {
-    '.md': CommonMarkParser,
-}
+#source_parsers = {
+#    '.md': CommonMarkParser,
+#}
 
 source_suffix = ['.rst', '.md']
 # source_suffix = '.rst'
diff --git a/doc/source/library/REPL.md b/doc/source/library/REPL.md
index 1e7969af6..48a426993 100644
--- a/doc/source/library/REPL.md
+++ b/doc/source/library/REPL.md
@@ -6,7 +6,7 @@ Depends on [prompt_toolkit](https://python-prompt-toolkit.readthedocs.io/en/stab
 
 Install dependencies
 ```
-$ pip install click prompt_toolkit --upgarde
+$ pip install click prompt_toolkit --upgrade
 ```
 
 Or