@@ -131,10 +131,17 @@ Remote
    :members:
    :undoc-members:
 
-Repo
-----
+Repo.Base
+---------
+
+.. automodule:: git.repo.base
+   :members:
+   :undoc-members:
+   
+Repo.Functions
+--------------
 
-.. automodule:: git.repo
+.. automodule:: git.repo.fun
    :members:
    :undoc-members:
 
 
@@ -445,12 +445,12 @@ def iter_blobs(self, predicate = lambda t: True):
 
 	def unmerged_blobs(self):
 		"""
-		Returns
+		:return:
 			Iterator yielding dict(path : list( tuple( stage, Blob, ...))), being
 			a dictionary associating a path in the index with a list containing
 			sorted stage/blob pairs
 
-		Note:
+		:note:
 			Blobs that have been removed in one side simply do not exist in the
 			given stage. I.e. a file removed on the 'other' branch whose entries
 			are at stage 3 will not have a stage 3 entry.
 
@@ -48,6 +48,7 @@ def write_cache_entry(entry, stream):
 
 def write_cache(entries, stream, extension_data=None, ShaStreamCls=IndexFileSHA1Writer):
 	"""Write the cache represented by entries to a stream
+	
 	:param entries: **sorted** list of entries
 	:param stream: stream to wrap into the AdapterStreamCls - it is used for
 		final output.
@@ -149,6 +150,7 @@ def read_cache(stream):
 def write_tree_from_cache(entries, odb, sl, si=0):
 	"""Create a tree from the given sorted list of entries and put the respective
 	trees into the given object database
+	
 	:param entries: **sorted** list of IndexEntries
 	:param odb: object database to store the trees in
 	:param si: start index at which we should start creating subtrees