Skip to content

Commit 227607c

Browse files
authored
Merge pull request #1603 from timgates42/bugfix_typos
docs: fix a few typos
2 parents e19314d + 7ea4ddc commit 227607c

File tree

9 files changed

+13
-13
lines changed

9 files changed

+13
-13
lines changed

docs/gl_objects/deploy_tokens.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ the following parameters:
7575

7676
With GitLab 12.9, even though ``username`` and ``expires_at`` are not required, they always have to be passed to the API.
7777
You can set them to empty strings, see: https://gitlab.com/gitlab-org/gitlab/-/issues/211878.
78-
Also, the ``username``'s value is ignored by the API and will be overriden with ``gitlab+deploy-token-{n}``,
78+
Also, the ``username``'s value is ignored by the API and will be overridden with ``gitlab+deploy-token-{n}``,
7979
see: https://gitlab.com/gitlab-org/gitlab/-/issues/211963
8080
These issues were fixed in GitLab 12.10.
8181

@@ -125,7 +125,7 @@ the following parameters:
125125

126126
With GitLab 12.9, even though ``username`` and ``expires_at`` are not required, they always have to be passed to the API.
127127
You can set them to empty strings, see: https://gitlab.com/gitlab-org/gitlab/-/issues/211878.
128-
Also, the ``username``'s value is ignored by the API and will be overriden with ``gitlab+deploy-token-{n}``,
128+
Also, the ``username``'s value is ignored by the API and will be overridden with ``gitlab+deploy-token-{n}``,
129129
see: https://gitlab.com/gitlab-org/gitlab/-/issues/211963
130130
These issues were fixed in GitLab 12.10.
131131

gitlab/base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ class RESTObjectList(object):
192192
This generator uses the Gitlab pagination system to fetch new data when
193193
required.
194194
195-
Note: you should not instanciate such objects, they are returned by calls
195+
Note: you should not instantiate such objects, they are returned by calls
196196
to RESTManager.list()
197197
198198
Args:

gitlab/mixins.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ def set(self, key: str, value: str, **kwargs: Any) -> base.RESTObject:
439439
440440
Raises:
441441
GitlabAuthenticationError: If authentication is not correct
442-
GitlabSetError: If an error occured
442+
GitlabSetError: If an error occurred
443443
444444
Returns:
445445
obj: The created/updated attribute
@@ -661,7 +661,7 @@ def download(
661661
Args:
662662
streamed (bool): If True the data will be processed by chunks of
663663
`chunk_size` and each chunk is passed to `action` for
664-
reatment
664+
treatment
665665
action (callable): Callable responsible of dealing with chunk of
666666
data
667667
chunk_size (int): Size of each chunk

gitlab/v4/objects/features.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def set(
4141
4242
Raises:
4343
GitlabAuthenticationError: If authentication is not correct
44-
GitlabSetError: If an error occured
44+
GitlabSetError: If an error occurred
4545
4646
Returns:
4747
obj: The created/updated attribute

gitlab/v4/objects/groups.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ def transfer_project(self, project_id, **kwargs):
8383
8484
Raises:
8585
GitlabAuthenticationError: If authentication is not correct
86-
GitlabTransferProjectError: If the project could not be transfered
86+
GitlabTransferProjectError: If the project could not be transferred
8787
"""
8888
path = "/groups/%s/projects/%s" % (self.id, project_id)
8989
self.manager.gitlab.http_post(path, **kwargs)

gitlab/v4/objects/packages.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ def download(
105105
file_name (str): The name of the file in the registry
106106
streamed (bool): If True the data will be processed by chunks of
107107
`chunk_size` and each chunk is passed to `action` for
108-
reatment
108+
treatment
109109
action (callable): Callable responsible of dealing with chunk of
110110
data
111111
chunk_size (int): Size of each chunk

gitlab/v4/objects/projects.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@ def transfer_project(self, to_namespace: str, **kwargs: Any) -> None:
515515
516516
Raises:
517517
GitlabAuthenticationError: If authentication is not correct
518-
GitlabTransferProjectError: If the project could not be transfered
518+
GitlabTransferProjectError: If the project could not be transferred
519519
"""
520520
path = "/projects/%s/transfer" % (self.id,)
521521
self.manager.gitlab.http_put(

gitlab/v4/objects/sidekiq.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
class SidekiqManager(RESTManager):
1111
"""Manager for the Sidekiq methods.
1212
13-
This manager doesn't actually manage objects but provides helper fonction
13+
This manager doesn't actually manage objects but provides helper function
1414
for the sidekiq metrics API.
1515
"""
1616

1717
@cli.register_custom_action("SidekiqManager")
1818
@exc.on_http_error(exc.GitlabGetError)
1919
def queue_metrics(self, **kwargs):
20-
"""Return the registred queues information.
20+
"""Return the registered queues information.
2121
2222
Args:
2323
**kwargs: Extra options to send to the server (e.g. sudo)
@@ -34,7 +34,7 @@ def queue_metrics(self, **kwargs):
3434
@cli.register_custom_action("SidekiqManager")
3535
@exc.on_http_error(exc.GitlabGetError)
3636
def process_metrics(self, **kwargs):
37-
"""Return the registred sidekiq workers.
37+
"""Return the registered sidekiq workers.
3838
3939
Args:
4040
**kwargs: Extra options to send to the server (e.g. sudo)

gitlab/v4/objects/todos.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,6 @@ def mark_all_as_done(self, **kwargs):
4545
GitlabTodoError: If the server failed to perform the request
4646
4747
Returns:
48-
int: The number of todos maked done
48+
int: The number of todos marked done
4949
"""
5050
self.gitlab.http_post("/todos/mark_as_done", **kwargs)

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy