Solved conflict

Author: JJ

assets/sass/style.scss

@@ -71,7 +71,7 @@ img, svg {
 }
 
 table.pod-table tr:nth-child(odd) {
-    background-color: #f8f8f8;
+    background-color: rgba(0, 0, 0, 0.031373);
 }
 table.pod-table tr:nth-child(even) {
     background-color: none;
@@ -320,11 +320,9 @@ td, th {
     margin: 2em auto;
     overflow: hidden;
     max-width: 800px;
+    min-height: 220px;
     background: #FFF;
-    background-repeat: no-repeat;
-    background-position: right 2em top 2em;
-    background-image: url(/images/Camelia-faded.svg);
-    
+
     dt {
         font-weight: bold;
         margin-bottom: 0.2em;
@@ -361,6 +359,12 @@ td, th {
         padding-top: 0.25em;
     }
 }
+#content:not(.content_HomePage) {
+    background-repeat: no-repeat;
+    background-position: right 2rem top 2rem;
+    background-size: 243px;
+    background-image: url(/images/Camelia-faded.svg);
+}
 
 @media (min-width: 110em) {
     #content {

doc/HomePage.pod6

@@ -1,5 +1,6 @@
 =begin Html
-<img style="float: right; margin: 0 0 2em 2em" src="/images/camelia.png" alt="" id="home_logo"/>
+<img style="float: right; margin: 0 0 1em 1em"
+    width=261 src="/images/Camelia.svg" alt="" id="home_logo"/>
 Welcome to the official documentation of the <a href="https://perl6.org">Perl 6</a>
 programming language!
 Besides online browsing and searching, you can also

doc/Language/faq.pod6

@@ -67,18 +67,23 @@ X<|rakudobrew (FAQ)>
 =head2 As an advanced user I want to track Rakudo development.
 
 An option is to clone L<the repository|https://github.com/rakudo/rakudo> and
-L<build from source|https://github.com/zoffixznet/r#table-of-contents>.
+build it. This will install work in progress which is minimally-tested and
+may contain severe bugs. If you're interested in contributing to Rakudo
+Perl 6 compiler, you may find
+L<Z-Script helper tool|https://github.com/zoffixznet/z> useful.
 
-This will install work in progress which isn't necessarily fully functional.
 To install the last official monthly release check out the tag visible at
 L<https://raw.githubusercontent.com/rakudo/rakudo/master/VERSION>
+or set up L<a helper command|https://github.com/zoffixznet/r#table-of-contents>.
 
 Some users choose to use L<rakudobrew|https://github.com/tadzik/rakudobrew>,
 which allows installation of multiple versions of rakudo. Be sure to L<read its
-documentation|https://github.com/tadzik/rakudobrew#making-new-scripts-available>
+documentation|https://github.com/tadzik/rakudobrew#making-new-scripts-available>.
 
-In either case you will probably need to also install zef and p6doc from
-the ecosystem.
+In either case you will probably need to also install
+L«C<zef>|https://modules.perl6.org/dist/zef:github» and
+L«C<p6doc>|https://modules.perl6.org/dist/p6doc:github» from the
+L<ecosystem|http://modules.perl6.org/>.
 
 =head2 Where can I find good documentation on Perl 6?
 
@@ -143,11 +148,6 @@ L«C<zef> module installer|https://github.com/ugexe/zef»
 automatically check for latest versions of a module on CPAN as well as our
 L<GitHub-based ecosystem|https://github.com/perl6/ecosystem/>.
 
-Viewing of modules available CPAN will be implemented soon on
-L<modules.perl6.org website|https://modules.perl6.org/> (temporarily, it's
-available as a
-L<raw JSON file|https://github.com/ugexe/Perl6-ecosystems/blob/master/cpan.json>
-
 X<|p6doc (FAQ)> X<|perldoc (FAQ)>
 =head2 Is there a perldoc (command line documentation viewer) for Perl 6?
 

doc/Language/module-packages.pod6

@@ -14,7 +14,7 @@ focuses on use of the C<module> declarator.
 Modules, like classes and grammars, are a kind of
 L<package|/language/packages>. Module objects are instances of the
 C<ModuleHOW> metaclass; this provides certain capabilities useful
-for namespacing, versioning, delegation and data encapsulation (see
+for creating namespaces, versioning, delegation and data encapsulation (see
 also L<class|/syntax/class> and L<role|/syntax/role>).
 
 To create a module, use the C<module> declarator:

doc/Type/Signature.pod6

@@ -452,6 +452,11 @@ be omitted.
     foo "2016-12-01";
     # OUTPUT: «Date␤2016-12-01␤»
 
+The coercion is performed by calling the method with the name of the type
+to coerce to, if it exists (e.g. C<Foo(Bar)> coercer, would call method C<Foo>).
+The method is assumed to return the correct type—no additional checks on
+the result are currently performed.
+
 =head2 X<Slurpy (A.K.A. Variadic) Parameters|parameter,*@;parameter,*%,slurpy argument (Signature)>
 
 A function is X<variadic> if it can take a varying number of arguments; that is,