suggestions from Chris M.

Author: djarecka

CONTRIBUTING.md

@@ -4,9 +4,10 @@ Welcome to the Nipype repository! We're excited you're here and want to contribu
 
 These guidelines are designed to make it as easy as possible to get involved. If you have any questions that aren't discussed below, please let us know by opening an [issue][link_issues]!
 
-Before you start you'll need to set up a free [GitHub][link_github] account and sign in, here are some [instructions][link_signupinstructions].
-If you are not familiar with version control system and Git, 
-you will find introduction and links to tutorials [here](http://www.reproducibleimaging.org/module-reproducible-basics/02-vcs/).
+Before you start you'll need to set up a free [GitHub][link_github] account and sign in. Here are some [instructions][link_signupinstructions].
+If you are not familiar with version control systems such as git,
+ [introductions and tutorials](http://www.reproducibleimaging.org/module-reproducible-basics/02-vcs/)
+ may be found on [ReproducibleImaging.org](https://www.reproducibleimaging.org/).
 
 Already know what you're looking for in this guide? Jump to the following sections:
 * [Understanding issue labels](#issue-labels)
@@ -49,26 +50,28 @@ This allows other members of the Nipype development team to confirm that you are
 
 **2. [Fork][link_fork] the [Nipype repository][link_nipype] to your profile.**
 
-This is now your own unique copy of Nipype repository.
+This is now your own unique copy of the Nipype repository.
 Changes here won't affect anyone else's work, so it's a safe space to explore edits to the code!
 
 You can clone your Nipype repository in order to create a local copy of the code on your machine.
-In your local Nipype directory, run `pip install -e .[dev]`.
-This will add your version of nipype to your local python environment and
-install dependencies needed for development.
+To install your version of Nipype, and the dependencies needed for development,
+in your Python environment, run `pip install -e ".[dev]"` from your local Nipype
+directory.
 
-Make sure to [keep your fork up to date][link_updateupstreamwiki] with the original Nipype repository.
+Make sure to keep your fork up to date with the original Nipype repository.
+One way to do this is to [configure a new remote named "upstream"](https://help.github.com/articles/configuring-a-remote-for-a-fork/)
+ and to [sync your fork with the upstream repository][link_updateupstreamwiki].
 
 **3. Make the changes you've discussed.**
 
 If you're adding a new tool from an existing neuroimaging toolkit (e.g., 3dDeconvolve from AFNI), 
 check out the [guide for adding new interfaces to Nipype][link_new_interfaces].
 
-When you are working on your changes, you should test frequently if you are not breaking the existing code,
-more on testing you will find [the testing section of Nipype documentation](http://nipype.readthedocs.io/en/latest/devel/testing_nipype.html). 
+When you are working on your changes, test frequently to ensure you are not breaking the existing code.
+For more on testing, please see [the testing section of Nipype documentation](http://nipype.readthedocs.io/en/latest/devel/testing_nipype.html).
 
-Before pushing your changes to GitHub run `make check-before-commit`, this will remove trailing spaces, create new auto tests,
-test entire package and build the documentation.
+Before pushing your changes to GitHub, run `make check-before-commit`. This will remove trailing spaces, create new auto tests,
+test the entire package, and build the documentation.
 If you get no errors, you're ready to submit your changes!
 
 It's a good practice to create [a new branch](https://help.github.com/articles/about-branches/) 
@@ -95,7 +98,7 @@ If your pull request is not yet ready to be merged, please also include the **[W
 This tells the development team that your pull request is a "work-in-progress", and that you plan to continue working on it.
 
 Review and discussion on new code can begin well before the work is complete, and the more discussion the better!
-This provides the opportunity to check with the development team the path you've outlined.
+The development team may prefer a different path than you've outlined, so it's better to discuss it and get approval at the early stage of your work.
 
 One your PR is ready a member of the development team will review your changes to confirm that they can be merged into the main codebase.
 

doc/devel/testing_nipype.rst

@@ -89,13 +89,13 @@ Testing Nipype using Docker
 
 Nipype is tested inside Docker containers and users can use nipype images to test local versions. 
 First, install the `Docker Engine <https://docs.docker.com/engine/installation/>`_.
-Nipype has one base docker image called nipype/base:latest, that contains several useful tools 
-(FreeSurfer, AFNI, FSL, ANTs, etc.), and additional test images
+Nipype has one base docker image called nipype/nipype:base, that contains several useful tools
+ (FreeSurfer, AFNI, FSL, ANTs, etc.), and additional test images
 for specific Python versions: py27 for Python 2.7 and py36 for Python 3.6.
 
 Users can pull the nipype image for Python 3.6 as follows::
   
-  docker pull nipype/base:py36
+  docker pull nipype/nipype:py36
 
 In order to test a local version of nipype you can run test within container as follows::
 
@@ -105,8 +105,5 @@ In order to test a local version of nipype you can run test within container as
 Additional comments
 -------------------
 
-If the project is tested both on your local OS and within a Docker container you might have to remove all 
-``__pycache__`` directories before switching between your OS and a container.
-
-
-  
+If the project is tested both on your local OS and within a Docker container, you might have to remove all 
+``__pycache__`` directories before switching between your OS and a container.