9 files changed, 23 insertions, 17 deletions
diff --git a/pkgs/development/libraries/audio/ntk/default.nix b/pkgs/development/libraries/audio/ntk/default.nix
index 647d0962f0a..af98592e06d 100644
--- a/pkgs/development/libraries/audio/ntk/default.nix
+++ b/pkgs/development/libraries/audio/ntk/default.nix
@@ -23,9 +23,9 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "Fork of FLTK 1.3.0 with additional functionality.";
+    description = "Fork of FLTK 1.3.0 with additional functionality";
     version = "${version}";
-    homepage = "http://non.tuxfamily.org/";
+    homepage = http://non.tuxfamily.org/;
     license = stdenv.lib.licenses.lgpl21;
     maintainers = [ stdenv.lib.maintainers.magnetophon ];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix
index a2c00719463..c29a5da9f21 100644
--- a/pkgs/development/libraries/oracle-instantclient/default.nix
+++ b/pkgs/development/libraries/oracle-instantclient/default.nix
@@ -57,7 +57,7 @@ let requireSource = version: part: hash: (requireFile rec {
   dontPatchELF = true;
 
   meta = with stdenv.lib; {
-    description = "Oracle instant client libraries and sqlplus CLI.";
+    description = "Oracle instant client libraries and sqlplus CLI";
     longDescription = ''
       Oracle instant client provides access to Oracle databases (OCI,
       OCCI, Pro*C, ODBC or JDBC). This package includes the sqlplus
diff --git a/pkgs/development/ocaml-modules/bitstring/default.nix b/pkgs/development/ocaml-modules/bitstring/default.nix
index d48f93bd626..ae01cf9d7b5 100644
--- a/pkgs/development/ocaml-modules/bitstring/default.nix
+++ b/pkgs/development/ocaml-modules/bitstring/default.nix
@@ -20,7 +20,7 @@ buildOcaml rec {
   preConfigure = "./bootstrap";
 
   meta = with stdenv.lib; {
-    description = "This library adds Erlang-style bitstrings and matching over bitstrings as a syntax extension and library for OCaml.";
+    description = "This library adds Erlang-style bitstrings and matching over bitstrings as a syntax extension and library for OCaml";
     homepage = http://code.google.com/p/bitstring/;
     license = licenses.lgpl21Plus;
     maintainers = [ maintainers.maurer ];
diff --git a/pkgs/os-specific/linux/edac-utils/default.nix b/pkgs/os-specific/linux/edac-utils/default.nix
index 0a2f38ffd8a..b24099f9599 100644
--- a/pkgs/os-specific/linux/edac-utils/default.nix
+++ b/pkgs/os-specific/linux/edac-utils/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     homepage = http://github.com/grondo/edac-utils;
-    description = "handles the reporting of hardware-related memory errors.";
+    description = "Handles the reporting of hardware-related memory errors";
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ wkennington ];
diff --git a/pkgs/servers/monitoring/prometheus/prom2json/default.nix b/pkgs/servers/monitoring/prometheus/prom2json/default.nix
index 95457758cd2..368ea3ae214 100644
--- a/pkgs/servers/monitoring/prometheus/prom2json/default.nix
+++ b/pkgs/servers/monitoring/prometheus/prom2json/default.nix
@@ -19,7 +19,7 @@ goPackages.buildGoPackage rec {
   ];
 
   meta = with lib; {
-    description = "A tool to scrape a Prometheus client and dump the result as JSON.";
+    description = "A tool to scrape a Prometheus client and dump the result as JSON";
     homepage = https://github.com/prometheus/prom2json;
     license = licenses.asl20;
     maintainers = with maintainers; [ benley ];
diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/servers/nosql/eventstore/default.nix
index fd83ba889b9..9cb5dd41c1c 100644
--- a/pkgs/servers/nosql/eventstore/default.nix
+++ b/pkgs/servers/nosql/eventstore/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = https://geteventstore.com/;
-    description = "Event sourcing database with processing logic in JavaScript.";
+    description = "Event sourcing database with processing logic in JavaScript";
     license = stdenv.lib.licenses.bsd3;
     maintainers = with stdenv.lib.maintainers; [ puffnfresh ];
     platforms = with stdenv.lib.platforms; linux;
diff --git a/pkgs/tools/security/signing-party/default.nix b/pkgs/tools/security/signing-party/default.nix
index dd05030e712..21e0bb4c4a9 100644
--- a/pkgs/tools/security/signing-party/default.nix
+++ b/pkgs/tools/security/signing-party/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   doCheck = false; # no check rule
 
   meta = {
-    description = "PGP Tools is a collection for all kinds of pgp related things, including signing scripts, party preparation scripts etc.";
+    description = "A collection for all kinds of pgp related things, including signing scripts, party preparation scripts etc";
     homepage = http://pgp-tools.alioth.debian.org;
     platforms = gnupg.meta.platforms;
     license = stdenv.lib.licenses.gpl2;
diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index 21b42d1273b..bef3f9c0a01 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -280,8 +280,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
     outputFiles = [ "FSharp.AutoComplete/bin/Release/*" ];
 
     meta = {
-      description = "This project provides a command-line interface to the FSharp.Compiler.Service project. It is intended to be used as a backend service for rich editing or 'intellisense' features for editors.";
-      homepage = "https://github.com/fsharp/FSharp.AutoComplete";
+      description = "An interface to the FSharp.Compiler.Service project";
+      longDescription = ''
+        This project provides a command-line interface to the
+        FSharp.Compiler.Service project. It is intended to be used as a backend
+        service for rich editing or 'intellisense' features for editors.
+        '';
+      homepage = https://github.com/fsharp/FSharp.AutoComplete;
       license = stdenv.lib.licenses.asl20;
       maintainers = with stdenv.lib.maintainers; [ obadz ];
       platforms = with stdenv.lib.platforms; linux;
@@ -498,8 +503,8 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
     dontStrip = true;
 
     meta = {
-      description = "NDesk.Options is a callback-based program option parser for C#.";
-      homepage = "http://www.ndesk.org/Options";
+      description = "A callback-based program option parser for C#";
+      homepage = http://www.ndesk.org/Options;
       license = stdenv.lib.licenses.mit;
       maintainers = with stdenv.lib.maintainers; [ obadz ];
       platforms = with stdenv.lib.platforms; linux;
@@ -677,8 +682,8 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
     outputFiles = [ "bin/net40/*" ];
 
     meta = {
-      description = "A declarative CLI argument/XML configuration parser for F# applications.";
-      homepage = "http://nessos.github.io/UnionArgParser/";
+      description = "A declarative CLI argument/XML configuration parser for F# applications";
+      homepage = http://nessos.github.io/UnionArgParser/;
       license = stdenv.lib.licenses.mit;
       maintainers = with stdenv.lib.maintainers; [ obadz ];
       platforms = with stdenv.lib.platforms; linux;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bfe21546f5a..24f39b3bc93 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5195,8 +5195,8 @@ let
     };
 
     meta = {
-      description = "simple wrapper around fribidi.";
-      homepage = "https://github.com/pediapress/pyfribidi";
+      description = "A simple wrapper around fribidi";
+      homepage = https://github.com/pediapress/pyfribidi;
       license = stdenv.lib.licenses.gpl2;
     };
   };
@@ -9295,7 +9295,8 @@ let
     };
 
     meta = {
-      description = ''PicoSAT is a popular SAT solver written by Armin
+      description = "Python bindings for PicoSAT";
+      longDescription = ''PicoSAT is a popular SAT solver written by Armin
           Biere in pure C. This package provides efficient Python bindings
           to picosat on the C level, i.e. when importing pycosat, the
           picosat solver becomes part of the Python process itself. For