From 95f0e6a1a75dabb2131aae1db0a4ee30c802b2ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 20 Mar 2008 14:35:03 +0000
Subject: [PATCH] Differentiate between `longDescription' and `description'.

svn path=/nixpkgs/trunk/; revision=11230
---
 pkgs/development/interpreters/guile/default.nix | 10 +++++++---
 pkgs/development/libraries/avahi/common.nix     | 12 ++++++++----
 pkgs/servers/portmap/default.nix                | 11 +++++++----
 pkgs/tools/networking/lsh/default.nix           |  2 +-
 pkgs/tools/networking/nss-mdns/default.nix      | 14 +++++++++-----
 5 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix
index bb0a3f350867..ac9b7e9871ae 100644
--- a/pkgs/development/interpreters/guile/default.nix
+++ b/pkgs/development/interpreters/guile/default.nix
@@ -24,9 +24,13 @@ stdenv.mkDerivation rec {
   setupHook = ./setup-hook.sh;
 
   meta = {
-    description = ''GNU Guile is an interpreter for the Scheme
-                    programming language, packaged as a library that
-		    can be embedded into programs to make them extensible.'';
+    description = "GNU Guile, an embeddable Scheme interpreter";
+    longDescription = ''
+      GNU Guile is an interpreter for the Scheme programming language,
+      packaged as a library that can be embedded into programs to make
+      them extensible.  It supports many SRFIs.
+    '';
+
     homepage = http://www.gnu.org/software/guile/;
     license = "LGPL";
   };
diff --git a/pkgs/development/libraries/avahi/common.nix b/pkgs/development/libraries/avahi/common.nix
index 6b9c726f100c..a44c2863cc9d 100644
--- a/pkgs/development/libraries/avahi/common.nix
+++ b/pkgs/development/libraries/avahi/common.nix
@@ -19,10 +19,14 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = ''Avahi is a system which facilitates service discovery
-                    on a local network.  It is an implementation of the
-		    mDNS (for "Multicast DNS") and DNS-SD (for "DNS-Based
-		    Service Discovery") protocols.'';
+    description = "Avahi, an mDNS/DNS-SD implementation";
+    longDescription = ''
+      Avahi is a system which facilitates service discovery on a local
+      network.  It is an implementation of the mDNS (for "Multicast
+      DNS") and DNS-SD (for "DNS-Based Service Discovery")
+      protocols.
+    '';
+
     homepage = http://avahi.org;
     license = "LGPLv2+";
   };
diff --git a/pkgs/servers/portmap/default.nix b/pkgs/servers/portmap/default.nix
index 3664bdba661d..5687475d8fdd 100644
--- a/pkgs/servers/portmap/default.nix
+++ b/pkgs/servers/portmap/default.nix
@@ -29,10 +29,13 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = ''portmap is a part of the ONC RPC software collection
-                    implementing remote procedure calls (RPCs) between
-		    computer programs.  It is widely used by NFS and NIS,
-		    among others.'';
+    description = "ONC RPC portmapper";
+    longDescription = ''
+      Portmap is part of the ONC RPC software collection implementing
+      remote procedure calls (RPCs) between computer programs.  It is
+      widely used by NFS and NIS, among others.
+    '';
+
     homepage = http://neil.brown.name/portmap/;
     license = "BSD";
   };
diff --git a/pkgs/tools/networking/lsh/default.nix b/pkgs/tools/networking/lsh/default.nix
index a727c46424b0..85e0c91a003d 100644
--- a/pkgs/tools/networking/lsh/default.nix
+++ b/pkgs/tools/networking/lsh/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   buildInputs = [gperf guile gmp zlib liboop gnum4 pam];
 
   meta = {
-    description = "GNU lsh, a GPL'd implementation of the SSH protocol.";
+    description = "GNU lsh, a GPL'd implementation of the SSH protocol";
     homepage = http://www.lysator.liu.se/~nisse/lsh/;
     license = "GPL";
   };
diff --git a/pkgs/tools/networking/nss-mdns/default.nix b/pkgs/tools/networking/nss-mdns/default.nix
index 84dbc27d6412..1dd430c74931 100644
--- a/pkgs/tools/networking/nss-mdns/default.nix
+++ b/pkgs/tools/networking/nss-mdns/default.nix
@@ -22,11 +22,15 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = ''`nss-mdns' is a plugin for the GNU Name Service Switch
-                    (NSS) functionality of the GNU C Library (glibc) providing
-		    host name resolution via Multicast DNS (mDNS), effectively
-		    allowing name resolution by common Unix/Linux programs in
-		    the ad-hoc mDNS domain `.local'.'';
+    description = "The mDNS Name Service Switch (NSS) plug-in";
+    longDescription = ''
+      `nss-mdns' is a plugin for the GNU Name Service Switch (NSS)
+      functionality of the GNU C Library (glibc) providing host name
+      resolution via Multicast DNS (mDNS), effectively allowing name
+      resolution by common Unix/Linux programs in the ad-hoc mDNS
+      domain `.local'.
+    '';
+
     homepage = http://0pointer.de/lennart/projects/nss-mdns/;
     license = "LGPLv2+";
   };