Merge lp:~stewart/percona-server/misc-docs-fixes-5.1 into lp:percona-server/5.1

Proposed by Stewart Smith
Status: Merged
Approved by: Stewart Smith
Approved revision: no longer in the source branch.
Merged at revision: 420
Proposed branch: lp:~stewart/percona-server/misc-docs-fixes-5.1
Merge into: lp:percona-server/5.1
Diff against target: 126 lines (+15/-30)
5 files modified
doc/source/diagnostics/innodb_stats.rst (+2/-2)
doc/source/installation.rst (+4/-9)
doc/source/installation/apt_repo.rst (+7/-16)
doc/source/installation/yum_repo.rst (+1/-2)
doc/source/percona-theme/layout.html (+1/-1)
To merge this branch: bzr merge lp:~stewart/percona-server/misc-docs-fixes-5.1
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+87902@code.launchpad.net

Description of the change

Doc fixes for PS 5.1

To post a comment you must log in.
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) wrote :

LGTM, thank you.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'doc/source/diagnostics/innodb_stats.rst'
--- doc/source/diagnostics/innodb_stats.rst 2011-10-07 00:55:06 +0000
+++ doc/source/diagnostics/innodb_stats.rst 2012-01-09 06:43:24 +0000
@@ -6,7 +6,7 @@
66
7This feature provides new startup options (control method and collection of index statistics estimation) and information schema views to confirm the statistics.7This feature provides new startup options (control method and collection of index statistics estimation) and information schema views to confirm the statistics.
88
9This implements the fix for `MySQL Bug #30423 <http://bugs.|MySQL|.com/bug.php?id=30423>`_.9This implements the fix for `MySQL Bug #30423 <http://bugs.mysql.com/bug.php?id=30423>`_.
1010
11Version Specific Information11Version Specific Information
12============================12============================
@@ -156,5 +156,5 @@
156Other reading156Other reading
157=============157=============
158158
159 * `InnoDB Table/Index stats <http://www.|MySQL|performanceblog.com/2010/03/20/|InnoDB|-tableindex-stats/>`_159 * `InnoDB Table/Index stats <http://www.mysqlperformanceblog.com/2010/03/20/|InnoDB|-tableindex-stats/>`_
160160
161161
=== modified file 'doc/source/installation.rst'
--- doc/source/installation.rst 2011-10-07 00:55:06 +0000
+++ doc/source/installation.rst 2012-01-09 06:43:24 +0000
@@ -10,9 +10,7 @@
1010
11 * ``RPM`` packages for *RHEL* 5 and *RHEL* 611 * ``RPM`` packages for *RHEL* 5 and *RHEL* 6
1212
13 * *Debian* packages13 * *Debian* packages for *Debian* and *Ubuntu*
14
15 * *FreeBSD* ``.tbz`` packages
1614
17.. * *Microsoft Windows* binaries15.. * *Microsoft Windows* binaries
1816
@@ -193,12 +191,9 @@
193191
194 $ make192 $ make
195193
196This will fetch the upstream MySQL source tarball and apply the194If you are building an older version of Percona Server 5.1, this will fetch the upstream MySQL source tarball and apply the Percona Server patches to it either using quilt or patch. If you are building a modern Percona Server 5.1, this will simply prepare the additional plugins that are distributed as part of Percona Server.
197Percona Server patches to it. If you have the quilt utility installed,195
198it will use it to apply the patches, otherwise it will just use the196You will now have a directory named Percona-Server that is ready to run the configure script and build. ::
199standard patch utility. You will then have a directory named
200Percona-Server that is ready to run the configure script and
201build. ::
202197
203 $ ./configure --without-plugin-innobase --with-plugins=partition,archive,blackhole,csv,example,federated,innodb_plugin --without-embedded-server --with-pic --with-extra-charsets=complex --with-ssl --enable-assembler --enable-local-infile --enable-thread-safe-client --enable-profiling --with-readline198 $ ./configure --without-plugin-innobase --with-plugins=partition,archive,blackhole,csv,example,federated,innodb_plugin --without-embedded-server --with-pic --with-extra-charsets=complex --with-ssl --enable-assembler --enable-local-infile --enable-thread-safe-client --enable-profiling --with-readline
204 $ make199 $ make
205200
=== modified file 'doc/source/installation/apt_repo.rst'
--- doc/source/installation/apt_repo.rst 2011-10-07 00:55:06 +0000
+++ doc/source/installation/apt_repo.rst 2012-01-09 06:43:24 +0000
@@ -24,11 +24,8 @@
24Supported Platforms24Supported Platforms
25===================25===================
2626
27 * ``x86_64`` (also known as ``amd64``)27 * x86
2828 * x86_64 (also known as ``amd64``)
29 * ``i386``
30
31 * ``i686``
3229
33Supported Releases30Supported Releases
34==================31==================
@@ -36,21 +33,15 @@
36Debian33Debian
37------34------
3835
39 * ``lenny``36 * 5.0 (lenny)
4037 * 6.0 (squeeze)
41 * ``squeeze``
4238
43Ubuntu39Ubuntu
44------40------
4541
46 * ``hardy``42 * 10.04LTS (lucid)
4743 * 11.04 (natty)
48 * ``lucid``44 * 11.10 (oneiric)
49
50 * ``maverick``
51
52
53.. note:: ``natty`` users should use ``maverick`` in :file:`/etc/apt/sources.list`.
5445
5546
56Release Candidate Repository47Release Candidate Repository
5748
=== modified file 'doc/source/installation/yum_repo.rst'
--- doc/source/installation/yum_repo.rst 2011-10-07 00:55:06 +0000
+++ doc/source/installation/yum_repo.rst 2012-01-09 06:43:24 +0000
@@ -54,12 +54,11 @@
54 Percona-Server-shared-51.x86_64 5.1.47-rel11.1.51.rhel5 percona 54 Percona-Server-shared-51.x86_64 5.1.47-rel11.1.51.rhel5 percona
55 Percona-Server-test-51.x86_64 5.1.47-rel11.1.51.rhel5 percona 55 Percona-Server-test-51.x86_64 5.1.47-rel11.1.51.rhel5 percona
56 ...56 ...
57 maatkit.noarch 5240-1 percona
58 xtrabackup.x86_64 1.2-22.rhel5 percona 57 xtrabackup.x86_64 1.2-22.rhel5 percona
5958
60Supported Platforms59Supported Platforms
61===================60===================
62 61
63 * ``x86_64``62 * ``x86_64``
64 * ``i386``63 * ``i386``
6564
6665
=== modified file 'doc/source/percona-theme/layout.html'
--- doc/source/percona-theme/layout.html 2011-10-07 00:55:06 +0000
+++ doc/source/percona-theme/layout.html 2012-01-09 06:43:24 +0000
@@ -283,7 +283,7 @@
283283
284 <div class="file-bugs">284 <div class="file-bugs">
285 This documentation is developed in Launchpad as part of the <a href="https://code.launchpad.net/percona-server/5.1">Percona Server source code</a>.</br>285 This documentation is developed in Launchpad as part of the <a href="https://code.launchpad.net/percona-server/5.1">Percona Server source code</a>.</br>
286If you spotted innacuracies, errors, don't understood it or you think something is missing or should be improved, please <a href="https://bugs.launchpad.net/percona-server/+filebug?field.tags=doc&field.comment=[In:5.1:{{ title|e }}]&?field.tags=doc&field.title=[DOC] ">file a bug</a>.286If you find errors, omissions or encounter trouble understanding parts of our documentation, please <a href="https://bugs.launchpad.net/percona-server/+filebug?field.tags=doc&field.comment=[In:5.1:{{ title|e }}]&?field.tags=doc&field.title=[DOC] ">file a bug</a>.
287 </div>287 </div>
288288
289 <div class="footer">289 <div class="footer">

Subscribers

People subscribed via source and target branches