X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=README.md;h=7f429d12b31b108f0ec1907547d62a1cb0d64ac7;hb=560274d042d12f31aceabff6a293cdf71429552d;hp=bf26c9debc6ab25cd1579ca7bb87e125090b0e88;hpb=5ccbaa97a86715bfee2ab44523075a93a8abb698;p=vpp.git

diff --git a/README.md b/README.md
index bf26c9debc6..7f429d12b31 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 Vector Packet Processing
 ========================
 
-## Introduction.
+## Introduction
 
 The VPP platform is an extensible framework that provides out-of-the-box
 production quality switch/router functionality. It is the open source version
@@ -16,7 +16,13 @@ For more information on VPP and its features please visit the
 [What is VPP?](https://wiki.fd.io/view/VPP/What_is_VPP%3F) pages.
 
 
-## Directory layout.
+## Changes
+
+Details of the changes leading up to this version of VPP can be found under
+@ref release_notes.
+
+
+## Directory layout
 
 Directory name         | Description
 ---------------------- | -------------------------------------------
@@ -24,26 +30,24 @@ Directory name         | Description
      build-root        | Build output directory
      doxygen           | Documentation generator configuration
      dpdk              | DPDK patches and build infrastructure
-     g2                | Event log visualization tool
-     gmod              | perf related?
-     perftool          | Performance tool
-@ref plugins           | VPP bundled plugins directory
-@ref svm               | Shared virtual memory allocation library
+@ref src               | VPP source code
+@ref src/plugins       | VPP bundled plugins directory
+@ref src/svm           | Shared virtual memory allocation library
+     src/tests         | Unit tests
+     src/vat           | VPP API test program
+@ref src/vlib          | VPP application library
+@ref src/vlibapi       | VPP API library
+@ref src/vlibmemory    | VPP Memory management
+@ref src/vlibsocket    | VPP Socket I/O
+@ref src/vnet          | VPP networking
+@ref src/vpp           | VPP application
+@ref src/vpp-api       | VPP application API bindings
+@ref src/vppinfra      | VPP core library
      test              | Unit tests
-@ref vlib              | VPP application library source
-@ref vlib-api          | VPP API library source
-@ref vnet              | VPP networking source
-@ref vpp               | VPP application source
-@ref vpp-api           | VPP application API source
-     vppapigen         | VPP API generator source
-     vpp-api-test      | VPP API test program source
-@ref vppinfra          | VPP core library source
-
-(If the page you are viewing is not generated by Doxygen then
-ignore any @@ref labels in the above table.)
+@ref src/vpp/api       | Not-yet-relocated API bindings
 
 
-## Getting started.
+## Getting started
 
 In general anyone interested in building, developing or running VPP should
 consult the [VPP wiki](https://wiki.fd.io/view/VPP) for more complete
@@ -57,13 +61,13 @@ coverage of the topic.
 For the impatient, some salient information is distilled below.
 
 
-### Quick-start: On an existing Linux host.
+### Quick-start: On an existing Linux host
 
 To install system dependencies, build VPP and then install it, simply run the
 build script. This should be performed a non-privileged user with `sudo`
 access from the project base directory:
 
-    ./build-root/vagrant/build.sh
+    ./extras/vagrant/build.sh
 
 If you want a more fine-grained approach because you intend to do some
 development work, the `Makefile` in the root directory of the source tree
@@ -73,9 +77,9 @@ interest. To see the available targets run:
     make
 
 
-### Quick-start: Vagrant.
+### Quick-start: Vagrant
 
-The directory `build-root/vagrant` contains a `VagrantFile` and supporting
+The directory `extras/vagrant` contains a `VagrantFile` and supporting
 scripts to bootstrap a working VPP inside a Vagrant-managed Virtual Machine.
 This VM can then be used to test concepts with VPP or as a development
 platform to extend VPP. Some obvious caveats apply when using a VM for VPP
@@ -88,10 +92,15 @@ for this can be found [on the Setting up Vagrant wiki page]
 (https://wiki.fd.io/view/DEV/Setting_Up_Vagrant).
 
 
-## More information.
+## More information
 
 Several modules provide documentation, see @subpage user_doc for more
 information.
 
 Visit the [VPP wiki](https://wiki.fd.io/view/VPP) for details on more
 advanced building strategies and development notes.
+
+
+## Test Framework
+
+There is PyDoc generated documentation available for the VPP test framework. See @subpage test_framework_doc for details.