Difference between revisions of "Documentation/Conventions"
(→Force a line break) |
(→OS-specific (install & deploy guide)) |
||
Line 263: | Line 263: | ||
For example: | For example: | ||
− | |||
<pre><nowiki> | <pre><nowiki> | ||
Line 269: | Line 268: | ||
<screen os="rhel;fedora;centos"><prompt>$</prompt> <userinput>sudo yum install -y ntp</userinput></screen> | <screen os="rhel;fedora;centos"><prompt>$</prompt> <userinput>sudo yum install -y ntp</userinput></screen> | ||
</nowiki></pre> | </nowiki></pre> | ||
− | |||
== Define an Hostname == | == Define an Hostname == | ||
You should prefer lowercase nearly all the time unless legal reasons indicate capitalizing. | You should prefer lowercase nearly all the time unless legal reasons indicate capitalizing. |
Revision as of 22:17, 16 February 2013
Contents
- 1 DocBook markup conventions
- 1.1 General style conventions
- 1.2 euca2ools documentation
- 1.3 Configuration options
- 1.4 Sections
- 1.5 Links
- 1.6 Information or configuration files that the user has to type or read
- 1.7 Inline configuration information (option name or value)
- 1.8 Configuration information when part should be replaced
- 1.9 Inline mention of a specific command
- 1.10 Command to type into a shell
- 1.11 Result of the command
- 1.12 File names
- 1.13 File contents
- 1.14 Linux service
- 1.15 Ordered procedure to follow (where step 2 needs to be done after step 1)
- 1.16 Instructions to follow with no critical dependency across steps
- 1.17 A list in key/value form
- 1.18 Notes
- 1.19 Embedding images
- 1.20 Tables
- 1.21 Force a line break
- 1.22 OS-specific (install & deploy guide)
- 1.23 Define an Hostname
DocBook markup conventions
This page offers conventions for DocBook markup. Please modify this page as you come across more markup you need for the docs.openstack.org site.
General style conventions
- Use "OpenStack", not Openstack or openstack.
- Use "Compute", "Image", and "Identity" when referring to the services instead of "nova", "glance", and "keystone". Use the project names like "nova" and "keystone" when referring to the project or for CLI commands and service names.
- Wrap lines to 70 characters.
euca2ools documentation
Since Nova exposes both its own API and an EC2-compatible API, many tasks can be executed using either the nova CLI or euca2ools. Documentation related to euca2ools should generally be limited to:
- Describing euca2ools commands that don't yet have a nova CLI equivalent (e.g., euca-get-console-output)
- Describing how to get credentials to work with euca2ools
- Describing differences between how Amazon's EC2 endpoint behaves and how an OpenStack endpoint behaves when accessing via EC2.
Configuration options
When documenting options in a .conf file, use the literal tag.
<literal>flat_network_bridge</literal>
Boolean configuration options
When documenting boolean configuration options, use the format that explicitly specifies the truth value:
force_dhcp_release=True use_ipv6=False
Don't do it this way (which may not even work?)
force_dhcp_release nouse_ipv6
Sections
All section tags must have an xml:id attribute. This enables unique file names for the generated HTML and human-readable page titles, plus it lets Disqus threads stay with the HTML page:
<section xml:id="section-id-goes-here"> ... </section>
If you want to keep several sections on a single HTML page, use a "stop chunking" processing directive:
<?dbhtml stop-chunking?>
Links
External
<link xlink:href="http://www.example.com">Linked text here</link>
Internal
<link linkend="section-name-here">Linked text here</link>
Information or configuration files that the user has to type or read
Do not indent the text (open/close tags may be indented)
<programlisting> config-file-example=asdf foo=bar hello=world </programlisting>
Inline configuration information (option name or value)
<literal>--use_deprecated_auth</literal>
Configuration information when part should be replaced
<literal>http://<replaceable>IP_ADDRESS</replaceable>/foo/bar</literal>
Inline mention of a specific command
<command>nova-manage</command>
Command to type into a shell
Do not indent the text (open/close tags may be indented)
<screen> <prompt>$</prompt> <userinput>command as a regular user</userinput> </screen>
<screen> <prompt>#</prompt> <userinput>command as root</userinput> </screen>
<screen> <prompt>(mysql)</prompt> <userinput>command to type</userinput> </screen>
Result of the command
Do not indent the text (open/close tags may be indented)
<screen> <computeroutput>result output goes here</computeroutput> </screen>
Note that this can be combined with a prompt and input:
<screen> <prompt>$</prompt> <userinput>command to type</userinput> <computeroutput>result output goes here</computeroutput> </screen>
File names
<filename>/my/file/is/here</filename>
File contents
The programlisting tag can do further output enhancements by using the language="langname" attribute including: bash, java, json, and xml.
<programlisting> contents of a file </programlisting>
Linux service
For example, nova-network or dnsmasq.
<systemitem class="service">nova-network</systemitem>
Ordered procedure to follow (where step 2 needs to be done after step 1)
<orderedlist> <listitem><para>...</para></listitem> </orderedlist>
Instructions to follow with no critical dependency across steps
<itemizedlist> <listitem><para>...</para></listitem> </itemizedlist>
A list in key/value form
<variablelist> <varlistentry> <term>key</term> <listitem>value</listitem> </varlistentry> <varlistentry> <term>key</term> <listitem>value</listitem> </varlistentry> </variablelist>
Notes
You can specify a Note callout box by doing:
<note><para>...</para></note>
Embedding images
In DocBook source, here is how you include images that have both a scalable-for-print-resolution in the PDF and an online-resolution for the HTML output. In this case the two types of images are SVG and PNG formats. The scale="60" attribute ensures that the image does not overlap print margins nor take up too much screen space.
<figure xml:id="CFinterfaces"> <title>Cloud Files System Interfaces</title> <mediaobject> <imageobject role="fo"> <imagedata scale="60" fileref="figures/CFinterfaces.svg"/> </imageobject> <imageobject role="html"> <imagedata scale="60" fileref="figures/CFinterfaces.png"/> </imageobject> </mediaobject> </figure>
The convention is to use the /src/figures/ directory to store both the source image and any other formats of that same image. The pom.xml file copies the files in the /figures/ directory into the output directory required for HTML in the post processing section.
Also, when you add the image to the /src/figures directory, be sure to tell the source control system that you've added the image. For example, use "git add" to ensure the images get added to source control so the HTML and PDF output will be built correctly by the Jenkins continuous integration server.
For any figure you create, please also include the source files, even if the image was not created with open source tools, for maintenance purposes. While all OpenStack docs are created with open source in mind, including open-licensed fonts in the output, we are willing to allow non-open authoring or image creation tools if it's more efficient.
Tables
Example:
<table rules="all"> <caption>Hardware Recommendations </caption> <col width="20%"/> <col width="23%"/> <col width="57%"/> <thead> <tr> <td>Server</td> <td>Recommended Hardware</td> <td>Notes</td> </tr> </thead> <tbody> <tr> <td><para>...</para></td> ... </tr> </tbody> </table>
Force a line break
Especially handy when table cells aren't correctly wrapping or definition lists (like varlistentry) aren't wrapping well.
<?sbr?>
OS-specific (install & deploy guide)
The Install & Deploy guide has content that depends upon the operating system. Use the "os" attribute to specify a region that is operating-system specific. Valid values are:
- ubuntu
- fedora
- rhel
- centos
- deb
For example:
<screen os="ubuntu"><userinput><prompt>$</prompt> sudo apt-get install -y ntp</userinput></screen> <screen os="rhel;fedora;centos"><prompt>$</prompt> <userinput>sudo yum install -y ntp</userinput></screen>
Define an Hostname
You should prefer lowercase nearly all the time unless legal reasons indicate capitalizing.