diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a219570..478a722 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -29,9 +29,8 @@ Some guidelines on contributing to IPython: - bugfixes should include regression tests - new behavior should at least get minimal exercise * New features and backwards-incompatible changes should be documented by adding - a new file to the [development](docs/source/whatsnew/development) directory, - see [the README.md there](docs/source/whatsnew/development/README.md) for - details. + a new file to the [pr](docs/source/whatsnew/pr) directory, see [the README.md + there](docs/source/whatsnew/pr/README.md) for details. [Travis](http://travis-ci.org/#!/ipython/ipython) does a pretty good job testing IPython and Pull Requests, but it may make sense to manually perform tests (possibly with our `test_pr` script), diff --git a/docs/source/whatsnew/pr/README.md b/docs/source/whatsnew/pr/README.md index 5984da6..05f16d0 100644 --- a/docs/source/whatsnew/pr/README.md +++ b/docs/source/whatsnew/pr/README.md @@ -7,8 +7,8 @@ directory documenting this change as a part of your Pull Request. This will allow multiple Pull Requests to do the same without conflicting with one another. Periodically, IPython developers with commit rights will run a -script and populate [developement.rst](../developement.rst) with the contents -of this directory, and clean it up. +script and populate [development.rst](../development.rst) +with the contents of this directory, and clean it up. Files which describe new features can have any name, such as `antigravity-feature.rst`, whereas backwards incompatible changes should have a