Moved MERGE.txt into the setuptools documentation.

--HG-- rename : MERGE.txt => docs/merge.txt

Moved MERGE.txt into the setuptools documentation.
--HG-- rename : MERGE.txt => docs/merge.txt
acce77b1 · Jason R. Coombs · 87db22d0 · acce77b1 · acce77b1 · acce77b1
Commit acce77b1 authored Jun 09, 2013 by Jason R. Coombs
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 1 deletion

CHANGES.txt CHANGES.txt +1 -1

docs/index.txt docs/index.txt +1 -0

docs/merge.txt docs/merge.txt +6 -0

No files found.
--- 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:


--- a/docs/index.txt
+++ b/docs/index.txt
@@ -16,6 +16,7 @@ Documentation content:
 .. toctree::
   :maxdepth: 2

+   merge
   roadmap
   python3
   using

--- a/MERGE.txt
+++ b/MERGE.txt
+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
 =======