Merge branch 'master' into advertise-bugreport

Author: nasamuffin

app/views/community/index.html.erb

@@ -12,7 +12,11 @@
   <h2> Mailing List</h2>
 
   <p>
-    Questions or comments for the Git community can be sent to the mailing list by using the email address <a href="mailto:git@vger.kernel.org">git@vger.kernel.org</a>. <strong>Bug reports for git should be sent to this mailing list.</strong>
+    General questions or comments for the Git community can be sent to the mailing list by using the email address <a href="mailto:git@vger.kernel.org">git@vger.kernel.org</a>. 
+  </p>
+  
+  <p>
+    <strong>If you wish to report any possible bug for Git, please use this mailing list as well.</strong>
   </p>
 
   <p>
@@ -79,8 +83,18 @@
     If you need specific help about one of the for-profit Git hosting sites, you might try their own IRC channels (such as <span class="highlight fixed">#github</span> or <span class="highlight fixed">#gitlab</span>) on the same IRC server.
   </p>
 
+  <h2> Newsletter </h2>
+
+  <p>
+    There is a monthly community newsletter called <a href="https://git.github.io/rev_news/rev_news/">"Git Rev News"</a>, with <a href="https://git.github.io/rev_news/archive/">its archive</a> and <a href="https://git.github.io/rev_news/">its latest edition</a>. Information on how to subscribe can be found on the <a href="https://git.github.io/rev_news/rev_news/">dedicated webpage</a>.
+  </p>
+
   <h2> Contributing to Git </h2>
 
   <p>
     The <a href="https://github.com/git/git/tree/master/Documentation">Documentation directory</a> in the Git source code has several files of interest to developers who are looking to help contribute. After reading the <a href="https://github.com/git/git/blob/master/Documentation/CodingGuidelines">coding guidelines</a>, you can learn <a href="/docs/SubmittingPatches">how to submit patches</a>. If you are just starting out, you can read the <a href="/docs/MyFirstContribution">My First Contribution tutorial</a>. For those looking to get more deeply involved, there is a <a href="https://github.com/git/git/blob/master/Documentation/howto/maintain-git.txt">howto for Git maintainers</a>.
   </p>
+
+  <p>
+    The <a href="https://git.github.io/">Git Developer Pages</a> have a <a href="https://git.github.io/Hacking-Git/">Hacking Git page</a> which lists useful development resources. They also have <a href="https://git.github.io/General-Application-Information/">information</a> for people applying to work on Git as part of programs like <a href="https://www.outreachy.org/">Outreachy</a> or the <a href="https://summerofcode.withgoogle.com/">Google Summer of Code</a>.
+  </p>

app/views/shared/ref/_guides.html.erb

@@ -3,6 +3,7 @@
   <li><%= man('gitattributes') %></li>
   <li><%= man('gitcli', 'Command-line interface conventions') %></li>
   <li><%= man('giteveryday', 'Everyday Git') %></li>
+  <li><%= man('gitfaq', 'Frequently Asked Questions (FAQ)') %></li>
   <li><%= man('gitglossary', 'Glossary') %></li>
   <li><%= man('githooks') %></li>
   <li><%= man('gitignore') %></li>

lib/tasks/index.rake

@@ -62,10 +62,10 @@ def index_l10n_doc(filter_tags, doc_list, get_content)
         if categories[line]
           new_content = categories[line]
         else
-          new_content, path = get_f_content.call(path, line)
+          new_content, new_path = get_f_content.call(path, line)
         end
         if new_content
-          expand!(path, new_content, get_f_content, categories)
+          expand!(new_path, new_content, get_f_content, categories)
         else
           "\n\n[WARNING]\n====\nMissing `#{path}`\n\nSee original version for this content.\n====\n\n"
         end
@@ -159,6 +159,7 @@ def index_doc(filter_tags, doc_list, get_content)
         /^Documentation\/(
           SubmittingPatches |
           MyFirstContribution.txt |
+          MyFirstObjectWalk.txt |
           (
             git.* |
             everyday |