Merged changelog and overview docs into main index file. Fixed typo a…

…t NEWS.
lukaszb · Jan 26, 2011 · be8d653 · be8d653
1 parent 6dd8d17
commit be8d653
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 19 deletions.
diff --git 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
diff --git 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