Merge pull request #5516 from yarikoptic/upstream-master

ENH: list generated config files in generated, and rm them upon clean

docs/Makefile

@@ -40,6 +40,7 b' clean_api:'
 
 clean: clean_api
 	-rm -rf build/* dist/*
+	-cd $(SRCDIR)/config/options; cat generated | xargs -r rm -f
 	-rm -rf $(SRCDIR)/config/options/generated
 
 pdf: latex

docs/autogen_config.py

@@ -1,3 +1,5 b''
+#!/usr/bin/env python
+
 from IPython.utils.text import indent, wrap_paragraphs
 
 from IPython.terminal.ipapp import TerminalIPythonApp
@@ -47,17 +49,25 b' def document_config_options(classes):'
 
 kernel_classes = IPKernelApp().classes
 
-def write_doc(filename, title, classes, preamble=None):
+def write_doc(name, title, classes, preamble=None):
     configdoc = document_config_options(classes)
-    with open('source/config/options/%s.rst' % filename, 'w') as f:
+    filename = '%s.rst' % name
+    with open('source/config/options/%s' % filename, 'w') as f:
         f.write(title + '\n')
         f.write(('=' * len(title)) + '\n')
         f.write('\n')
         if preamble is not None:
             f.write(preamble + '\n\n')
         f.write(configdoc)
+    with open('source/config/options/generated', 'a') as f:
+        f.write(filename + '\n')
+
 
 if __name__ == '__main__':
+    # create empty file
+    with open('source/config/options/generated', 'w'):
+        pass
+
     write_doc('terminal', 'Terminal IPython options', TerminalIPythonApp().classes)
     write_doc('kernel', 'IPython kernel options', kernel_classes,
               preamble="These options can be used in :file:`ipython_notebook_config.py` "
@@ -76,5 +86,3 b" if __name__ == '__main__':"
         write_doc('qtconsole', 'IPython Qt console options', qtclasses,
                   preamble="Any of the :doc:`kernel` can also be used.")
 
-    with open('source/config/options/generated', 'w'):
-        pass
  No newline at end of file