diff --git a/doc/arch-design-draft/source/introduction.rst b/doc/arch-design-draft/source/introduction.rst
index 95755c9ac4..1ed04dcb2c 100644
--- a/doc/arch-design-draft/source/introduction.rst
+++ b/doc/arch-design-draft/source/introduction.rst
@@ -58,6 +58,9 @@ developing cloud architecture design documents. The sections covered are:
 *  :doc:`Legal requirements<legal-requirements>`: The legal requirements you
    will need to consider for the different OpenStack scenarios.
 
-*  :doc:`Example architectures<example-architectures>`: An examination of some
+.. TODO(jaegerandi): Use below :doc:`Example
+   architectures<example-architectures>`
+
+*  Example architectures: An examination of some
    of the most common uses for OpenStack clouds, and explanations of the
    considerations for each use case.
diff --git a/doc/networking-guide/source/adv-config-dns.rst b/doc/networking-guide/source/adv-config-dns.rst
index d091b7fe71..3d17ed9305 100644
--- a/doc/networking-guide/source/adv-config-dns.rst
+++ b/doc/networking-guide/source/adv-config-dns.rst
@@ -185,7 +185,7 @@ In the above example notice that:
 
 * The name given to the instance by the user, ``my_vm``, is sanitized by the
   Compute service and becomes ``my-vm`` as the port's ``dns_name``.
-* The port's ``dns_assignment`` attribute shows that its :term:`FQDN` is
+* The port's ``dns_assignment`` attribute shows that its FQDN is
   ``my-vm.my-domain.org.`` in the Networking service internal DNS, which is
   the result of concatenating the port's ``dns_name`` with the value configured
   in the ``dns_domain`` parameter in ``neutron.conf``, as explained previously.
diff --git a/tools/build-rst.sh b/tools/build-rst.sh
index 7cec778582..b8a338a1ee 100755
--- a/tools/build-rst.sh
+++ b/tools/build-rst.sh
@@ -32,12 +32,6 @@ TAG_OPT=""
 BUILD=""
 LINKCHECK=""
 
-if [ -x "$(command -v getconf)" ]; then
-    NUMBER_OF_CORES=$(getconf _NPROCESSORS_ONLN)
-else
-    NUMBER_OF_CORES=2
-fi
-
 while [[ $# > 0 ]] ; do
     option="$1"
     case $option in
@@ -91,13 +85,13 @@ fi
 if [ "$LINKCHECK" = "1" ] ; then
     # Show sphinx-build invocation for easy reproduction
     set -x
-    sphinx-build -j $NUMBER_OF_CORES -E -W -d $DOCTREES -b linkcheck \
+    sphinx-build -E -W -d $DOCTREES -b linkcheck \
         $TAG_OPT $DIRECTORY/source $BUILD_DIR
     set +x
 else
     # Show sphinx-build invocation for easy reproduction
     set -x
-    sphinx-build -j $NUMBER_OF_CORES -E -W -d $DOCTREES -b html \
+    sphinx-build -E -W -d $DOCTREES -b html \
         $TAG_OPT $DIRECTORY/source $BUILD_DIR
     set +x