docs: better docs, mv doxygen to sphinx

[vpp.git] / docs / gettingstarted / installing / ubuntu.rst

diff --git a/docs/gettingstarted/installing/ubuntu.rst b/docs/gettingstarted/installing/ubuntu.rst
index d1daed1..f1bdb3e 100644 (file)
--- a/docs/gettingstarted/installing/ubuntu.rst
+++ b/docs/gettingstarted/installing/ubuntu.rst
@@ -1,17 +1,17 @@
 .. _ubuntu:
 
 .. toctree::
- 
-Ubuntu 16.04 - Setup the fd.io Repository
-==========================================
 
-Choose one of the following releases to install.
+Ubuntu - Setup the FD.io Repository
+===================================
 
+Choose one of the following releases to install.
 
 Update the OS
 -----------------------
 
-It is a good idea to first update and upgrade the OS before starting; run the following command to update the OS:
+It is a good idea to first update and upgrade the OS before starting; run the
+following command to update the OS:
 
 .. code-block:: console
 
@@ -33,18 +33,13 @@ Create the file **/etc/apt/sources.list.d/99fd.io.list** that contain the follow
 
 .. code-block:: console
 
-   deb [trusted=yes] https://nexus.fd.io/content/repositories/fd.io.ubuntu.xenial.main/ ./
-
+   deb [trusted=yes] https://packagecloud.io/fdio/release/ubuntu bionic main
 
-VPP stable/1804 Branch
-^^^^^^^^^^^^^^^^^^^^^^^
-
-Create the file **/etc/apt/sources.list.d/99fd.io.list** that contain the following contents:
+Get the key:
 
 .. code-block:: console
 
-   deb [trusted=yes] https://nexus.fd.io/content/repositories/fd.io.stable.1804.ubuntu.xenial.main/ ./
-
+  curl -L https://packagecloud.io/fdio/release/gpgkey | sudo apt-key add -
 
 VPP master Branch
 ^^^^^^^^^^^^^^^^^^^^
@@ -53,7 +48,13 @@ Create the file **/etc/apt/sources.list.d/99fd.io.list** that contain the follow
 
 .. code-block:: console
 
-   deb [trusted=yes] https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/ ./
+   deb [trusted=yes] https://packagecloud.io/fdio/master/ubuntu bionic main
+
+Get the key:
+
+.. code-block:: console
+
+  curl -L https://packagecloud.io/fdio/master/gpgkey | sudo apt-key add -
 
 
 Install the Mandatory Packages
@@ -64,7 +65,7 @@ Install the mandatory packages by running the following commands:
 .. code-block:: console
 
   sudo apt-get update
-  sudo apt-get install vpp-lib vpp vpp-plugins
+  sudo apt-get install vpp vpp-plugin-core vpp-plugin-dpdk
 
 
 Install the Optional Packages
@@ -74,7 +75,7 @@ Install the optional packages by running the following command:
 
 .. code-block:: console
 
-  sudo apt-get install vpp-dbg vpp-dev vpp-api-java vpp-api-python vpp-api-lua
+  sudo apt-get install vpp-api-python python3-vpp-api vpp-dbg vpp-dev
 
 
 Uninstall the Packages
@@ -84,4 +85,4 @@ Uninstall the  packages by running the following command:
 
 .. code-block:: console
 
-  sudo apt-get remove --purge vpp*
+  sudo apt-get remove --purge "vpp*"