summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog.rst8
-rw-r--r--RELEASE_NOTES.rst2
-rw-r--r--docs/api-usage.rst4
-rw-r--r--docs/gl_objects/events.rst2
-rw-r--r--docs/gl_objects/projects.rst2
-rw-r--r--docs/gl_objects/users.rst6
6 files changed, 12 insertions, 12 deletions
diff --git a/ChangeLog.rst b/ChangeLog.rst
index f1a45f2..e1d06cb 100644
--- a/ChangeLog.rst
+++ b/ChangeLog.rst
@@ -32,7 +32,7 @@ Version 1.2.0_ - 2018-01-01
* Add support for impersonation tokens API
* Add support for user activities
* Update user docs with gitlab URLs
-* [docs] Bad arguments in projetcs file documentation
+* [docs] Bad arguments in projects file documentation
* Add support for user_agent_detail (issues)
* Add a SetMixin
* Add support for project housekeeping
@@ -464,7 +464,7 @@ Version 0.9.1_ - 2015-05-15
Version 0.9_ - 2015-05-15
--------------------------
-* Implement argparse libray for parsing argument on CLI
+* Implement argparse library for parsing argument on CLI
* Provide unit tests and (a few) functional tests
* Provide PEP8 tests
* Use tox to run the tests
@@ -537,9 +537,9 @@ Version 0.3_ - 2013-08-27
--------------------------
* Use PRIVATE-TOKEN header for passing the auth token
-* provide a AUTHORS file
+* provide an AUTHORS file
* cli: support ssl_verify config option
-* Add ssl_verify option to Gitlab object. Defauls to True
+* Add ssl_verify option to Gitlab object. Defaults to True
* Correct url for merge requests API.
Version 0.2_ - 2013-08-08
diff --git a/RELEASE_NOTES.rst b/RELEASE_NOTES.rst
index da2545f..7e05419 100644
--- a/RELEASE_NOTES.rst
+++ b/RELEASE_NOTES.rst
@@ -52,7 +52,7 @@ Changes from 0.21 to 1.0.0
by default.
v4 is mostly compatible with the v3, but some important changes have been
-introduced. Make sure to read `Switching to GtiLab API v4
+introduced. Make sure to read `Switching to GitLab API v4
<http://python-gitlab.readthedocs.io/en/master/switching-to-v4.html>`_.
The development focus will be v4 from now on. v3 has been deprecated by GitLab
diff --git a/docs/api-usage.rst b/docs/api-usage.rst
index 190482f..925f8bb 100644
--- a/docs/api-usage.rst
+++ b/docs/api-usage.rst
@@ -49,7 +49,7 @@ Note on password authentication
The ``/session`` API endpoint used for username/password authentication has
been removed from GitLab in version 10.2, and is not available on gitlab.com
-anymore. Personal token authentication is the prefered authentication method.
+anymore. Personal token authentication is the preferred authentication method.
If you need username/password authentication, you can use cookie-based
authentication. You can use the web UI form to authenticate, retrieve cookies,
@@ -195,7 +195,7 @@ To avoid useless calls to the server API, you can create lazy objects. These
objects are created locally using a known ID, and give access to other managers
and methods.
-The following exemple will only make one API call to the GitLab server to star
+The following example will only make one API call to the GitLab server to star
a project:
.. code-block:: python
diff --git a/docs/gl_objects/events.rst b/docs/gl_objects/events.rst
index 807dcad..eef524f 100644
--- a/docs/gl_objects/events.rst
+++ b/docs/gl_objects/events.rst
@@ -31,7 +31,7 @@ Examples
You can list events for an entire Gitlab instance (admin), users and projects.
You can filter you events you want to retrieve using the ``action`` and
-``target_type`` attributes. The possibole values for these attributes are
+``target_type`` attributes. The possible values for these attributes are
available on `the gitlab documentation
<https://docs.gitlab.com/ce/api/events.html>`_.
diff --git a/docs/gl_objects/projects.rst b/docs/gl_objects/projects.rst
index b39c73b..8c87bf7 100644
--- a/docs/gl_objects/projects.rst
+++ b/docs/gl_objects/projects.rst
@@ -320,7 +320,7 @@ Delete a tag:
Project snippets
================
-The snippet visibility can be definied using the following constants:
+The snippet visibility can be defined using the following constants:
* ``gitlab.VISIBILITY_PRIVATE``
* ``gitlab.VISIBILITY_INTERNAL``
diff --git a/docs/gl_objects/users.rst b/docs/gl_objects/users.rst
index 63609db..3cbea6b 100644
--- a/docs/gl_objects/users.rst
+++ b/docs/gl_objects/users.rst
@@ -208,19 +208,19 @@ List GPG keys for a user:
:start-after: # gpgkey list
:end-before: # end gpgkey list
-Get an GPG gpgkey for a user:
+Get a GPG gpgkey for a user:
.. literalinclude:: users.py
:start-after: # gpgkey get
:end-before: # end gpgkey get
-Create an GPG gpgkey for a user:
+Create a GPG gpgkey for a user:
.. literalinclude:: users.py
:start-after: # gpgkey create
:end-before: # end gpgkey create
-Delete an GPG gpgkey for a user:
+Delete a GPG gpgkey for a user:
.. literalinclude:: users.py
:start-after: # gpgkey delete