Skip to content

Commit a675db0

Browse files
authored
Merge pull request #981 from perl6/minor-spelling
Make sigiled consistent; americanize travellers
2 parents 977f8f2 + aa41593 commit a675db0

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

doc/Language/control.pod6

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,7 @@ the C<given> value once more, consider this code:
532532
C<42> since this is the next positive match, but doesn't enter the
533533
C<default> block since the C<when 42> block doesn't contain a C<proceed>.
534534
535-
By contrast, the C<succeed> keyword shortcircuits execution and exits the
535+
By contrast, the C<succeed> keyword short-circuits execution and exits the
536536
entire C<given> block at that point. It may also take an argument to
537537
specify a final value for the block.
538538

doc/Language/glossary.pod6

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -727,7 +727,7 @@ X<|Sigil>
727727
In Perl, the sigil is the first character of a variable name. It must be
728728
either $, @, %, or & respectively for a L<scalar|/type/Scalar>,
729729
L<array|/type/Array>, L<hash|/type/Hash>, or L<code|/type/Code> variable. See also
730-
Twigil and role. Also sigilled variables allow short conventions
730+
Twigil and role. Also sigiled variables allow short conventions
731731
for L<variable interpolation|#Variable Interpolation> in a double quoted
732732
string, or even L<postcircumfix|#Postcircumfix> expressions starting with
733733
such a variable.

doc/Language/objects.pod6

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ They are typically declared using the C<has> declarator and the C<!> twigil.
145145
class Journey {
146146
has $!origin;
147147
has $!destination;
148-
has @!travellers;
148+
has @!travelers;
149149
has $!notes;
150150
}
151151
@@ -157,7 +157,7 @@ call).
157157
class Journey {
158158
has $.origin;
159159
has $.destination;
160-
has @!travellers;
160+
has @!travelers;
161161
has $.notes;
162162
}
163163
@@ -167,7 +167,7 @@ to the attribute, add the L<is rw> trait:
167167
class Journey {
168168
has $.origin;
169169
has $.destination;
170-
has @!travellers;
170+
has @!travelers;
171171
has $.notes is rw;
172172
}
173173
@@ -184,7 +184,7 @@ sure that it is provided by marking it with L<is required>.
184184
has $.origin is required;
185185
# set the destination to Orlando as default (unless that is the origin!)
186186
has $.destination = self.origin eq 'Orlando' ?? 'Kampala' !! 'Orlando';
187-
has @!travellers;
187+
has @!travelers;
188188
has $.notes is rw;
189189
}
190190
@@ -218,12 +218,12 @@ Methods are declared with the C<method> keyword inside a class body.
218218
class Journey {
219219
has $.origin;
220220
has $.destination;
221-
has @!travellers;
221+
has @!travelers;
222222
has $.notes is rw;
223223
224-
B<method> add_traveller($name) {
225-
if $name L<ne> L<any>(@!travellers) {
226-
L<push> @!travellers, $name;
224+
B<method> add_traveler($name) {
225+
if $name L<ne> L<any>(@!travelers) {
226+
L<push> @!travelers, $name;
227227
}
228228
else {
229229
L<warn> "$name is already going on the journey!";

0 commit comments

Comments
 (0)