Merged changelog and overview docs into main index file. Fixed typo at NEWS.

diff --git a/NEWS b/NEWS
index 74020c748bd8925fdc0f3cfb3eee0edb32d83909..a24617af2d80d0a76c35cb7a1f6220706f36e130 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -391,7 +391,7 @@ note: This list is most likely incomplete for 0.6.0.
 
  FEATURES
 
-  * A new function `commit_tree' has been added that can commit a tree 
+  * A new function 'commit_tree' has been added that can commit a tree 
     based on an index.
 
  BUG FIXES

diff --git a/docs/changelog.txt b/docs/changelog.txt
deleted file mode 100644 (file)
index d819f60..0000000
--- a/docs/changelog.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-.. _changelog:
-
-=========
-Changelog
-=========
-
-.. include:: ../NEWS
-

diff --git a/docs/index.txt b/docs/index.txt
index a221f275ce7573252b379fbadb2d70868dbc880b..076f9a35f79fe53551319113a6f2b2d2c355673c 100644 (file)
--- a/docs/index.txt
+++ b/docs/index.txt
@@ -4,19 +4,29 @@
 dulwich - Python implementation of Git
 ======================================
 
-**Documentation**:
+Overview
+========
+
+.. include:: ../README
+
+Documentation
+=============
+
 
 .. toctree::
     :maxdepth: 2
 
-    overview
     performance
     protocol
-    changelog
 
     tutorial/index
 
 
+Changelog
+=========
+
+.. include:: ../NEWS
+
 Indices and tables
 ==================
 

diff --git a/docs/overview.txt b/docs/overview.txt
deleted file mode 100644 (file)
index 4ce5f4a..0000000
--- a/docs/overview.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-.. _overview:
-
-Overview
-========
-
-.. include:: ../README
-