Fix step numbering

Numbered list resets mid-list are fixed.
Resolved merge conflict.
Fixed 'greybar' issue.

Signed-off-by: Ron Stone <ronald.stone@windriver.com>
Change-Id: I748039fb2680ec60f69b2928da219aff1da6b816
Signed-off-by: Ron Stone <ronald.stone@windriver.com>

doc/source/dist_cloud/installing-a-subcloud-using-redfish-platform-management-service.rst

@@ -2,9 +2,9 @@
 .. vbb1579292724479
 .. _installing-a-subcloud-using-redfish-platform-management-service:
 
-===============================================================
-Installing a Subcloud Using Redfish Platform Management Service
-===============================================================
+============================================================
+Install a Subcloud Using Redfish Platform Management Service
+============================================================
 
 For subclouds with servers that support Redfish Virtual Media Service \(version
 1.2 or higher\), you can use the Central Cloud's CLI to install the ISO and
@@ -76,18 +76,18 @@ subcloud, the subcloud installation has these phases:
 
     .. note::
 
-        Do not power off the servers. The host portion of the server can be
-        powered off, but the |BMC| portion of the server must be powered and
-        accessible from the System Controller.
+       Do not power off the servers. The host portion of the server can be
+       powered off, but the |BMC| portion of the server must be powered and
+       accessible from the System Controller.
 
-        There is no need to wipe the disks.
+       There is no need to wipe the disks.
 
     .. note::
 
-        The servers require connectivity to a gateway router that provides IP
-        routing between the subcloud management subnet and the System Controller
-        management subnet, and between the subcloud |OAM| subnet and the
-        System Controller subnet.
+       The servers require connectivity to a gateway router that provides IP
+       routing between the subcloud management subnet and the System Controller
+       management subnet, and between the subcloud |OAM| subnet and the
+       System Controller subnet.
 
     .. include:: ../_includes/installing-a-subcloud-using-redfish-platform-management-service.rest
        :start-after: begin-ref-1

doc/source/dist_cloud/migrate-an-aiosx-subcloud-to-an-aiodx-subcloud.rst

@@ -138,6 +138,7 @@ using the ansible playbook.
 
     .. include:: ../_includes/migrate-an-aiosx-subcloud-to-an-aiodx-subcloud.rest
 
+
 .. _manually-migrate-a-subcloud-from-AIO-SX-to-AIO-DX:
 
 =================================================

doc/source/dist_cloud/upgrading-the-systemcontroller-using-the-cli.rst

@@ -266,7 +266,8 @@ Follow the steps below to manually upgrade the System Controller:
 
 #.  Upgrade **controller-0**.
 
-    .. xbooklink For more information, see :ref:`|updates-doc| <software-updates-and-upgrades-software-updates>` guide.
+    For more information, see :ref:`Updates and Upgrades
+    <software-updates-and-upgrades-software-updates>`.
 
     #.  Lock **controller-0**.
 

doc/source/storage/kubernetes/create-readwritemany-persistent-volume-claims.rst

@@ -23,35 +23,35 @@ accessMode.
 
 .. _iqu1616951298602-steps-bdr-qnm-tkb:
 
-#.  Create the **rwx-test-claim** Persistent Volume Claim.
+Create the **rwx-test-claim** Persistent Volume Claim.
 
-    #.  Create a yaml file defining the claim and its attributes.
+#.  Create a yaml file defining the claim and its attributes.
 
-        For example:
+    For example:
 
-        .. code-block:: none
+    .. code-block:: none
 
-            ~(keystone_admin)]$
-            cat <<EOF > rwx-claim.yaml
-            kind: PersistentVolumeClaim
-            apiVersion: v1
-            metadata:
-              name: rwx-test-claim
-            spec:
-              accessModes:
-              - ReadWriteMany
-              resources:
-                requests:
-                  storage: 1Gi
-              storageClassName: cephfs
-            EOF
+        ~(keystone_admin)]$
+        cat <<EOF > rwx-claim.yaml
+        kind: PersistentVolumeClaim
+        apiVersion: v1
+        metadata:
+          name: rwx-test-claim
+        spec:
+          accessModes:
+          - ReadWriteMany
+          resources:
+            requests:
+              storage: 1Gi
+          storageClassName: cephfs
+        EOF
 
-    2.  Apply the settings created above.
+#.  Apply the settings created above.
 
-        .. code-block:: none
+    .. code-block:: none
 
-            ~(keystone_admin)]$ kubectl apply -f rwx-claim.yaml
-            persistentvolumeclaim/rwx-test-claim created
+       ~(keystone_admin)]$ kubectl apply -f rwx-claim.yaml
+       persistentvolumeclaim/rwx-test-claim created
 
 
 This results in 1GB |PVC| being created. You can view the |PVC| using the
@@ -64,8 +64,6 @@ following command.
     NAME              STATUS   VOLUME       CAPACITY   ACCESS MODES   STORAGECLASS
     rwx-test-claim    Bound    pvc-df9f..   1Gi        RWX            cephfs
 
-.. code-block:: none
-
     ~(keystone_admin)]$ kubectl get persistentvolume
     NAME       CAPACITY ACCESS.. RECLAIM.. STATUS CLAIM                   STORAGECLASS
     pvc-df9f.. 1Gi      RWX       Delete    Bound  default/rwx-test-claim  cephfs