Fixed many descriptions

18 files changed, 30 insertions, 24 deletions

diff --git a/pkgs/tools/audio/gvolicon/default.nix b/pkgs/tools/audio/gvolicon/default.nix
index 3e97d11fffb..6bcddfa72f1 100644
--- a/pkgs/tools/audio/gvolicon/default.nix
+++ b/pkgs/tools/audio/gvolicon/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
     '';
 
   meta = {
-    description = "A simple and lightweight volume icon that sits in your system tray.";
+    description = "A simple and lightweight volume icon that sits in your system tray";
     homepage = https://github.com/Unia/gvolicon;
     platforms = stdenv.lib.platforms.linux;
     license = stdenv.lib.licenses.gpl3Plus;
diff --git a/pkgs/tools/audio/mpdcron/default.nix b/pkgs/tools/audio/mpdcron/default.nix
index 6a59fc49a95..c8f485ed5da 100644
--- a/pkgs/tools/audio/mpdcron/default.nix
+++ b/pkgs/tools/audio/mpdcron/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = {
-    description = "A cron like daemon for mpd.";
+    description = "A cron like daemon for mpd";
     homepage    = http://alip.github.io/mpdcron/;
     license     = stdenv.lib.licenses.gpl2;
     platforms   = with stdenv.lib.platforms; unix;
diff --git a/pkgs/tools/audio/volumeicon/default.nix b/pkgs/tools/audio/volumeicon/default.nix
index 0de3af28c19..92091c18df3 100644
--- a/pkgs/tools/audio/volumeicon/default.nix
+++ b/pkgs/tools/audio/volumeicon/default.nix
@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
   buildInputs = [ gtk3 pkgconfig intltool alsaLib ];
 
   meta = with stdenv.lib; {
-    description = "A lightweight volume control that sits in your systray.";
-    homepage = "http://softwarebakery.com/maato/volumeicon.html";
+    description = "A lightweight volume control that sits in your systray";
+    homepage = http://softwarebakery.com/maato/volumeicon.html;
     platforms = pkgs.lib.platforms.linux;
     maintainers = with maintainers; [ bobvanderlinden ];
     license = pkgs.lib.licenses.gpl3;
diff --git a/pkgs/tools/filesystems/jmtpfs/default.nix b/pkgs/tools/filesystems/jmtpfs/default.nix
index 5ee79397707..86dad1cc0fa 100644
--- a/pkgs/tools/filesystems/jmtpfs/default.nix
+++ b/pkgs/tools/filesystems/jmtpfs/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ autoconf automake file fuse libmtp pkgconfig unzip ];
 
   meta = {
-    description = "A FUSE filesystem for MTP devices like Android phones.";
+    description = "A FUSE filesystem for MTP devices like Android phones";
     homepage = https://github.com/JasonFerrara/jmtpfs;
     license = stdenv.lib.licenses.gpl3;
     maintainers = [ stdenv.lib.maintainers.coconnor ];
diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix
index ba0784138b3..8462ca0e9c6 100644
--- a/pkgs/tools/misc/execline/default.nix
+++ b/pkgs/tools/misc/execline/default.nix
@@ -46,7 +46,7 @@ in stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://skarnet.org/software/execline/;
-    description = "A small scripting language, to be used in place of a shell in non-interactive scripts.";
+    description = "A small scripting language, to be used in place of a shell in non-interactive scripts";
     platforms = stdenv.lib.platforms.all;
     license = stdenv.lib.licenses.isc;
   };
diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix
index f8e7dfaddc9..8da10b7eb58 100644
--- a/pkgs/tools/misc/s6-portable-utils/default.nix
+++ b/pkgs/tools/misc/s6-portable-utils/default.nix
@@ -47,7 +47,7 @@ in stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://www.skarnet.org/software/s6-portable-utils/;
-    description = "A set of tiny general Unix utilities optimized for simplicity and small size.";
+    description = "A set of tiny general Unix utilities optimized for simplicity and small size";
     platforms = stdenv.lib.platforms.all;
     license = stdenv.lib.licenses.isc;
   };
diff --git a/pkgs/tools/misc/screenfetch/default.nix b/pkgs/tools/misc/screenfetch/default.nix
index 826f4e4d869..442922b7805 100644
--- a/pkgs/tools/misc/screenfetch/default.nix
+++ b/pkgs/tools/misc/screenfetch/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    description = "Fetches system/theme information in terminal for Linux desktop screenshots.";
+    description = "Fetches system/theme information in terminal for Linux desktop screenshots";
     longDescription = ''
     screenFetch is a "Bash Screenshot Information Tool". This handy Bash
     script can be used to generate one of those nifty terminal theme
diff --git a/pkgs/tools/misc/sutils/default.nix b/pkgs/tools/misc/sutils/default.nix
index 53945113e7f..d0576cc069a 100644
--- a/pkgs/tools/misc/sutils/default.nix
+++ b/pkgs/tools/misc/sutils/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
    prePatch = ''sed -i "s@/usr/local@$out@" Makefile'';
 
    meta = {
-     description = "Small command-line utilities.";
+     description = "Small command-line utilities";
      homepage = https://github.com/baskerville/sutils;
      maintainers = [ stdenv.lib.maintainers.meisternu ];
      license = "Custom";
diff --git a/pkgs/tools/networking/bully/default.nix b/pkgs/tools/networking/bully/default.nix
index f667d772ac4..6c090a7ec1f 100644
--- a/pkgs/tools/networking/bully/default.nix
+++ b/pkgs/tools/networking/bully/default.nix
@@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "Retrieve WPA/WPA2 passphrase from a WPS enabled access point.";
-    homepage = "https://github.com/bdpurcell/bully";
+    description = "Retrieve WPA/WPA2 passphrase from a WPS enabled access point";
+    homepage = https://github.com/bdpurcell/bully;
     maintainers = [ stdenv.lib.maintainers.edwtjo ];
     license = stdenv.lib.licenses.gpl3;
   };
diff --git a/pkgs/tools/networking/ccnet/default.nix b/pkgs/tools/networking/ccnet/default.nix
index 8896156bd1c..a967e8b2735 100644
--- a/pkgs/tools/networking/ccnet/default.nix
+++ b/pkgs/tools/networking/ccnet/default.nix
@@ -26,8 +26,8 @@ stdenv.mkDerivation rec
 
   meta =
   {
-    homepage = "https://github.com/haiwen/ccnet";
-    description = "A framework for writing networked applications in C.";
+    homepage = https://github.com/haiwen/ccnet;
+    description = "A framework for writing networked applications in C";
     license = stdenv.lib.licenses.gpl3Plus;
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.calrama ];
diff --git a/pkgs/tools/networking/ndjbdns/default.nix b/pkgs/tools/networking/ndjbdns/default.nix
index e2dc1fd1eaf..2a7e996f8db 100644
--- a/pkgs/tools/networking/ndjbdns/default.nix
+++ b/pkgs/tools/networking/ndjbdns/default.nix
@@ -11,7 +11,10 @@ stdenv.mkDerivation rec {
   buildInputs = [ pkgconfig systemd ];
 
   meta = with stdenv.lib; {
-    description = "N-DJBDNS is a brand new release of the Djbdns. Djbdns is a fully‐fledged Domain Name System(DNS), originally written by the eminent author of qmail, Dr. D J Bernstein.";
+    description = "A brand new release of the Djbdns";
+    longDescription = ''
+      Djbdns is a fully‐fledged Domain Name System(DNS), originally written by the eminent author of qmail, Dr. D J Bernstein.
+    '';
     homepage = http://pjp.dgplug.org/ndjbdns/;
     license = licenses.gpl2;
     maintainers = [ maintainers.msackman ];
diff --git a/pkgs/tools/networking/netcat-openbsd/default.nix b/pkgs/tools/networking/netcat-openbsd/default.nix
index 8619eb79847..e71abcd8a2c 100644
--- a/pkgs/tools/networking/netcat-openbsd/default.nix
+++ b/pkgs/tools/networking/netcat-openbsd/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://packages.debian.org/netcat-openbsd";
-    description = "TCP/IP swiss army knife. OpenBSD variant.";
+    description = "TCP/IP swiss army knife, OpenBSD variant";
     platforms = stdenv.lib.platforms.linux;
   };
 
diff --git a/pkgs/tools/networking/s6-dns/default.nix b/pkgs/tools/networking/s6-dns/default.nix
index 3165434de3d..881bb7dd32f 100644
--- a/pkgs/tools/networking/s6-dns/default.nix
+++ b/pkgs/tools/networking/s6-dns/default.nix
@@ -45,7 +45,7 @@ in stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://www.skarnet.org/software/s6-dns/;
-    description = "A suite of DNS client programs and libraries for Unix systems.";
+    description = "A suite of DNS client programs and libraries for Unix systems";
     platforms = stdenv.lib.platforms.all;
     license = stdenv.lib.licenses.isc;
   };
diff --git a/pkgs/tools/networking/s6-networking/default.nix b/pkgs/tools/networking/s6-networking/default.nix
index 3d5e3e04811..5faa2af8ba1 100644
--- a/pkgs/tools/networking/s6-networking/default.nix
+++ b/pkgs/tools/networking/s6-networking/default.nix
@@ -55,7 +55,7 @@ in stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://www.skarnet.org/software/s6-networking/;
-    description = "A suite of small networking utilities for Unix systems.";
+    description = "A suite of small networking utilities for Unix systems";
     platforms = stdenv.lib.platforms.all;
     license = stdenv.lib.licenses.isc;
   };
diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix
index 56964c1f692..61e4989f6cb 100644
--- a/pkgs/tools/security/nmap/default.nix
+++ b/pkgs/tools/security/nmap/default.nix
@@ -32,8 +32,8 @@ stdenv.mkDerivation rec {
     ];
 
   meta = {
-    description = "A free and open source utility for network discovery and security auditing.";
-    homepage    = "http://www.nmap.org";
+    description = "A free and open source utility for network discovery and security auditing";
+    homepage    = http://www.nmap.org;
     license     = licenses.gpl2;
     platforms   = platforms.linux;
     maintainers = with maintainers; [ mornfall thoughtpolice ];
diff --git a/pkgs/tools/security/tpm-quote-tools/default.nix b/pkgs/tools/security/tpm-quote-tools/default.nix
index c178d401154..b294c1c9feb 100644
--- a/pkgs/tools/security/tpm-quote-tools/default.nix
+++ b/pkgs/tools/security/tpm-quote-tools/default.nix
@@ -11,9 +11,12 @@ stdenv.mkDerivation {
   buildInputs = [ trousers openssl ];
 
   meta = with stdenv.lib; {
-    description = ''The TPM Quote Tools is a collection of programs that provide support
-                    for TPM based attestation using the TPM quote mechanism.  The manual
-                    page for tpm_quote_tools provides a usage overview.'';
+    description = "A collection of programs that provide support for TPM based attestation using the TPM quote mechanism";
+    longDescription = ''
+      The TPM Quote Tools is a collection of programs that provide support
+      for TPM based attestation using the TPM quote mechanism.  The manual
+      page for tpm_quote_tools provides a usage overview.
+    '';
     homepage    = http://tpmquotetools.sourceforge.net/;
     license     = licenses.bsd3;
     maintainers = [ maintainers.ak ];
diff --git a/pkgs/tools/system/safe-rm/default.nix b/pkgs/tools/system/safe-rm/default.nix
index 418817332e9..1cd7743e152 100644
--- a/pkgs/tools/system/safe-rm/default.nix
+++ b/pkgs/tools/system/safe-rm/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "Tool intended to prevent the accidental deletion of important files.";
+    description = "Tool intended to prevent the accidental deletion of important files";
     homepage = https://launchpad.net/safe-rm;
     license = licenses.gpl3;
     platforms = platforms.all;
diff --git a/pkgs/tools/text/numdiff/default.nix b/pkgs/tools/text/numdiff/default.nix
index 9cef82e5e53..db7eeb789af 100644
--- a/pkgs/tools/text/numdiff/default.nix
+++ b/pkgs/tools/text/numdiff/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
     description = ''
       A little program that can be used to compare putatively similar files
       line by line and field by field, ignoring small numeric differences
-      or/and different numeric formats.
+      or/and different numeric formats
     '';
     homepage = http://www.nongnu.org/numdiff/;
     license = stdenv.lib.licenses.gpl3Plus;