diff --git a/coreapi/help/doc/sphinx/gendoc.py b/coreapi/help/doc/sphinx/gendoc.py
index 5c1e7bc0d..514dfb596 100755
--- a/coreapi/help/doc/sphinx/gendoc.py
+++ b/coreapi/help/doc/sphinx/gendoc.py
@@ -68,12 +68,27 @@ class RstTools:
 	class Table:
 		def __init__(self):
 			self._rows = []
-			self._widths = []
-			self._heights = []
-		
+
 		@property
 		def rows(self):
 			return self._rows
+
+	class CSVTable(Table):
+		def addrow(self, row):
+			self._rows.append(', '.join([self._format_cell(cell) for cell in row]))
+
+		def __str__(self):
+			return '.. csv-table::\n\t\n\t' + '\n\t'.join(self._rows)
+
+		def _format_cell(self, cell):
+			return '"{0}"'.format(cell.replace('"', '""'))
+
+
+	class GridTable(Table):
+		def __init__(self):
+			RstTools.Table.__init__(self)
+			self._widths = []
+			self._heights = []
 		
 		def addrow(self, row):
 			if len(self._widths) == 0:
@@ -375,35 +390,35 @@ class ClassPage(SphinxPage):
 
 	@property
 	def enumsSummary(self):
-		table = RstTools.Table()
+		table = RstTools.CSVTable()
 		for enum in self.enums:
-			briefDoc = '\n'.join([line['line'] for line in enum.briefDesc['lines']])
+			briefDoc = ' '.join([line['line'] for line in enum.briefDesc['lines']])
 			table.addrow((enum.link, briefDoc))
 		return table
 	
 	@property
 	def propertiesSummary(self):
-		table = RstTools.Table()
+		table = RstTools.CSVTable()
 		for property_ in self.properties:
 			reference = ':ref:`{0}`'.format(property_['ref_label'])
 			briefDoc = property_['getter']['briefDoc'] if property_['getter'] is not None else property_['setter']['briefDoc']
-			briefDoc = '\n'.join([line['line'] for line in briefDoc['lines']])
+			briefDoc = ' '.join([line['line'] for line in briefDoc['lines']])
 			table.addrow([reference, briefDoc])
 		return table
 	
 	@property
 	def instanceMethodsSummary(self):
-		table = RstTools.Table()
+		table = RstTools.CSVTable()
 		for method in self.methods:
-			briefDoc = '\n'.join([line['line'] for line in method['briefDoc']['lines']])
+			briefDoc = ' '.join([line['line'] for line in method['briefDoc']['lines']])
 			table.addrow([method['link'], briefDoc])
 		return table
 	
 	@property
 	def classMethodsSummary(self):
-		table = RstTools.Table()
+		table = RstTools.CSVTable()
 		for method in self.classMethods:
-			briefDoc = '\n'.join([line['line'] for line in method['briefDoc']['lines']])
+			briefDoc = ' '.join([line['line'] for line in method['briefDoc']['lines']])
 			table.addrow([method['link'], briefDoc])
 		return table
 
@@ -413,7 +428,7 @@ class OldFilesCleaner:
 		self._filesToKeep = set()
 		self.root = rootDirectory
 
-	def add_directory(self, directory):
+	def protect_file(self, directory):
 		self._filesToKeep.add(directory)
 
 	def clean(self):
@@ -448,14 +463,14 @@ class DocGenerator:
 				page = EnumPage(enum, lang, self.languages)
 				filepath = page.write(directory)
 				indexPage.add_entry(page.filename)
-				cleaner.add_directory(filepath)
+				cleaner.protect_file(filepath)
 			for class_ in (self.api.namespace.classes + self.api.namespace.interfaces):
 				page = ClassPage(class_, lang, self.languages)
 				filepath = page.write(directory)
 				indexPage.add_entry(page.filename)
-				cleaner.add_directory(filepath)
+				cleaner.protect_file(filepath)
 			filepath = indexPage.write(directory)
-			cleaner.add_directory(filepath)
+			cleaner.protect_file(filepath)
 			cleaner.clean()