Merge lp:~percona-toolkit-dev/percona-toolkit/doc-spelling-fixes-2.1-bug-896553 into lp:percona-toolkit/2.1

Proposed by Daniel Nichter
Status: Merged
Approved by: Daniel Nichter
Approved revision: 218
Merged at revision: 218
Proposed branch: lp:~percona-toolkit-dev/percona-toolkit/doc-spelling-fixes-2.1-bug-896553
Merge into: lp:percona-toolkit/2.1
Diff against target: 108 lines (+9/-9)
7 files modified
bin/pt-online-schema-change (+1/-1)
bin/pt-query-advisor (+1/-1)
bin/pt-sift (+1/-1)
bin/pt-tcp-model (+1/-1)
bin/pt-upgrade (+2/-2)
bin/pt-visual-explain (+1/-1)
docs/percona-toolkit.pod (+2/-2)
To merge this branch: bzr merge lp:~percona-toolkit-dev/percona-toolkit/doc-spelling-fixes-2.1-bug-896553
Reviewer Review Type Date Requested Status
Daniel Nichter Approve
Review via email: mp+99451@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Daniel Nichter (daniel-nichter) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/pt-online-schema-change'
2--- bin/pt-online-schema-change 2012-03-07 23:41:54 +0000
3+++ bin/pt-online-schema-change 2012-03-26 23:56:26 +0000
4@@ -4871,7 +4871,7 @@
5 specified.
6
7 The default behavior, when this option is not specified and
8-C<--[no]create-tmp-tble> is true, is to create a temporary table named
9+C<--[no]create-tmp-table> is true, is to create a temporary table named
10 C<__tmp_TABLE> where C<TABLE> is the original table specified by the DSN
11 on the command line.
12
13
14=== modified file 'bin/pt-query-advisor'
15--- bin/pt-query-advisor 2012-03-07 23:41:54 +0000
16+++ bin/pt-query-advisor 2012-03-26 23:56:26 +0000
17@@ -6677,7 +6677,7 @@
18
19 pt-query-advisor /path/to/slow-query.log
20
21-Analyze all queires in a general log:
22+Analyze all queries in a general log:
23
24 pt-query-advisor --type genlog mysql.log
25
26
27=== modified file 'bin/pt-sift'
28--- bin/pt-sift 2012-03-07 23:41:54 +0000
29+++ bin/pt-sift 2012-03-26 23:56:26 +0000
30@@ -632,7 +632,7 @@
31
32 =item *
33
34-Sets the action to view all of the samples's files in the less program.
35+Sets the action to view all of the sample's files in the less program.
36
37 =back
38
39
40=== modified file 'bin/pt-tcp-model'
41--- bin/pt-tcp-model 2012-03-07 23:41:54 +0000
42+++ bin/pt-tcp-model 2012-03-26 23:56:26 +0000
43@@ -2253,7 +2253,7 @@
44 response time (elapsed time) are computed. Recall that there may be multiple
45 inbound and outbound packets per request and response, and refer to the
46 following ASCII diagram. Suppose that a client sends a series of three inbound
47-(I) packets to the server, whch computes the result and then sends two outbound
48+(I) packets to the server, which computes the result and then sends two outbound
49 (O) packets back:
50
51 I I I ..................... O O
52
53=== modified file 'bin/pt-upgrade'
54--- bin/pt-upgrade 2012-03-07 23:41:54 +0000
55+++ bin/pt-upgrade 2012-03-26 23:56:26 +0000
56@@ -11332,7 +11332,7 @@
57 =head1 DESCRIPTION
58
59 pt-upgrade executes queries from slowlogs on one or more MySQL server to find
60-differences in query time, warnings, results, and other aspects of the querys'
61+differences in query time, warnings, results, and other aspects of the queries'
62 execution. This helps evaluate upgrades, migrations and configuration
63 changes. The comparisons specified by L<"--compare"> determine what
64 differences can be found. A report is printed which outlines all the
65@@ -11494,7 +11494,7 @@
66 Convert non-SELECT statements to SELECTs and compare.
67
68 By default non-SELECT statements are not allowed. This option causes
69-non-SELECT statments (like UPDATE, INSERT and DELETE) to be converted
70+non-SELECT statements (like UPDATE, INSERT and DELETE) to be converted
71 to SELECT statements, executed and compared.
72
73 For example, C<DELETE col FROM tbl WHERE id=1> is converted to
74
75=== modified file 'bin/pt-visual-explain'
76--- bin/pt-visual-explain 2012-03-07 23:41:54 +0000
77+++ bin/pt-visual-explain 2012-03-26 23:56:26 +0000
78@@ -2564,7 +2564,7 @@
79 2, 4 is a subquery of 3. As it is, this means 4 is a subquery of the nearest
80 previous recent row with a smaller id, which is 1. Likewise for 3 and 2.
81
82-This structure is hard to programatically build into a tree for the same reason
83+This structure is hard to programmatically build into a tree for the same reason
84 it's hard to understand by inspection: there are both forward and backward
85 references. <derivedN> is a forward reference to selectN, while <unionM,N> is a
86 backward reference to selectM and selectN. That makes recursion and other
87
88=== modified file 'docs/percona-toolkit.pod'
89--- docs/percona-toolkit.pod 2012-03-07 23:41:54 +0000
90+++ docs/percona-toolkit.pod 2012-03-26 23:56:26 +0000
91@@ -464,7 +464,7 @@
92 =head1 AUTHORS
93
94 Percona Toolkit is primarily developed by Baron Schwartz and Daniel Nichter,
95-both of whom are employed by Percona Inc. See each program's documenation
96+both of whom are employed by Percona Inc. See each program's documentation
97 for details.
98
99 =head1 COPYRIGHT, LICENSE, AND WARRANTY
100@@ -474,7 +474,7 @@
101
102 THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
103 WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
104-MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
105+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
106
107 This program is free software; you can redistribute it and/or modify it under
108 the terms of the GNU General Public License as published by the Free Software

Subscribers

People subscribed via source and target branches