diff --git a/doc/arch-design/ch_compute_focus.xml b/doc/arch-design/ch_compute_focus.xml
index 85b085d889..79d9fcd678 100644
--- a/doc/arch-design/ch_compute_focus.xml
+++ b/doc/arch-design/ch_compute_focus.xml
@@ -31,13 +31,13 @@
       <para>Platform-as-a-Service (PaaS)</para>
     </listitem>
     <listitem>
-      <para>Signal processing for Network Function Virtualization (NFV)</para>
+      <para>Signal processing for network function virtualization (NFV)</para>
     </listitem>
   </itemizedlist>
   <para>Based on the use case requirements, such clouds might need to provide
     additional services such as a virtual machine disk library, file or object
     storage, firewalls, load balancers, IP addresses, and network connectivity
-    in the form of overlays or virtual Local Area Networks (VLANs). A
+    in the form of overlays or virtual local area networks (VLANs). A
     compute-focused OpenStack cloud will not typically use raw block storage
     services since the applications hosted on a compute-focused OpenStack
     cloud generally do not need persistent block storage.</para>
diff --git a/doc/arch-design/ch_network_focus.xml b/doc/arch-design/ch_network_focus.xml
index 3343ea4716..30f14d1f9f 100644
--- a/doc/arch-design/ch_network_focus.xml
+++ b/doc/arch-design/ch_network_focus.xml
@@ -10,16 +10,18 @@
         network communication in order to function properly due to a
         service-based nature. In some cases, however, use cases
         dictate that the network is elevated beyond simple
-        infrastructure. This section is a discussion of architectures
+        infrastructure. This chapter is a discussion of architectures
         that are more reliant or focused on network services. These
         architectures are heavily dependent on the network
         infrastructure and need to be architected so that the network
         services perform and are reliable in order to satisfy user and
         application requirements.</para>
     <para>Some possible use cases include:</para>
-    <itemizedlist>
+    <variablelist>
+      <varlistentry>
+        <term>Content delivery network</term>
         <listitem>
-            <para>Content Delivery Network: This could include
+            <para>This could include
                 streaming video, photographs or any other cloud based
                 repository of data that is distributed to a large
                 number of end users. Mass market streaming video will
@@ -36,21 +38,30 @@
                 as well as the WAN architecture and the cache
                 methodology.</para>
         </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>Network management functions</term>
         <listitem>
-            <para>Network Management Functions: A cloud that provides
+            <para>A cloud that provides
                 network service functions would be built to support
                 the delivery of back-end network services such as DNS,
                 NTP or SNMP and would be used by a company for
                 internal network management.</para>
         </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>Network service offerings</term>
         <listitem>
-            <para>Network Service Offerings: A cloud can be used to
+            <para>A cloud can be used to
                 run customer facing network tools to support services.
                 For example, VPNs, MPLS private networks, GRE tunnels
                 and others.</para>
         </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>Web portals or web services</term>
         <listitem>
-            <para>Web portals / Web Services: Web servers are a common
+            <para>Web servers are a common
                 application for cloud services and it is recommended
                 to have an understanding of the network requirements.
                 The network will need to be able to scale out to meet
@@ -59,8 +70,11 @@
                 bandwidth must be considered depending on the details
                 of the portal architecture.</para>
         </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>High speed and high volume transactional systems</term>
         <listitem>
-            <para>High Speed and High Volume Transactional Systems:
+            <para>
                 These types of applications are very sensitive to
                 network configurations. Examples include many
                 financial systems, credit card transaction
@@ -73,8 +87,11 @@
                 performance database back ends that need to be
                 accessed.</para>
         </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>High availability</term>
         <listitem>
-            <para>High Availability: These types of use cases are
+            <para>These types of use cases are
                 highly dependent on the proper sizing of the network
                 to maintain replication of data between sites for high
                 availability. If one site becomes unavailable, the
@@ -83,8 +100,11 @@
                 important to size network capacity to handle the loads
                 that are desired.</para>
         </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>Big data</term>
         <listitem>
-            <para>Big Data: Clouds that will be used for the
+            <para>Clouds that will be used for the
                 management and collection of big data (data ingest)
                 will have a significant demand on network resources.
                 Big data often uses partial replicas of the data to
@@ -94,8 +114,11 @@
                 NuoDB, RIAK and other No-SQL and distributed
                 databases.</para>
         </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>Virtual desktop infrastructure (VDI)</term>
         <listitem>
-            <para>Virtual Desktop Infrastructure (VDI): This use case
+            <para>This use case
                 is very sensitive to network congestion, latency,
                 jitter and other network characteristics. Like video
                 streaming, the user experience is very important
@@ -105,8 +128,11 @@
                 caching for the delivery of the application to the end
                 user.</para>
         </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>Voice over IP (VoIP)</term>
         <listitem>
-            <para>Voice over IP (VoIP): This is extremely sensitive to
+            <para>This is extremely sensitive to
                 network congestion, latency, jitter and other network
                 characteristics. VoIP has a symmetrical traffic
                 pattern and it requires network quality of service
@@ -116,8 +142,11 @@
                 jitter fluctuations and can detect them at very low
                 levels.</para>
         </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>Video Conference or web conference</term>
         <listitem>
-            <para>Video Conference / Web Conference: This also is
+            <para>This also is
                 extremely sensitive to network congestion, latency,
                 jitter and other network flaws. Video Conferencing has
                 a symmetrical traffic pattern, but unless the network
@@ -126,8 +155,11 @@
                 Similar to VOIP, users will be sensitive to network
                 performance issues even at low levels.</para>
         </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>High performance computing (HPC)</term>
         <listitem>
-            <para>High Performance Computing (HPC): This is a complex
+            <para>This is a complex
                 use case that requires careful consideration of the
                 traffic flows and usage patterns to address the needs
                 of cloud clusters. It has high East-West traffic
@@ -135,7 +167,8 @@
                 substantial North-South traffic depending on the
                 specific application.</para>
         </listitem>
-    </itemizedlist>
+      </varlistentry>
+    </variablelist>
 
     <xi:include href="network_focus/section_user_requirements_network_focus.xml"/>
     <xi:include href="network_focus/section_tech_considerations_network_focus.xml"/>
diff --git a/doc/arch-design/ch_specialized.xml b/doc/arch-design/ch_specialized.xml
index ce99a80332..211162d2d6 100644
--- a/doc/arch-design/ch_specialized.xml
+++ b/doc/arch-design/ch_specialized.xml
@@ -17,34 +17,50 @@
         for each use case:</para>
     <itemizedlist>
         <listitem>
-            <para>Specialized Networking: This describes running
-                networking-oriented software that may involve reading
-                packets directly from the wire or participating in
-                routing protocols.</para>
+            <para>
+              <link
+              linkend="specialized-networking-example">Specialized
+              Networking</link>: This describes running
+              networking-oriented software that may involve reading
+              packets directly from the wire or participating in
+              routing protocols.
+            </para>
         </listitem>
         <listitem>
-            <para>Software-Defined Networking: This use case details
-                both running an SDN controller from within OpenStack
-                as well as participating in a software-defined
-                network.</para>
+            <para>
+              <link
+              linkend="software-defined-networking-sdn">Software-defined
+              networking (SDN)</link>: This use case details both
+              running an SDN controller from within OpenStack as well
+              as participating in a software-defined network.
+            </para>
         </listitem>
         <listitem>
-            <para>Desktop-as-a-Service: This is for organizations that
-                want to run a virtualized desktop environment on a
-                cloud. This can apply to private or public
-                clouds.</para>
+            <para>
+              <link
+              linkend="desktop-as-a-service">Desktop-as-a-Service</link>:
+              This is for organizations that want to run a virtualized
+              desktop environment on a cloud. This can apply to
+              private or public clouds.
+            </para>
         </listitem>
         <listitem>
-            <para>OpenStack on OpenStack: Some organizations are
-                finding that it makes technical sense to build a
-                multi-tiered cloud by running OpenStack on top of an
-                OpenStack installation.</para>
+            <para>
+              <link
+              linkend="arch-guide-openstack-on-openstack">OpenStack on
+              OpenStack</link>: Some organizations are finding that it
+              makes technical sense to build a multi-tiered cloud by
+              running OpenStack on top of an OpenStack
+              installation.
+            </para>
         </listitem>
         <listitem>
-            <para>Specialized Hardware: Some highly specialized
-                situations will require the use of specialized
-                hardware devices from within the OpenStack
-                environment.</para>
+            <para>
+              <link linkend="specialized-hardware">Specialized
+              hardware</link>: Some highly specialized situations will
+              require the use of specialized hardware devices from
+              within the OpenStack environment.
+            </para>
         </listitem>
     </itemizedlist>
 
diff --git a/doc/arch-design/specialized/section_software_defined_networking_specialized.xml b/doc/arch-design/specialized/section_software_defined_networking_specialized.xml
index 29ac398670..d15b44ef8b 100644
--- a/doc/arch-design/specialized/section_software_defined_networking_specialized.xml
+++ b/doc/arch-design/specialized/section_software_defined_networking_specialized.xml
@@ -5,8 +5,8 @@
   version="5.0"
   xml:id="software-defined-networking-sdn">
   <?dbhtml stop-chunking?>
-  <title>Software Defined Networking</title>
-  <para>Software Defined Networking (SDN) is the separation of the data
+  <title>Software-defined networking</title>
+  <para>Software-defined networking (SDN) is the separation of the data
     plane and control plane. SDN has become a popular method of
     managing and controlling packet flows within networks. SDN
     uses overlays or directly controlled layer 2 devices to