* Cleaned up a lot of description fields that contained newlines.

  Some of these should be longDescriptions, but most others just
  shouldn't contain newlines.  E.g. write

    description = "Bla";

  and not

    description = ''
      Bla
    '';

  This pollutes "nix-env -qa --description" output.

svn path=/nixpkgs/trunk/; revision=14310

104 files changed, 348 insertions, 452 deletions

diff --git a/pkgs/applications/audio/aumix/default.nix b/pkgs/applications/audio/aumix/default.nix
index 57c690fee9bc..9a8a75600889 100644
--- a/pkgs/applications/audio/aumix/default.nix
+++ b/pkgs/applications/audio/aumix/default.nix
@@ -16,8 +16,10 @@ stdenv.mkDerivation {
     ++ (if gtkGUI then [pkgconfig gtk] else []);
 
   meta = {
-    description = ''Aumix adjusts an audio mixer from X, the console,
-    		    a terminal, the command line or a script.'';
+    longDescription = ''
+      Aumix adjusts an audio mixer from X, the console, a terminal,
+      the command line or a script.
+    '';
     homepage = http://www.jpj.net/~trevor/aumix.html;
     license = "GPL";
   };
diff --git a/pkgs/applications/audio/ladspa-plugins/default.nix b/pkgs/applications/audio/ladspa-plugins/default.nix
index 8dd783a2d1af..6a0dfe020d0a 100644
--- a/pkgs/applications/audio/ladspa-plugins/default.nix
+++ b/pkgs/applications/audio/ladspa-plugins/default.nix
@@ -21,9 +21,7 @@ stdenv.mkDerivation {
 		(textClosure localDefs [doConfigure doMakeInstall 
 			postInstall doForceShare]);
 	meta = {
-		description = "
-	LADSPA format audio plugins.
-";
+		description = "LADSPA format audio plugins";
 		inherit src;
 	};
 }
diff --git a/pkgs/applications/audio/ladspa-plugins/ladspah.nix b/pkgs/applications/audio/ladspa-plugins/ladspah.nix
index dd3286081555..1e29eadcadae 100644
--- a/pkgs/applications/audio/ladspa-plugins/ladspah.nix
+++ b/pkgs/applications/audio/ladspa-plugins/ladspah.nix
@@ -22,9 +22,7 @@ stdenv.mkDerivation {
 	builder = writeScript "ladspa.h-builder"
 		(textClosure localDefs [copyFile]);
 	meta = {
-		description = "
-	LADSPA format audio plugins.
-";
+		description = "LADSPA format audio plugins";
 		inherit src;
 	};
 }
diff --git a/pkgs/applications/audio/vorbis-tools/default.nix b/pkgs/applications/audio/vorbis-tools/default.nix
index 626dc1c9d96c..91d9ba00a0f5 100644
--- a/pkgs/applications/audio/vorbis-tools/default.nix
+++ b/pkgs/applications/audio/vorbis-tools/default.nix
@@ -15,9 +15,10 @@ stdenv.mkDerivation {
   patches = [ ./ogg123-curlopt-mute.patch ];
 
   meta = {
-    description = ''A set of command-line tools to manipulate Ogg Vorbis
-                    audio files, notably the `ogg123' player and the
-		    `oggenc' encoder.'';
+    longDescription = ''
+      A set of command-line tools to manipulate Ogg Vorbis audio
+      files, notably the `ogg123' player and the `oggenc' encoder.
+    '';
     homepage = http://xiph.org/vorbis/;
     license = "GPLv2";
   };
diff --git a/pkgs/applications/editors/emacs-modes/bbdb/default.nix b/pkgs/applications/editors/emacs-modes/bbdb/default.nix
index 3799d0a0f1bd..51474a197174 100644
--- a/pkgs/applications/editors/emacs-modes/bbdb/default.nix
+++ b/pkgs/applications/editors/emacs-modes/bbdb/default.nix
@@ -14,8 +14,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   meta = {
-    description = ''The Insidious Big Brother Database (BBDB), a
-                    contact management utility for Emacs.'';
+    description = "The Insidious Big Brother Database (BBDB), a contact management utility for Emacs";
     homepage = http://bbdb.sourceforge.net/;
     license = "GPL";
   };
diff --git a/pkgs/applications/editors/emacs-modes/quack/default.nix b/pkgs/applications/editors/emacs-modes/quack/default.nix
index 3dea3f41fd6b..943359086e7f 100644
--- a/pkgs/applications/editors/emacs-modes/quack/default.nix
+++ b/pkgs/applications/editors/emacs-modes/quack/default.nix
@@ -14,8 +14,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   meta = {
-    description = ''Quack: Enhanced Emacs Support for Editing and
-                    Running Scheme Code'';
+    description = "Enhanced Emacs support for editing and running Scheme code";
     homepage = http://www.neilvandyke.org/quack/;
     license = "GPLv2+";
   };
diff --git a/pkgs/applications/graphics/gocr/0.44.nix b/pkgs/applications/graphics/gocr/0.44.nix
index 7273c5d98c31..4d3d33f58f54 100644
--- a/pkgs/applications/graphics/gocr/0.44.nix
+++ b/pkgs/applications/graphics/gocr/0.44.nix
@@ -15,9 +15,7 @@ stdenv.mkDerivation rec {
 	builder = writeScript (name + "-builder")
 		(textClosure localDefs [doConfigure doMakeInstall doForceShare doPropagate]);
 	meta = {
-		description = "
-		GPL Optical Character Recognition
-";
+		description = "GPL Optical Character Recognition";
 		inherit src;
 	};
 }
diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index 33defc0bea42..f2379220a65b 100644
--- a/