2015-09-22 06:31:53 -04:00
|
|
|
---
|
|
|
|
layout: doc
|
|
|
|
title: Documentation Guidelines
|
2015-10-28 18:14:40 -04:00
|
|
|
permalink: /doc/doc-guidelines/
|
2015-09-22 06:31:53 -04:00
|
|
|
redirect_from:
|
2015-10-28 18:14:40 -04:00
|
|
|
- /en/doc/doc-guidelines/
|
|
|
|
- /wiki/DocStyle/
|
|
|
|
- /doc/DocStyle/
|
2015-09-22 06:31:53 -04:00
|
|
|
---
|
|
|
|
|
|
|
|
Guidelines for Documentation Contributors
|
|
|
|
=========================================
|
|
|
|
|
|
|
|
All Qubes OS documentation pages are stored as plain text files in the
|
|
|
|
dedicated [qubes-doc] repository. By cloning and regularly pulling from
|
|
|
|
this repo, users can maintain their own up-to-date offline copy of all Qubes
|
|
|
|
documentation rather than relying solely on the Web. Contributions to the
|
2016-02-02 18:09:21 -05:00
|
|
|
documentation (both new content and edits of existing content) are welcome!
|
|
|
|
|
|
|
|
To contribute, please [fork and clone][gh-fork] this repo, make your changes,
|
2015-09-22 06:31:53 -04:00
|
|
|
then either [submit a pull request][gh-pull] or [send a patch][patch] to the
|
|
|
|
`qubes-devel` [mailing list][lists]. If you have a GitHub account (free), you
|
|
|
|
can simply browse the [qubes-doc] repository and edit the files there. The
|
|
|
|
GitHub interface will automatically guide you through the
|
2016-02-02 18:09:21 -05:00
|
|
|
[fork and pull request creation process][gh-fork]. (We provide a detailed
|
|
|
|
walkthrough of this process below.)
|
2015-09-22 06:31:53 -04:00
|
|
|
|
|
|
|
|
|
|
|
Markdown Conventions
|
|
|
|
--------------------
|
|
|
|
|
|
|
|
All the documentation is written in Markdown for maximum accessibility. When
|
2016-02-02 18:11:40 -05:00
|
|
|
making contributions, please try to observe the following style conventions:
|
2015-09-22 06:31:53 -04:00
|
|
|
|
|
|
|
* Use spaces instead of tabs.
|
|
|
|
* Hard wrap Markdown lines at 80 characters.
|
|
|
|
* If appropriate, make numerals in numbered lists match between Markdown
|
|
|
|
source and HTML output.
|
2016-02-02 18:09:21 -05:00
|
|
|
* Rationale: In the event that a user is required to read the Markdown source
|
|
|
|
directly, this will make it easier to follow, e.g., numbered steps in a set
|
|
|
|
of instructions.
|
2015-09-22 06:31:53 -04:00
|
|
|
* Use hanging indentations
|
|
|
|
where appropriate.
|
|
|
|
* Use underline headings (`=====` and `-----`) if possible. If this is not
|
|
|
|
possible, use Atx-style headings on both the left and right sides
|
|
|
|
(`### H3 ###`).
|
|
|
|
* Use `[reference-style][ref]` links.
|
|
|
|
|
2016-02-02 18:09:21 -05:00
|
|
|
`[ref]: https://daringfireball.net/projects/markdown/syntax#link`
|
|
|
|
|
2016-02-02 18:11:40 -05:00
|
|
|
([This][md] is a great source for learning about Markdown.)
|
2016-02-02 18:09:21 -05:00
|
|
|
|
|
|
|
|
|
|
|
Git Conventions
|
|
|
|
---------------
|
|
|
|
|
|
|
|
Please attempt to follow these conventions when writing your Git commit
|
|
|
|
messages:
|
2015-09-22 06:31:53 -04:00
|
|
|
|
2016-02-02 18:09:21 -05:00
|
|
|
* Separate the subject line from the body with a blank line.
|
|
|
|
* Limit the subject line to approximately 50 characters.
|
|
|
|
* Capitalize the subject line.
|
|
|
|
* Do not end the subject line with a period.
|
|
|
|
* Use the imperative mood in the subject line.
|
|
|
|
* Wrap the body at 72 characters.
|
|
|
|
* Use the body to explain *what* and *why* rather than *how*.
|
2016-01-29 07:40:00 -05:00
|
|
|
|
2016-02-02 18:09:21 -05:00
|
|
|
For details, examples, and the rationale behind each of these conventions,
|
|
|
|
please see [this blog post][git-commit], which is the source of this list.
|
2016-01-29 07:40:00 -05:00
|
|
|
|
|
|
|
|
2016-02-02 18:09:21 -05:00
|
|
|
How to Contribute Using GitHub
|
|
|
|
------------------------------
|
|
|
|
|
|
|
|
Editing the documentation is easy, so if you spot any errors, please help us
|
|
|
|
fix them! (The documentation maintainers are just volunteers who have day jobs
|
|
|
|
of their own, so we rely heavily on the community to improve the documentation.)
|
|
|
|
Since Qubes is a security-oriented project, every documentation change will be
|
|
|
|
reviewed before it's published to the web. This allows us to maintain quality
|
|
|
|
control and protect our users.
|
|
|
|
|
|
|
|
As mentioned above, we keep all the documentation in a dedicated Git repository
|
|
|
|
hosted on [GitHub][github]. Thanks to GitHub interface, you can edit the
|
|
|
|
documentation even if you don't know Git at all! The only thing you need is a
|
|
|
|
GitHub account, which is free.
|
|
|
|
|
|
|
|
Ok, let's start. Every documentation page has an "Edit this page" button. It may
|
|
|
|
be on the right side (in the desktop layout):
|
2016-01-29 07:40:00 -05:00
|
|
|
|
|
|
|
![edit-button-desktop](/attachment/wiki/doc-edit/03-button2.png)
|
|
|
|
|
2016-02-02 18:09:21 -05:00
|
|
|
Or at the bottom (in the mobile layout):
|
2016-01-29 07:40:00 -05:00
|
|
|
|
|
|
|
![edit-button-mobile](/attachment/wiki/doc-edit/02-button1.png)
|
|
|
|
|
2016-02-02 18:09:21 -05:00
|
|
|
When you click on it, you'll be prompted for your GitHub username and password
|
|
|
|
(if you aren't already logged in). You can also create an account from here.
|
2016-01-29 07:40:00 -05:00
|
|
|
|
|
|
|
![github-sign-in](/attachment/wiki/doc-edit/04-sign-in.png)
|
|
|
|
|
2016-02-02 18:09:21 -05:00
|
|
|
If this is your first contribution to the documentation, you need to "fork" the
|
|
|
|
repository (make your own copy). It's easy --- just click the big green button
|
|
|
|
on the next page. This step is only needed the first time you make a
|
|
|
|
contribution.
|
2016-01-29 07:40:00 -05:00
|
|
|
|
|
|
|
![fork](/attachment/wiki/doc-edit/05-fork.png)
|
|
|
|
|
2016-02-02 18:09:21 -05:00
|
|
|
Now you can make your modifications. You can also preview the changes to see how
|
|
|
|
they'll be formatted by clicking the "Preview changes" tab.
|
2016-01-29 07:40:00 -05:00
|
|
|
|
|
|
|
![edit](/attachment/wiki/doc-edit/06-edit.png)
|
|
|
|
|
2016-02-02 18:09:21 -05:00
|
|
|
Once you're finish, describe your changes at the bottom and click "Propose file
|
|
|
|
change".
|
2016-01-29 07:40:00 -05:00
|
|
|
|
|
|
|
![commit](/attachment/wiki/doc-edit/07-commit-msg.png)
|
|
|
|
|
2016-02-02 18:09:21 -05:00
|
|
|
After that, you'll see exactly what modifications you've made. At this stage,
|
2016-01-29 07:40:00 -05:00
|
|
|
those changes are still in your own copy of the documentation ("fork"). If
|
2016-02-02 18:09:21 -05:00
|
|
|
everything looks good, send those changes to us by pressing the "Create pull
|
|
|
|
request" button.
|
2016-01-29 07:40:00 -05:00
|
|
|
|
|
|
|
![pull-request](/attachment/wiki/doc-edit/08-review-changes.png)
|
|
|
|
|
2016-02-02 18:09:21 -05:00
|
|
|
You will be able to adjust the pull request message and title there. In most
|
|
|
|
cases, the defaults are ok, so you can just confirm by pressing the "Create pull
|
|
|
|
request" button again.
|
2016-01-29 07:40:00 -05:00
|
|
|
|
|
|
|
![pull-request-confirm](/attachment/wiki/doc-edit/09-create-pull-request.png)
|
|
|
|
|
2016-02-02 18:09:21 -05:00
|
|
|
That's all! We will review your changes. If everything looks good, we'll pull
|
|
|
|
them into the official documentation. Otherwise, we may have some questions for
|
|
|
|
you, which we'll post in a comment on your pull request. (GitHub will
|
|
|
|
automatically notify you if we do.) If, for some reason, we can't accept your
|
|
|
|
pull request, we'll post a comment explaining why we can't.
|
2016-01-29 07:40:00 -05:00
|
|
|
|
|
|
|
![done](/attachment/wiki/doc-edit/10-done.png)
|
2015-09-22 06:31:53 -04:00
|
|
|
|
2016-02-02 18:09:21 -05:00
|
|
|
|
2016-02-02 18:11:40 -05:00
|
|
|
[md]: https://daringfireball.net/projects/markdown/
|
2015-09-22 06:31:53 -04:00
|
|
|
[qubes-doc]: https://github.com/QubesOS/qubes-doc
|
|
|
|
[qubes]: https://github.com/QubesOS
|
|
|
|
[gh-fork]: https://guides.github.com/activities/forking/
|
|
|
|
[gh-pull]: https://help.github.com/articles/using-pull-requests/
|
|
|
|
[patch]: /doc/SourceCode/#sending-a-patch
|
|
|
|
[lists]: https://www.qubes-os.org/doc/QubesLists/
|
2016-01-29 07:40:00 -05:00
|
|
|
[github]: https://github.com/
|
2016-02-02 18:09:21 -05:00
|
|
|
[git-commit]: http://chris.beams.io/posts/git-commit/
|