Skip to content

Commit 6c71f0e

Browse files
committed
Fixes #3024 and adjusts regex
1 parent fa7f7eb commit 6c71f0e

File tree

7 files changed

+14
-12
lines changed

7 files changed

+14
-12
lines changed

doc/Language/packages.pod6

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ MyType::<$foo>
235235
=head2 Class member lookup
236236
237237
Methods—including auto-generated methods, such as public attributes'
238-
accessors—are stored in the class meta object and can be looked up through by
238+
accessors—are stored in the class metaobject and can be looked up through by
239239
the L<lookup|/routine/lookup> method.
240240
241241
=for code

doc/Language/performance.pod6

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ L<NativeCall|/language/nativecall> makes it easy to create wrappers for them. Th
219219
experimental support for C++ libraries, too.
220220
221221
If you want to L<use Perl 5 modules in Perl 6|https://stackoverflow.com/a/27206428/1077672>,
222-
mix in Perl 6 types and the L<Meta-Object Protocol|/language/mop>.
222+
mix in Perl 6 types and the L<Metaobject Protocol|/language/mop>.
223223
224224
More generally, Perl 6 is designed to smoothly interoperate with other languages and
225225
there are a number of L<modules aimed at facilitating the use of libs from other langs|https://modules.perl6.org/#q=inline>.

doc/Language/pod.pod6

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ Z<Eventually copy everything from tables.pod6 and put it here>
419419
420420
Pod6 comments are comments that Pod6 renderers ignore.
421421
422-
Comments are useful for meta-documentation (documenting the documentation).
422+
Comments are useful for I<meta>documentation (documenting the documentation).
423423
Single-line comments use the C<=comment> marker:
424424
425425
=begin code :lang<pod6>
@@ -438,7 +438,7 @@ multi-line.
438438
=head2 Semantic blocks
439439
440440
All uppercase block typenames are reserved for specifying standard
441-
documentation, publishing, source components, or meta-information.
441+
documentation, publishing, source components, or metainformation.
442442
443443
=begin code :lang<pod6>
444444
=NAME

doc/Language/quoting.pod6

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ some multi line
469469
Heredocs include the newline from before the terminator.
470470
471471
To allow interpolation of variables use the C<qq> form, but you will then have
472-
to escape meta characters C<{\> as well as C<$> if it is not the sigil for a
472+
to escape metacharacters C<{\> as well as C<$> if it is not the sigil for a
473473
defined variable. For example:
474474
475475
my $f = 'db.7.3.8';

doc/Language/rb-nutshell.pod6

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1012,10 +1012,10 @@ An important note is that in Ruby child objects can see parent private methods
10121012
(so they are more like "protected" methods in other languages). In Perl 6 child
10131013
objects cannot call parent private methods.
10141014
1015-
=head2 Going meta
1015+
=head2 Going I<meta>
10161016
1017-
Here are a few examples of meta-programming. Note that Perl 6 separates the
1018-
meta-methods from the regular methods with a caret.
1017+
Here are a few examples of metaprogramming. Note that Perl 6 separates the
1018+
metamethods from the regular methods with a caret.
10191019
10201020
=for code :lang<ruby>
10211021
# Ruby
@@ -1030,7 +1030,7 @@ class Person {};
10301030
...
10311031
my $person = Person.new;
10321032
$person.^name; # Perl 6, returns Person (class)
1033-
$person.^methods; # Perl 6, using .^ syntax to access meta-methods
1033+
$person.^methods; # Perl 6, using .^ syntax to access metamethods
10341034
$person.^attributes;
10351035
10361036
@@ -1045,7 +1045,7 @@ to use.
10451045
&[+](5, 3) # => 8, Perl 6, reference to infix addition operator
10461046
&[+].^candidates # Perl 6, lists all signatures for the + operator
10471047
1048-
See L<Meta-Object Protocol|/language/mop> for lots of further details.
1048+
See L<Metaobject Protocol|/language/mop> for lots of further details.
10491049
10501050
=head1 Environment variables
10511051

doc/Language/structures.pod6

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,7 @@ the name of the methods that match, certifies that we can use it.
478478
479479
See also L<this article on class introspection|https://perl6advent.wordpress.com/2015/12/19/day-19-introspection/>
480480
on how to access class properties and methods, and use it to generate test data
481-
for a class; this L<Advent Calendar article describes the meta-object protocol|https://perl6advent.wordpress.com/2010/12/22/day-22-the-meta-object-protocol/>
481+
for a class; this L<Advent Calendar article describes the metaobject protocol|https://perl6advent.wordpress.com/2010/12/22/day-22-the-meta-object-protocol/>
482482
extensively.
483483
484484

xt/word-variants.t

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ my %variants = %( filehandle => 'file [\s+|\-] handle',
2222
smartmatch => 'smart [\s+|\-] match',
2323
zero-width => 'zero \s+ width<!before \' joiner\'><!before \' no-break space\'>',
2424
NYI => 'niy',
25-
meta => '<!after [ method || \$ ] \s*> meta [\s+|\-] <<',
25+
meta => '<!after [ method || \$ || \-] \s*> meta
26+
[\s+|\-]
27+
<<',
2628
precompil => 'pre \- compil',
2729
semicolon => 'semi [\s+|\-] colon',
2830
metadata => 'meta [\s+|\+] data',

0 commit comments

Comments
 (0)