From 6790d075bfbe3723fd1ac88e202938f63edde164 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 9 Jun 2013 10:29:25 -0400
Subject: Linked FAQ

---
 docs/merge.txt | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'docs/merge.txt')

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
 =======
 
-- 
cgit v1.2.3