Merge pull request #1382 from bashirk/patch-1

Updated infrastructure.rst

Author: beckermr

src/maintainer/infrastructure.rst

@@ -15,7 +15,7 @@ You can find a detailed guide to submitting new package recipes in :ref:`creatin
 Smithy
 ------
 
-Smithy contains maintenance code for conda-forge, which is used by the ``conda smithy`` command line tool and the :ref:`dev_admservice`. Smithy lives in the repository `conda-forge/conda-smithy <https://github.com/conda-forge/conda-smithy>`_.
+Smithy contains maintenance code for conda-forge, which is used by the ``conda-smithy`` command line tool and the :ref:`dev_admservice`. Smithy lives in the repository `conda-forge/conda-smithy <https://github.com/conda-forge/conda-smithy>`_.
 
 ``conda-forge/conda-smithy`` is the right repository to report bugs for
 
@@ -41,12 +41,12 @@ Package-wide dependency pins are defined in `conda_build_config.yaml <https://gi
 
 For more information on conda-forge wide package pins, please refer to :ref:`globally_pinned_packages`.
 
-Please open a :term:`PR` and/or issues there if you think a pin needs to be advanced. For more information on updating globally pinned packages, please refer to :ref:`update_pins`.
+Please open a :term:`PR` and/or an issue there, if you think a pin needs to be advanced. For more information on updating globally pinned packages, please refer to :ref:`update_pins`.
 
 Documentation
 -------------
 
-The documentation lives in `conda-forge/conda-forge.github.io <https://github.com/conda-forge/conda-forge.github.io/>`__ and is automatically deployed to our `online version <https://conda-forge.org/docs/>`__.
+The documentation lives in `conda-forge/conda-forge.github.io <https://github.com/conda-forge/conda-forge.github.io/>`__, and is automatically deployed to our `online version <https://conda-forge.org/docs/>`__.
 
 The documentation is built with ``Sphinx`` and the sources files are located in the `src <https://github.com/conda-forge/conda-forge.github.io/tree/master/src>`__ directory of the repository.
 
@@ -64,30 +64,30 @@ Conda-forge is running a webservice on Heroku called `conda-forge-webservices <h
 The following services are run by default on a feedstock:
 
 - It will lint the recipes in the PRs and report back whether the recipe is in excellent condition or not.
-- When maintainers are added to a recipe, the maintainer will be added to the team and given push access.
+- When maintainers are added to a recipe, each of the maintainers will be added to the team and given push access to the feedstock.
 
-The webservice also listens to issue and PR comments so that you can ask for the following services to be done.
+The webservice also listens to issues and PR comments, so that you can ask for the following services to be done:
 
 @conda-forge-admin, please rerender
 -----------------------------------
 
 Entering the above phrase in a PR of a feedstock will rerender the feedstock and push the changes to your PR.
 Make sure to tick the ``Allow edits from maintainers.`` button locate at the bottom of the right side bar of
-the PR. If you say this phrase in an issue comment, the bot will create a new pull request with the requested
-re-rendering completed.
+the PR. If you enter this phrase in the comment for an issue, the bot will create a new pull request, with the requested
+re-rendering being completed.
 
 
 @conda-forge-admin, please add noarch: python
 ---------------------------------------------
 
-Entering the above phrase in a PR or issue of a feedstock will add ``noarch: python`` to the build and rerender the feedstock
+Entering the above phrase in a PR or an issue of a feedstock will add ``noarch: python`` to the build and rerender the feedstock
 for you.
 
 
 @conda-forge-admin, please update for conda-build 3
 ---------------------------------------------------
 
-This command will attempt to update a recipe to the new conda-build 3 format. It can be sent either in an issue or a PR.
+This command will attempt to update a recipe to the new ``conda-build 3`` format. It can be sent either in an issue or a PR.
 
 Note that this update command is kind of a hack, and things might go wrong. Make sure to look over the changes, and ask for help if you're not sure about something.
 
@@ -158,7 +158,7 @@ Here we describe common issues with the CI Services that conda-forge builds.
 
 Azure Pipelines
 ---------------
-Azure is used to build packages for OS X, Linux (x86_64, native), Linux (ARMv8, emulated) and Linux (IBM Power8+, emulated). 
+Azure is used to build packages for OSX, Linux (x86_64, native), Linux (ARMv8, emulated) and Linux (IBM Power8+, emulated). 
 The build queue on Azure is substantially larger than on all the other providers. 
 Azure builds have a maximum duration of 6 hours.
 
@@ -173,7 +173,7 @@ If that doesn't work, a close/open will kick off a new build. You can also use t
 Using Azure for *everything*
 ............................
 
-Azure is the default provider for Linux and OS X.  To use Azure for everything, add the following to ``conda-forge.yml`` in the root
+Azure is the default provider for Linux and OSX.  To use Azure for everything, add the following to ``conda-forge.yml`` in the root
 of the feedstock.
 
 .. code-block:: yaml
@@ -183,21 +183,21 @@ of the feedstock.
 
 .. note::
 
-  Presently Azure has some issues building libraries using cmake on Windows.  Azure does not have a VS2008 installation so building
+  Presently Azure has some issues building libraries using cmake on Windows. Azure does not have a VS2008 installation, so building
   certain very old packages that require VC9 will fail.
 
 
-Travis CI (OS X, IBM Power 8+)
+TravisCI (OSX, IBM Power 8+)
 ------------------------------
 
-Travis CI is used to build packages for IBM Power 8+. After merging a staged-recipes pull request, it might be necessary to
-force sync your repositories in Travis CI to see the reload and cancel buttons. To do this please visit `<https://travis-ci.com/profile>`_ 
+TravisCI is used to build packages for IBM Power 8+. After merging a staged-recipes pull request, it might be necessary to
+force sync your repositories in TravisCI to see the reload and cancel buttons. To do this please visit `<https://travis-ci.com/profile>`_ 
 and click "Sync accounts".
 
 Enabling Travis
 ...............
 
-TravisCI should only be needed to build recipes on OS X if there is a strange failure on Azure.
+TravisCI should only be needed to build recipes on OSX, if there is a strange failure on Azure.
 
 Enable a build by adding the following to ``conda-forge.yml`` in the root of the feedstock.
 
@@ -206,46 +206,46 @@ Enable a build by adding the following to ``conda-forge.yml`` in the root of the
     provider:
       osx: travis
       
-For IBM Power 8+ builds, add the name of your feedstock to the list here
-`<https://github.com/conda-forge/conda-forge-pinning-feedstock/blob/master/recipe/migrations/arch_rebuild.txt>`_
+For IBM Power 8+ builds, add the name of your feedstock to the list `here
+<https://github.com/conda-forge/conda-forge-pinning-feedstock/blob/master/recipe/migrations/arch_rebuild.txt>`_
 via a pull request.
 
 
-CircleCI (Linux, OS X)
+CircleCI (Linux, OSX)
 ----------------------
-Circle CI is a container-based CI service that conda-forge uses to build
-Linux packages. It can optionally build OS X packages.
+CircleCI is a container-based CI service that conda-forge uses to build
+Linux packages. It can optionally build OSX packages.
 
 Linux builds are identical to those on Azure as both are built inside Docker containers.
 
 
-Using Circle for both Linux and OS X
+Using Circle for both Linux and OSX
 ....................................
 
-To use CircleCI for OS X, add the following to ``conda-forge.yml`` in the root of the feedstock.
+To use CircleCI for OSX, add the following to ``conda-forge.yml`` in the root of the feedstock.
 
 .. code-block:: yaml
 
     provider:
       osx: circle
       linux: circle
 
-CircleCI for OS X should be used for OS X only when Travis-CI resources (50 minutes of build time per job) are not enough as CircleCI gives more resources (2 hours of build time per job).
+CircleCI for OSX should be used for OSX, only when TravisCI resources (50 minutes of build time per job) are not enough as CircleCI gives more resources (2 hours of build time per job).
 
-Note that you need to rerender the feedstock once this change has been made.
+Note that you need to rerender the feedstock, once this change has been made.
 
 
 Enabling Circle on your Fork
 ............................
 
-If for some reason Circle CI is not triggering build from forks,
+If for some reason CircleCI is not triggering build from forks,
 Circle can be manually added for each fork. Circle calls this "Adding a Project" and
-`the official Circle's documentation is available here <https://circleci.com/docs/getting-started/#add-and-follow-more-projects>`_.
+`the official CircleCI documentation is available here <https://circleci.com/docs/getting-started/#add-and-follow-more-projects>`_.
 This effectively amounts to going to the `Add Projects <https://circleci.com/add-projects>`_
 page, finding the fork that you wish to enable, and clicking the "Build Project" button.
 This is not normally needed.
 
-If CircleCI lacks permissions to checkout the source code, it will produce an error like follows::
+If CircleCI lacks permissions to checkout the source code, it will produce an error as follows::
 
     Cloning into '.'...
     Warning: Permanently added the RSA host key for IP address '192.30.253.113' to the list of known hosts.
@@ -259,21 +259,21 @@ When this happens for a feedstock, it can be fixed using the `webservice <https:
 Otherwise (e.g. in a PR to staged-recipes), here are some things you can try:
 
 * Log in and out of Circle CI.
-* Revoke Circle CI's access and then enable it again.
+* Revoke CircleCI's access and then enable it again.
 * In the "Checkout SSH keys" section of your Circle CI project settings, press "add user key".
 
 
 Drone.io
 --------
 
-We use Drone.io for Linux ARMv8 builds. To enable these builds on your feedstock, make a pull request to add your feedstock to the list 
+We use `Drone.io <https://drone.io>`_ for Linux ARMv8 builds. To enable these builds on your feedstock, make a pull request to add your feedstock to the list 
 here `<https://github.com/conda-forge/conda-forge-pinning-feedstock/blob/master/recipe/migrations/arch_rebuild.txt>`_.
 
 
 GitHub Actions
 --------------
 
-We use GitHub actions to rerender feedstocks and run our pull request automerge service. We do not currently support builds on 
+We use GitHub actions to rerender feedstocks and also run our pull request automerge service. We do not currently support builds on 
 GitHub Actions.