diff --git a/doc/configuration.rst b/doc/configuration.rst index e48b519..9690307 100644 --- a/doc/configuration.rst +++ b/doc/configuration.rst @@ -24,7 +24,7 @@ SALT_EMAIL This configuration key is used to ensure that when sending notifications to different users, each one of them has a different, unique -and un-fakable ``Reply-To`` header. This header is then used by the milter to find +and unfakeable ``Reply-To`` header. This header is then used by the milter to find out if the response received is a real one or a fake/invalid one. @@ -57,7 +57,7 @@ Defaults to: ``https://pagure.org/`` EMAIL_ERROR ~~~~~~~~~~~ -Pagure sends email when it catches an un-expected error (which saves you from +Pagure sends email when it catches an unexpected error (which saves you from having to monitor the logs regularly; but if you like, the error is still present in the logs). This configuration key allows you to specify to which email address to send @@ -148,7 +148,7 @@ are stored and served from. UPLOAD_FOLDER_URL ~~~~~~~~~~~~~~~~~~ -Full URL to where the uploads are available. It is highly recommanded for +Full URL to where the uploads are available. It is highly recommended for security reasons that this URL lives on a different domain than the main application (an entirely different domain, not just a sub-domain). @@ -354,7 +354,7 @@ Optional options SSH_KEYS ~~~~~~~~ -It is a good pratice to publish the fingerprint and public SSH key of a +It is a good practice to publish the fingerprint and public SSH key of a server you provide access to. Pagure offers the possibility to expose this information based on the values set in the configuration file, in the ``SSH_KEYS`` configuration key. @@ -501,7 +501,7 @@ Defaults to: ``4 * 1024 * 1024`` which corresponds to 4 megabytes. ENABLE_TICKETS ~~~~~~~~~~~~~~ -This configuration key activates or de-activates the ticketing system +This configuration key activates or deactivates the ticketing system for all the projects hosted on this pagure instance. Defaults to: ``True`` @@ -519,7 +519,7 @@ Defaults to: ``True`` ENABLE_DEL_PROJECTS ~~~~~~~~~~~~~~~~~~~ -This configuration key permits or forbids deletiion of projects via +This configuration key permits or forbids deletion of projects via the user interface of this pagure instance. Defaults to: ``True`` @@ -575,7 +575,7 @@ INSTANCE_NAME ~~~~~~~~~~~~~ This allows giving a name to this running instance of pagure. The name is -then used in the welcome screen showns upon first login. +then used in the welcome screen shown upon first login. Defaults to: ``Pagure`` @@ -625,7 +625,7 @@ The use-case is the following: the Fedora project is deploying pagure has a front-end for the git repos of the packages in the distribution, that means about 17,000 git repositories in pagure. The project has a group of people that have access to all of these repositories, so when viewing the user's -page of one member ot that group, instead of seeing all the project that +page of one member of that group, instead of seeing all the project that this user works on, you can see all the projects hosted in that pagure instance. Using this configuration key, pagure will hide all the projects that this user has access to via the specified groups and thus return only diff --git a/doc/development.rst b/doc/development.rst index 1c7cecc..bb0e806 100644 --- a/doc/development.rst +++ b/doc/development.rst @@ -95,7 +95,7 @@ For example, create the file ``config`` with in it: EVENTSOURCE_PORT = '8080' DOC_APP_URL = '*' - # Avoid sending email when developping + # Avoid sending email when developing EMAIL_SEND = False and run the server with: @@ -190,7 +190,7 @@ your source. We are also inspecting the code using `pylint `_ and aim of course for a 10/10 code -(but it is an assymptotic goal). +(but it is an asymptotic goal). .. note:: both pep8 and pylint are available in Fedora: diff --git a/doc/install.rst b/doc/install.rst index fa53048..f13b0ae 100644 --- a/doc/install.rst +++ b/doc/install.rst @@ -3,7 +3,7 @@ Installing pagure There are two ways to install pagure: -* via the RPM package (recommended if you are using a RPM-based linux distribution) +* via the RPM package (recommended if you are using a RPM-based GNU/Linux distribution) * via the setup.py @@ -265,7 +265,7 @@ which returns the most recent revision found by alembic, and since the database was just created, it is at the latest revision. -Set up virus scannining +Set up virus scanning ----------------------- Pagure can automatically scan uploaded attachments for viruses using Clam. To set this up, first install clamav-data-empty, clamav-server, diff --git a/doc/overview.rst b/doc/overview.rst index cc4e06b..66d2e84 100644 --- a/doc/overview.rst +++ b/doc/overview.rst @@ -12,7 +12,7 @@ These components are: Before going into the overall picture, one should realize that most of the components listed above are optional. -Here is a diagram representing pagure without all the optionals components: +Here is a diagram representing pagure without all the optional components: .. image:: _static/overview_simple.png :target: _static/overview_simple.png @@ -48,7 +48,7 @@ Pagure doc server While integrated into the main application at first, it has been split out for security concern, displaying information directly provided by the user -without a clear/safe way of filtering for un-safe script or hacks is a +without a clear/safe way of filtering for unsafe script or hacks is a security hole. For this reason we also strongly encourage anyone wanting to deploy their own instance of pagure with the doc server, to run this application on a diff --git a/doc/usage/forks.rst b/doc/usage/forks.rst index 3c3527b..7d8247f 100644 --- a/doc/usage/forks.rst +++ b/doc/usage/forks.rst @@ -58,7 +58,7 @@ area and commit the changes:: $ git commit -s Your text editor of choice will open and you can write your commit message. -Afterwords, you are ready to push your changes to your remote fork:: +Afterwards, you are ready to push your changes to your remote fork:: $ git push -u origin my-feature-or-bugfix diff --git a/doc/usage/project_acls.rst b/doc/usage/project_acls.rst index 01f3424..d027a6f 100644 --- a/doc/usage/project_acls.rst +++ b/doc/usage/project_acls.rst @@ -32,7 +32,7 @@ With Project ACL feature, We can now have three levels of access: Add/Update Access ================= -* Everytime you add a new user or a new group to the project, you will be asked to +* Every time you add a new user or a new group to the project, you will be asked to provide the level of access you want to give to that user or group. It's a required field in the form. diff --git a/doc/usage/project_settings.rst b/doc/usage/project_settings.rst index 1d9f7b4..6518ae0 100644 --- a/doc/usage/project_settings.rst +++ b/doc/usage/project_settings.rst @@ -74,8 +74,8 @@ This option can be used for project wishing to enforce having a minimum number of people reviewing a pull-request before it can be merged. If this option is enabled, anyone can vote in favor or against a pull-request -and the sum of the votes in favor minus the sum of the votes againsts give -the pull-request a score that should be equal or great to the value +and the sum of the votes in favor minus the sum of the votes against give +the pull-request a score that should be equal or greater than the value entered in this option for the pull-request to be allowed to be merged. .. note:: Only the main comments (ie: not in-line) are taken into account diff --git a/doc/usage/pull_requests.rst b/doc/usage/pull_requests.rst index aea4e1d..f3a9a0a 100644 --- a/doc/usage/pull_requests.rst +++ b/doc/usage/pull_requests.rst @@ -67,7 +67,7 @@ the commit or commits in this pull request by doing:: $ git remote add -f jcline https://pagure.io/forks/jcline/pagure.git # Add and fetch the remote $ git checkout jcline/doc-prs-locally -You will now be in a "detatched HEAD" state. If you want to build off this pull +You will now be in a "detached HEAD" state. If you want to build off this pull request, just create a local branch, add some commits, push it to your fork, and open your own pull request:: diff --git a/doc/usage/upgrade_db.rst b/doc/usage/upgrade_db.rst index 6c3ebe3..dafa2d0 100644 --- a/doc/usage/upgrade_db.rst +++ b/doc/usage/upgrade_db.rst @@ -36,7 +36,7 @@ you can declare that your database is at this given revision using: Eventually, if you do not know where your database is or should be, you can do an iterative process stamping the database for every revision, one by one -trying everytime to ``alembic upgrade`` until it works. +trying every time to ``alembic upgrade`` until it works. * The database used does not support some of the changes diff --git a/pagure/lib/repo.py b/pagure/lib/repo.py index 851c360..98f15d0 100644 --- a/pagure/lib/repo.py +++ b/pagure/lib/repo.py @@ -80,6 +80,7 @@ class PagureRepo(pygit2.Repository): else: _log.debug( 'Un-expected merge result: %s' % ( + 'Unexpected merge result: %s' % ( pygit2.GIT_MERGE_ANALYSIS_NORMAL)) raise AssertionError('Unknown merge analysis result')