Merge pull request #2 from perl6/master

update

Author: finanalyst

doc/Language/experimental.pod6

@@ -22,10 +22,53 @@ not yet rendered properly.
 
 =item X<B<cache>|cache> [TBD]
 
-=item X<B<macros>|macros> [TBD]
-
 =item X<B<pack>|pack> [TBD]
 
+=head2 X<B<macros>|macros>
+
+L<Macros|https://en.wikipedia.org/wiki/Macro_(computer_science)> are
+code-generating routines, that generate code in compile time, before the program
+is executed. In Perl 6 its use is still experimental and it needs to be turned
+on via the pragma
+
+    use experimental :macros;
+
+Macro processing happens during parsing time. A macro generates an abstract
+syntax tree, which is grafted into the program syntax tree. C<quasi> is the
+routine that performs this task.
+
+=begin code :skip-test<need use experimental>
+macro does-nothing() {
+    quasi {}
+};
+does-nothing; # OUTPUT: «»
+=end code
+
+X<|quasi (macros)>
+Macros are a kind of routine, so they can take arguments in exactly the same
+way, and act also in almost the same way.
+
+=begin code :skip-test<need use experimental>
+macro is-mighty( $who ) {
+    quasi { "$who is mighty!"}
+};
+say is-mighty "Freija"; # OUTPUT: « "Freija" is mighty!␤»
+=end code
+
+X<|unquoting (macros)>
+X<|{{{}}} (macros)>
+"Almost" accounts for the fact that the argument is inserted as a literal,
+including the quotes. Please note that we can also eliminate the parentheses for
+a macro call, following the same rules as a routine. You can use the unquoting
+construct C<{{{}}}> to get rid of this kind of thing:
+
+=begin code :skip-test<need use experimental>
+macro is-mighty( $who ) {
+    quasi { {{{$who}}} ~ " is mighty!"}
+};
+say is-mighty "Freija";# OUTPUT: «Freija is mighty!␤»
+=end code
+
 
 =end pod
 

doc/Type/Distribution.pod6

@@ -9,7 +9,7 @@
 Interface for objects that provide API access mapping META6 data to the files its represents.
 Objects that fulfill the C<Distribution> role can be read by e.g. L<CompUnit::Repository::Installation>.
 Generally a C<Distribution> provides read access to a set of modules and meta data. These
-may be backed by the file system (L<Distribution::Path>, L<Distribution::Hash>) but could
+may be backed by the filesystem (L<Distribution::Path>, L<Distribution::Hash>) but could
 also read from a e.g. tar file or socket.
 
 =head1 Required Methods

doc/Type/Distribution/Hash.pod6

@@ -6,8 +6,8 @@
 
     class Distribution::Hash does Distribution::Locally { }
 
-A L<Distribution|/type/Distribution> implementation backed by the file system. It does not require a
-a C<META6.json> file, essentially providing a lower level C<Distribution::Path>.
+A L<Distribution|/type/Distribution> implementation backed by the filesystem. It does not require a
+C<META6.json> file, essentially providing a lower level C<Distribution::Path>.
 
 =head1 Methods
 
@@ -33,4 +33,4 @@ path as it would be found in the meta data such as C<lib/Foo.pm6> or C<resources
 
 =end pod
 
-# vim: expandtab softtabstop=4 shiftwidth=4 ft=perl6
+# vim: expandtab softtabstop=4 shiftwidth=4 ft=perl6

doc/Type/Distribution/Path.pod6

@@ -6,7 +6,7 @@
 
     class Distribution::Path does Distribution::Locally { }
 
-A L<Distribution|/type/Distribution> implementation backed by the file system. It requires a
+A L<Distribution|/type/Distribution> implementation backed by the filesystem. It requires a
 C<META6.json> file at its root.
 
 =head1 Methods
@@ -34,4 +34,4 @@ path as it would be found in the meta data such as C<lib/Foo.pm6> or C<resources
 
 =end pod
 
-# vim: expandtab softtabstop=4 shiftwidth=4 ft=perl6
+# vim: expandtab softtabstop=4 shiftwidth=4 ft=perl6