summaryrefslogtreecommitdiff
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
commit7e99d3f3ca15ee72bd53dcfe08f240da3b10aa2f (patch)
tree1b7f193889ff2f5959481f0212f9bee5bc57df96
parent746931a3542818513c400eb45aeae383f29cfcc4 (diff)
downloadpython-setuptools-bitbucket-7e99d3f3ca15ee72bd53dcfe08f240da3b10aa2f.tar.gz
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
=======