Merge "Remove unicode prefixes"

1 files changed, 11 insertions, 11 deletions

diff --git a/doc/source/conf.py b/doc/source/conf.py
index d04763b4..d8fa0d6d 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -60,8 +60,8 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'Ceilometer'
-copyright = u'2012-2015, OpenStack Foundation'
+project = 'Ceilometer'
+copyright = '2012-2015, OpenStack Foundation'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -203,8 +203,8 @@ smartquotes_excludes = {'builders': ['latex']}
 # (source start file, target name, title, author, documentclass
 # [howto/manual]).
 latex_documents = [
-    ('index', 'doc-ceilometer.tex', u'Ceilometer Documentation',
-     u'OpenStack Foundation', 'manual'),
+    ('index', 'doc-ceilometer.tex', 'Ceilometer Documentation',
+     'OpenStack Foundation', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -233,8 +233,8 @@ latex_documents = [
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'ceilometer', u'Ceilometer Documentation',
-     [u'OpenStack'], 1)
+    ('index', 'ceilometer', 'Ceilometer Documentation',
+     ['OpenStack'], 1)
 ]
 
 # If true, show URL addresses after external links.
@@ -247,7 +247,7 @@ man_pages = [
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    ('index', 'Ceilometer', u'Ceilometer Documentation', u'OpenStack',
+    ('index', 'Ceilometer', 'Ceilometer Documentation', 'OpenStack',
      'Ceilometer', 'One line description of project.', 'Miscellaneous'),
 ]
 
@@ -264,10 +264,10 @@ texinfo_documents = [
 # -- Options for Epub output --------------------------------------------------
 
 # Bibliographic Dublin Core info.
-epub_title = u'Ceilometer'
-epub_author = u'OpenStack'
-epub_publisher = u'OpenStack'
-epub_copyright = u'2012-2015, OpenStack'
+epub_title = 'Ceilometer'
+epub_author = 'OpenStack'
+epub_publisher = 'OpenStack'
+epub_copyright = '2012-2015, OpenStack'
 
 # The language of the text. It defaults to the language option
 # or en if the language is not set.