diff --git a/doc/README.md b/doc/README.md
index 805b894e4..84c8b98ff 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -1,15 +1,15 @@
 # Sphinx DOC hints
 
-## Migrating from Openstack Wiki
+## Migrating from OpenStack Wiki
 
 * Install pandoc
 * Copy wiki code into a file, e.g. `source.mw`
 * Convert to .rst
 
-  pandoc --from=mediawiki --to=rst --output=doc/source/dsl/dsl_v1.rst doc/source/dsl/source.mw 
+  pandoc --from=mediawiki --to=rst --output=doc/source/dsl/dsl_v1.rst doc/source/dsl/source.mw
+
+* To make code samples fancy:
 
-* To make code samples fancy: 
-  
   TODO: figure how to make YAML samples look nicer with `code::` directive
 
 ## Using autodoc with sphinxcontrib.pecanwsme.rest and wsmeext.sphinxext plugins
@@ -18,7 +18,7 @@
 
 ## Running sphinx-audobuild
 
-[auto-loader](https://pypi.python.org/pypi/sphinx-autobuild/0.2.3) - rules for convenient development https://pypi.python.org/pypi/sphinx-autobuild/0.2.3. install, and run: 
+[auto-loader](https://pypi.python.org/pypi/sphinx-autobuild/0.2.3) - rules for convenient development https://pypi.python.org/pypi/sphinx-autobuild/0.2.3. install, and run:
 
   sphinx-autobuild doc/source doc/build
 
diff --git a/setup.cfg b/setup.cfg
index ba6c39ef6..b24661ea1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -15,7 +15,7 @@ classifiers =
     Intended Audience :: System Administrators
     #License :: OSI Approved :: Apache Software License
     Operating System :: POSIX :: Linux
-author = Openstack Mistral Team
+author = OpenStack Mistral Team
 author-email = openstack-dev@lists.openstack.org
 
 [files]