Skip to content

Commit

Permalink
Merge pull request #6347 from NethServer/ns79
Browse files Browse the repository at this point in the history
Dev manual improvements
  • Loading branch information
gsanchietti committed Nov 26, 2020
2 parents afe3530 + 639ad65 commit 4621921
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 19 deletions.
13 changes: 7 additions & 6 deletions developer-manual/building_iso.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,14 @@ To create a NethServer ISO on a NethServer system, follow these steps:

1) Install ``nethserver-createiso`` package

2) Log in as a non-privileged user, member of the ``mock`` group

3) Download CentOS minimal ISO

4) Run ``createiso`` command ::
2) Make sure mock cache is clean, execute as ``root`` user: ::

createiso -i CentOS-7.2.1511-x86_64-minimal.iso -n nethserver -v 7.2.1511-beta1
rm -rf /var/cache/mock/nethserver-iso*

3) Log in as a non-privileged user, member of the ``mock`` group

4) Download CentOS minimal ISO

5) Run ``createiso`` command ::

createiso -n nethserver -v 7.9.2009 -i CentOS-7-x86_64-Minimal-2009.iso
22 changes: 11 additions & 11 deletions developer-manual/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# serve to show the default.

import sys, os
import urllib
import urllib.request, urllib.parse, urllib.error

# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
Expand Down Expand Up @@ -41,8 +41,8 @@
master_doc = 'index'

# General information about the project.
project = u'NethServer'
copyright = u'2017, Nethesis Srl'
project = 'NethServer'
copyright = '2017, Nethesis Srl'

# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
Expand Down Expand Up @@ -185,8 +185,8 @@
# Grouping the document tree into LaTeX files. List of tuples
# (source start file, target name, title, author, documentclass [howto/manual]).
latex_documents = [
('index', 'NethServer.tex', u'NethServer Documentation',
u'Nethesis', 'manual'),
('index', 'NethServer.tex', 'NethServer Documentation',
'Nethesis', 'manual'),
]

# The name of an image file (relative to this directory) to place at the top of
Expand Down Expand Up @@ -215,8 +215,8 @@
# One entry per manual page. List of tuples
# (source start file, name, description, authors, manual section).
man_pages = [
('index', 'nethserver', u'NethServer Documentation',
[u'Nethesis'], 1)
('index', 'nethserver', 'NethServer Documentation',
['Nethesis'], 1)
]

# If true, show URL addresses after external links.
Expand All @@ -229,8 +229,8 @@
# (source start file, target name, title, author,
# dir menu entry, description, category)
texinfo_documents = [
('index', 'NethServer', u'NethServer Documentation',
u'Nethesis', 'NethServer', 'One line description of project.',
('index', 'NethServer', 'NethServer Documentation',
'Nethesis', 'NethServer', 'One line description of project.',
'Miscellaneous'),
]

Expand All @@ -244,7 +244,7 @@ def setup(app):
line = fp.readline().strip()
while line:
url = "https://raw.githubusercontent.com/NethServer/%s/master/README.rst" % line
urllib.urlretrieve(url, line+".rst")
print "Downloading %s: %s" % (line, url)
urllib.request.urlretrieve(url, line+".rst")
print("Downloading %s: %s" % (line, url))
line = fp.readline().strip()
fp.close()
4 changes: 2 additions & 2 deletions developer-manual/development_process.rst
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ The *Developer*.
* Finally, clears the *Assignee*.

If the issue is not valid, it must be closed using the **invalid** label.
A comment must convey the reason why it is invalid, like *duplicate of (URL of issue)*, *wontfix because ...".
A comment must convey the reason why it is invalid, like *"duplicate of (URL of issue), wontfix because ..."*.


.. _qa-section:
Expand Down Expand Up @@ -184,7 +184,7 @@ After the *QA member* has completed the testing phase:

* Takes an unassigned issue with label **verified**

* Commits a *release tag* (see `Building RPMs`_).
* Commits a *release tag* (see :ref:`buildrpm-section`).

* Re-builds the tagged RPM.

Expand Down

0 comments on commit 4621921

Please sign in to comment.