Workflow¶
GeoServer documentation aims to mirror the development process of the software itself. The process for writing/editing documentation is as follows:
Step 1: Check out source
Step 2: Make changes
Step 3: Build and test locally
Step 4: Commit changes
Check out source¶
Software¶
You must use the version control software git to retrieve files.
Or use git on the command line
Repository¶
This documentation source code exists in the same repository as the GeoServer source code:
https://github.com/geoserver/geoserver
Follow these instructions to fork the GeoServer repository:
https://help.github.com/articles/fork-a-repo
Substituting
geoserver/geoserver
in place ofoctocat/Spoon-Knife
, when you are finishedgit remote -v
should show:$ git remote -v origin https://github.com/YOUR_USERNAME/geoserver.git (fetch) origin https://github.com/YOUR_USERNAME/geoserver.git (push) upstream https://github.com/geoserver/geoserver.git (fetch) upstream https://github.com/geoserver/geoserver.git (push)
Within this repository are the various branches and tags associated with releases, and the documentation is always inside a doc
path. Inside this path, the repository contains directories corresponding to different translations. The languages are referred to by a two letter code, with en
(English) being the default.
For example, the path review the English docs is:
https://github.com/geoserver/geoserver/tree/master/doc/en
Inside this directory, there are four directories:
user/
developer/
docguide/
theme/
Directory |
Description |
|
User Manual source files |
|
Developer Manual source files |
|
Documentation Guide source files (this is what you are reading now) |
|
GeoServer Sphinx theme (common to all three projects) |
Make changes¶
Documentation in Sphinx is written in reStructuredText, a lightweight markup syntax. For suggestions on writing reStructuredText for use with Sphinx, please see the section on Sphinx Syntax. For suggestions about writing style, please see the Style Guidelines.
Build and test locally¶
You should install Sphinx on your local system (see Installing Sphinx) to build the documentation locally and view any changes made. Sphinx builds the reStructuredText files into HTML pages and PDF files.
HTML¶
On a terminal, navigate to your GeoServer source checkout and change to the
doc/en/user
directory (or whichever project you wish to build).Run the following command:
ant user
The resulting HTML pages will be contained in
doc/en/target/user/html
.Watch the output of the above command for any errors and warnings. These could be indicative of problems with your markup. Please fix any errors and warnings before continuing.
PDF¶
On a terminal, navigate to your GeoServer source checkout and change to the
doc/en/user
directory (or whichever project you wish to build).Run the following command:
ant user-pdf
This will create a PDF file called
GeoServerProject.pdf
in the same directoryNote
The exact name of
GeoServerProject
depends on which project is being built. However, there will only be one file with the extension.tex
in thedoc/en/user/build/latex
directory, so there should hopefully be little confusion.Warning
This command requires LaTeX to be installed, and pdflatex to be added to your Path.
Watch the output of the above command for any errors and warnings. These could be indicative of problems with your markup. Please fix any errors and warnings before continuing.
Commit changes¶
Warning
If you have any errors or warnings in your project, please fix them before committing!
The final step is to commit the changes to a branch in your repository, using these commands:
git checkout -b doc-fix
git add [path/file(s)]
git commit -m "message describing your fix"
git push origin doc-fix
You can use any name you like for the branch, often I use the issue number so I
can tell my branches apart if I need to find them later.
path/file(s)
is the path and file(s) you wish to commit to the repository. If you are unclear about which files you have changed you can use git status -sb
to list the files that you have changed, this will give you a list of changed files, and indicate the ones that still need to be added to this commit:
$ git status -sb
## update
M docguide/source/background.rst
M docguide/source/contributing.rst
M docguide/source/install.rst
M docguide/source/installlatex.rst
M docguide/source/workflow.rst
Here the M
indicate these files are modified but not added. Once git add
*.rst
is run the indicator will change to A
, files that are not under
git’s control will show a ?
these are new files that you may need to add if
you have created them for the documentation.
When ready return to the GitHub website and submit a pull request:
The GitHub website provides a link to CONTRIBUTING.md outlining how we can accept your patch. Small fixes may be contributed on your behalf, changes larger than a file (such as a tutorial) may require some paperwork.