From: ChristopherPrice <christopher.price@ericsson.com>
Date: Wed, 18 May 2016 09:49:02 +0000 (+0200)
Subject: Adding additional examples and references to the glossary.
X-Git-Tag: colorado.1.0~32
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F01%2F14301%2F2;p=opnfvdocs.git

Adding additional examples and references to the glossary.

Change-Id: I87a7b98891335914de4be2f346b7b932d4da1987
Signed-off-by: ChristopherPrice <christopher.price@ericsson.com>
---

diff --git a/docs/glossary/index.rst b/docs/glossary/index.rst
index 0102d1868..be5b6d732 100644
--- a/docs/glossary/index.rst
+++ b/docs/glossary/index.rst
@@ -12,6 +12,8 @@ Contents
 
 This glossary provides a common definition of phrases and words commonly used in OPNFV.
 
+--------
+
 A
 -
 
@@ -19,6 +21,11 @@ Arno
 
   A river running through Tuscany and the name of the first OPNFV release.
 
+API
+    Application Programming Interface
+
+--------
+
 B
 -
 
@@ -26,6 +33,47 @@ Brahmaputra
 
   A river running through Asia and the name of the Second OPNFV release.
 
+--------
+
+C
+-
+
+Colorado
+
+  A river in Argentina and the name of the Third OPNFV release.
+
+--------
+
+D
+-
+
+DPDK
+
+  Data Plane Development Kit
+
+DPI
+
+  Deep Packet Inspection
+
+DSCP
+
+  Differentiated Services Code Point
+
+--------
+
+I
+-
+
+IGMP
+
+  Internet Group Management Protocol
+
+IOPS
+
+  Input/Output Operations Per Second
+
+--------
+
 N
 -
 
@@ -33,6 +81,16 @@ NFV
 
   Network Functions Virtualisation, an industry initiative to leverage virtualisation technologies in carrier networks.
 
+NFVI
+
+  Network Function Virtualization Infrastructure
+
+NIC
+
+  Network Interface Controller
+
+--------
+
 O
 -
 
@@ -40,3 +98,20 @@ OPNFV
 
   Open Platform for NFV, an open source project developing an NFV reference platform and features.
 
+--------
+
+V
+-
+
+VLAN
+
+  A virtual local area network, typically an isolated ethernet network.
+
+VM
+
+  Virtual machine, an emulation in software of a computer system.
+
+VNF
+
+  Virtual network function, typically a networking application or function running in a virtual environment.
+