Merge lp:~hrvojem/percona-server/rn-5.5.41-37.0-5.6 into lp:percona-server/5.6

Proposed by Hrvoje Matijakovic
Status: Merged
Approved by: Hrvoje Matijakovic
Approved revision: no longer in the source branch.
Merged at revision: 725
Proposed branch: lp:~hrvojem/percona-server/rn-5.5.41-37.0-5.6
Merge into: lp:percona-server/5.6
Diff against target: 28 lines (+3/-3)
1 file modified
doc/source/conf.py (+3/-3)
To merge this branch: bzr merge lp:~hrvojem/percona-server/rn-5.5.41-37.0-5.6
Reviewer Review Type Date Requested Status
Hrvoje Matijakovic Approve
Review via email: mp+245967@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Hrvoje Matijakovic (hrvojem) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'doc/source/conf.py'
2--- doc/source/conf.py 2014-12-01 07:53:48 +0000
3+++ doc/source/conf.py 2015-01-09 15:21:09 +0000
4@@ -45,7 +45,7 @@
5
6 # General information about the project.
7 project = u'Percona Server'
8-copyright = u'Percona LLC and/or its affiliates 2009-2014'
9+copyright = u'Percona LLC and/or its affiliates 2009-2015'
10
11 # The version info for the project you're documenting, acts as replacement for
12 # |version| and |release|, also used in various other places throughout the
13@@ -226,7 +226,7 @@
14 # (source start file, target name, title, author, documentclass [howto/manual]).
15 latex_documents = [
16 ('index', 'PerconaServer-5.6.tex', u'Percona Server Documentation',
17- u'Percona LLC and/or its affiliates 2009-2014', 'manual'),
18+ u'Percona LLC and/or its affiliates 2009-2015', 'manual'),
19 ]
20
21 # The name of an image file (relative to this directory) to place at the top of
22@@ -259,7 +259,7 @@
23 # (source start file, name, description, authors, manual section).
24 man_pages = [
25 ('index', 'perconaserver56', u'Percona Server 5.6 Documentation',
26- [u'Percona LLC and/or its affiliates 2009-2014'], 1)
27+ [u'Percona LLC and/or its affiliates 2009-2015'], 1)
28 ]
29
30

Subscribers

People subscribed via source and target branches