summary refs log tree commit diff
path: root/doc
diff options
context:
space:
mode:
authorGraham Christensen <graham@grahamc.com>2017-08-30 06:59:20 -0400
committerGraham Christensen <graham@grahamc.com>2017-08-30 06:59:20 -0400
commit128cdeffd0b801dd36258684e25fcd4ee99015d3 (patch)
tree77585d7a51aaa7ec702f769a337f6f3eb1316d2c /doc
parent7978edad53456e0eff490c6a72b62fdadc16bf8c (diff)
downloadnixpkgs-128cdeffd0b801dd36258684e25fcd4ee99015d3.tar
nixpkgs-128cdeffd0b801dd36258684e25fcd4ee99015d3.tar.gz
nixpkgs-128cdeffd0b801dd36258684e25fcd4ee99015d3.tar.bz2
nixpkgs-128cdeffd0b801dd36258684e25fcd4ee99015d3.tar.lz
nixpkgs-128cdeffd0b801dd36258684e25fcd4ee99015d3.tar.xz
nixpkgs-128cdeffd0b801dd36258684e25fcd4ee99015d3.tar.zst
nixpkgs-128cdeffd0b801dd36258684e25fcd4ee99015d3.zip
compiz: drop
Diffstat (limited to 'doc')
-rw-r--r--doc/coding-conventions.xml8
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/coding-conventions.xml b/doc/coding-conventions.xml
index f89437af445..0457018f7d0 100644
--- a/doc/coding-conventions.xml
+++ b/doc/coding-conventions.xml
@@ -254,7 +254,7 @@ bound to the variable name <varname>e2fsprogs</varname> in
   dash) — e.g., <literal>"hello-0.3.1rc2"</literal>.</para></listitem>
 
   <listitem><para>If a package is not a release but a commit from a repository, then
-  the version part of the name <emphasis>must</emphasis> be the date of that 
+  the version part of the name <emphasis>must</emphasis> be the date of that
   (fetched) commit. The date must be in <literal>"YYYY-MM-DD"</literal> format.
   Also append <literal>"unstable"</literal> to the name - e.g.,
   <literal>"pkgname-unstable-2014-09-23"</literal>.</para></listitem>
@@ -456,7 +456,7 @@ splitting up an existing category.</para>
   <varlistentry>
     <term>If it’s a <emphasis>window manager</emphasis>:</term>
     <listitem>
-      <para><filename>applications/window-managers</filename> (e.g. <filename>awesome</filename>, <filename>compiz</filename>, <filename>stumpwm</filename>)</para>
+      <para><filename>applications/window-managers</filename> (e.g. <filename>awesome</filename>, <filename>stumpwm</filename>)</para>
     </listitem>
   </varlistentry>
   <varlistentry>
@@ -661,9 +661,9 @@ src = fetchFromGitHub {
 </section>
 
 <section xml:id="sec-patches"><title>Patches</title>
-  <para>Only patches that are unique to <literal>nixpkgs</literal> should be 
+  <para>Only patches that are unique to <literal>nixpkgs</literal> should be
     included in <literal>nixpkgs</literal> source.</para>
-  <para>Patches available online should be retrieved using 
+  <para>Patches available online should be retrieved using
     <literal>fetchpatch</literal>.</para>
   <para>
 <programlisting>