Merging r50265 through r50373 from trunk into soc-2011-tomato

2012-09-04 09:06:37 +00:00
parent 86ff6cc346
commit e15f352831
242 changed files with 2877 additions and 1577 deletions
--- a/doc/python_api/sphinx_doc_gen.py
+++ b/doc/python_api/sphinx_doc_gen.py
@@ -849,7 +849,7 @@ def pymodule2sphinx(basepath, module_name, module, title):
        elif value_type in (bool, int, float, str, tuple):
            # constant, not much fun we can do here except to list it.
            # TODO, figure out some way to document these!
-            #fw(".. data:: %s\n\n" % attribute)
+            fw(".. data:: %s\n\n" % attribute)
            write_indented_lines("   ", fw, "constant value %s" % repr(value), False)
            fw("\n")
        else: