1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
|
.. _include-documentation:
============================
Including your Documentation
============================
.. contents::
:depth: 3
:local:
In your project repository
--------------------------
Add your documentation to your repository in the folder structure and
according to the templates listed above. The documentation templates you
will require are available in opnfvdocs/docs/templates/ repository, you should
copy the relevant templates to your <repo>/docs/ directory in your repository.
For instance if you want to document userguide, then your steps shall be
as follows:
.. code-block:: bash
git clone ssh://<your_id>@gerrit.opnfv.org:29418/opnfvdocs.git
cp -p opnfvdocs/docs/userguide/* <my_repo>/docs/userguide/
You should then add the relevant information to the template that will
explain the documentation. When you are done writing, you can commit
the documentation to the project repository.
.. code-block:: bash
git add .
git commit --signoff --all
git review
In OPNFVDocs Composite Documentation
------------------------------------
In toctree
+++++++++++
To import project documents from project repositories, we use submodules.
Each project is stored in :code:`opnfvdocs/docs/submodule/` as follows:
.. image:: Submodules.jpg
:scale: 50 %
To include your project specific documentation in the composite documentation,
first identify where your project documentation should be included.
Say your project userguide should figure in the ‘OPNFV Userguide’, then:
.. code-block:: bash
vim opnfvdocs/docs/release/userguide.introduction.rst
This opens the text editor. Identify where you want to add the userguide.
If the userguide is to be added to the toctree, simply include the path to
it, example:
.. code-block:: bash
.. toctree::
:maxdepth: 1
submodules/functest/docs/userguide/index
submodules/bottlenecks/docs/userguide/index
submodules/yardstick/docs/userguide/index
<submodules/path-to-your-file>
As Hyperlink
++++++++++++
It's pretty common to want to reference another location in the
OPNFV documentation and it's pretty easy to do with
reStructuredText. This is a quick primer, more information is in the
`Sphinx section on Cross-referencing arbitrary locations
<http://www.sphinx-doc.org/en/stable/markup/inline.html#ref-role>`_.
Within a single document, you can reference another section simply by::
This is a reference to `The title of a section`_
Assuming that somewhere else in the same file there a is a section
title something like::
The title of a section
^^^^^^^^^^^^^^^^^^^^^^
It's typically better to use ``:ref:`` syntax and labels to provide
links as they work across files and are resilient to sections being
renamed. First, you need to create a label something like::
.. _a-label:
The title of a section
^^^^^^^^^^^^^^^^^^^^^^
.. note:: The underscore (_) before the label is required.
Then you can reference the section anywhere by simply doing::
This is a reference to :ref:`a-label`
or::
This is a reference to :ref:`a section I really liked <a-label>`
.. note:: When using ``:ref:``-style links, you don't need a trailing
underscore (_).
Because the labels have to be unique, it usually makes sense to prefix
the labels with the project name to help share the label space, e.g.,
``sfc-user-guide`` instead of just ``user-guide``.
Once you have made these changes you need to push the patch back to
the opnfvdocs team for review and integration.
.. code-block:: bash
git add .
git commit --signoff --all
git review
Be sure to add the project leader of the opnfvdocs project
as a reviewer of the change you just pushed in gerrit.
'doc8' Validation
-----------------
It is recommended that all rst content is validated by `doc8 <https://pypi.python.org/pypi/doc8>`_ standards.
To validate your rst files using doc8, install doc8.
.. code-block:: bash
sudo pip install doc8
doc8 can now be used to check the rst files. Execute as,
.. code-block:: bash
doc8 --ignore D000,D001 <file>
Testing: Build Documentation Locally
------------------------------------
Composite OPNFVDOCS documentation
+++++++++++++++++++++++++++++++++
To build whole documentation under opnfvdocs/, follow these steps:
Install virtual environment.
.. code-block:: bash
sudo pip install virtualenv
cd /local/repo/path/to/project
Download the OPNFVDOCS repository.
.. code-block:: bash
git clone https://gerrit.opnfv.org/gerrit/opnfvdocs
Change directory to opnfvdocs & install requirements.
.. code-block:: bash
cd opnfvdocs
sudo pip install -r etc/requirements.txt
Update submodules, build documentation using tox & then open using any browser.
.. code-block:: bash
cd opnfvdocs
git submodule update --init
tox -edocs
firefox docs/_build/html/index.html
.. note:: Make sure to run `tox -edocs` and not just `tox`.
Individual project documentation
++++++++++++++++++++++++++++++++
To test how the documentation renders in HTML, follow these steps:
Install virtual environment.
.. code-block:: bash
sudo pip install virtualenv
cd /local/repo/path/to/project
Download the opnfvdocs repository.
.. code-block:: bash
git clone https://gerrit.opnfv.org/gerrit/opnfvdocs
Change directory to opnfvdocs & install requirements.
.. code-block:: bash
cd opnfvdocs
sudo pip install -r etc/requirements.txt
Move the conf.py file to your project folder where RST files have been kept:
.. code-block:: bash
mv opnfvdocs/docs/conf.py <path-to-your-folder>/
Move the static files to your project folder:
.. code-block:: bash
mv opnfvdocs/_static/ <path-to-your-folder>/
Build the documentation from within your project folder:
.. code-block:: bash
sphinx-build -b html <path-to-your-folder> <path-to-output-folder>
Your documentation shall be built as HTML inside the
specified output folder directory.
.. 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.
Adding your project repository as a submodule
---------------------------------------------
Clone the opnfvdocs repository and your submodule to .gitmodules following the convention of the file
.. code-block:: bash
cd docs/submodules/
git submodule add https://gerrit.opnfv.org/gerrit/$reponame
git submodule init $reponame/
git submodule update $reponame/
git add .
git commit -sv
git review
Removing a project repository as a submodule
--------------------------------------------
.. code-block:: bash
git rm docs/submodules/$reponame
rm -rf .git/modules/$reponame
git config -f .git/config --remove-section submodule.$reponame 2> /dev/null
git add .
git commit -sv
git review
|