Merge "Minor documentation fixes"

5 files changed, 15 insertions, 14 deletions

diff --git a/doc/cinder-guide.rst b/doc/cinder-guide.rst
index 5b3b08342..3d613e720 100644
--- a/doc/cinder-guide.rst
+++ b/doc/cinder-guide.rst
@@ -87,7 +87,7 @@ If the disk stays in the available state, something went wrong during the
 iSCSI mounting of the volume to the guest VM.
 
 Cinder LVM2 back end with iSCSI
-==============================
+===============================
 
 As of Newton-1 milestone, Kolla supports LVM2 as cinder back end. It is
 accomplished by introducing two new containers ``tgtd`` and ``iscsid``.
@@ -128,7 +128,7 @@ targeted for nova compute role.
       mount -t configfs /etc/rc.local /sys/kernel/config
 
 Cinder back end with external iSCSI storage
-==========================================
+===========================================
 
 In order to use external storage system (like one from EMC or NetApp)
 the following parameter must be specified in ``globals.yml`` ::
diff --git a/doc/image-building.rst b/doc/image-building.rst
index 9d067f611..9e8ac58f2 100644
--- a/doc/image-building.rst
+++ b/doc/image-building.rst
@@ -150,8 +150,8 @@ of the container runtime operating system.  To obtain a RHN
 username/password/pool id, contact Red Hat.  Use a template's header block
 overrides file, add the following::
 
-    RUN subscription-manager register --user=<user-name> --password=<password> \
-    && subscription-manager attach --pool <pool-id>
+    RUN subscription-manager register --user=<user-name> \
+    --password=<password> && subscription-manager attach --pool <pool-id>
 
 Dockerfile Customisation
 ========================
diff --git a/doc/manila-guide.rst b/doc/manila-guide.rst
index 8db7c9e03..4436af5c9 100644
--- a/doc/manila-guide.rst
+++ b/doc/manila-guide.rst
@@ -324,12 +324,12 @@ Use the manila migration command, as shown in the following example:
   destination host and pool.
 - ``--writable`` and ``--preserve-metadata``: Are only for driver assisted.
 - ``--new_share_network``: Only if driver supports shared network.
-- ``--new_share_type``: Choose a share type compatible with the destinationHost.
+- ``--new_share_type``: Choose share type compatible with destinationHost.
 
 Checking share migration progress
 ---------------------------------
 
-Use the ``manila migration-get-progress shareID`` command to check the progress.
+Use the ``manila migration-get-progress shareID`` command to check progress.
 
 .. code-block:: console
 
diff --git a/doc/manila-hnas-guide.rst b/doc/manila-hnas-guide.rst
index c8cc97350..1fe518cfd 100644
--- a/doc/manila-hnas-guide.rst
+++ b/doc/manila-hnas-guide.rst
@@ -24,8 +24,8 @@ Requirements
   -  SSC CLI.
 
 
-Supported shared filesystems and operations
-------------------------------------------
+Supported shared file systems and operations
+-------------------------------------------
 The driver supports CIFS and NFS shares.
 
 The following operations are supported:
@@ -72,7 +72,8 @@ Preparation and Deployment
 Configuration on Kolla deployment
 ---------------------------------
 
-Enable Shared File Systems service and HNAS driver in ``/etc/kolla/globals.yml``
+Enable Shared File Systems service and HNAS driver in
+``/etc/kolla/globals.yml``
 
 .. code-block:: console
 
@@ -99,7 +100,7 @@ In ``/etc/kolla/globals.yml`` set:
 
 
 HNAS back end configuration
---------------------------
+---------------------------
 
 In ``/etc/kolla/globals.yml`` uncomment and set:
 
diff --git a/doc/quickstart.rst b/doc/quickstart.rst
index 7ee7016a7..c85bd548c 100644
--- a/doc/quickstart.rst
+++ b/doc/quickstart.rst
@@ -65,8 +65,8 @@ to add .xz compressed format support.
 Ubuntu: For Ubuntu based systems where Docker is used it is recommended to use
 the latest available LTS kernel. The latest LTS kernel available is the wily
 kernel (version 4.2). While all kernels should work for Docker, some older
-kernels may have issues with some of the different Docker back ends such as AUFS
-and OverlayFS. In order to update kernel in Ubuntu 14.04 LTS to 4.2, run:
+kernels may have issues with some of the different Docker back ends such as
+AUFS and OverlayFS. In order to update kernel in Ubuntu 14.04 LTS to 4.2, run:
 
 ::
 
@@ -184,14 +184,14 @@ run the following:
     mount --make-shared /run
     mount --make-shared /var/lib/nova/mnt
 
-If ``/var/lib/nova/mnt`` is not partition, can do below work around 
+If ``/var/lib/nova/mnt`` is not partitioned, can do below work around
 
 ::
     mkdir -p /var/lib/nova/mnt /var/lib/nova/mnt1
     mount --bind /var/lib/nova/mnt1 /var/lib/nova/mnt
     mount --make-shared /var/lib/nova/mnt
 
-For mounting ``/run`` and ``/var/lib/nova/mnt`` as shared upon startup, 
+For mounting ``/run`` and ``/var/lib/nova/mnt`` as shared upon startup,
 add below commands to ``/etc/rc.local``
 
 ::