Merge "Fix some PEP8 issues and Openstack Licensing"

doc/source/conf.py

@@ -1,5 +1,15 @@
 # -*- coding: utf-8 -*-
+#  Licensed under the Apache License, Version 2.0 (the "License"); you may
+#  not use this file except in compliance with the License. You may obtain
+#  a copy of the License at
 #
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
 
 # -- General configuration ----------------------------------------------------
 
@@ -73,9 +83,9 @@ exclude_patterns = ['api/ironic_tempest_plugin.*']
 
 # The theme to use for HTML and HTML Help pages.  Major themes that come with
 # Sphinx are currently 'default' and 'sphinxdoc'.
-#html_theme_path = ["."]
-#html_theme = '_theme'
-#html_static_path = ['_static']
+# html_theme_path = ["."]
+# html_theme = '_theme'
+# html_static_path = ['_static']
 
 # Output file base name for HTML help builder.
 htmlhelp_basename = '%sdoc' % project