From 73cba9d1f841020b0ee1304f204923d994dd5363 Mon Sep 17 00:00:00 2001
From: Joshua Harlow <harlowja@yahoo-inc.com>
Date: Fri, 8 Mar 2013 15:57:05 -0800
Subject: Enable the merging.txt to be in .rst format for public viewing

---
 doc/rtd/index.rst          | 1 +
 doc/rtd/topics/merging.rst | 5 +++++
 2 files changed, 6 insertions(+)
 create mode 100644 doc/rtd/topics/merging.rst

(limited to 'doc/rtd')

diff --git a/doc/rtd/index.rst b/doc/rtd/index.rst
index 619bb5dc..fe04b1a9 100644
--- a/doc/rtd/index.rst
+++ b/doc/rtd/index.rst
@@ -24,6 +24,7 @@ Summary
    topics/examples
    topics/datasources
    topics/modules
+   topics/merging
    topics/moreinfo
    topics/hacking
 
diff --git a/doc/rtd/topics/merging.rst b/doc/rtd/topics/merging.rst
new file mode 100644
index 00000000..8a03f3c7
--- /dev/null
+++ b/doc/rtd/topics/merging.rst
@@ -0,0 +1,5 @@
+=========
+Merging
+=========
+
+.. include:: ../../merging.rst
-- 
cgit v1.2.3