diff --git a/pagure/api/__init__.py b/pagure/api/__init__.py index 06a9a47..fbadc3e 100644 --- a/pagure/api/__init__.py +++ b/pagure/api/__init__.py @@ -66,7 +66,7 @@ class APIERROR(enum.Enum): ENOPROJECT = 'Project not found' ENOPROJECTS = 'No projects found' ETRACKERDISABLED = 'Issue tracker disabled for this project' - EDBERROR = 'An error occured at the database level and prevent the ' \ + EDBERROR = 'An error occurred at the database level and prevent the ' \ 'action from reaching completion' EINVALIDREQ = 'Invalid or incomplete input submitted' EINVALIDTOK = 'Invalid or expired token. Please visit %s to get or '\ @@ -97,7 +97,7 @@ class APIERROR(enum.Enum): ENOTMAINADMIN = 'Only the main admin can set the main admin of a project' EMODIFYPROJECTNOTALLOWED = 'You are not allowed to modify this project' EINVALIDPERPAGEVALUE = 'The per_page value must be between 1 and 100' - EGITERROR = 'An error occured during a git operation' + EGITERROR = 'An error occurred during a git operation' ENOCOMMIT = 'No such commit found in this repository' ENOTHIGHENOUGH = 'You do not have sufficient permissions to perform '\ 'this action' @@ -285,7 +285,7 @@ def api_users(): ''' List users ----------- - Retrieve users that have logged into the Paugre instance. + Retrieve users that have logged into the Pagure instance. This can then be used as input for autocompletion in some forms/fields. :: diff --git a/pagure/api/fork.py b/pagure/api/fork.py index 9068994..12ccc11 100644 --- a/pagure/api/fork.py +++ b/pagure/api/fork.py @@ -296,7 +296,7 @@ def api_pull_request_merge(repo, requestid, username=None, namespace=None): """ Merge a pull-request -------------------- - Instruct Paugre to merge a pull request. + Instruct Pagure to merge a pull request. This is an asynchronous call.