summary refs log tree commit diff
path: root/doc/contributing
diff options
context:
space:
mode:
authorRobert Hensing <robert@roberthensing.nl>2021-03-04 17:54:35 +0100
committerRobert Hensing <robert@roberthensing.nl>2021-03-04 18:10:57 +0100
commit7d551ead60f90b8c879bea7ce421f54482406dbb (patch)
treef2f2eef1cdd0f71dfc1e953e24271eae98a4c90c /doc/contributing
parent0a4a486096bc2a6efb1bc0d11543f208eda23dc3 (diff)
downloadnixpkgs-7d551ead60f90b8c879bea7ce421f54482406dbb.tar
nixpkgs-7d551ead60f90b8c879bea7ce421f54482406dbb.tar.gz
nixpkgs-7d551ead60f90b8c879bea7ce421f54482406dbb.tar.bz2
nixpkgs-7d551ead60f90b8c879bea7ce421f54482406dbb.tar.lz
nixpkgs-7d551ead60f90b8c879bea7ce421f54482406dbb.tar.xz
nixpkgs-7d551ead60f90b8c879bea7ce421f54482406dbb.tar.zst
nixpkgs-7d551ead60f90b8c879bea7ce421f54482406dbb.zip
doc: Format
Diffstat (limited to 'doc/contributing')
-rw-r--r--doc/contributing/coding-conventions.xml12
1 files changed, 3 insertions, 9 deletions
diff --git a/doc/contributing/coding-conventions.xml b/doc/contributing/coding-conventions.xml
index 9005a9ebafd..9f00942918c 100644
--- a/doc/contributing/coding-conventions.xml
+++ b/doc/contributing/coding-conventions.xml
@@ -180,17 +180,12 @@ args.stdenv.mkDerivation (args // {
    </listitem>
    <listitem>
     <para>
-     Arguments should be listed in the order they are used, with the
-     exception of <varname>lib</varname>, which always goes first.
+     Arguments should be listed in the order they are used, with the exception of <varname>lib</varname>, which always goes first.
     </para>
    </listitem>
    <listitem>
     <para>
-     Prefer using the top-level <varname>lib</varname> over its alias
-     <literal>stdenv.lib</literal>.  <varname>lib</varname> is unrelated to
-     <varname>stdenv</varname>, and so <literal>stdenv.lib</literal> should only
-     be used as a convenience alias when developing to avoid having to modify
-     the function inputs just to test something out.
+     Prefer using the top-level <varname>lib</varname> over its alias <literal>stdenv.lib</literal>. <varname>lib</varname> is unrelated to <varname>stdenv</varname>, and so <literal>stdenv.lib</literal> should only be used as a convenience alias when developing to avoid having to modify the function inputs just to test something out.
     </para>
    </listitem>
   </itemizedlist>
@@ -689,8 +684,7 @@ args.stdenv.mkDerivation (args // {
        </varlistentry>
        <varlistentry>
         <term>
-         If it’s a <emphasis>theme</emphasis> for a <emphasis>desktop environment</emphasis>,
-         a <emphasis>window manager</emphasis> or a <emphasis>display manager</emphasis>:
+         If it’s a <emphasis>theme</emphasis> for a <emphasis>desktop environment</emphasis>, a <emphasis>window manager</emphasis> or a <emphasis>display manager</emphasis>:
         </term>
         <listitem>
          <para>