Constrain label char set (r6,r5)

Some characters in rST labels are not handled correctly by XSLT
post-processors.
This change fixes two known instances and modifies the newfile
tox job to handle these chars.

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

doc/source/dist_cloud/kubernetes/failure-during-the-installation-or-data-migration-of-n-plus-1-load-on-a-subcloud.rst

@@ -1,6 +1,6 @@
 
 .. oeo1597292999568
-.. _failure-during-the-installation-or-data-migration-of-n+1-load-on-a-subcloud:
+.. _failure-during-the-installation-or-data-migration-of-n-plus-1-load-on-a-subcloud:
 
 ===========================================================================
 Failure During the Installation or Data Migration of N+1 Load on a Subcloud
@@ -86,9 +86,8 @@ and finalized. If failure occurs:
 
 -   Check specified log files
 
--   Follow the recovery procedure. See :ref:`Failure Prior to the Installation
-    of N+1 Load on a Subcloud <failure-prior-to-the-installation-of-n+1-load-on-a-subcloud>`
+-   Follow the recovery procedure. See :ref:`failure-prior-to-the-installation-of-n-plus-1-load-on-a-subcloud`
 
 .. only:: partner
 
-    .. include:: /_includes/distributed-upgrade-orchestration-process-using-the-cli.rest
+    .. include:: /_includes/distributed-upgrade-orchestration-process-using-the-cli.rest

doc/source/dist_cloud/kubernetes/failure-prior-to-the-installation-of-n-plus-1-load-on-a-subcloud.rst

@@ -1,6 +1,6 @@
 
 .. uvp1597292940831
-.. _failure-prior-to-the-installation-of-n+1-load-on-a-subcloud:
+.. _failure-prior-to-the-installation-of-n-plus-1-load-on-a-subcloud:
 
 ===========================================================
 Failure Prior to the Installation of N+1 Load on a Subcloud

doc/source/dist_cloud/kubernetes/index-dist-cloud-kub-95bef233eef0.rst

@@ -148,8 +148,8 @@ Upgrade Orchestration for Distributed Cloud SubClouds using the CLI
     aborting-the-distributed-upgrade-orchestration
     configuration-for-specific-subclouds
     robust-error-handling-during-an-orchestrated-upgrade
-    failure-prior-to-the-installation-of-n+1-load-on-a-subcloud
-    failure-during-the-installation-or-data-migration-of-n+1-load-on-a-subcloud
+    failure-prior-to-the-installation-of-n-plus-1-load-on-a-subcloud
+    failure-during-the-installation-or-data-migration-of-n-plus-1-load-on-a-subcloud
 
 --------
 Appendix

doc/source/dist_cloud/kubernetes/robust-error-handling-during-an-orchestrated-upgrade.rst

@@ -14,6 +14,8 @@ upgrade and the steps you can use to troubleshoot the errors.
 For a successful orchestrated upgrade, ensure the upgrade prerequisites,
 procedure, and postrequisites are met.
 
+.. rubric:: |proc|
+
 If a failure occurs, use the following general steps:
 
 
@@ -24,9 +26,8 @@ If a failure occurs, use the following general steps:
 #.  Check the output using the :command:`dcmanager strategy-step list` command
     for failures, if any.
 
-#.  Address the cause of the failure. For more information, see :ref:`Failure
-    During the Installation or Data Migration of N+1 Load on a Subcloud
-    <failure-during-the-installation-or-data-migration-of-n+1-load-on-a-subcloud>`.
+#.  Address the cause of the failure. For more information, see
+    :ref:`failure-during-the-installation-or-data-migration-of-n-plus-1-load-on-a-subcloud`.
 
 #.  Retry the orchestrated upgrade. For more information, see :ref:`Distributed
     Upgrade Orchestration Process Using the CLI
@@ -40,8 +41,6 @@ If a failure occurs, use the following general steps:
 
 .. seealso::
 
-    :ref:`Failure Prior to the Installation of N+1 Load on a Subcloud
-    <failure-prior-to-the-installation-of-n+1-load-on-a-subcloud>`
+    * :ref:`failure-prior-to-the-installation-of-n-plus-1-load-on-a-subcloud`
 
-    :ref:`Failure During the Installation or Data Migration of N+1 Load on a
-    Subcloud <failure-during-the-installation-or-data-migration-of-n+1-load-on-a-subcloud>`
+    * :ref:`failure-during-the-installation-or-data-migration-of-n-plus-1-load-on-a-subcloud`

new-topic.sh

@@ -7,6 +7,15 @@ fi
 
 INCLUDEDIR="$2/doc/source/_includes"
 
+declare -A charReplacements
+
+charReplacements=(
+   ["-"]="minus"
+   ["+"]="plus"
+   ["\@"]="at"
+   ["\&"]="and"
+)
+
 ask_name () {
 
    echo -e "`cat <<EOF
@@ -112,11 +121,19 @@ done)
 
 ask_type
 
-filename="${title//[^[:alnum:]]/-}"
+filename=${title}
+
+for c in "${!charReplacements[@]}"
+do
+  filename=`sed "s/$c/${charReplacements[$c]}/g" <<< $filename`
+done
+
+filename="${filename//[^[:alnum:]]/-}"
 filename=$(echo $filename | tr -s -)
 filename="${filename}-${myuuid}"
 filename=${filename,,}
 filename=`sed 's/--/-/g' <<< $filename`
+
 [ $input == "i" ] && filename="index-${filename}"
 
 CONTEXT_DIR="${BASH_SOURCE%/*}"