NixOS · Aug 28, 2018 · Aug 28, 2018
Showing with 21 additions and 16 deletions.

+2 −0 doc/functions.xml

+19 −16 doc/reviewing-contributions.xml
diff --git a/doc/functions.xml b/doc/functions.xml
@@ -1,5 +1,6 @@
 <chapter xmlns="http://docbook.org/ns/docbook"
 	 xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
 	 xml:id="chap-functions">
  <title>Functions reference</title>
  <para>
@@ -372,6 +373,7 @@
    <filename>./bin/start.sh</filename> -- relative paths are supported.
   </para>
  </section>
+ <xi:include href="shell.section.xml" />
  <section xml:id="sec-pkgs-dockerTools">
   <title>pkgs.dockerTools</title>
 

diff --git a/doc/reviewing-contributions.xml b/doc/reviewing-contributions.xml
@@ -6,18 +6,20 @@
  <title>Reviewing contributions</title>
  <warning>
   <para>
-   The following section is a draft, and the policy for reviewing is still being
-   discussed in issues such as <link
+   The following section is a draft, and the policy for reviewing is still
+   being discussed in issues such as
+   <link
 	   xlink:href="https://github.com/NixOS/nixpkgs/issues/11166">#11166
-   </link> and <link
+   </link> and
+   <link
 	   xlink:href="https://github.com/NixOS/nixpkgs/issues/20836">#20836
    </link>.
   </para>
  </warning>
  <para>
-  The nixpkgs project receives a fairly high number of contributions via
-  GitHub pull-requests. Reviewing and approving these is an important task and
-  a way to contribute to the project.
+  The nixpkgs project receives a fairly high number of contributions via GitHub
+  pull-requests. Reviewing and approving these is an important task and a way
+  to contribute to the project.
  </para>
  <para>
   The high change rate of nixpkgs makes any pull request that remains open for
@@ -38,10 +40,10 @@
   to respect every community member and their work.
  </para>
  <para>
-  GitHub provides reactions as a simple and quick way to provide
-  feedback to pull-requests or any comments. The thumb-down reaction should be
-  used with care and if possible accompanied with some explanation so the
-  submitter has directions to improve their contribution.
+  GitHub provides reactions as a simple and quick way to provide feedback to
+  pull-requests or any comments. The thumb-down reaction should be used with
+  care and if possible accompanied with some explanation so the submitter has
+  directions to improve their contribution.
  </para>
  <para>
   Pull-request reviews should include a list of what has been reviewed in a
@@ -101,8 +103,9 @@
     <itemizedlist>
      <listitem>
       <para>
-       mention-bot usually notifies GitHub users based on the submitted changes,
-       but it can happen that it misses some of the package maintainers.
+       mention-bot usually notifies GitHub users based on the submitted
+       changes, but it can happen that it misses some of the package
+       maintainers.
       </para>
      </listitem>
     </itemizedlist>
@@ -114,8 +117,8 @@
     <itemizedlist>
      <listitem>
       <para>
-       License can change with version updates, so it should be checked to match
-       the upstream license.
+       License can change with version updates, so it should be checked to
+       match the upstream license.
       </para>
      </listitem>
      <listitem>
@@ -140,8 +143,8 @@
      <listitem>
       <para>
        Pull-requests are often targeted to the master or staging branch, and
-       building the pull-request locally when it is submitted can trigger
-       many source builds.
+       building the pull-request locally when it is submitted can trigger many
+       source builds.
       </para>
       <para>
        It is possible to rebase the changes on nixos-unstable or