diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2013-06-09 10:14:32 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2013-06-09 10:14:32 -0400 |
| commit | acce77b1dfb768dd7fdec3b76dc5c64d27320f82 (patch) | |
| tree | 7974fddd9edd07e2bcf7004cc48d668d4d9a6083 | |
| parent | 87db22d06a93278635e4fc551872be3b40c5a249 (diff) | |
| download | external_python_setuptools-acce77b1dfb768dd7fdec3b76dc5c64d27320f82.tar.gz external_python_setuptools-acce77b1dfb768dd7fdec3b76dc5c64d27320f82.tar.bz2 external_python_setuptools-acce77b1dfb768dd7fdec3b76dc5c64d27320f82.zip | |
Moved MERGE.txt into the setuptools documentation.
--HG--
rename : MERGE.txt => docs/merge.txt
| -rw-r--r-- | CHANGES.txt | 2 | ||||
| -rw-r--r-- | docs/index.txt | 1 | ||||
| -rw-r--r-- | docs/merge.txt (renamed from MERGE.txt) | 6 |
3 files changed, 8 insertions, 1 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 34177d63..aac22ad0 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -19,7 +19,7 @@ CHANGES 0.7 --- -* Merged Setuptools and Distribute. See MERGE.txt for details. +* Merged Setuptools and Distribute. See docs/merge.txt for details. Added several features that were slated for setuptools 0.6c12: diff --git a/docs/index.txt b/docs/index.txt index 21442b93..162a5f6f 100644 --- a/docs/index.txt +++ b/docs/index.txt @@ -16,6 +16,7 @@ Documentation content: .. toctree:: :maxdepth: 2 + merge roadmap python3 using diff --git a/MERGE.txt b/docs/merge.txt index 16fbdc68..23d1e857 100644 --- a/MERGE.txt +++ b/docs/merge.txt @@ -1,3 +1,9 @@ +Merge with Distribute +~~~~~~~~~~~~~~~~~~~~~ + +In 2013, the fork of Distribute was merged back into Setuptools. This +document describes some of the details of the merge. + Process ======= |