diff --git a/doc/advanced-configuration.rst b/doc/advanced-configuration.rst
index 1139f8829a..db66ac1e09 100644
--- a/doc/advanced-configuration.rst
+++ b/doc/advanced-configuration.rst
@@ -206,5 +206,5 @@ first disable the deployment of the central logging.
 
     enable_central_logging: "no"
 
-Now you can use the parameter ``elasticsearch_address`` to configure the address
-of the external Elasticsearch environment.
+Now you can use the parameter ``elasticsearch_address`` to configure the
+address of the external Elasticsearch environment.
diff --git a/doc/cinder-guide.rst b/doc/cinder-guide.rst
index 461189b1f0..221912d1fc 100644
--- a/doc/cinder-guide.rst
+++ b/doc/cinder-guide.rst
@@ -101,7 +101,8 @@ exist on the server and following parameter must be specified in
 
     enable_cinder_backend_lvm: "yes"
 
-NOTE: For Ubuntu and LVM2/iSCSI
+For Ubuntu and LVM2/iSCSI
+~~~~~~~~~~~~~~~~~~~~~~~~~
 
 ``iscsd`` process uses configfs which is normally mounted at
 ``/sys/kernel/config`` to store discovered targets information, on centos/rhel
@@ -112,11 +113,16 @@ targeted for nova compute role.
 
   - Add configfs module to ``/etc/modules``
   - Rebuild initramfs using: ``update-initramfs -u`` command
-  - Stop ``open-iscsi`` system service due to its conflicts with iscsid container.
-    For Ubuntu 14.04 (upstart): ``service open-iscsi stop``,
-    Ubuntu 16.04 (systemd): ``systemctl stop open-iscsi; systemctl stop iscsid``
+  - Stop ``open-iscsi`` system service due to its conflicts
+    with iscsid container.
+
+    For Ubuntu 14.04 (upstart): ``service open-iscsi stop``
+
+    Ubuntu 16.04 (systemd):
+    ``systemctl stop open-iscsi; systemctl stop iscsid``
 
   - Make sure configfs gets mounted during a server boot up process. There are
-    multiple ways to accomplish it, one example:  ::
+    multiple ways to accomplish it, one example:
+    ::
 
-    mount -t configfs /etc/rc.local /sys/kernel/config
+      mount -t configfs /etc/rc.local /sys/kernel/config