Merge "remove unicode prefix from code"

2 files changed, 15 insertions, 15 deletions

diff --git a/doc/source/conf.py b/doc/source/conf.py
index 41a245632..1eb530ae3 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -88,7 +88,7 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-copyright = u'2012, OpenStack Foundation'
+copyright = '2012, OpenStack Foundation'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -131,8 +131,8 @@ modindex_common_prefix = ['keystone.']
 # List of tuples 'sourcefile', 'target', u'title', u'Authors name', 'manual'
 
 man_pages = [
-    ('cli/keystone-manage', 'keystone-manage', u'Keystone Management Utility',
-     [u'OpenStack'], 1)
+    ('cli/keystone-manage', 'keystone-manage', 'Keystone Management Utility',
+     ['OpenStack'], 1)
 ]
 
 
@@ -232,8 +232,8 @@ latex_elements = {
 # NOTE(gyee): Specify toctree_only=True for a better document structure of
 # the generated PDF file.
 latex_documents = [
-    ('index', 'doc-keystone.tex', u'Keystone Documentation',
-     u'OpenStack', 'manual', True)
+    ('index', 'doc-keystone.tex', 'Keystone Documentation',
+     'OpenStack', 'manual', True)
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -263,8 +263,8 @@ latex_documents = [
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    ('index', 'keystone', u'Keystone Documentation',
-     u'OpenStack', 'keystone', 'One line description of project.',
+    ('index', 'keystone', 'Keystone Documentation',
+     'OpenStack', 'keystone', 'One line description of project.',
      'Miscellaneous'),
 ]
 
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index 0b5d76c1b..c16798107 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -54,8 +54,8 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'Keystone Release Notes'
-copyright = u'2015, Keystone Developers'
+project = 'Keystone Release Notes'
+copyright = '2015, Keystone Developers'
 
 # Release  notes are version independent
 
@@ -197,8 +197,8 @@ htmlhelp_basename = 'KeystoneReleaseNotesdoc'
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
     ('index', 'KeystoneReleaseNotes.tex',
-     u'Keystone Release Notes Documentation',
-     u'Keystone Developers', 'manual'),
+     'Keystone Release Notes Documentation',
+     'Keystone Developers', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -227,8 +227,8 @@ latex_documents = [
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'keystonereleasenotes', u'Keystone Release Notes Documentation',
-     [u'Keystone Developers'], 1)
+    ('index', 'keystonereleasenotes', 'Keystone Release Notes Documentation',
+     ['Keystone Developers'], 1)
 ]
 
 # If true, show URL addresses after external links.
@@ -241,8 +241,8 @@ man_pages = [
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    ('index', 'KeystoneReleaseNotes', u'Keystone Release Notes Documentation',
-     u'Keystone Developers', 'KeystoneReleaseNotes',
+    ('index', 'KeystoneReleaseNotes', 'Keystone Release Notes Documentation',
+     'Keystone Developers', 'KeystoneReleaseNotes',
      'Identity, Authentication and Access Management for OpenStack.',
      'Miscellaneous'),
 ]