Merge lp:~hrvojem/percona-server/theme-update-5.1 into lp:percona-server/5.1

Proposed by Hrvoje Matijakovic
Status: Merged
Approved by: Hrvoje Matijakovic
Approved revision: no longer in the source branch.
Merged at revision: 431
Proposed branch: lp:~hrvojem/percona-server/theme-update-5.1
Merge into: lp:percona-server/5.1
Diff against target: 117 lines (+9/-4)
3 files modified
doc/source/conf.py (+2/-2)
doc/source/flexibility/mysqlbinlog_change_db.rst (+2/-2)
doc/source/percona-theme/layout.html (+5/-0)
To merge this branch: bzr merge lp:~hrvojem/percona-server/theme-update-5.1
Reviewer Review Type Date Requested Status
Percona core Pending
Review via email: mp+100071@code.launchpad.net
To post a comment you must log in.

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 2012-03-09 08:03:43 +0000
3+++ doc/source/conf.py 2012-03-30 05:20:27 +0000
4@@ -52,9 +52,9 @@
5 # built documents.
6 #
7 # The short X.Y version.
8-version = '5.1.60'
9+version = '5.1.61'
10 # The full version, including alpha/beta/rc tags.
11-release = '13.1'
12+release = '5.1.61-13.2'
13
14 # The language for content autogenerated by Sphinx. Refer to documentation
15 # for a list of supported languages.
16
17=== modified file 'doc/source/flexibility/mysqlbinlog_change_db.rst'
18--- doc/source/flexibility/mysqlbinlog_change_db.rst 2012-02-09 15:03:59 +0000
19+++ doc/source/flexibility/mysqlbinlog_change_db.rst 2012-03-30 05:20:27 +0000
20@@ -1,8 +1,8 @@
21 .. _mysqlbinlog_change_db:
22
23-=========================
24+==========================================
25 Ability to change database for mysqlbinlog
26-=========================
27+==========================================
28
29 Sometimes there is a need to take a binary log and apply it to a database with
30 a different name than the original name of the database on binlog producer.
31
32=== added file 'doc/source/percona-theme/._layout.html'
33Binary files doc/source/percona-theme/._layout.html 1970-01-01 00:00:00 +0000 and doc/source/percona-theme/._layout.html 2012-03-30 05:20:27 +0000 differ
34=== added file 'doc/source/percona-theme/._searchbox.html'
35Binary files doc/source/percona-theme/._searchbox.html 1970-01-01 00:00:00 +0000 and doc/source/percona-theme/._searchbox.html 2012-03-30 05:20:27 +0000 differ
36=== added file 'doc/source/percona-theme/._static'
37Binary files doc/source/percona-theme/._static 1970-01-01 00:00:00 +0000 and doc/source/percona-theme/._static 2012-03-30 05:20:27 +0000 differ
38=== added file 'doc/source/percona-theme/._theme.conf'
39Binary files doc/source/percona-theme/._theme.conf 1970-01-01 00:00:00 +0000 and doc/source/percona-theme/._theme.conf 2012-03-30 05:20:27 +0000 differ
40=== modified file 'doc/source/percona-theme/layout.html'
41--- doc/source/percona-theme/layout.html 2012-03-26 17:58:56 +0000
42+++ doc/source/percona-theme/layout.html 2012-03-30 05:20:27 +0000
43@@ -85,6 +85,11 @@
44 {%- else %}
45 {#- old style sidebars: using blocks -- should be deprecated #}
46 {%- block serverseries %}
47+<h3>Server Series</h3>
48+ <ul>
49+ <li><a href="http://www.percona.com/doc/percona-server/5.5/">Percona Server 5.5</a></li>
50+ <li><a href="http://www.percona.com/doc/percona-server/5.1/">Percona Server 5.1</a></li>
51+ </ul>
52 {%- endblock %}
53 {%- block sidebartoc %}
54 {%- include "localtoc.html" %}
55
56=== added file 'doc/source/percona-theme/static/._default.css_t'
57Binary files doc/source/percona-theme/static/._default.css_t 1970-01-01 00:00:00 +0000 and doc/source/percona-theme/static/._default.css_t 2012-03-30 05:20:27 +0000 differ
58=== added file 'doc/source/percona-theme/static/._email-small.png'
59Binary files doc/source/percona-theme/static/._email-small.png 1970-01-01 00:00:00 +0000 and doc/source/percona-theme/static/._email-small.png 2012-03-30 05:20:27 +0000 differ
60=== added file 'doc/source/percona-theme/static/._jquery.min.js'
61Binary files doc/source/percona-theme/static/._jquery.min.js 1970-01-01 00:00:00 +0000 and doc/source/percona-theme/static/._jquery.min.js 2012-03-30 05:20:27 +0000 differ
62=== added file 'doc/source/percona-theme/static/._percona.com.css'
63Binary files doc/source/percona-theme/static/._percona.com.css 1970-01-01 00:00:00 +0000 and doc/source/percona-theme/static/._percona.com.css 2012-03-30 05:20:27 +0000 differ
64=== added file 'doc/source/percona-theme/static/._percona.com.js'
65Binary files doc/source/percona-theme/static/._percona.com.js 1970-01-01 00:00:00 +0000 and doc/source/percona-theme/static/._percona.com.js 2012-03-30 05:20:27 +0000 differ
66=== added file 'doc/source/percona-theme/static/._phone-small.png'
67Binary files doc/source/percona-theme/static/._phone-small.png 1970-01-01 00:00:00 +0000 and doc/source/percona-theme/static/._phone-small.png 2012-03-30 05:20:27 +0000 differ
68=== added file 'doc/source/percona-theme/static/._phone.png'
69Binary files doc/source/percona-theme/static/._phone.png 1970-01-01 00:00:00 +0000 and doc/source/percona-theme/static/._phone.png 2012-03-30 05:20:27 +0000 differ
70=== added file 'doc/source/percona-theme/static/._shield.png'
71Binary files doc/source/percona-theme/static/._shield.png 1970-01-01 00:00:00 +0000 and doc/source/percona-theme/static/._shield.png 2012-03-30 05:20:27 +0000 differ
72=== added file 'doc/source/percona-theme/static/._sidebar.js'
73Binary files doc/source/percona-theme/static/._sidebar.js 1970-01-01 00:00:00 +0000 and doc/source/percona-theme/static/._sidebar.js 2012-03-30 05:20:27 +0000 differ
74=== added file 'doc/source/percona-theme/static/._software-download.png'
75Binary files doc/source/percona-theme/static/._software-download.png 1970-01-01 00:00:00 +0000 and doc/source/percona-theme/static/._software-download.png 2012-03-30 05:20:27 +0000 differ
76=== added file 'doc/source/percona-theme/static/._software-latest.png'
77Binary files doc/source/percona-theme/static/._software-latest.png 1970-01-01 00:00:00 +0000 and doc/source/percona-theme/static/._software-latest.png 2012-03-30 05:20:27 +0000 differ
78=== added file 'doc/source/percona-theme/static/._support-small.png'
79Binary files doc/source/percona-theme/static/._support-small.png 1970-01-01 00:00:00 +0000 and doc/source/percona-theme/static/._support-small.png 2012-03-30 05:20:27 +0000 differ
80=== added file 'doc/source/percona-theme/static/._ui-dropdown-bg.png'
81Binary files doc/source/percona-theme/static/._ui-dropdown-bg.png 1970-01-01 00:00:00 +0000 and doc/source/percona-theme/static/._ui-dropdown-bg.png 2012-03-30 05:20:27 +0000 differ
82=== added file 'doc/source/percona-theme/static/._ui-dropdown-footer.png'
83Binary files doc/source/percona-theme/static/._ui-dropdown-footer.png 1970-01-01 00:00:00 +0000 and doc/source/percona-theme/static/._ui-dropdown-footer.png 2012-03-30 05:20:27 +0000 differ
84=== added file 'doc/source/percona-theme/static/._ui-dropdown-header-l.png'
85Binary files doc/source/percona-theme/static/._ui-dropdown-header-l.png 1970-01-01 00:00:00 +0000 and doc/source/percona-theme/static/._ui-dropdown-header-l.png 2012-03-30 05:20:27 +0000 differ
86=== added file 'doc/source/percona-theme/static/._ui-dropdown-header-r.png'
87Binary files doc/source/percona-theme/static/._ui-dropdown-header-r.png 1970-01-01 00:00:00 +0000 and doc/source/percona-theme/static/._ui-dropdown-header-r.png 2012-03-30 05:20:27 +0000 differ
88=== added file 'doc/source/percona-theme/static/._ui-dropdown-header-search.png'
89Binary files doc/source/percona-theme/static/._ui-dropdown-header-search.png 1970-01-01 00:00:00 +0000 and doc/source/percona-theme/static/._ui-dropdown-header-search.png 2012-03-30 05:20:27 +0000 differ
90=== added file 'doc/source/percona-theme/static/._ui-footer-logo.png'
91Binary files doc/source/percona-theme/static/._ui-footer-logo.png 1970-01-01 00:00:00 +0000 and doc/source/percona-theme/static/._ui-footer-logo.png 2012-03-30 05:20:27 +0000 differ
92=== added file 'doc/source/percona-theme/static/._ui-leftnavi-sel.png'
93Binary files doc/source/percona-theme/static/._ui-leftnavi-sel.png 1970-01-01 00:00:00 +0000 and doc/source/percona-theme/static/._ui-leftnavi-sel.png 2012-03-30 05:20:27 +0000 differ
94=== added file 'doc/source/percona-theme/static/._ui-logo.png'
95Binary files doc/source/percona-theme/static/._ui-logo.png 1970-01-01 00:00:00 +0000 and doc/source/percona-theme/static/._ui-logo.png 2012-03-30 05:20:27 +0000 differ
96=== added file 'doc/source/percona-theme/static/._ui-navi-hover-l.png'
97Binary files doc/source/percona-theme/static/._ui-navi-hover-l.png 1970-01-01 00:00:00 +0000 and doc/source/percona-theme/static/._ui-navi-hover-l.png 2012-03-30 05:20:27 +0000 differ
98=== added file 'doc/source/percona-theme/static/._ui-navi-hover-r.png'
99Binary files doc/source/percona-theme/static/._ui-navi-hover-r.png 1970-01-01 00:00:00 +0000 and doc/source/percona-theme/static/._ui-navi-hover-r.png 2012-03-30 05:20:27 +0000 differ
100=== added file 'doc/source/percona-theme/static/._ui-navi-l.png'
101Binary files doc/source/percona-theme/static/._ui-navi-l.png 1970-01-01 00:00:00 +0000 and doc/source/percona-theme/static/._ui-navi-l.png 2012-03-30 05:20:27 +0000 differ
102=== added file 'doc/source/percona-theme/static/._ui-navi-r.png'
103Binary files doc/source/percona-theme/static/._ui-navi-r.png 1970-01-01 00:00:00 +0000 and doc/source/percona-theme/static/._ui-navi-r.png 2012-03-30 05:20:27 +0000 differ
104=== added file 'doc/source/percona-theme/static/._ui-navi-sel-l.png'
105Binary files doc/source/percona-theme/static/._ui-navi-sel-l.png 1970-01-01 00:00:00 +0000 and doc/source/percona-theme/static/._ui-navi-sel-l.png 2012-03-30 05:20:27 +0000 differ
106=== added file 'doc/source/percona-theme/static/._ui-navi-sel-r.png'
107Binary files doc/source/percona-theme/static/._ui-navi-sel-r.png 1970-01-01 00:00:00 +0000 and doc/source/percona-theme/static/._ui-navi-sel-r.png 2012-03-30 05:20:27 +0000 differ
108=== added file 'doc/source/percona-theme/static/._ui-orange-content.png'
109Binary files doc/source/percona-theme/static/._ui-orange-content.png 1970-01-01 00:00:00 +0000 and doc/source/percona-theme/static/._ui-orange-content.png 2012-03-30 05:20:27 +0000 differ
110=== added file 'doc/source/percona-theme/static/._ui-orange-front.png'
111Binary files doc/source/percona-theme/static/._ui-orange-front.png 1970-01-01 00:00:00 +0000 and doc/source/percona-theme/static/._ui-orange-front.png 2012-03-30 05:20:27 +0000 differ
112=== added file 'doc/source/percona-theme/static/._ui-search.png'
113Binary files doc/source/percona-theme/static/._ui-search.png 1970-01-01 00:00:00 +0000 and doc/source/percona-theme/static/._ui-search.png 2012-03-30 05:20:27 +0000 differ
114=== added file 'doc/source/percona-theme/static/._ui-tab-bg.png'
115Binary files doc/source/percona-theme/static/._ui-tab-bg.png 1970-01-01 00:00:00 +0000 and doc/source/percona-theme/static/._ui-tab-bg.png 2012-03-30 05:20:27 +0000 differ
116=== added file 'doc/source/percona-theme/static/._warning.png'
117Binary files doc/source/percona-theme/static/._warning.png 1970-01-01 00:00:00 +0000 and doc/source/percona-theme/static/._warning.png 2012-03-30 05:20:27 +0000 differ

Subscribers

People subscribed via source and target branches