diff options
Diffstat (limited to 'meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/pod_fixes.diff')
-rw-r--r-- | meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/pod_fixes.diff | 146 |
1 files changed, 146 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/pod_fixes.diff b/meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/pod_fixes.diff new file mode 100644 index 0000000000..58e770bc76 --- /dev/null +++ b/meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/pod_fixes.diff | |||
@@ -0,0 +1,146 @@ | |||
1 | Upstream-Status:Inappropriate [debian patches] | ||
2 | From c6b1fdd18dab0236458502564e54c180bb0ce341 Mon Sep 17 00:00:00 2001 | ||
3 | From: Keith Thompson <kst@mib.org> | ||
4 | Date: Fri, 29 Jul 2011 17:17:00 -0700 | ||
5 | Subject: Fix typos in several pod/perl*.pod files | ||
6 | |||
7 | Bug-Debian: http://bugs.debian.org/637816 | ||
8 | Origin: http://perl5.git.perl.org/perl.git/commit/7698aede74509727f7bca31c58fc7a53b182315d | ||
9 | Patch-Name: fixes/pod_fixes.diff | ||
10 | --- | ||
11 | pod/perlfunc.pod | 8 ++++---- | ||
12 | pod/perlglossary.pod | 10 +++++----- | ||
13 | pod/perlmod.pod | 4 ++-- | ||
14 | pod/perlretut.pod | 6 +++--- | ||
15 | 4 files changed, 14 insertions(+), 14 deletions(-) | ||
16 | |||
17 | diff --git a/pod/perlfunc.pod b/pod/perlfunc.pod | ||
18 | index 2ee3637..719a740 100644 | ||
19 | --- a/pod/perlfunc.pod | ||
20 | +++ b/pod/perlfunc.pod | ||
21 | @@ -3918,7 +3918,7 @@ count. A numeric repeat count may optionally be enclosed in brackets, as | ||
22 | in C<pack("C[80]", @arr)>. The repeat count gobbles that many values from | ||
23 | the LIST when used with all format types other than C<a>, C<A>, C<Z>, C<b>, | ||
24 | C<B>, C<h>, C<H>, C<@>, C<.>, C<x>, C<X>, and C<P>, where it means | ||
25 | -something else, dscribed below. Supplying a C<*> for the repeat count | ||
26 | +something else, described below. Supplying a C<*> for the repeat count | ||
27 | instead of a number means to use however many items are left, except for: | ||
28 | |||
29 | =over | ||
30 | @@ -5870,7 +5870,7 @@ sometimes saying the opposite, for example) the results are not | ||
31 | well-defined. | ||
32 | |||
33 | Because C<< <=> >> returns C<undef> when either operand is C<NaN> | ||
34 | -(not-a-number), and laso because C<sort> raises an exception unless the | ||
35 | +(not-a-number), and also because C<sort> raises an exception unless the | ||
36 | result of a comparison is defined, be careful when sorting with a | ||
37 | comparison function like C<< $a <=> $b >> any lists that might contain a | ||
38 | C<NaN>. The following example takes advantage that C<NaN != NaN> to | ||
39 | @@ -5958,7 +5958,7 @@ specified. | ||
40 | |||
41 | A pattern matching the empty string (not to be confused with | ||
42 | an empty pattern C<//>, which is just one member of the set of patterns | ||
43 | -matching the epmty string), splits EXPR into individual | ||
44 | +matching the empty string), splits EXPR into individual | ||
45 | characters. For example: | ||
46 | |||
47 | print join(':', split(/ */, 'hi there')), "\n"; | ||
48 | @@ -6222,7 +6222,7 @@ For example: | ||
49 | printf '<%.1e>', 10; # prints "<1.0e+01>" | ||
50 | |||
51 | For "g" and "G", this specifies the maximum number of digits to show, | ||
52 | -including thoe prior to the decimal point and those after it; for | ||
53 | +including those prior to the decimal point and those after it; for | ||
54 | example: | ||
55 | |||
56 | # These examples are subject to system-specific variation. | ||
57 | diff --git a/pod/perlglossary.pod b/pod/perlglossary.pod | ||
58 | index 639ce33..191371c 100644 | ||
59 | --- a/pod/perlglossary.pod | ||
60 | +++ b/pod/perlglossary.pod | ||
61 | @@ -507,7 +507,7 @@ the class (its L<objects|/object>). See also L</inheritance>. | ||
62 | |||
63 | =item class method | ||
64 | |||
65 | -A L</method> whose L</invocand> is a L</package> name, not an | ||
66 | +A L</method> whose L</invocant> is a L</package> name, not an | ||
67 | L</object> reference. A method associated with the class as a whole. | ||
68 | |||
69 | =item client | ||
70 | @@ -1470,7 +1470,7 @@ Perl, C<print STDOUT "$foo\n";> can be understood as "verb | ||
71 | indirect-object object" where L</STDOUT> is the recipient of the | ||
72 | L<print|perlfunc/print> action, and C<"$foo"> is the object being | ||
73 | printed. Similarly, when invoking a L</method>, you might place the | ||
74 | -invocand between the method and its arguments: | ||
75 | +invocant between the method and its arguments: | ||
76 | |||
77 | $gollum = new Pathetic::Creature "Smeagol"; | ||
78 | give $gollum "Fisssssh!"; | ||
79 | @@ -1548,11 +1548,11 @@ of compiler that takes a program and turns it into a more executable | ||
80 | form (L<syntax trees|/syntax tree>) within the I<perl> process itself, | ||
81 | which the Perl L</run time> system then interprets. | ||
82 | |||
83 | -=item invocand | ||
84 | +=item invocant | ||
85 | |||
86 | The agent on whose behalf a L</method> is invoked. In a L</class> | ||
87 | -method, the invocand is a package name. In an L</instance> method, | ||
88 | -the invocand is an object reference. | ||
89 | +method, the invocant is a package name. In an L</instance> method, | ||
90 | +the invocant is an object reference. | ||
91 | |||
92 | =item invocation | ||
93 | |||
94 | diff --git a/pod/perlmod.pod b/pod/perlmod.pod | ||
95 | index 5266f19..17de73e 100644 | ||
96 | --- a/pod/perlmod.pod | ||
97 | +++ b/pod/perlmod.pod | ||
98 | @@ -571,7 +571,7 @@ like for example handle the cloning of non-Perl data, if necessary. | ||
99 | C<CLONE> will be called once as a class method for every package that has it | ||
100 | defined (or inherits it). It will be called in the context of the new thread, | ||
101 | so all modifications are made in the new area. Currently CLONE is called with | ||
102 | -no parameters other than the invocand package name, but code should not assume | ||
103 | +no parameters other than the invocant package name, but code should not assume | ||
104 | that this will remain unchanged, as it is likely that in future extra parameters | ||
105 | will be passed in to give more information about the state of cloning. | ||
106 | |||
107 | @@ -593,7 +593,7 @@ to make use of the objects, then a more sophisticated approach is | ||
108 | needed. | ||
109 | |||
110 | Like C<CLONE>, C<CLONE_SKIP> is currently called with no parameters other | ||
111 | -than the invocand package name, although that may change. Similarly, to | ||
112 | +than the invocant package name, although that may change. Similarly, to | ||
113 | allow for future expansion, the return value should be a single C<0> or | ||
114 | C<1> value. | ||
115 | |||
116 | diff --git a/pod/perlretut.pod b/pod/perlretut.pod | ||
117 | index ea80594..1c65f5b 100644 | ||
118 | --- a/pod/perlretut.pod | ||
119 | +++ b/pod/perlretut.pod | ||
120 | @@ -781,7 +781,7 @@ so may lead to surprising and unsatisfactory results. | ||
121 | =head2 Relative backreferences | ||
122 | |||
123 | Counting the opening parentheses to get the correct number for a | ||
124 | -backreference is errorprone as soon as there is more than one | ||
125 | +backreference is error-prone as soon as there is more than one | ||
126 | capturing group. A more convenient technique became available | ||
127 | with Perl 5.10: relative backreferences. To refer to the immediately | ||
128 | preceding capture group one now may write C<\g{-1}>, the next but | ||
129 | @@ -1537,7 +1537,7 @@ the regexp in the I<last successful match> is used instead. So we have | ||
130 | |||
131 | =head3 Global matching | ||
132 | |||
133 | -The final two modifiers we will disccuss here, | ||
134 | +The final two modifiers we will discuss here, | ||
135 | C<//g> and C<//c>, concern multiple matches. | ||
136 | The modifier C<//g> stands for global matching and allows the | ||
137 | matching operator to match within a string as many times as possible. | ||
138 | @@ -1870,7 +1870,7 @@ substituted. | ||
139 | |||
140 | C<\Q>, C<\L>, C<\l>, C<\U>, C<\u> and C<\E> are actually part of | ||
141 | double-quotish syntax, and not part of regexp syntax proper. They will | ||
142 | -work if they appear in a regular expression embeddded directly in a | ||
143 | +work if they appear in a regular expression embedded directly in a | ||
144 | program, but not when contained in a string that is interpolated in a | ||
145 | pattern. | ||
146 | |||