From cb3e4c7818faf470486d1fadb07c97bc62e7bf31 Mon Sep 17 00:00:00 2001
From: OpenStack Proposal Bot <openstack-infra@lists.openstack.org>
Date: Mon, 22 Sep 2014 16:46:32 +0000
Subject: [PATCH] Updated from openstack-manuals

Change-Id: I4371b590fc3df4a7e73daf834401ea9e0f2ac55b
---
 doc/glossary/glossary-terms.xml | 51 +++++++++++++++++++++++++--------
 1 file changed, 39 insertions(+), 12 deletions(-)

diff --git a/doc/glossary/glossary-terms.xml b/doc/glossary/glossary-terms.xml
index 63ec8aa8..2367ebb2 100644
--- a/doc/glossary/glossary-terms.xml
+++ b/doc/glossary/glossary-terms.xml
@@ -2642,8 +2642,8 @@
         </indexterm>
 
       <glossdef>
-        <para>Daemon that provides DNS, DHCP, BOOTP, and TFTP services, used
-        by the Compute VLAN manager and FlatDHCP manager.</para>
+        <para>Daemon that provides DNS, DHCP, BOOTP, and TFTP services for
+          virtual networks.</para>
       </glossdef>
     </glossentry>
 
@@ -3369,12 +3369,11 @@
         </indexterm>
 
       <glossdef>
-        <para>The Network Controller provides virtual networks to enable
-        compute servers to interact with each other and with the public
-        network. All machines must have a public and private network
-        interface. A flat network is a private network interface, which is
-        controlled by the <literal>flat_interface</literal> option with flat
-        managers.</para>
+        <para>Virtual network type that uses neither VLANs nor tunnels to
+          segregate tenant traffic. Each flat network typically requires
+          a separate underlying physical interface defined by bridge
+          mappings. However, a flat network can contain multiple
+          subnets.</para>
       </glossdef>
     </glossentry>
 
@@ -3495,9 +3494,9 @@
     </glossentry>
 
     <glossentry>
-      <glossterm>Generic Receive Offload (GRO)</glossterm>
+      <glossterm>generic receive offload (GRO)</glossterm>
       <indexterm class="singular">
-          <primary>Generic Receive Offload (GRO)</primary>
+          <primary>generic receive offload (GRO)</primary>
         </indexterm>
       <glossdef>
         <para>Feature of certain network interface drivers that
@@ -4414,9 +4413,9 @@
     </glossentry>
 
     <glossentry>
-      <glossterm>internet protocol (IP)</glossterm>
+      <glossterm>Internet protocol (IP)</glossterm>
       <indexterm class="singular">
-        <primary>internet protocol (IP)</primary>
+        <primary>Internet protocol (IP)</primary>
       </indexterm>
 
       <glossdef>
@@ -5272,6 +5271,20 @@
   <glossdiv>
     <title>N</title>
 
+    <glossentry>
+      <glossterm>network namespace</glossterm>
+      <indexterm class="singular">
+          <primary>network namespace</primary>
+        </indexterm>
+
+      <glossdef>
+        <para>Linux kernel feature that provides independent virtual
+          networking instances on a single host with separate routing
+          tables and interfaces. Similar to virtual routing and forwarding
+          (VRF) services on physical network equipment.</para>
+      </glossdef>
+    </glossentry>
+
     <glossentry>
       <glossterm>Nebula</glossterm>
       <indexterm class="singular">
@@ -5886,6 +5899,20 @@
       </glossdef>
     </glossentry>
 
+    <glossentry>
+      <glossterm>Open vSwitch (OVS) agent</glossterm>
+      <indexterm class="singular">
+          <primary>Open vSwitch (OVS) agent</primary>
+        </indexterm>
+
+      <glossdef>
+        <para>
+          Provides an interface to the underlying Open vSwitch service for
+          the Networking plug-in.
+        </para>
+      </glossdef>
+    </glossentry>
+
     <glossentry>
       <glossterm>Open vSwitch neutron plug-in</glossterm>
       <indexterm class="singular">