This styleguide recommends best practices to improve documentation and to keep it organized and easy to find.
Note: These guidelines derive from the discussion taken place in issue #3349.
The documentation hierarchy can be vastly improved by providing a better layout and organization of directories.
Having a structured document layout, we will be able to have meaningful URLs like docs.gitlab.com/user/project/merge_requests.html
. With this pattern, you can immediately tell that you are navigating a user related documentation and is about the project and its merge requests.
The table below shows what kind of documentation goes where.
Directory | What belongs here |
---|---|
doc/user/ |
User related documentation. Anything that can be done within the GitSwarm UI goes here including /admin . |
doc/administration/ |
Documentation that requires the user to have access to the server where GitSwarm is installed. The admin settings that can be accessed via GitSwarm's interface go under doc/user/admin_area/ . |
doc/api/ |
API related documentation. |
doc/development/ |
Documentation related to the development of GitSwarm. Any styleguides should go here. |
doc/legal/ |
Legal documents about contributing to GitSwarm. |
doc/install/ |
Probably the most visited directory, since installation.md is there. Ideally this should go under doc/administration/ , but it's best to leave it as-is in order to avoid confusion (still debated though). |
doc/update/ |
Same with doc/install/ . Should be under administration/ , but this is a well known location, better leave as-is, at least for now. |
General rules:
-
). For example, a proper naming would be import_projects_from_github.md
. The same rule applies to images.user
, administration
, api
and development
.doc/user/
directory has five main subdirectories: project/
, group/
, profile/
, dashboard/
and admin_area/
.doc/user/project/
should contain all project related documentation.doc/user/group/
should contain all group related documentation.doc/user/profile/
should contain all profile related documentation. Every page you would navigate under /profile
should have its own document, i.e. account.md
, applications.md
, emails.md
, etc.doc/user/dashboard/
should contain all dashboard related documentation.doc/user/admin_area/
should contain all admin related documentation describing what can be achieved by accessing GitSwarm's admin interface (not to be confused with doc/administration
where server access is required).
/admin/application_settings
should have its own document located at doc/user/admin_area/settings/
. For example, the Visibility and Access Controls category should have a document located at doc/user/admin_area/settings/visibility_and_access_controls.md
.If you are unsure where a document should live, you can ping @axil
in your merge request.
-
) for unordered lists instead of asterisks (*
)1
) for ordered lists_
) to mark a word or text in italics**
) to mark a word or text in bold#
at the beginning of it (when using markdown). For subheadings, use ##
, ###
and so on@axil
, @rspeicher
, @marcia
, @SeanPackham
. This is to ensure that no document with wrong heading is going live without an audit, thus preventing dead links and redirection issues when corrected[Text](https://example.com)
. Instead use [Text][identifier]
and at the very bottom of the document add: [identifier]: https://example.com
. This is another way to create Markdown links which keeps the document clear and concise. Bonus points if you also add an alternative text: [identifier]: https://example.com "Alternative text"
that appears when hovering your mouse on a linkimg/
in the same directory where the .md
document that you're working on is located. Always prepend their names with the name of the document that they will be included in. For example, if there is a document called twitter.md
, then a valid image name could be twitter_login_screen.png
.Inside the document:
![Proper description what the image is about](img/document_image_title.png)
---
) between the image and the text to create a horizontal line for better clarity---
) between the image and the headingNotes should be quoted with the word Note:
being bold. Use this form:
>**Note:**
This is something to note.
which renders to:
Note: This is something to note.
If the note spans across multiple lines it's OK to split the line.
Every piece of documentation that comes with a new feature should declare the GitSwarm version that feature got introduced. Right below the heading add a note:
> Introduced in GitSwarm 2016.1.
If possible every feature should have a link to the MR that introduced it. The above note would be then transformed to:
> [Introduced][ce-1242] in GitSwarm 2016.1.
, where the link identifier is named after the repository (CE) and the MR number.
If the feature is only in GitSwarm Enterprise Edition, don't forget to mention it, like:
> Introduced in GitSwarm Enterprise GitSwarm 2016.1.
Otherwise, leave this mention out.
GitSwarm Restart: There are many cases that a restart/reconfigure of GitSwarm is required. To avoid duplication, link to the special document that can be found in doc/administration/restart_gitlab.md
. Usually the text will read like:
Save the file and [reconfigure GitSwarm](../administration/restart_gitlab.md)
for the changes to take effect.
If the document you are editing resides in a place other than the GitSwarm CE/EE doc/
directory, instead of the relative link, use the full path: https://www.perforce.com/perforce/doc.current/manuals/gitswarm/administration/restart_gitlab.html
. Replace reconfigure
with restart
where appropriate.
Changing a document's location is not to be taken lightly. Remember that the documentation is available to all installations under help/
and not only to GitLab.com or http://docs.gitlab.com. Make sure this is discussed with the Documentation team beforehand.
If you indeed need to change a document's location, do NOT remove the old document, but rather put a text in it that points to the new location, like:
This document was moved to [path/to/new_doc.md](path/to/new_doc.md).
where path/to/new_doc.md
is the relative path to the root directory doc/
.
For example, if you were to move doc/workflow/lfs/lfs_administration.md
to doc/administration/lfs.md
, then the steps would be:
doc/workflow/lfs/lfs_administration.md
to doc/administration/lfs.md
Replace the contents of doc/workflow/lfs/lfs_administration.md
with:
This document was moved to [administration/lfs.md](../../administration/lfs.md).
Find and replace any occurrences of the old location with the new one. A quick way to find them is to use git grep
. First go to the root directory where you cloned the gitlab-ce
repository and then do:
git grep -n "workflow/lfs/lfs_administration"
git grep -n "lfs/lfs_administration"
Things to note:
app/
) which will render when visiting /help
, and sometimes in the testing suite (spec/
).git grep
command will search recursively in the directory you run it in for workflow/lfs/lfs_administration
and lfs/lfs_administration
and will print the file and the line where this file is mentioned. You may ask why the two greps. Since we use relative paths to link to documentation, sometimes it might be useful to search a path deeper.*.md
extension is not used when a document is linked to GitSwarm's built-in help page, that's why we omit it in git grep
.GitSwarm currently officially supports two installation methods: source installations and package installations installations.
Whenever there is a setting that is configurable for both installation methods, prefer to document it in the CE docs to avoid duplication.
Configuration settings include:
config/
lib/support/
in generalWhen there is a list of steps to perform, usually that entails editing the configuration file and reconfiguring/restarting GitSwarm. In such case, follow the style below as a guide:
**For package installations**
1. Edit `/etc/gitswarm/gitswarm.rb`:
```ruby
external_url "https://gitswarm.example.com"
```
1. Save the file and [reconfigure] GitSwarm for the changes to take effect.
---
**For source installations**
1. Edit `config/gitlab.yml`:
```yaml
gitlab:
host: "gitswarm.example.com"
```
1. Save the file and [restart] GitSwarm for the changes to take effect.
[reconfigure]: path/to/administration/gitlab_restart.md#gitswarm-reconfigure
[restart]: path/to/administration/gitlab_restart.md#installations-from-source
In this case:
---
) are used to create an horizontal line and separate the two methodsThere may be times where a token is needed to demonstrate an API call using cURL or a secret variable used in CI. It is strongly advised not to use real tokens in documentation even if the probability of a token being exploited is low.
You can use the following fake tokens as examples.
Token type | Token value |
---|---|
Private user token | 9koXpg98eAheJpvBs5tK |
Personal access token | n671WNGecHugsdEDPsyo |
Application ID | 2fcb195768c39e9a94cec2c2e32c59c0aad7a3365c10892e8116b5d83d4096b6 |
Application secret | 04f294d1eaca42b8692017b426d53bbc8fe75f827734f0260710b83a556082df |
Secret CI variable | Li8j-mLUVA3eZYjPfd_H |
Specific Runner token | yrnZW46BrtBFqM7xDzE7dddd |
Shared Runner token | 6Vk7ZsosqQyfreAxXTZr |
Trigger token | be20d8dcc028677c931e04f3871a9b |
Webhook secret token | 6XhDroRcYPM5by_h-HLY |
Health check token | Tu7BgjR9qeZTEyRzGG2P |
Request profile token | 7VgpS4Ax5utVD2esNstz |
Here is a list of must-have items. Use them in the exact order that appears on this document. Further explanation is given below.
Every method must have the REST API request. For example:
GET /projects/:id/repository/branches
Every method must have a response body (in JSON format).
Use the following table headers to describe the methods. Attributes should always be in code blocks using backticks (`).
| Attribute | Type | Required | Description |
| --------- | ---- | -------- | ----------- |
Rendered example:
Attribute | Type | Required | Description |
---|---|---|---|
user |
string | yes | The GitSwarm username |
https://gitswarm.example.com/api/v3/
as an endpoint.9koXpg98eAheJpvBs5tK
.GET
is the default so you don't have to include it.Methods | Description |
---|---|
-H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" |
Use this method as is, whenever authentication needed |
-X POST |
Use this method when creating new objects |
-X PUT |
Use this method when updating existing objects |
-X DELETE |
Use this method when removing existing objects |
Below is a set of cURL examples that you can use in the API documentation.
Get the details of a group:
curl --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitswarm.example.com/api/v3/groups/gitlab-org
Create a new project under the authenticated user's namespace:
curl --request POST --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" "https://gitswarm.example.com/api/v3/projects?name=foo"
Instead of using -X POST
and appending the parameters to the URI, you can use cURL's --data
option. The example below will create a new project foo
under the authenticated user's namespace.
curl --data "name=foo" --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" "https://gitswarm.example.com/api/v3/projects"
Note: In this example we create a new group. Watch carefully the single and double quotes.
curl --request POST --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" --header "Content-Type: application/json" --data '{"path": "my-group", "name": "My group"}' https://gitswarm.example.com/api/v3/groups
Instead of using JSON or urlencode you can use multipart/form-data which properly handles data encoding:
curl --request POST --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" --form "title=ssh-key" --form "key=ssh-rsa AAAAB3NzaC1yc2EA..." https://gitswarm.example.com/api/v3/users/25/keys
The above example is run by and administrator and will add an SSH public key titled ssh-key to user's account which has an id of 25.
Spaces or slashes (/
) may sometimes result to errors, thus it is recommended to escape them when possible. In the example below we create a new issue which contains spaces in its title. Observe how spaces are escaped using the %20
ASCII code.
curl --request POST --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" "https://gitswarm.example.com/api/v3/projects/42/issues?title=Hello%20Dude"
Use %2F
for slashes (/
).
The GitSwarm API sometimes accepts arrays of strings or integers. For example, to restrict the sign-up e-mail domains of a GitSwarm instance to *.example.com
and example.net
, you would do something like this:
curl --request PUT --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" --data "domain_whitelist[]=*.example.com" --data "domain_whitelist[]=example.net" https://gitswarm.example.com/api/v3/application/settings