Merge branch 'master' into bug/angular-htmlbug/angular-html

# Conflicts:
#	tests/test_shell.py

1 files changed, 6 insertions, 6 deletions

diff --git a/doc/conf.py b/doc/conf.py
index 9e896890..1a08e0d6 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -34,8 +34,8 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'Pygments'
-copyright = u'2006-2020, Georg Brandl and Pygments contributors'
+project = 'Pygments'
+copyright = '2006-2020, Georg Brandl and Pygments contributors'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -180,8 +180,8 @@ latex_elements = {
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-  ('docs/index', 'Pygments.tex', u'Pygments Documentation',
-   u'Pygments authors', 'manual'),
+    ('docs/index', 'Pygments.tex', 'Pygments Documentation',
+     'Pygments authors', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -210,8 +210,8 @@ latex_documents = [
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('docs/index', 'pygments', u'Pygments Documentation',
-     [u'Pygments authors'], 1)
+    ('docs/index', 'pygments', 'Pygments Documentation',
+     ['Pygments authors'], 1)
 ]
 
 # If true, show URL addresses after external links.