aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2013-06-09 10:29:25 -0400
committerJason R. Coombs <jaraco@jaraco.com>2013-06-09 10:29:25 -0400
commit6790d075bfbe3723fd1ac88e202938f63edde164 (patch)
treed5c187ef7203e9d2a56ee59c32fce9bd9af8cf2e
parent5c041343fab9b643998e4390e109f69171841d94 (diff)
downloadexternal_python_setuptools-6790d075bfbe3723fd1ac88e202938f63edde164.tar.gz
external_python_setuptools-6790d075bfbe3723fd1ac88e202938f63edde164.tar.bz2
external_python_setuptools-6790d075bfbe3723fd1ac88e202938f63edde164.zip
Linked FAQ
-rw-r--r--docs/merge.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/docs/merge.txt b/docs/merge.txt
index 23d1e857..ba37d6e4 100644
--- a/docs/merge.txt
+++ b/docs/merge.txt
@@ -4,6 +4,11 @@ Merge with Distribute
In 2013, the fork of Distribute was merged back into Setuptools. This
document describes some of the details of the merge.
+.. toctree::
+ :maxdepth: 2
+
+ merge-faq
+
Process
=======