From 9ad39c026c8a3c945a7003c4aa4f5cb1d4c80160 Mon Sep 17 00:00:00 2001 From: Nathan Skrzypczak Date: Thu, 19 Aug 2021 11:38:06 +0200 Subject: docs: better docs, mv doxygen to sphinx This patch refactors the VPP sphinx docs in order to make it easier to consume for external readers as well as VPP developers. It also makes sphinx the single source of documentation, which simplifies maintenance and operation. Most important updates are: - reformat the existing documentation as rst - split RELEASE.md and move it into separate rst files - remove section 'events' - remove section 'archive' - remove section 'related projects' - remove section 'feature by release' - remove section 'Various links' - make (Configuration reference, CLI docs, developer docs) top level items in the list - move 'Use Cases' as part of 'About VPP' - move 'Troubleshooting' as part of 'Getting Started' - move test framework docs into 'Developer Documentation' - add a 'Contributing' section for gerrit, docs and other contributer related infos - deprecate doxygen and test-docs targets - redirect the "make doxygen" target to "make docs" Type: refactor Change-Id: I552a5645d5b7964d547f99b1336e2ac24e7c209f Signed-off-by: Nathan Skrzypczak Signed-off-by: Andrew Yourtchenko --- docs/gettingstarted/writingdocs/buildingrst.rst | 94 ------------------ docs/gettingstarted/writingdocs/index.rst | 20 ---- .../writingdocs/styleguide/index.rst | 31 ------ .../writingdocs/styleguide/iperf-vm.xml | 106 --------------------- .../writingdocs/styleguide/rawhtml.rst | 10 -- .../writingdocs/styleguide/styleguide.rst | 20 ---- .../writingdocs/styleguide/styleguide02.rst | 83 ---------------- .../writingdocs/styleguide/styleguide02table.rst | 76 --------------- .../writingdocs/styleguide/styleguide03.rst | 32 ------- .../writingdocs/styleguide/styleguide04.rst | 12 --- .../writingdocs/styleguide/styleguide05.rst | 11 --- .../writingdocs/styleguide/xmlexample.rst | 11 --- .../writingdocs/styleguidemd/index.rst | 16 ---- .../writingdocs/styleguidemd/styleguide.md | 13 --- .../writingdocs/styleguidemd/styleguide02.md | 66 ------------- .../writingdocs/styleguidemd/styleguide03.md | 32 ------- 16 files changed, 633 deletions(-) delete mode 100644 docs/gettingstarted/writingdocs/buildingrst.rst delete mode 100644 docs/gettingstarted/writingdocs/index.rst delete mode 100644 docs/gettingstarted/writingdocs/styleguide/index.rst delete mode 100644 docs/gettingstarted/writingdocs/styleguide/iperf-vm.xml delete mode 100644 docs/gettingstarted/writingdocs/styleguide/rawhtml.rst delete mode 100644 docs/gettingstarted/writingdocs/styleguide/styleguide.rst delete mode 100644 docs/gettingstarted/writingdocs/styleguide/styleguide02.rst delete mode 100644 docs/gettingstarted/writingdocs/styleguide/styleguide02table.rst delete mode 100644 docs/gettingstarted/writingdocs/styleguide/styleguide03.rst delete mode 100644 docs/gettingstarted/writingdocs/styleguide/styleguide04.rst delete mode 100644 docs/gettingstarted/writingdocs/styleguide/styleguide05.rst delete mode 100644 docs/gettingstarted/writingdocs/styleguide/xmlexample.rst delete mode 100644 docs/gettingstarted/writingdocs/styleguidemd/index.rst delete mode 100644 docs/gettingstarted/writingdocs/styleguidemd/styleguide.md delete mode 100644 docs/gettingstarted/writingdocs/styleguidemd/styleguide02.md delete mode 100644 docs/gettingstarted/writingdocs/styleguidemd/styleguide03.md (limited to 'docs/gettingstarted/writingdocs') diff --git a/docs/gettingstarted/writingdocs/buildingrst.rst b/docs/gettingstarted/writingdocs/buildingrst.rst deleted file mode 100644 index 474257d35d0..00000000000 --- a/docs/gettingstarted/writingdocs/buildingrst.rst +++ /dev/null @@ -1,94 +0,0 @@ -.. _buildingrst: - -************************** -Creating VPP Documents -************************** - -These instructions show how the VPP documentation sources are built. - -The VPP Documents are written using `reStructuredText `_ (rst), -or markdown (md). These files are then built using the Sphinx build system `Sphinx `_. - -Get the VPP sources -===================== - -Start with a clone of the vpp repository. - -.. code-block:: console - - $ git clone https://gerrit.fd.io/r/vpp - $ cd vpp - - -Install the Necessary Packages -=============================== - -Before building the docs there are some packages that are needed. To install -these packages on ubuntu execute the following. - -.. code-block:: console - - $ sudo apt-get install python3-all python3-setuptools python3-pip - - -Create a Virtual Environment using virtualenv -=============================================== - -For more information on how to use the Python virtual environment check out -`Installing packages using pip and virtualenv`_. - -.. _`Installing packages using pip and virtualenv`: https://packaging.python.org/guides/installing-using-pip-and-virtualenv/ - -In the vpp root directory on your system, run: - -.. code-block:: console - - $ make docs-venv - -Which installs all the required applications into it's own, isolated, virtual environment, so as to not -interfere with other builds that may use different versions of software. - -Build the html files -====================== - -Build the html **index.html** file: - -.. code-block:: console - - $ make docs - -Clean the environment -====================== - -Delete all the generated files with the following: - -.. code-block:: console - - $ make docs-clean - -View the results -================= - -| If there are no errors during the build process, you should now have an **index.html** file in your -| **vpp/docs/_build/html** directory, which you can then view in your browser. - -.. figure:: /_images/htmlBuild.png - :alt: Figure: My directory containing the index.html file - :scale: 35% - :align: center - -Whenever you make changes to your **.rst** files that you want to see, repeat this build process. - -.. note:: - - To exit from the virtual environment execute: - -.. code-block:: console - - $ deactivate - -Getting your documents reviewed and merged -========================================== - -VPP documents are reviewed and merged like and other source code. Refer to :ref:`gitreview` -to get your changes reviewed and merged. diff --git a/docs/gettingstarted/writingdocs/index.rst b/docs/gettingstarted/writingdocs/index.rst deleted file mode 100644 index 45a746df826..00000000000 --- a/docs/gettingstarted/writingdocs/index.rst +++ /dev/null @@ -1,20 +0,0 @@ -.. _writingdocs: - -######################### -Writing Documents -######################### - -This section covers the following topics: - -* Building VPP Documents -* Merging FD.io VPP documents and performing a Git review -* reStructured Text Style Guide that describes different format styles -* Markdown Style Guide that describes different format styles - - -.. toctree:: - :maxdepth: 3 - - buildingrst - styleguide/index.rst - styleguidemd/index.rst diff --git a/docs/gettingstarted/writingdocs/styleguide/index.rst b/docs/gettingstarted/writingdocs/styleguide/index.rst deleted file mode 100644 index 240b3a26b19..00000000000 --- a/docs/gettingstarted/writingdocs/styleguide/index.rst +++ /dev/null @@ -1,31 +0,0 @@ -.. _styleguide: - -############################# -reStructured Text Style Guide -############################# - -Most of the these documents are written ins reStructured Text (rst). This chapter describes some of -the Sphinx Markup Constructs used in these documents. The Sphinx style guide can be found at: -`Sphinx Style Guide `_ -For a more detailed list of Sphinx Markup Constructs please refer to: -`Sphinx Markup Constructs `_ - -This document is also an example of a directory structure for a document that spans multiple pages. -Notice we have the file **index.rst** and the then documents that are referenced in index.rst. The -referenced documents are shown at the bottom of this page. - -A label is shown at the top of this page. Then the first construct describes a the document title -**FD.io Style Guide**. Text usually follows under each title or heading. - -A **Table of Contents** structure is shown below. Using **toctree** in this way will show the headings -in a nicely in the generated documents. - -.. toctree:: - :maxdepth: 2 - - styleguide.rst - styleguide02.rst - styleguide02table.rst - styleguide03.rst - styleguide04.rst - styleguide05.rst diff --git a/docs/gettingstarted/writingdocs/styleguide/iperf-vm.xml b/docs/gettingstarted/writingdocs/styleguide/iperf-vm.xml deleted file mode 100644 index be354c5f977..00000000000 --- a/docs/gettingstarted/writingdocs/styleguide/iperf-vm.xml +++ /dev/null @@ -1,106 +0,0 @@ - - iperf-server - 1048576 - 1048576 - - - - - - 1 - - /machine - - - hvm - - - - - - - - - - - - - - - - - - destroy - restart - restart - - - - - - /usr/bin/kvm - - - - - - -
- - - - - - - - -
- - - -
- - - - - - -
- - - -
- - - - - - -
- - - - - - - - - - - - - - - - - - -
- - - - - libvirt-2c4c9317-c7a5-4b37-b789-386ccda7348a - - - diff --git a/docs/gettingstarted/writingdocs/styleguide/rawhtml.rst b/docs/gettingstarted/writingdocs/styleguide/rawhtml.rst deleted file mode 100644 index e94eb452312..00000000000 --- a/docs/gettingstarted/writingdocs/styleguide/rawhtml.rst +++ /dev/null @@ -1,10 +0,0 @@ -.. _rawhtml01: - -Raw HTML Example -================ - -This example shows how to include include a CSIT performance graph. - -.. raw:: html - -