Merge branch 'master' of github.com:gpocentek/python-gitlab

Gauvain Pocentek · Gauvain Pocentek · commit e3ac32f76a54 · 2016-08-06T14:26:33.000+02:00
diff --git a/docs/api-objects.rst b/docs/api-objects.rst
@@ -9,6 +9,7 @@ API objects manipulation
    gl_objects/commits
    gl_objects/groups
    gl_objects/issues
+   gl_objects/namespaces
    gl_objects/projects
    gl_objects/runners
    gl_objects/users
diff --git a/docs/api-usage.rst b/docs/api-usage.rst
@@ -99,9 +99,9 @@ actions on the GitLab resources. For example:
 
 .. code-block:: python
 
-   # get a tarball of the git repository
+   # star a git repository
    project = gl.projects.get(1)
-   project.archive()
+   project.star()
 
 Pagination
 ==========
diff --git a/docs/gl_objects/namespaces.py b/docs/gl_objects/namespaces.py
@@ -0,0 +1,7 @@
+# list
+namespaces = gl.namespaces.list()
+# end list
+
+# search
+namespaces = gl.namespaces.list(search='foo')
+# end search
diff --git a/docs/gl_objects/namespaces.rst b/docs/gl_objects/namespaces.rst
@@ -0,0 +1,21 @@
+##########
+Namespaces
+##########
+
+Use :class:`~gitlab.objects.Namespace` objects to manipulate namespaces. The
+:attr:`gitlab.Gitlab.namespaces` manager objects provides helper functions.
+
+Examples
+========
+
+List namespaces:
+
+.. literalinclude:: namespaces.py
+   :start-after: # list
+   :end-before: # end list
+
+Search namespaces:
+
+.. literalinclude:: namespaces.py
+   :start-after: # search
+   :end-before: # end search
diff --git a/docs/gl_objects/runners.rst b/docs/gl_objects/runners.rst
@@ -13,7 +13,7 @@ Examples
 
 Use the ``list()`` and ``all()`` methods to list runners.
 
- The ``all()`` method accepts a ``scope`` parameter to filter the list. Allowed
+The ``all()`` method accepts a ``scope`` parameter to filter the list. Allowed
 values for this parameter are ``specific``, ``shared``, ``active``, ``paused``
 and ``online``.
 
