diff options
| author | Gauvain Pocentek <gauvain@pocentek.net> | 2017-07-09 09:01:23 +0200 |
|---|---|---|
| committer | Gauvain Pocentek <gauvain@pocentek.net> | 2017-07-09 09:01:23 +0200 |
| commit | 274b3bffc3365eca2fd3fa10c1e7e9b49990533e (patch) | |
| tree | 445e4688164cff6f327494fc082dc0a0db476ed0 /docs | |
| parent | fe3a06c2a6a9776c22ff9120c99b3654e02e5e50 (diff) | |
| parent | cb8c1a198276cc6aa2a3ddbf52bcc3866418e9fd (diff) | |
| download | gitlab-274b3bffc3365eca2fd3fa10c1e7e9b49990533e.tar.gz | |
Merge branch 'master' into rework_api
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/cli.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/cli.rst b/docs/cli.rst index 6730c9b..f0ed2ee 100644 --- a/docs/cli.rst +++ b/docs/cli.rst @@ -49,9 +49,9 @@ The configuration file uses the ``INI`` format. It contains at least a timeout = 1 The ``default`` option of the ``[global]`` section defines the GitLab server to -use if no server is explitly specified with the ``--gitlab`` CLI option. +use if no server is explicitly specified with the ``--gitlab`` CLI option. -The ``[global]`` section also defines the values for the default connexion +The ``[global]`` section also defines the values for the default connection parameters. You can override the values in each GitLab server section. .. list-table:: Global options |