blob: 4e76f6149d8d181e9ab93d20f323b659bd645f1e [file] [log] [blame]
Rich Bennettac93e0e2017-07-19 01:36:52 -04001.. This work is licensed under a Creative Commons Attribution 4.0 International License.
2
Rich Bennettac93e0e2017-07-19 01:36:52 -04003
Rich Bennett1da30462017-08-24 12:11:36 -04004Setting Up
5==========
jsseidelda2324a2017-09-15 10:43:14 -04006
Rich Bennetta9d6a442017-08-25 02:37:15 -04007Some initial set up is required to connect a project with
Rich Bennett1da30462017-08-24 12:11:36 -04008the master document structure and enable automated publishing of
Blaisonneau David2963ece2017-11-27 10:07:18 +01009changes as summarized in the following diagram and description below
Rich Bennett1da30462017-08-24 12:11:36 -040010below.
Rich Bennettac93e0e2017-07-19 01:36:52 -040011
Rich Bennett1da30462017-08-24 12:11:36 -040012.. seqdiag::
Rich Bennetta9d6a442017-08-25 02:37:15 -040013 :height: 700
14 :width: 1000
Rich Bennettac93e0e2017-07-19 01:36:52 -040015
Rich Bennett1da30462017-08-24 12:11:36 -040016 seqdiag {
17 RD [label = "Read The Docs", color =lightgreen ];
18 DA [label = "Doc Project\nAuthor/Committer", color=lightblue];
19 DR [label = "Doc Gerrit Repo" , color=pink];
20 PR [label = "Other Project\nGerrit Repo", color=pink ];
21 PA [label = "Other Project\nAuthor/Committer", color=lightblue];
Blaisonneau David2963ece2017-11-27 10:07:18 +010022
Rich Bennett1da30462017-08-24 12:11:36 -040023 === One time setup doc project only ===
Blaisonneau David2963ece2017-11-27 10:07:18 +010024 RD -> DA [label = "Acquire Account" ];
Rich Bennetta9d6a442017-08-25 02:37:15 -040025 DA -> DR [label = "Create initial\n doc repository content"];
26 DA <<-- DR [label = "Merge" ];
Rich Bennett1da30462017-08-24 12:11:36 -040027 RD <-- DA [label = "Connect gerrit.onap.org" ];
Rich Bennette4c42512017-09-06 08:07:22 -040028 === For each project repository containing document source ===
29 PA -> DR [label = "Add project repo as\ngit submodule" ];
30 DR -> DA [label = "Review & Plan to\nIntegrate Content with\nTocTree Structure" ];
31 DR <-- DA [label = "Vote +2/Merge" ];
Blaisonneau David2963ece2017-11-27 10:07:18 +010032 PA <-- DR [label = "Merge Notification" ];
Rich Bennette4c42512017-09-06 08:07:22 -040033 PA -> PR [label = "Create in project repo\ntop level directory and index.rst" ];
Rich Bennett358472a2017-08-31 08:05:36 -040034 PR -> DA [label = "Add as Reviewer" ];
35 PR <-- DA [label = "Approve and Integrate" ];
36 PA <-- PR [label = "Merge" ];
Rich Bennett1da30462017-08-24 12:11:36 -040037 }
Blaisonneau David2963ece2017-11-27 10:07:18 +010038
39
Rich Bennettac93e0e2017-07-19 01:36:52 -040040
Rich Bennett1da30462017-08-24 12:11:36 -040041Setup doc project
42-----------------
43These steps are performed only once for the doc project and include:
Rich Bennettac93e0e2017-07-19 01:36:52 -040044
Rich Bennett1da30462017-08-24 12:11:36 -040045(1) creating in the doc repository an initial:
Blaisonneau David2963ece2017-11-27 10:07:18 +010046 - sphinx master document index
47 - a directory structure aligned with the document structure
48 - tests performed in jenkins verify jobs
49 - sphinx configuration
50
Rich Bennetta9d6a442017-08-25 02:37:15 -040051(2) establishing an account at readthedocs connected with the doc
52doc project repo in gerrit.onap.org.
Rich Bennett1da30462017-08-24 12:11:36 -040053
54
Rich Bennette4c42512017-09-06 08:07:22 -040055Setup project repositories(s)
56-----------------------------
Blaisonneau David2963ece2017-11-27 10:07:18 +010057These steps are performed for each project repository that provides documentation.
Rich Bennett1da30462017-08-24 12:11:36 -040058
Rich Bennett5baea462017-09-13 03:19:19 -040059First let's set two variables that will be used in the subsequent steps.
Rich Bennette4c42512017-09-06 08:07:22 -040060Set reponame to the project repository you are setting up just as it appears in the
61**Project Name** column of the Gerrit projects page.
62Set lfid to your Linux Foundation identity that you use to login to gerrit or for git
63clone requests over ssh.
64
65.. code-block:: bash
66
67 reponame=
68 lfid=
69
Blaisonneau David2963ece2017-11-27 10:07:18 +010070The next step is to add a directory in the doc project where your project will be included as a
Rich Bennette4c42512017-09-06 08:07:22 -040071submodule and at least one reference from the doc project to the documentation index in your repository.
Rich Bennett5baea462017-09-13 03:19:19 -040072The following sequence will do this over ssh.
73
74.. caution::
75
76 If your access network restricts ssh, you will need to use equivalent git commands and
77 HTTP Passwords as described `here <http://wiki.onap.org/x/X4AP>`_.
Blaisonneau David2963ece2017-11-27 10:07:18 +010078
Rich Bennett358472a2017-08-31 08:05:36 -040079.. code-block:: bash
80
Rich Bennette4c42512017-09-06 08:07:22 -040081 git clone ssh://$lfid@gerrit.onap.org:29418/doc
Rich Bennett358472a2017-08-31 08:05:36 -040082 cd doc
83 mkdir -p `dirname docs/submodules/$reponame`
Rich Bennett2360e212017-09-20 08:26:05 -040084 git submodule add ../$reponame docs/submodules/$reponame.git
Rich Bennette4c42512017-09-06 08:07:22 -040085 git submodule init docs/submodules/$reponame.git
86 git submodule update docs/submodules/$reponame.git
Rich Bennett358472a2017-08-31 08:05:36 -040087
Rich Bennette4c42512017-09-06 08:07:22 -040088 echo " $reponame <../submodules/$reponame.git/docs/index>" >> docs/release/repolist.rst
Blaisonneau David2963ece2017-11-27 10:07:18 +010089
Rich Bennett358472a2017-08-31 08:05:36 -040090 git add .
Rich Bennette4c42512017-09-06 08:07:22 -040091 git commit -s
Rich Bennett358472a2017-08-31 08:05:36 -040092 git review
Blaisonneau David2963ece2017-11-27 10:07:18 +010093
Rich Bennett5baea462017-09-13 03:19:19 -040094.. caution::
95 Wait for the above change to be merged before any merge to the
96 project repository that you have just added as a submodule.
97 If the project repository added as submodule changes before the doc project merge, git may not
98 automatically update the submodule reference on changes and/or the verify job will
99 fail in the step below.
Rich Bennett358472a2017-08-31 08:05:36 -0400100
101
Rich Bennette4c42512017-09-06 08:07:22 -0400102The last step is to create a docs directory in your repository with an index.rst file.
Rich Bennett5baea462017-09-13 03:19:19 -0400103The following sequence will complete the minimum required over ssh. As you have time
104to convert or add new content you can update the index and add files under the docs folder.
105
106.. hint::
107 If you have additional content, you can include it by editing the
108 index.rst file and/or adding other files before the git commit.
109 See `Templates and Examples`_ below and :ref:`converting-to-rst` for more information.
Blaisonneau David2963ece2017-11-27 10:07:18 +0100110
Rich Bennett1da30462017-08-24 12:11:36 -0400111
112.. code-block:: bash
113
Rich Bennette4c42512017-09-06 08:07:22 -0400114 git clone ssh://$lfid@gerrit.onap.org:29418/$reponame
Rich Bennetta9d6a442017-08-25 02:37:15 -0400115 cd $reponame
Rich Bennett1da30462017-08-24 12:11:36 -0400116 mkdir docs
117 echo ".. This work is licensed under a Creative Commons Attribution 4.0 International License.
118
Rich Bennetta9d6a442017-08-25 02:37:15 -0400119 TODO Add files to toctree and delete this header
120 ------------------------------------------------
Rich Bennett1da30462017-08-24 12:11:36 -0400121 .. toctree::
122 :maxdepth: 1
Blaisonneau David2963ece2017-11-27 10:07:18 +0100123
Rich Bennett1da30462017-08-24 12:11:36 -0400124 " > docs/index.rst
Blaisonneau David2963ece2017-11-27 10:07:18 +0100125
Rich Bennett1da30462017-08-24 12:11:36 -0400126 git add .
Rich Bennette4c42512017-09-06 08:07:22 -0400127 git commit -s
Rich Bennett1da30462017-08-24 12:11:36 -0400128 git review
Blaisonneau David2963ece2017-11-27 10:07:18 +0100129
Rich Bennettac93e0e2017-07-19 01:36:52 -0400130
Rich Bennett1da30462017-08-24 12:11:36 -0400131The diagram below illustrates what is accomplished in the setup steps
Rich Bennetta9d6a442017-08-25 02:37:15 -0400132above from the perspective of a file structure created for a local test,
Rich Bennett358472a2017-08-31 08:05:36 -0400133a jenkins verify job, and/or published release documentation including:
Rich Bennett0c826432017-09-18 17:28:09 -0400134
135- ONAP gerrit project repositories,
136- doc project repository master document index.rst, templates, configuration, and other documents
Blaisonneau David2963ece2017-11-27 10:07:18 +0100137- submodules directory where other project repositories and directories/files are referenced
Rich Bennett0c826432017-09-18 17:28:09 -0400138- file structure: directories (ellipses), files(boxes)
139- references: directory/files (solid edges), git submodule (dotted edges), sphinx toctree (dashed edges)
Rich Bennettac93e0e2017-07-19 01:36:52 -0400140
141
142.. graphviz::
143
Blaisonneau David2963ece2017-11-27 10:07:18 +0100144
Rich Bennettac93e0e2017-07-19 01:36:52 -0400145 digraph docstructure {
146 size="8,12";
147 node [fontname = "helvetica"];
148 // Align gerrit repos and docs directories
Rich Bennetta9d6a442017-08-25 02:37:15 -0400149 {rank=same doc aaf aai reponame repoelipse vnfsdk vvp}
Rich Bennett1da30462017-08-24 12:11:36 -0400150 {rank=same confpy release templates masterindex submodules otherdocdocumentelipse}
Rich Bennett358472a2017-08-31 08:05:36 -0400151 {rank=same releasedocumentindex releaserepolist}
Rich Bennettac93e0e2017-07-19 01:36:52 -0400152
153 //Illustrate Gerrit Repos and provide URL/Link for complete repo list
154 gerrit [label="gerrit.onap.org/r", href="https://gerrit.onap.org/r/#/admin/projects/" ];
Rich Bennett358472a2017-08-31 08:05:36 -0400155 doc [href="https://gerrit.onap.org/r/gitweb?p=doc.git;a=tree"];
Rich Bennettac93e0e2017-07-19 01:36:52 -0400156 gerrit -> doc;
157 gerrit -> aaf;
158 gerrit -> aai;
Blaisonneau David2963ece2017-11-27 10:07:18 +0100159 gerrit -> reponame;
Rich Bennett1da30462017-08-24 12:11:36 -0400160 gerrit -> repoelipse;
161 repoelipse [label=". . . ."];
Rich Bennettac93e0e2017-07-19 01:36:52 -0400162 gerrit -> vnfsdk;
163 gerrit -> vvp;
164
Rich Bennetta9d6a442017-08-25 02:37:15 -0400165 //Show example of local reponame instance of component info
166 reponame -> reponamedocsdir;
Blaisonneau David2963ece2017-11-27 10:07:18 +0100167 reponamesm -> reponamedocsdir;
Rich Bennetta9d6a442017-08-25 02:37:15 -0400168 reponamedocsdir [label="docs"];
Blaisonneau David2963ece2017-11-27 10:07:18 +0100169 reponamedocsdir -> repnamedocsdirindex;
Rich Bennette4c42512017-09-06 08:07:22 -0400170 repnamedocsdirindex [label="index.rst", shape=box];
Rich Bennettac93e0e2017-07-19 01:36:52 -0400171
Blaisonneau David2963ece2017-11-27 10:07:18 +0100172 //Show detail structure of a portion of doc/docs
Rich Bennettac93e0e2017-07-19 01:36:52 -0400173 doc -> docs;
Blaisonneau David2963ece2017-11-27 10:07:18 +0100174 docs -> confpy;
Rich Bennett1da30462017-08-24 12:11:36 -0400175 confpy [label="conf.py",shape=box];
Blaisonneau David2963ece2017-11-27 10:07:18 +0100176 docs -> masterindex;
Rich Bennett358472a2017-08-31 08:05:36 -0400177 masterindex [label="Master\nindex.rst", shape=box];
Rich Bennettac93e0e2017-07-19 01:36:52 -0400178 docs -> release;
Blaisonneau David2963ece2017-11-27 10:07:18 +0100179 docs -> templates;
180 docs -> otherdocdocumentelipse;
Rich Bennett1da30462017-08-24 12:11:36 -0400181 otherdocdocumentelipse [label="...other\ndocuments"];
Rich Bennettac93e0e2017-07-19 01:36:52 -0400182 docs -> submodules
Blaisonneau David2963ece2017-11-27 10:07:18 +0100183
Rich Bennett1da30462017-08-24 12:11:36 -0400184 masterindex -> releasedocumentindex [style=dashed, label="sphinx\ntoctree\nreference"];
Blaisonneau David2963ece2017-11-27 10:07:18 +0100185
Rich Bennett1da30462017-08-24 12:11:36 -0400186 //Show submodule linkage to docs directory
Blaisonneau David2963ece2017-11-27 10:07:18 +0100187 submodules -> reponamesm [style=dotted,label="git\nsubmodule\nreference"];
Rich Bennette4c42512017-09-06 08:07:22 -0400188 reponamesm [label="reponame.git"];
Rich Bennettac93e0e2017-07-19 01:36:52 -0400189
Rich Bennett1da30462017-08-24 12:11:36 -0400190 //Example Release document index that references component info provided in other project repo
Blaisonneau David2963ece2017-11-27 10:07:18 +0100191 release -> releasedocumentindex;
Rich Bennett1da30462017-08-24 12:11:36 -0400192 releasedocumentindex [label="index.rst", shape=box];
Rich Bennett358472a2017-08-31 08:05:36 -0400193 releasedocumentindex -> releaserepolist [style=dashed, label="sphinx\ntoctree\nreference"];
Blaisonneau David2963ece2017-11-27 10:07:18 +0100194 releaserepolist [label="repolist.rst", shape=box];
Rich Bennett358472a2017-08-31 08:05:36 -0400195 release -> releaserepolist;
Rich Bennette4c42512017-09-06 08:07:22 -0400196 releaserepolist -> repnamedocsdirindex [style=dashed, label="sphinx\ntoctree\nreference"];
Blaisonneau David2963ece2017-11-27 10:07:18 +0100197
Rich Bennettac93e0e2017-07-19 01:36:52 -0400198 }
199
Blaisonneau David2963ece2017-11-27 10:07:18 +0100200About GIT branches
201------------------
202
203GIT is a powerful tool allowing many actions, but without respecting some rules
204the GIT structure can be quickly ugly and unmaintaible.
205
206Here are some conventions about GIT branches:
207 - ALWAYS create a local branch to edit or create any file. This local branch
208 will be considered as a topic in Gerrit and allow contributors to work at the
209 same time on the same project.
210 - 1 feature = 1 branch. In the case of documentation, a new chapter or page about
211 a new code feature can be considered as a 'doc feature'
212 - 1 bug = 1 branch. In the case of documentation, a correction on an existing
213 sentence can be considered as a 'doc bug'
214 - the master branch is considered as "unstable", containing new features that
215 will converge to a stable situation for the release date.
216
217The day of the release, the repository owner will create a new branch to
218fix the code and documentation. This will represent the 'stable' code of the
219release. In this context:
220 - NEVER push a new feature on a stable branch
221 - Only bug correction are authorized on a stable branch using cherry pick method
222
223.. image:: git_branches.png
224
Rich Bennetta9d6a442017-08-25 02:37:15 -0400225Creating Restructured Text
226==========================
Rich Bennettac93e0e2017-07-19 01:36:52 -0400227
Rich Bennett5baea462017-09-13 03:19:19 -0400228Templates and Examples
229----------------------
Rich Bennett7134cba2017-10-10 07:39:06 -0400230Templates are available that capture the kinds of information
Blaisonneau David2963ece2017-11-27 10:07:18 +0100231useful for different types of projects and provide some examples of
232restructured text. We organize templates in the following way to: help authors
233understand relationships between documents; keep the user audience context in mind when writing;
Rich Bennett7134cba2017-10-10 07:39:06 -0400234and tailor sections for different kinds of projects.
235
236**Sections** Represent a certain type of content. A section is **provided** in a repository, to
237to describe something about the characteristics, use, capability, etc. of things in that repository.
238A section may also be **referenced** from other sections and in other repositories.
239The notes in the beginning of each section template provide
240additional detail about what is typically covered and where there may be references to the section.
241
242**Collections** Are a set of sections that are typically provided for a particular type
243of project, repository, guide, reference manual, etc.
244
245You can: browse the template *collections* and *sections* below; show source to look at the Restructured
246Text and Sphinx directives used; copy the source either from a browser window
Rich Bennett5baea462017-09-13 03:19:19 -0400247or by downloading the file in raw form from
Rich Bennett7134cba2017-10-10 07:39:06 -0400248the `gerrit doc repository <https://gerrit.onap.org/r/gitweb?p=doc.git;a=tree;f=docs/templates;/>`_ and
249then add them to your repository docs folder and index.rst.
250
251
252Sections
253++++++++
Rich Bennett5baea462017-09-13 03:19:19 -0400254
255.. toctree::
256 :maxdepth: 1
257 :glob:
258
Rich Bennett7134cba2017-10-10 07:39:06 -0400259 ../../../templates/sections/*
260
261
262Collections
263+++++++++++
264
265.. toctree::
266 :maxdepth: 1
267 :glob:
268
269 ../../../templates/collections/*
270
271
Rich Bennett5baea462017-09-13 03:19:19 -0400272
Blaisonneau David2963ece2017-11-27 10:07:18 +0100273In addition to these simple templates and examples
Rich Bennett5baea462017-09-13 03:19:19 -0400274there are many open source projects (e.g. Open Daylight, Open Stack)
275that are using Sphinx and Readthedocs where you may find examples to start with.
276Working with project teams we will continue to enhance templates here and
Blaisonneau David2963ece2017-11-27 10:07:18 +0100277capture frequently asked questions on the developer wiki question
Rich Bennett5baea462017-09-13 03:19:19 -0400278topic `documentation <https://wiki.onap.org/questions/topics/16384055/documentation>`_.
279
280Each project should: decide what is relevant content; determine the
281best way to create/maintain it in a CI/CD process; and work with the
282documentation team to reference content from the master index and guides.
Blaisonneau David2963ece2017-11-27 10:07:18 +0100283Consider options including filling in a template,
Rich Bennett5baea462017-09-13 03:19:19 -0400284identifying existing content that can be used as is or
285easily converted, and use of Sphinx directives/extensions to automatically
286generate restructured text from other source you already have.
Rich Bennettac93e0e2017-07-19 01:36:52 -0400287
Rich Bennetta9d6a442017-08-25 02:37:15 -0400288Links and References
Rich Bennett5baea462017-09-13 03:19:19 -0400289--------------------
Rich Bennettac93e0e2017-07-19 01:36:52 -0400290It's pretty common to want to reference another location in the
291ONAP documentation and it's pretty easy to do with
292reStructuredText. This is a quick primer, more information is in the
293`Sphinx section on Cross-referencing arbitrary locations
294<http://www.sphinx-doc.org/en/stable/markup/inline.html#ref-role>`_.
295
296Within a single document, you can reference another section simply by::
297
298 This is a reference to `The title of a section`_
299
300Assuming that somewhere else in the same file there a is a section
301title something like::
302
303 The title of a section
304 ^^^^^^^^^^^^^^^^^^^^^^
305
306It's typically better to use ``:ref:`` syntax and labels to provide
307links as they work across files and are resilient to sections being
308renamed. First, you need to create a label something like::
309
310 .. _a-label:
311
312 The title of a section
313 ^^^^^^^^^^^^^^^^^^^^^^
314
315.. note:: The underscore (_) before the label is required.
316
317Then you can reference the section anywhere by simply doing::
318
319 This is a reference to :ref:`a-label`
320
321or::
322
323 This is a reference to :ref:`a section I really liked <a-label>`
324
325.. note:: When using ``:ref:``-style links, you don't need a trailing
326 underscore (_).
327
328Because the labels have to be unique, it usually makes sense to prefix
329the labels with the project name to help share the label space, e.g.,
330``sfc-user-guide`` instead of just ``user-guide``.
331
Rich Bennetta9d6a442017-08-25 02:37:15 -0400332Testing
333=======
Rich Bennettac93e0e2017-07-19 01:36:52 -0400334
Rich Bennetta9d6a442017-08-25 02:37:15 -0400335One RST File
336------------
Rich Bennettac93e0e2017-07-19 01:36:52 -0400337It is recommended that all rst content is validated by `doc8 <https://pypi.python.org/pypi/doc8>`_ standards.
338To validate your rst files using doc8, install doc8.
339
340.. code-block:: bash
341
342 sudo pip install doc8
343
344doc8 can now be used to check the rst files. Execute as,
345
346.. code-block:: bash
347
348 doc8 --ignore D000,D001 <file>
349
350
Rich Bennettac93e0e2017-07-19 01:36:52 -0400351
Rich Bennetta9d6a442017-08-25 02:37:15 -0400352One Project
353-----------
Rich Bennettac93e0e2017-07-19 01:36:52 -0400354To test how the documentation renders in HTML, follow these steps:
355
356Install virtual environment.
357
358.. code-block:: bash
359
360 sudo pip install virtualenv
361 cd /local/repo/path/to/project
362
363Download the doc repository.
364
365.. code-block:: bash
366
367 git clone http://gerrit.onap.org/r/doc
368
369Change directory to doc & install requirements.
370
371.. code-block:: bash
372
373 cd doc
374 sudo pip install -r etc/requirements.txt
375
376Move the conf.py file to your project folder where RST files have been kept:
377
378.. code-block:: bash
379
380 mv doc/docs/conf.py <path-to-your-folder>/
381
382Move the static files to your project folder:
383
384.. code-block:: bash
385
386 mv docs/_static/ <path-to-your-folder>/
387
388Build the documentation from within your project folder:
389
390.. code-block:: bash
391
392 sphinx-build -b html <path-to-your-folder> <path-to-output-folder>
393
394Your documentation shall be built as HTML inside the
395specified output folder directory.
396
397.. note:: Be sure to remove the `conf.py`, the static/ files and the output folder from the `<project>/docs/`. This is for testing only. Only commit the rst files and related content.
398
jsseidel80666192017-09-19 13:29:23 -0400399.. _building-all-documentation:
Rich Bennettac93e0e2017-07-19 01:36:52 -0400400
Rich Bennetta9d6a442017-08-25 02:37:15 -0400401All Documentation
402-----------------
403To build the whole documentation under doc/, follow these steps:
Rich Bennettac93e0e2017-07-19 01:36:52 -0400404
Rich Bennetta9d6a442017-08-25 02:37:15 -0400405Install virtual environment.
Rich Bennettac93e0e2017-07-19 01:36:52 -0400406
407.. code-block:: bash
408
Rich Bennetta9d6a442017-08-25 02:37:15 -0400409 sudo pip install virtualenv
410 cd /local/repo/path/to/project
411
412Download the DOC repository.
413
414.. code-block:: bash
415
416 git clone http://gerrit.onap.org/r/doc
417
Rich Bennetta9d6a442017-08-25 02:37:15 -0400418Update submodules, build documentation using tox & then open using any browser.
419
420.. code-block:: bash
421
422 cd doc
Cédric Ollivier268209c2017-11-10 11:31:53 +0100423 tox -elocal
Rich Bennetta9d6a442017-08-25 02:37:15 -0400424 firefox docs/_build/html/index.html
425
Cédric Ollivier268209c2017-11-10 11:31:53 +0100426.. note:: Make sure to run `tox -elocal` and not just `tox`.