Skip to content

Commit e468490

Browse files
authored
Merge branch 'master' into comments
2 parents 4d1bcfc + 525e94e commit e468490

22 files changed

+638
-550
lines changed

doc/Language/containers.pod6

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ maps over a list of three elements, not of one.
283283
284284
Complex containers, like Array or Hash and relatives, can contain a reference
285285
to itself, forming recursive data structures. Please note that very few builtin
286-
functions and methods will detect infinite loops. It is the objective of the
286+
functions and methods will detect infinite loops. It is the responsibility of the
287287
user to L<handle|/type/Promise#method_in> timeouts.
288288
289289
my @a;

doc/Language/glossary.pod6

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,12 @@ See also L<#Adverb>.
225225
Original author of the L<#Exegesis> (among many other things).
226226
See also L<https://en.wikipedia.org/wiki/Damian_Conway>.
227227
228+
=head1 diffy
229+
X<|diffy>
230+
231+
See L<operator|#Operator>. It means the type of the operator result is
232+
sufficiently different from its arguments that op= makes little sense
233+
228234
=head1 Exegesis
229235
X<|Exegesis>
230236
@@ -235,12 +241,17 @@ historical document for reference. See also L<#Synopsis>.
235241
=head1 fiddly
236242
X<|fiddly>
237243
244+
Too complicated to apply a meta-op to. See L<operator|#Operator>.
245+
238246
=head1 handles
239247
X<|handles>
240248
241249
=head1 iffy
242250
X<|iffy>
243251
252+
Often used as a boolean value. See L<operator|#Operator>.
253+
254+
244255
=head1 Instance
245256
X<|instance>
246257
@@ -688,11 +699,16 @@ B<P>lain B<O>l' B<D>ocumentation, a documentation format understood by Perl
688699
X<|Pull Request>
689700
690701
A feature of L<https://github.com> that allows you to make patches
691-
to be easily applied using the Github user interface.
702+
to be easily applied using the Github user interface. It means you
703+
request someone to do a git pull from your L<repository|#Repository> to hers. In
704+
GitHub, it can be done automatically through the web interface. PR is
705+
its usual acronym.
692706
693707
=head1 pugs
694708
X<|pugs>
695709
710+
L<pugs|https://en.wikipedia.org/wiki/Pugs> was one of the first interpreters/compilers written for Perl 6. It was written in Haskell by Audrey Tang.
711+
696712
=head1 QAST
697713
X<|QAST>
698714
@@ -709,6 +725,12 @@ means "Paradise."
709725
=head1 Repository
710726
X<|Repository>
711727
728+
A filesystem under control of a source control management application, usually git,
729+
that holds the sources for a project, library or application. This file, for
730+
instance, is in L<a GitHub repository|https://github.com/perl6/doc>. Repositories store not only
731+
files, but also history of changes and can be used by the developing
732+
or writing team for interaction through issues or comments to code.
733+
712734
=head1 roast
713735
X<|roast>
714736

0 commit comments

Comments
 (0)