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
1=== modified file 'doc/source/diagnostics/innodb_stats.rst'
2--- doc/source/diagnostics/innodb_stats.rst 2011-10-07 00:55:06 +0000
3+++ doc/source/diagnostics/innodb_stats.rst 2012-01-09 06:43:24 +0000
4@@ -6,7 +6,7 @@
5
6 This feature provides new startup options (control method and collection of index statistics estimation) and information schema views to confirm the statistics.
7
8-This implements the fix for `MySQL Bug #30423 <http://bugs.|MySQL|.com/bug.php?id=30423>`_.
9+This implements the fix for `MySQL Bug #30423 <http://bugs.mysql.com/bug.php?id=30423>`_.
10
11 Version Specific Information
12 ============================
13@@ -156,5 +156,5 @@
14 Other reading
15 =============
16
17- * `InnoDB Table/Index stats <http://www.|MySQL|performanceblog.com/2010/03/20/|InnoDB|-tableindex-stats/>`_
18+ * `InnoDB Table/Index stats <http://www.mysqlperformanceblog.com/2010/03/20/|InnoDB|-tableindex-stats/>`_
19
20
21=== modified file 'doc/source/installation.rst'
22--- doc/source/installation.rst 2011-10-07 00:55:06 +0000
23+++ doc/source/installation.rst 2012-01-09 06:43:24 +0000
24@@ -10,9 +10,7 @@
25
26 * ``RPM`` packages for *RHEL* 5 and *RHEL* 6
27
28- * *Debian* packages
29-
30- * *FreeBSD* ``.tbz`` packages
31+ * *Debian* packages for *Debian* and *Ubuntu*
32
33 .. * *Microsoft Windows* binaries
34
35@@ -193,12 +191,9 @@
36
37 $ make
38
39-This will fetch the upstream MySQL source tarball and apply the
40-Percona Server patches to it. If you have the quilt utility installed,
41-it will use it to apply the patches, otherwise it will just use the
42-standard patch utility. You will then have a directory named
43-Percona-Server that is ready to run the configure script and
44-build. ::
45+If 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.
46+
47+You will now have a directory named Percona-Server that is ready to run the configure script and build. ::
48
49 $ ./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
50 $ make
51
52=== modified file 'doc/source/installation/apt_repo.rst'
53--- doc/source/installation/apt_repo.rst 2011-10-07 00:55:06 +0000
54+++ doc/source/installation/apt_repo.rst 2012-01-09 06:43:24 +0000
55@@ -24,11 +24,8 @@
56 Supported Platforms
57 ===================
58
59- * ``x86_64`` (also known as ``amd64``)
60-
61- * ``i386``
62-
63- * ``i686``
64+ * x86
65+ * x86_64 (also known as ``amd64``)
66
67 Supported Releases
68 ==================
69@@ -36,21 +33,15 @@
70 Debian
71 ------
72
73- * ``lenny``
74-
75- * ``squeeze``
76+ * 5.0 (lenny)
77+ * 6.0 (squeeze)
78
79 Ubuntu
80 ------
81
82- * ``hardy``
83-
84- * ``lucid``
85-
86- * ``maverick``
87-
88-
89-.. note:: ``natty`` users should use ``maverick`` in :file:`/etc/apt/sources.list`.
90+ * 10.04LTS (lucid)
91+ * 11.04 (natty)
92+ * 11.10 (oneiric)
93
94
95 Release Candidate Repository
96
97=== modified file 'doc/source/installation/yum_repo.rst'
98--- doc/source/installation/yum_repo.rst 2011-10-07 00:55:06 +0000
99+++ doc/source/installation/yum_repo.rst 2012-01-09 06:43:24 +0000
100@@ -54,12 +54,11 @@
101 Percona-Server-shared-51.x86_64 5.1.47-rel11.1.51.rhel5 percona
102 Percona-Server-test-51.x86_64 5.1.47-rel11.1.51.rhel5 percona
103 ...
104- maatkit.noarch 5240-1 percona
105 xtrabackup.x86_64 1.2-22.rhel5 percona
106
107 Supported Platforms
108 ===================
109-
110+
111 * ``x86_64``
112 * ``i386``
113
114
115=== modified file 'doc/source/percona-theme/layout.html'
116--- doc/source/percona-theme/layout.html 2011-10-07 00:55:06 +0000
117+++ doc/source/percona-theme/layout.html 2012-01-09 06:43:24 +0000
118@@ -283,7 +283,7 @@
119
120 <div class="file-bugs">
121 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>
122-If 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>.
123+If 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>.
124 </div>
125
126 <div class="footer">

Subscribers

People subscribed via source and target branches