From 35b9e4232c1b59568c9a76630251c1ea6a330ac4 Mon Sep 17 00:00:00 2001
From: Eric Bavier <bavier@member.fsf.org>
Date: Thu, 23 Oct 2014 23:46:59 -0500
Subject: [PATCH] gnu: Some cleanup based on lint checkers.

* gnu/packages/admin.scm, gnu/packages/aidc.scm, gnu/packages/algebra.scm,
  gnu/packages/apr.scm, gnu/packages/avahi.scm, gnu/packages/backup.scm,
  gnu/packages/base.scm, gnu/packages/calcurse.scm, gnu/packages/cdrom.scm,
  gnu/packages/check.scm, gnu/packages/compression.scm, gnu/packages/cook.scm,
  gnu/packages/crypto.scm, gnu/packages/cryptsetup.scm, gnu/packages/curl.scm,
  gnu/packages/cyrus-sasl.scm, gnu/packages/databases.scm,
  gnu/packages/doxygen.scm, gnu/packages/dwm.scm, gnu/packages/elf.scm,
  gnu/packages/emacs.scm, gnu/packages/feh.scm, gnu/packages/file.scm,
  gnu/packages/fish.scm, gnu/packages/flex.scm, gnu/packages/fltk.scm,
  gnu/packages/fontutils.scm, gnu/packages/games.scm, gnu/packages/gcal.scm,
  gnu/packages/gcc.scm, gnu/packages/geeqie.scm, gnu/packages/ghostscript.scm,
  gnu/packages/gimp.scm, gnu/packages/gl.scm, gnu/packages/glib.scm,
  gnu/packages/gnome.scm, gnu/packages/gnunet.scm, gnu/packages/gnupg.scm,
  gnu/packages/gperf.scm, gnu/packages/grub.scm, gnu/packages/gsasl.scm,
  gnu/packages/gtk.scm, gnu/packages/guile-wm.scm, gnu/packages/guile.scm,
  gnu/packages/hurd.scm, gnu/packages/icu4c.scm, gnu/packages/image.scm,
  gnu/packages/imagemagick.scm, gnu/packages/irssi.scm, gnu/packages/kde.scm,
  gnu/packages/libdaemon.scm, gnu/packages/libevent.scm,
  gnu/packages/libidn.scm, gnu/packages/libusb.scm, gnu/packages/linux.scm,
  gnu/packages/lout.scm, gnu/packages/lsh.scm, gnu/packages/lsof.scm,
  gnu/packages/lua.scm, gnu/packages/maths.scm, gnu/packages/mcrypt.scm,
  gnu/packages/mp3.scm, gnu/packages/netpbm.scm, gnu/packages/noweb.scm,
  gnu/packages/ocaml.scm, gnu/packages/openssl.scm, gnu/packages/pcre.scm,
  gnu/packages/pdf.scm, gnu/packages/pkg-config.scm,
  gnu/packages/pretty-print.scm, gnu/packages/python.scm, gnu/packages/qt.scm,
  gnu/packages/rsync.scm, gnu/packages/scheme.scm, gnu/packages/scrot.scm,
  gnu/packages/sdl.scm, gnu/packages/skribilo.scm, gnu/packages/ssh.scm,
  gnu/packages/stalonetray.scm, gnu/packages/tcl.scm, gnu/packages/tcsh.scm,
  gnu/packages/telephony.scm, gnu/packages/texlive.scm, gnu/packages/tor.scm,
  gnu/packages/valgrind.scm, gnu/packages/version-control.scm,
  gnu/packages/vim.scm, gnu/packages/vpn.scm, gnu/packages/w3m.scm,
  gnu/packages/web.scm, gnu/packages/wordnet.scm, gnu/packages/xiph.scm,
  gnu/packages/xml.scm, gnu/packages/xorg.scm, gnu/packages/zile.scm,
  gnu/packages/zip.scm, gnu/packages/zsh.scm [synopsis, description]: Adjust
  according to lint checkers.
* gnu/packages/fltk.scm (fltk)[source]: Wrap long line in uri.
* /gnu/packages/xiph.scm (libogg, libtheora, vorbis-tools)[source]: Same.
---
 gnu/packages/admin.scm           |  10 +-
 gnu/packages/aidc.scm            |   2 +-
 gnu/packages/algebra.scm         |  13 +-
 gnu/packages/apr.scm             |   2 +-
 gnu/packages/avahi.scm           |   4 +-
 gnu/packages/backup.scm          |   2 +-
 gnu/packages/base.scm            |   4 +-
 gnu/packages/calcurse.scm        |   6 +-
 gnu/packages/cdrom.scm           |  10 +-
 gnu/packages/check.scm           |   6 +-
 gnu/packages/compression.scm     |   9 +-
 gnu/packages/cook.scm            |   6 +-
 gnu/packages/crypto.scm          |   2 +-
 gnu/packages/cryptsetup.scm      |   4 +-
 gnu/packages/curl.scm            |   2 +-
 gnu/packages/cyrus-sasl.scm      |   4 +-
 gnu/packages/databases.scm       |  10 +-
 gnu/packages/doxygen.scm         |   2 +-
 gnu/packages/dwm.scm             |  24 +--
 gnu/packages/elf.scm             |   2 +-
 gnu/packages/emacs.scm           |   4 +-
 gnu/packages/feh.scm             |   2 +-
 gnu/packages/file.scm            |   4 +-
 gnu/packages/fish.scm            |   4 +-
 gnu/packages/flex.scm            |  14 +-
 gnu/packages/fltk.scm            |  13 +-
 gnu/packages/fontutils.scm       |  24 +--
 gnu/packages/games.scm           |   4 +-
 gnu/packages/gcal.scm            |   2 +-
 gnu/packages/gcc.scm             |   4 +-
 gnu/packages/geeqie.scm          |   2 +-
 gnu/packages/ghostscript.scm     |  16 +-
 gnu/packages/gimp.scm            |   2 +-
 gnu/packages/gl.scm              |  14 +-
 gnu/packages/glib.scm            |  14 +-
 gnu/packages/gnome.scm           |  46 ++---
 gnu/packages/gnunet.scm          |   2 +-
 gnu/packages/gnupg.scm           |  18 +-
 gnu/packages/gperf.scm           |   2 +-
 gnu/packages/grub.scm            |   2 +-
 gnu/packages/gsasl.scm           |   4 +-
 gnu/packages/gtk.scm             |  16 +-
 gnu/packages/guile-wm.scm        |   2 +-
 gnu/packages/guile.scm           |  10 +-
 gnu/packages/hurd.scm            |   2 +-
 gnu/packages/icu4c.scm           |   4 +-
 gnu/packages/image.scm           |  10 +-
 gnu/packages/imagemagick.scm     |   4 +-
 gnu/packages/irssi.scm           |   4 +-
 gnu/packages/kde.scm             |   4 +-
 gnu/packages/libdaemon.scm       |   6 +-
 gnu/packages/libevent.scm        |   3 +-
 gnu/packages/libidn.scm          |   2 +-
 gnu/packages/libusb.scm          |   2 +-
 gnu/packages/linux.scm           |  16 +-
 gnu/packages/lout.scm            |   4 +-
 gnu/packages/lsh.scm             |   4 +-
 gnu/packages/lsof.scm            |   2 +-
 gnu/packages/lua.scm             |   2 +-
 gnu/packages/maths.scm           |   4 +-
 gnu/packages/mcrypt.scm          |   6 +-
 gnu/packages/mp3.scm             |  34 ++--
 gnu/packages/netpbm.scm          |   2 +-
 gnu/packages/noweb.scm           |   2 +-
 gnu/packages/ocaml.scm           |   2 +-
 gnu/packages/openssl.scm         |   2 +-
 gnu/packages/pcre.scm            |   4 +-
 gnu/packages/pdf.scm             |   2 +-
 gnu/packages/pkg-config.scm      |   5 +-
 gnu/packages/pretty-print.scm    |   2 +-
 gnu/packages/python.scm          |  14 +-
 gnu/packages/qt.scm              |   2 +-
 gnu/packages/rsync.scm           |   6 +-
 gnu/packages/scheme.scm          |   2 +-
 gnu/packages/scrot.scm           |   2 +-
 gnu/packages/sdl.scm             |   2 +-
 gnu/packages/skribilo.scm        |   2 +-
 gnu/packages/ssh.scm             |  16 +-
 gnu/packages/stalonetray.scm     |   2 +-
 gnu/packages/tcl.scm             |   4 +-
 gnu/packages/tcsh.scm            |   4 +-
 gnu/packages/telephony.scm       |  15 +-
 gnu/packages/texlive.scm         |   2 +-
 gnu/packages/tor.scm             |   2 +-
 gnu/packages/valgrind.scm        |   2 +-
 gnu/packages/version-control.scm |  10 +-
 gnu/packages/vim.scm             |   6 +-
 gnu/packages/vpn.scm             |   4 +-
 gnu/packages/w3m.scm             |   2 +-
 gnu/packages/web.scm             |  21 +-
 gnu/packages/wordnet.scm         |   3 +-
 gnu/packages/xiph.scm            |  36 ++--
 gnu/packages/xml.scm             |   6 +-
 gnu/packages/xorg.scm            | 338 +++++++++++++++----------------
 gnu/packages/zile.scm            |   2 +-
 gnu/packages/zip.scm             |  26 +--
 gnu/packages/zsh.scm             |   2 +-
 97 files changed, 505 insertions(+), 511 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index a5b84af61ad..37841efd122 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -340,7 +340,7 @@ (define-public netcat
      "Netcat is a featured networking utility which reads and writes data
 across network connections, using the TCP/IP protocol.  It is designed to be a
 reliable \"back-end\" tool that can be used directly or easily driven by other
-programs and scripts. At the same time, it is a feature-rich network debugging
+programs and scripts.  At the same time, it is a feature-rich network debugging
 and exploration tool, since it can create almost any kind of connection you
 would need and has several interesting built-in capabilities.")
     (license gpl2+)))
@@ -816,7 +816,7 @@ (define-public acpica
        #:tests? #f  ; no 'check' target.
        #:phases (alist-delete 'configure %standard-phases)))
     (home-page "http://acpica.org/")
-    (synopsis "ACPICA tools for the development and debug of ACPI tables")
+    (synopsis "Tools for the development and debug of ACPI tables")
     (description
      "The ACPI Component Architecture (ACPICA) project provides an
 OS-independent reference implementation of the Advanced Configuration and
@@ -842,11 +842,11 @@ (define-public stress
     (home-page "http://packages.debian.org/wheezy/stress")
     (synopsis "Impose load on and stress test a computer system")
     (description
-     "'stress' is a tool that imposes a configurable amount of CPU, memory, I/O,
+     "Stress is a tool that imposes a configurable amount of CPU, memory, I/O,
 or disk stress on a POSIX-compliant operating system and reports any errors it
 detects.
 
-'stress' is not a benchmark.  It is a tool used by system administrators to
+Stress is not a benchmark.  It is a tool used by system administrators to
 evaluate how well their systems will scale, by kernel programmers to evaluate
 perceived performance characteristics, and by systems programmers to expose
 the classes of bugs which only or more frequently manifest themselves when the
@@ -940,7 +940,7 @@ (define-public direvent
     (synopsis "Daemon to monitor directories for events such as file removal")
     (description
      "A daemon that monitors directories for events, such as creating,
-deleting or modifying files. It can monitor different sets of directories for
+deleting or modifying files.  It can monitor different sets of directories for
 different events.  When an event is detected, direvent calls a specified
 external program with information about the event, such as the location
 within the file system where it occurred.  Thus, \"direvent\" provides an
diff --git a/gnu/packages/aidc.scm b/gnu/packages/aidc.scm
index d5428d30aa8..02254c85479 100644
--- a/gnu/packages/aidc.scm
+++ b/gnu/packages/aidc.scm
@@ -62,7 +62,7 @@ (define-public qrencode
     (synopsis "Encode data into a QR Code symbol")
     (description "Libqrencode is a C library for encoding data in a QR Code
 symbol, a kind of 2D symbology that can be scanned by handy terminals such as
-a mobile phone with CCD. The capacity of QR Code is up to 7000 digits or 4000
+a mobile phone with CCD.  The capacity of QR Code is up to 7000 digits or 4000
 characters, and is highly robust.")
     (license license:lgpl2.1+)
     (home-page "http://fukuchi.org/works/qrencode")))
diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm
index 53382eb67be..b212aa67a93 100644
--- a/gnu/packages/algebra.scm
+++ b/gnu/packages/algebra.scm
@@ -48,14 +48,13 @@ (define-public mpfrcx
    (inputs `(("gmp" ,gmp)
              ("mpfr" ,mpfr)
              ("mpc"  ,mpc)))
-   (synopsis "mpfrcx, a library for the arithmetic of univariate polynomials
-over arbitrary precision real or complex numbers")
+   (synopsis "Arithmetic of polynomials over arbitrary precision numbers")
    (description
-    "mpfrcx is a library for the arithmetic of univariate polynomials over
+    "Mpfrcx is a library for the arithmetic of univariate polynomials over
 arbitrary precision real (mpfr) or complex (mpc) numbers, without control
-on the rounding. For the time being, only the few functions needed to
+on the rounding.  For the time being, only the few functions needed to
 implement the floating point approach to complex multiplication are
-implemented. On the other hand, these comprise asymptotically fast
+implemented.  On the other hand, these comprise asymptotically fast
 multiplication routines such as Toom–Cook and the FFT. ")
    (license lgpl2.1+)
    (home-page "http://mpfrcx.multiprecision.org/")))
@@ -74,9 +73,9 @@ (define-public fplll
    (build-system gnu-build-system)
    (inputs `(("gmp" ,gmp)
              ("mpfr" ,mpfr)))
-   (synopsis "fplll, a library for LLL-reduction of euclidean lattices")
+   (synopsis "Library for LLL-reduction of euclidean lattices")
    (description
-    "fplll LLL-reduces euclidean lattices. Since version 3, it can also
+    "fplll LLL-reduces euclidean lattices.  Since version 3, it can also
 solve the shortest vector problem.")
    (license lgpl2.1+)
    (home-page "http://perso.ens-lyon.fr/damien.stehle/fplll/")))
diff --git a/gnu/packages/apr.scm b/gnu/packages/apr.scm
index de068ee996d..cedeea8a14d 100644
--- a/gnu/packages/apr.scm
+++ b/gnu/packages/apr.scm
@@ -54,7 +54,7 @@ (define-public apr
     (description
      "The mission of the Apache Portable Runtime (APR) project is to create and
 maintain software libraries that provide a predictable and consistent interface
-to underlying platform-specific implementations. The primary goal is to provide
+to underlying platform-specific implementations.  The primary goal is to provide
 an API to which software developers may code and be assured of predictable if
 not identical behaviour regardless of the platform on which their software is
 built, relieving them of the need to code special-case conditions to work
diff --git a/gnu/packages/avahi.scm b/gnu/packages/avahi.scm
index c3faf8dfdb5..0c4f35ed326 100644
--- a/gnu/packages/avahi.scm
+++ b/gnu/packages/avahi.scm
@@ -63,7 +63,7 @@ (define-public avahi
      `(("intltool" ,intltool)
        ("glib" ,glib "bin")
        ("pkg-config" ,pkg-config)))
-    (synopsis "Avahi, an mDNS/DNS-SD implementation")
+    (synopsis "Implementation of mDNS/DNS-SD protocols")
     (description
      "Avahi is a system which facilitates service discovery on a local
 network.  It is an implementation of the mDNS (for \"Multicast DNS\") and
@@ -99,7 +99,7 @@ (define-public nss-mdns
 
     (synopsis "The mDNS Name Service Switch (NSS) plug-in")
     (description
-     "'nss-mdns' is a plug-in for the Name Service Switch (NSS) functionality
+     "Nss-mdns is a plug-in for the Name Service Switch (NSS) functionality
 of the GNU C Library, providing host name resolution via Multicast DNS (mDNS).
 It allows for name resolution by programs in the ad-hoc mDNS domain
 '.local'.")
diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index a634c9454e3..516712b94c4 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -182,7 +182,7 @@ (define-public libarchive
 reading and writing archives compressed using various compression filters such
 as gzip and bzip2.  The library is inherently stream-oriented; readers
 serially iterate through the archive, writers serially add things to the
-archive. In particular, note that there is currently no built-in support for
+archive.  In particular, note that there is currently no built-in support for
 random access nor for in-place modification.")
     (license license:bsd-2)))
 
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index a3b9095572b..9a58776fb84 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -75,7 +75,7 @@ (define-public grep
    (build-system gnu-build-system)
    (synopsis "Print lines matching a pattern")
    (description
-    "grep is a tool for finding text inside files.  Text is found by
+    "Grep is a tool for finding text inside files.  Text is found by
 matching a pattern provided by the user in one or many files.  The pattern
 may be provided as a basic or extended regular expression, or as fixed
 strings.  By default, the matching text is simply printed to the screen,
@@ -562,7 +562,7 @@ (define-public tzdata
     (synopsis "Database of current and historical time zones")
     (description "The Time Zone Database (often called tz or zoneinfo)
 contains code and data that represent the history of local time for many
-representative locations around the globe. It is updated periodically to
+representative locations around the globe.  It is updated periodically to
 reflect changes made by political bodies to time zone boundaries, UTC offsets,
 and daylight-saving rules.")
     (license public-domain)))
diff --git a/gnu/packages/calcurse.scm b/gnu/packages/calcurse.scm
index c13cfeaa37b..be1c49bc303 100644
--- a/gnu/packages/calcurse.scm
+++ b/gnu/packages/calcurse.scm
@@ -41,9 +41,9 @@ (define-public calcurse
     (home-page "http://www.calcurse.org")
     (synopsis "Text-based calendar and scheduling")
     (description
-     "Calcurse is a text-based calendar and scheduling application. It helps
-keep track of events, appointments and everyday tasks. A configurable
+     "Calcurse is a text-based calendar and scheduling application.  It helps
+keep track of events, appointments and everyday tasks.  A configurable
 notification system reminds user of upcoming deadlines, and the curses based
-interface can be customized to suit user needs. All of the commands are
+interface can be customized to suit user needs.  All of the commands are
 documented within an online help system.")
     (license bsd-2)))
diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm
index 7c62e59626b..29def9b6aae 100644
--- a/gnu/packages/cdrom.scm
+++ b/gnu/packages/cdrom.scm
@@ -50,7 +50,7 @@ (define-public libcddb
     (home-page "http://libcddb.sourceforge.net/")
     (synopsis "C library to access data on a CDDB server")
     (description
-     "Libcddb is a C library to access data on a CDDB server (freedb.org). It
+     "Libcddb is a C library to access data on a CDDB server (freedb.org).  It
 allows you to:
 
  1. search the database for possible CD matches;
@@ -60,8 +60,8 @@ (define-public libcddb
  3. submit new CD entries to the database.
 
 Libcddb supports both the custom CDDB protocol and tunnelling the query and
-read operations over plain HTTP. It is also possible to use an HTTP proxy
-server. If you want to speed things up, you can make use of the built-in
+read operations over plain HTTP.  It is also possible to use an HTTP proxy
+server.  If you want to speed things up, you can make use of the built-in
 caching facility provided by the library.")
     (license lgpl2.1+)))
 
@@ -160,7 +160,7 @@ (define-public cdparanoia
                          (find-files "bin" ".*")))))
          %standard-phases)))
     (home-page "http://www.xiph.org/paranoia/")
-    (synopsis "audio CD reading utility which includes extra data verification features")
+    (synopsis "Audio CD reading utility")
     (description "Cdparanoia retrieves audio tracks from CDDA capable CDROM
 drives.  The data can be saved to a file or directed to standard output
 in WAV, AIFF, AIFF-C or raw format.  Most ATAPI, SCSI and several
@@ -201,7 +201,7 @@ (define-public dvdisaster
             (delete-file ".#GNUmakefile"))
           %standard-phases)))
     (home-page "http://dvdisaster.net/en/index.html")
-    (synopsis "error correcting codes for optical media images")
+    (synopsis "Error correcting codes for optical media images")
     (description "Optical media (CD,DVD,BD) keep their data only for a
 finite time (typically for many years).  After that time, data loss develops
 slowly with read errors growing from the outer media region towards the
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 3d33fae78d9..6cbff6f5fde 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -37,13 +37,13 @@ (define-public check
         "1jcahzrvxcnp5chdn2x46l0y4aba8d8yd70lljfin7h5knxrlyhs"))))
     (build-system gnu-build-system)
     (home-page "http://check.sourceforge.net/")
-    (synopsis "Check, a unit testing framework for C")
+    (synopsis "Unit test framework for C")
     (description
-     "Check is a unit testing framework for C. It features a simple
+     "Check is a unit testing framework for C.  It features a simple
 interface for defining unit tests, putting little in the way of the
 developer.  Tests are run in a separate address space, so Check can
 catch both assertion failures and code errors that cause segmentation
-faults or other signals. The output from unit tests can be used within
+faults or other signals.  The output from unit tests can be used within
 source code editors and IDEs.")
     (license lgpl2.1+)))
 
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 217ddef1c0c..7c22300dd1e 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -57,12 +57,12 @@ (define-public zlib
                                (string-append "--prefix=" out)))))
                  %standard-phases)))
     (home-page "http://zlib.net/")
-    (synopsis "The zlib compression library")
+    (synopsis "Compression library")
     (description
      "zlib is designed to be a free, general-purpose, legally unencumbered --
 that is, not covered by any patents -- lossless data-compression library for
 use on virtually any computer hardware and operating system.  The zlib data
-format is itself portable across platforms. Unlike the LZW compression method
+format is itself portable across platforms.  Unlike the LZW compression method
 used in Unix compress(1) and in the GIF image format, the compression method
 currently used in zlib essentially never expands the data. (LZW can double or
 triple the file size in extreme cases.)  zlib's memory footprint is also
@@ -173,7 +173,7 @@ (define-public bzip2
          ,@(if (%current-target-system)
                '(#:tests? #f)
                '())))
-      (synopsis "high-quality data compression program")
+      (synopsis "High-quality data compression program")
       (description
        "bzip2 is a freely available, patent free (see below), high-quality data
 compressor.  It typically compresses files to within 10% to 15% of the best
@@ -196,8 +196,7 @@ (define-public xz
              (base32
               "1dl35ca8fdss9z2d6y234gxh24ixq904xksizrjmjr5dimwhax6n"))))
    (build-system gnu-build-system)
-   (synopsis
-    "XZ, general-purpose data compression software, successor of LZMA")
+   (synopsis "General-purpose data compression")
    (description
     "XZ Utils is free general-purpose data compression software with high
 compression ratio.  XZ Utils were written for POSIX-like systems, but also
diff --git a/gnu/packages/cook.scm b/gnu/packages/cook.scm
index c1799e78878..4eb3096153f 100644
--- a/gnu/packages/cook.scm
+++ b/gnu/packages/cook.scm
@@ -76,8 +76,8 @@ (define-public cook
                      ("ed" ,ed)))
     (home-page "http://miller.emu.id.au/pmiller/software/cook")
     (synopsis "Tool for constructing files")
-    (description "Cook is a tool for constructing files. It is given a set of
-files to create, and recipes of how to create them. In any non-trivial program
+    (description "Cook is a tool for constructing files.  It is given a set of
+files to create, and recipes of how to create them.  In any non-trivial program
 there will be prerequisites to performing the actions necessary to creating
-any file, such as include files. Cook provides a mechanism to define these.")
+any file, such as include files.  Cook provides a mechanism to define these.")
     (license gpl3+)))
diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm
index 5fbc0cf857b..d3dbd28aaca 100644
--- a/gnu/packages/crypto.scm
+++ b/gnu/packages/crypto.scm
@@ -38,7 +38,7 @@ (define-public libsodium
     (build-system gnu-build-system)
     (synopsis "Portable NaCl-based crypto library")
     (description
-     "libsodium is a new easy-to-use high-speed software library for network
+     "Sodium is a new easy-to-use high-speed software library for network
 communication, encryption, decryption, signatures, etc.")
     (license isc)
     (home-page "http://libsodium.org")))
diff --git a/gnu/packages/cryptsetup.scm b/gnu/packages/cryptsetup.scm
index efb7e1f2daf..725a3978373 100644
--- a/gnu/packages/cryptsetup.scm
+++ b/gnu/packages/cryptsetup.scm
@@ -46,12 +46,12 @@ (define-public cryptsetup
       ("popt" ,popt)))
    (native-inputs
       `(("python" ,python-wrapper)))
-   (synopsis "hard disk encryption tool")
+   (synopsis "Hard disk encryption tool")
    (description
     "LUKS (Linux Unified Key Setup)/Cryptsetup provides a standard on-disk
 encryption format, which does not only facilitate compatibility among
 distributions, but which also provides secure management of multiple user
-passwords. In contrast to existing solutions, LUKS stores all setup necessary
+passwords.  In contrast to existing solutions, LUKS stores all setup necessary
 setup information in the partition header, enabling the users to transport
 or migrate their data seamlessly.")
    (license license:gpl2)
diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm
index f77c5401d4b..1a428d54ffc 100644
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@ -67,7 +67,7 @@ (define-public curl
            (substitute* "tests/runtests.pl"
              (("/bin/sh") (which "sh"))))
        %standard-phases)))
-   (synopsis "curl, command line tool for transferring data with URL syntax")
+   (synopsis "Command line tool for transferring data with URL syntax")
    (description
     "curl is a command line tool for transferring data with URL syntax,
 supporting DICT, FILE, FTP, FTPS, Gopher, HTTP, HTTPS, IMAP, IMAPS, LDAP,
diff --git a/gnu/packages/cyrus-sasl.scm b/gnu/packages/cyrus-sasl.scm
index 9f709888142..9880ace94fa 100644
--- a/gnu/packages/cyrus-sasl.scm
+++ b/gnu/packages/cyrus-sasl.scm
@@ -55,10 +55,10 @@ (define-public cyrus-sasl
       ;; ends up doing "ln -s plugin_common.lo plugin_common.o", which can
       ;; fail with EEXIST when building things in parallel.
       #:parallel-build? #f))
-   (synopsis "Cyrus SASL, an implementation of the Simple Authentication Security Layer framework")
+   (synopsis "Simple Authentication Security Layer implementation")
    (description
     "SASL (Simple Authentication Security Layer) is an Internet
-standards-track method for remote computers to authenticate. The Cyrus SASL
+standards-track method for remote computers to authenticate.  The Cyrus SASL
 library makes supporting various SASL mechanisms easy for both client and
 server writers.")
    (license (license:bsd-style "file://COPYING"
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 59bd21baa7d..5a7b9950a12 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -80,7 +80,7 @@ (define-public bdb
                                ;; notably iproute2.
                                "--enable-compat185"))))
                  %standard-phases)))
-    (synopsis "db, the Berkeley database")
+    (synopsis "Berkeley database")
     (description
      "Berkeley DB is an embeddable database allowing developers the choice of
 SQL, Key/Value, XML/XQuery or Java Object storage for their data model.")
@@ -243,9 +243,9 @@ (define-public sqlite
    (synopsis "The SQLite database management system")
    (description
     "SQLite is a software library that implements a self-contained, serverless,
-zero-configuration, transactional SQL database engine. SQLite is the most
-widely deployed SQL database engine in the world. The source code for SQLite is
-in the public domain.")
+zero-configuration, transactional SQL database engine.  SQLite is the most
+widely deployed SQL database engine in the world.  The source code for SQLite
+is in the public domain.")
    (license public-domain)))
 
 (define-public tdb
@@ -277,7 +277,7 @@ (define-public tdb
        ;; ("libxslt" ,libxslt)
        ("python" ,python-2)))                     ;for the Waf build system
     (home-page "http://tdb.samba.org/")
-    (synopsis "TDB, the trivial database")
+    (synopsis "Trivial database")
     (description
      "TDB is a Trivial Database.  In concept, it is very much like GDBM,
 and BSD's DB except that it allows multiple simultaneous writers and uses
diff --git a/gnu/packages/doxygen.scm b/gnu/packages/doxygen.scm
index 8c51ae858eb..8b1a0577243 100644
--- a/gnu/packages/doxygen.scm
+++ b/gnu/packages/doxygen.scm
@@ -65,7 +65,7 @@ (define-public doxygen
                       "--prefix" out))))
           %standard-phases)))
     (home-page "http://www.stack.nl/~dimitri/doxygen/")
-    (synopsis "tool for generating documentation from annotated sources")
+    (synopsis "Generate documentation from annotated sources")
     (description "Doxygen is the de facto standard tool for generating
 documentation from annotated C++ sources, but it also supports other popular
 programming languages such as C, Objective-C, C#, PHP, Java, Python,
diff --git a/gnu/packages/dwm.scm b/gnu/packages/dwm.scm
index ce87b14e5fc..b5dbe73cdae 100644
--- a/gnu/packages/dwm.scm
+++ b/gnu/packages/dwm.scm
@@ -57,27 +57,27 @@ (define-public dwm
     (home-page "http://dwm.suckless.org/")
     (synopsis "Dynamic window manager")
     (description
-     "dwm is a dynamic window manager for X. It manages windows in tiled,
-monocle and floating layouts. All of the layouts can be applied dynamically,
+     "dwm is a dynamic window manager for X.  It manages windows in tiled,
+monocle and floating layouts.  All of the layouts can be applied dynamically,
 optimising the environment for the application in use and the task performed.
 
-In tiled layout windows are managed in a master and stacking area. The master
+In tiled layout windows are managed in a master and stacking area.  The master
 area contains the window which currently needs most attention, whereas the
-stacking area contains all other windows. In monocle layout all windows are
-maximised to the screen size. In floating layout windows can be resized and
-moved freely. Dialog windows are always managed floating, regardless of the
+stacking area contains all other windows.  In monocle layout all windows are
+maximised to the screen size.  In floating layout windows can be resized and
+moved freely.  Dialog windows are always managed floating, regardless of the
 layout applied.
 
-Windows are grouped by tags. Each window can be tagged with one or multiple
-tags. Selecting certain tags displays all windows with these tags.
+Windows are grouped by tags.  Each window can be tagged with one or multiple
+tags.  Selecting certain tags displays all windows with these tags.
 
 Each screen contains a small status bar which displays all available tags, the
 layout, the number of visible windows, the title of the focused window, and the
-text read from the root window name property, if the screen is focused. A
+text read from the root window name property, if the screen is focused.  A
 floating window is indicated with an empty square and a maximised floating
-window is indicated with a filled square before the windows title. The selected
-tags are indicated with a different color. The tags of the focused window are
-indicated with a filled square in the top left corner. The tags which are
+window is indicated with a filled square before the windows title.  The selected
+tags are indicated with a different color.  The tags of the focused window are
+indicated with a filled square in the top left corner.  The tags which are
 applied to one or more windows are indicated with an empty square in the top
 left corner.
 
diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm
index a63a00f97cd..248297bbbb9 100644
--- a/gnu/packages/elf.scm
+++ b/gnu/packages/elf.scm
@@ -81,7 +81,7 @@ (define-public libelf
                            %standard-phases)))
     (home-page "http://www.mr511.de/software/english.html")
     (synopsis "ELF object file access library")
-    (description "libelf is a C library to access ELF object files.")
+    (description "Libelf is a C library to access ELF object files.")
     (license lgpl2.0+)))
 
 (define-public patchelf
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 084a8049552..119c613128b 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -322,7 +322,7 @@ (define-public emacs-w3m
     (home-page "http://emacs-w3m.namazu.org/")
     (synopsis "Simple Web browser for Emacs based on w3m")
     (description
-     "emacs-w3m is an emacs interface for the w3m web browser.")
+     "Emacs-w3m is an emacs interface for the w3m web browser.")
     (license gpl2+)))
 
 (define-public emacs-wget
@@ -363,5 +363,5 @@ (define-public emacs-wget
     (home-page "http://www.emacswiki.org/emacs/EmacsWget")
     (synopsis "Simple file downloader for Emacs based on wget")
     (description
-     "emacs-wget is an emacs interface for the wget file downloader.")
+     "Emacs-wget is an emacs interface for the wget file downloader.")
     (license gpl2+)))
diff --git a/gnu/packages/feh.scm b/gnu/packages/feh.scm
index 5f467439bfe..3707a539572 100644
--- a/gnu/packages/feh.scm
+++ b/gnu/packages/feh.scm
@@ -54,7 +54,7 @@ (define-public feh
     (description
       "feh is an X11 image viewer aimed mostly at console users.
 Unlike most other viewers, it does not have a fancy GUI, but simply
-displays images. It can also be used to set the desktop wallpaper.
+displays images.  It can also be used to set the desktop wallpaper.
 It is controlled via commandline arguments and configurable key/mouse
 actions.")
 
diff --git a/gnu/packages/file.scm b/gnu/packages/file.scm
index 601b1581289..ccd6f6ff7da 100644
--- a/gnu/packages/file.scm
+++ b/gnu/packages/file.scm
@@ -36,10 +36,10 @@ (define-public file
                      "0z1sgrcfy6d285kj5izy1yypf371bjl3247plh9ppk0svaxv714l"))
             (patches (list (search-patch "file-CVE-2014-3587.patch")))))
    (build-system gnu-build-system)
-   (synopsis "file, a file type guesser")
+   (synopsis "File type guesser")
    (description
     "The file command is a file type guesser, a command-line tool that tells
-you in words what kind of data a file contains. It does not rely on filename
+you in words what kind of data a file contains.  It does not rely on filename
 extentions to tell you the type of a file, but looks at the actual contents
 of the file.")
    (license bsd-2)
diff --git a/gnu/packages/fish.scm b/gnu/packages/fish.scm
index 5833e7b75b2..6f818b4ed9a 100644
--- a/gnu/packages/fish.scm
+++ b/gnu/packages/fish.scm
@@ -50,8 +50,8 @@ (define-public fish
 tab-completion, including descriptions of every completion, completion of
 strings with wildcards, and many completions for specific commands.  It also
 has extensive and discoverable help.  A special help command gives access to
-all the fish documentation in your web browser. Other features include smart
+all the fish documentation in your web browser.  Other features include smart
 terminal handling based on terminfo, an easy to search history, and syntax
-highlighting. ")
+highlighting.")
     (home-page "http://fishshell.com/")
     (license gpl2)))
diff --git a/gnu/packages/flex.scm b/gnu/packages/flex.scm
index 82a2e98d98e..0b290857fa3 100644
--- a/gnu/packages/flex.scm
+++ b/gnu/packages/flex.scm
@@ -64,16 +64,16 @@ (define flex
     (home-page "http://flex.sourceforge.net/")
     (synopsis "Fast lexical analyser generator")
     (description
-     "Flex is a tool for generating scanners. A scanner, sometimes
+     "Flex is a tool for generating scanners.  A scanner, sometimes
 called a tokenizer, is a program which recognizes lexical patterns in
-text. The flex program reads user-specified input files, or its standard
+text.  The flex program reads user-specified input files, or its standard
 input if no file names are given, for a description of a scanner to
-generate. The description is in the form of pairs of regular expressions
-and C code, called rules. Flex generates a C source file named,
-\"lex.yy.c\", which defines the function yylex(). The file \"lex.yy.c\"
-can be compiled and linked to produce an executable. When the executable
+generate.  The description is in the form of pairs of regular expressions
+and C code, called rules.  Flex generates a C source file named,
+\"lex.yy.c\", which defines the function yylex().  The file \"lex.yy.c\"
+can be compiled and linked to produce an executable.  When the executable
 is run, it analyzes its input for occurrences of text matching the
-regular expressions for each rule. Whenever it finds a match, it
+regular expressions for each rule.  Whenever it finds a match, it
 executes the corresponding C code.")
     (license (bsd-style "file://COPYING"
                         "See COPYING in the distribution."))))
diff --git a/gnu/packages/fltk.scm b/gnu/packages/fltk.scm
index e6d965ec86b..9d228927d27 100644
--- a/gnu/packages/fltk.scm
+++ b/gnu/packages/fltk.scm
@@ -31,7 +31,8 @@ (define-public fltk
     (source
      (origin
       (method url-fetch)
-      (uri (string-append "http://fltk.org/pub/fltk/" version "/fltk-" version "-source.tar.gz"))
+      (uri (string-append "http://fltk.org/pub/fltk/" version
+                          "/fltk-" version "-source.tar.gz"))
       (sha256
        (base32
         "1974brlk723095vf8z72kazq1cbqr9a51kq6b0xda6zkjkgl8q0p"))))
@@ -51,9 +52,9 @@ (define-public fltk
         %standard-phases)))
     (home-page "https://www.fltk.org")
     (synopsis "3D C++ GUI library")
-    (description "FLTK is a C++ GUI toolkit providing modern GUI functionality without the
-bloat. It supports 3D graphics via OpenGL and its built-in GLUT emulation.
-FLTK is designed to be small and modular enough to be statically linked, but
-works fine as a shared library. FLTK also includes an excellent UI builder
-called FLUID that can be used to create applications in minutes.")
+    (description "FLTK is a C++ GUI toolkit providing modern GUI functionality
+without the bloat.  It supports 3D graphics via OpenGL and its built-in GLUT
+emulation.  FLTK is designed to be small and modular enough to be statically
+linked, but works fine as a shared library.  FLTK also includes an excellent
+UI builder called FLUID that can be used to create applications in minutes.")
     (license lgpl2.0))) ; plus certain additional permissions
diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm
index 512dbb6406e..e383b36b537 100644
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@ -62,12 +62,12 @@ (define-public freetype
            (symlink (string-append include "/freetype2/freetype")
                     (string-append include "/freetype"))))
        %standard-phases)))
-   (synopsis "Freetype, a library to render fonts")
+   (synopsis "Font rendering library")
    (description
     "Freetype is a library that can be used by applications to access the
-contents of font files. It provides a uniform interface to access font files.
+contents of font files.  It provides a uniform interface to access font files.
 It supports both bitmap and scalable formats, including TrueType, OpenType,
-Type1, CID, CFF, Windows FON/FNT, X11 PCF, and others. It supports high-speed
+Type1, CID, CFF, Windows FON/FNT, X11 PCF, and others.  It supports high-speed
 anti-aliased glyph bitmap generation with 256 gray levels.")
    (license license:freetype)           ; some files have other licenses
    (home-page "http://www.freetype.org/")))
@@ -134,10 +134,10 @@ (define-public t1lib
 It is based on the code of the X11 rasteriser of the X11 project.
 
 The bitmaps created by t1lib are returned in a data structure with type
-GLYPH. This special GLYPH-type is also used in the X11 window system to
-describe character bitmaps. It contains the bitmap data as well as some
-metric information. But t1lib is in itself entirely independent of the
-X11-system or any other graphical user interface. ")
+GLYPH.  This special GLYPH-type is also used in the X11 window system to
+describe character bitmaps.  It contains the bitmap data as well as some
+metric information.  But t1lib is in itself entirely independent of the
+X11-system or any other graphical user interface.")
    (license license:gpl2)
    (home-page "http://www.t1lib.org/")))
 
@@ -156,13 +156,13 @@ (define-public teckit
             (patches (list (search-patch "teckit-cstdio.patch")))))
    (build-system gnu-build-system)
    (inputs `(("zlib" ,zlib)))
-   (synopsis "TECkit, a toolkit for encoding conversions")
+   (synopsis "Toolkit for encoding conversions")
    (description
     "TECkit is a low-level toolkit intended to be used by other applications
 that need to perform encoding conversions (e.g., when importing legacy data
-into a Unicode-based application). The primary component of the TECkit
+into a Unicode-based application).  The primary component of the TECkit
 package is therefore a library that performs conversions; this is the
-\"TECkit engine\". The engine relies on mapping tables in a specific binary
+\"TECkit engine\".  The engine relies on mapping tables in a specific binary
 format (for which documentation is available); there is a compiler that
 creates such tables from a human-readable mapping description (a simple
 text file).
@@ -171,7 +171,7 @@ (define-public teckit
 several applications are also included in the current package; these
 include simple tools for applying conversions to plain-text and Standard
 Format files, as well as both command-line and simple GUI versions of the
-TECkit compiler. However, it is not intended that these tools will be the
+TECkit compiler.  However, it is not intended that these tools will be the
 primary means by which end users perform conversions, and they have not
 been designed, tested, and debugged to the extent that general-purpose
 applications should be.")
@@ -196,7 +196,7 @@ (define-public graphite2
     `(("freetype" ,freetype)
       ("perl" ,perl)
       ("python" ,python-2))) ; because of "import imap" in tests
-   (synopsis "reimplementation of the SIL Graphite text processing engine")
+   (synopsis "Reimplementation of the SIL Graphite text processing engine")
    (description
     "Graphite2 is a reimplementation of the SIL Graphite text processing
 engine.  Graphite is a smart font technology designed to facilitate the
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index e7868af6c04..a1858bc2093 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -372,6 +372,6 @@ (define-public xboing
     (synopsis "Ball and paddle game")
     (description "XBoing is a blockout type game where you have a paddle which
 you control to bounce a ball around the game zone destroying blocks with a
-proton ball. Each block carries a different point value. The more blocks you
-destroy, the better your score. The person with the highest score wins.")
+proton ball.  Each block carries a different point value.  The more blocks you
+destroy, the better your score.  The person with the highest score wins.")
     (license (x11-style "file://COPYING" "Very similar to the X11 licence."))))
diff --git a/gnu/packages/gcal.scm b/gnu/packages/gcal.scm
index ca79887b208..6bb54fac38d 100644
--- a/gnu/packages/gcal.scm
+++ b/gnu/packages/gcal.scm
@@ -39,7 +39,7 @@ (define-public gcal
     (description
      "Gcal is a program to calculate and print calendars on the
 command-line.  Calendars can be printed in 1-month, 3-month or whole-year
-views. In addition, eternal holiday lists can be generated for many
+views.  In addition, eternal holiday lists can be generated for many
 countries, which can be complemented by user-made lists of fixed dates to
 make an agenda.  Gcal can also calculate astronomical data, such as the
 phases of the moon, and supports alternative calendar formats: Julian,
diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index 02601585b93..06e73328f13 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -341,11 +341,11 @@ (define-public isl
 bounded by linear constraints")
     (description
      "isl is a library for manipulating sets and relations of integer points
-bounded by linear constraints. Supported operations on sets include
+bounded by linear constraints.  Supported operations on sets include
 intersection, union, set difference, emptiness check, convex hull, (integer)
 affine hull, integer projection, computing the lexicographic minimum using
 parametric integer programming, coalescing and parametric vertex
-enumeration. It also includes an ILP solver based on generalized basis
+enumeration.  It also includes an ILP solver based on generalized basis
 reduction, transitive closures on maps (which may encode infinite graphs),
 dependence analysis and bounds on piecewise step-polynomials.")
     (license lgpl2.1+)))
diff --git a/gnu/packages/geeqie.scm b/gnu/packages/geeqie.scm
index 3bc25ce790f..ff45bda8c4b 100644
--- a/gnu/packages/geeqie.scm
+++ b/gnu/packages/geeqie.scm
@@ -49,7 +49,7 @@ (define-public exiv2                              ; XXX: move elsewhere?
     (synopsis "Library and command-line utility to manage image metadata")
     (description
      "Exiv2 is a C++ library and a command line utility to manage image
-metadata. It provides fast and easy read and write access to the Exif, IPTC
+metadata.  It provides fast and easy read and write access to the Exif, IPTC
 and XMP metadata of images in various formats.")
 
     ;; Files under `xmpsdk' are a copy of Adobe's XMP SDK, licensed under the
diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm
index 1d12075fcc3..f21eeadf456 100644
--- a/gnu/packages/ghostscript.scm
+++ b/gnu/packages/ghostscript.scm
@@ -48,7 +48,7 @@ (define-public lcms
    (synopsis "Little CMS, a small-footprint colour management engine")
    (description
     "Little CMS is a small-footprint colour management engine, with special
-focus on accuracy and performance. It uses the International Color
+focus on accuracy and performance.  It uses the International Color
 Consortium standard (ICC), approved as ISO 15076-1.")
    (license license:x11)
    (home-page "http://www.littlecms.com/")))
@@ -65,7 +65,7 @@ (define-public libpaper
             (sha256 (base32
                      "0zhcx67afb6b5r936w5jmaydj3ks8zh83n9rm5sv3m3k8q8jib1q"))))
    (build-system gnu-build-system)
-   (synopsis "libpaper, a library for handling paper sizes")
+   (synopsis "Library for handling paper sizes")
    (description
     "The paper library and accompanying files are intended to provide a simple
 way for applications to take actions based on a system- or user-specified
@@ -104,10 +104,10 @@ (define-public psutils
          (substitute* "Makefile"
            ((" install.include") ""))))
       %standard-phases)))
-   (synopsis "psutils, a collection of utilities for manipulating PostScript documents")
+   (synopsis "Collection of utilities for manipulating PostScript documents")
    (description
     "PSUtils is a collection of utilities for manipulating PostScript
-documents. Programs included are psnup, for placing out several logical pages
+documents.  Programs included are psnup, for placing out several logical pages
 on a single sheet of paper, psselect, for selecting pages from a document,
 pstops, for general imposition, psbook, for signature generation for booklet
 printing, and psresize, for adjusting page sizes.")
@@ -198,10 +198,10 @@ (define-public gs-fonts
                 (copy-file file (string-append dir "/" file)))
               (find-files "." "pfb|afm"))))
        %standard-phases)))))
-   (synopsis "free replacements for the PostScript fonts")
+   (synopsis "Free replacements for the PostScript fonts")
    (description
-    "gs-fonts provides fonts and font metrics customarily distributed with
-Ghostscript. It currently includes the 35 standard PostScript fonts.")
+    "Ghostscript fonts provides fonts and font metrics customarily distributed with
+Ghostscript.  It currently includes the 35 standard PostScript fonts.")
    (license license:gpl2)
    (home-page "http://sourceforge.net/projects/gs-fonts/")))
 
@@ -218,7 +218,7 @@ (define-public libspectre
    (build-system gnu-build-system)
    (inputs `(("ghostscript" ,ghostscript)))
    (native-inputs `(("pkg-config" ,pkg-config)))
-   (synopsis "postscript rendering library")
+   (synopsis "Postscript rendering library")
    (description
     "libspectre is a small library for rendering Postscript documents.
 It provides a convenient easy to use API for handling and rendering
diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm
index 8fe4f767ed5..aeedd239163 100644
--- a/gnu/packages/gimp.scm
+++ b/gnu/packages/gimp.scm
@@ -51,7 +51,7 @@ (define-public babl
     (home-page "http://gegl.org/babl/")
     (synopsis "Image pixel format conversion library")
     (description
-     "babl is a dynamic, any to any, pixel format translation library.
+     "Babl is a dynamic, any to any, pixel format translation library.
 It allows converting between different methods of storing pixels known as
 pixel formats that have with different bitdepths and other data
 representations, color models and component permutations.
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index bf267bfca80..94f03cb1ec8 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -49,7 +49,7 @@ (define-public glu
     (synopsis "Mesa OpenGL Utility library")
     (description
      "GLU, or OpenGL Utility Library provides some higher-level functionality
-not provided by just OpenGL itself. Some of GLU's Features
+not provided by just OpenGL itself.  Some of GLU's Features
 include: Scaling of 2D images and creation of mipmap pyramids,
 Transformation of object coordinates into device coordinates and
 vice versa, Support for NURBS surfaces, Support for tessellation
@@ -83,15 +83,15 @@ (define-public freeglut
     (synopsis "Alternative to the OpenGL Utility Toolkit (GLUT)")
     (description
      "Freeglut is a completely Free/OpenSourced alternative to
-the OpenGL Utility Toolkit (GLUT) library. GLUT was originally
+the OpenGL Utility Toolkit (GLUT) library.  GLUT was originally
 written by Mark Kilgard to support the sample programs in the
-second edition OpenGL 'RedBook'. Since then, GLUT has been used
+second edition OpenGL 'RedBook'.  Since then, GLUT has been used
 in a wide variety of practical applications because it is simple,
 widely available and highly portable.
 
 GLUT (and hence freeglut) allows the user to create and manage windows
 containing OpenGL contexts on a wide range of platforms and also read
-the mouse, keyboard and joystick functions. freeglut is released under
+the mouse, keyboard and joystick functions.  Freeglut is released under
 the X-Consortium license.")
     (license l:x11)))
 
@@ -113,7 +113,7 @@ (define-public ftgl
     (home-page "http://ftgl.sourceforge.net")
     (synopsis "Font rendering library for OpenGL applications")
     (description
-     "FTGL is a font rendering library for OpenGL applications. Supported
+     "FTGL is a font rendering library for OpenGL applications.  Supported
 rendering modes are: Bitmaps, Anti-aliased pixmaps, Texture maps, Outlines,
 Polygon meshes, and Extruded polygon meshes")
     (license l:x11)))
@@ -165,9 +165,9 @@ (define-public mesa
             (delete-file "src/gallium/state_trackers/d3d1x/w32api"))
          %standard-phases)))
     (home-page "http://mesa3d.org/")
-    (synopsis "Mesa, an OpenGL implementation")
+    (synopsis "OpenGL implementation")
     (description "Mesa is a free implementation of the OpenGL specification -
-a system for rendering interactive 3D graphics. A variety of device drivers
+a system for rendering interactive 3D graphics.  A variety of device drivers
 allows Mesa to be used in many different environments ranging from software
 emulation to complete hardware acceleration for modern GPUs.")
     (license l:x11)))
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 0a42c0d4c13..90766432219 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -97,7 +97,7 @@ (define dbus
     (synopsis "Message bus for inter-process communication (IPC)")
     (description
      "D-Bus is a message bus system, a simple way for applications to
-talk to one another. In addition to interprocess communication, D-Bus
+talk to one another.  In addition to interprocess communication, D-Bus
 helps coordinate process lifecycle; it makes it simple and reliable to
 code a \"single instance\" application or daemon, and to launch
 applications and daemons on demand when their services are needed.
@@ -105,10 +105,10 @@ (define dbus
 D-Bus supplies both a system daemon (for events such as \"new hardware
 device added\" or \"printer queue changed\") and a
 per-user-login-session daemon (for general IPC needs among user
-applications). Also, the message bus is built on top of a general
+applications).  Also, the message bus is built on top of a general
 one-to-one message passing framework, which can be used by any two apps
 to communicate directly (without going through the message bus
-daemon). Currently the communicating applications are on one computer,
+daemon).  Currently the communicating applications are on one computer,
 or through unencrypted TCP/IP suitable for use behind a firewall with
 shared NFS home directories.")
     (license license:gpl2+)))                     ; or Academic Free License 2.1
@@ -263,7 +263,7 @@ (define intltool
     (home-page "https://launchpad.net/intltool/+download")
     (synopsis "Tools to centralise translations of different file formats")
     (description
-     "intltool is a set of tools to centralise translations of many different
+     "Intltool is a set of tools to centralise translations of many different
 file formats using GNU gettext-compatible PO files.
 
 The intltool collection can be used to do these things:
@@ -275,7 +275,7 @@ (define intltool
     source files (.c, .h) in po/$(PACKAGE).pot.
 
     Merge back the translations from .po files into .xml, .desktop and
-    oaf files. This merge step will happen at build resp. installation time.")
+    oaf files.  This merge step will happen at build resp. installation time.")
     (license license:gpl2+)))
 
 (define itstool
@@ -359,7 +359,7 @@ (define libsigc++
     (home-page "http://libsigc.sourceforge.net/")
     (synopsis "Type-safe callback system for standard C++")
     (description
-     "libsigc++ implements a type-safe callback system for standard C++.  It
+     "Libsigc++ implements a type-safe callback system for standard C++.  It
 allows you to define signals and to connect those signals to any callback
 function, either global or a member function, regardless of whether it is
 static or virtual.
@@ -405,6 +405,6 @@ (define glibmm
     (home-page "http://gtkmm.org/")
     (synopsis "C++ interface to the GLib library")
     (description
-     "glibmm provides a C++ programming interface to the part of GLib that are
+     "Glibmm provides a C++ programming interface to the part of GLib that are
 useful for C++.")
     (license license:lgpl2.1+)))
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index d4972468a38..1f27901bbc7 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -113,12 +113,12 @@ (define-public gnome-desktop
        ("xkeyboard-config" ,xkeyboard-config)))
     (home-page "https://www.gnome.org/")
     (synopsis
-     "libgnome-desktop, gnome-about, and desktop-wide documents")
+     "Libgnome-desktop, gnome-about, and desktop-wide documents")
     (description
      "The libgnome-desktop library provides API shared by several applications
-on the desktop, but that cannot live in the platform for various reasons. There
-is no API or ABI guarantee, although we are doing our best to provide
-stability. Documentation for the API is available with gtk-doc.
+on the desktop, but that cannot live in the platform for various reasons.
+There is no API or ABI guarantee, although we are doing our best to provide
+stability.  Documentation for the API is available with gtk-doc.
 
 The gnome-about program helps find which version of GNOME is installed.")
     ; Some bits under the LGPL.
@@ -422,7 +422,7 @@ (define-public libnotify
      "GNOME desktop notification library")
     (description
      "Libnotify is a library that sends desktop notifications to a
-notification daemon, as defined in the Desktop Notifications spec. These
+notification daemon, as defined in the Desktop Notifications spec.  These
 notifications can be used to inform the user about an event or display
 some form of information without getting in the user's way.")
     (license license:lgpl2.1+)))
@@ -455,7 +455,7 @@ (define-public libpeas
     (home-page "https://wiki.gnome.org/Libpeas")
     (synopsis "GObject plugin system")
     (description
-     "libpeas is a gobject-based plugins engine, and is targetted at giving
+     "Libpeas is a gobject-based plugins engine, and is targetted at giving
 every application the chance to assume its own extensibility.  It also has a
 set of features including, but not limited to: multiple extension points; on
 demand (lazy) programming language support for C, Python and JS; simplicity of
@@ -485,7 +485,7 @@ (define-public gtkglext
     (propagated-inputs `(("pangox-compat" ,pangox-compat)))
     (home-page "https://projects.gnome.org/gtkglext")
     (synopsis "OpenGL extension to GTK+")
-    (description "GtkGLExt is an OpenGL extension to GTK+. It provides
+    (description "GtkGLExt is an OpenGL extension to GTK+.  It provides
 additional GDK objects which support OpenGL rendering in GTK+ and GtkWidget
 API add-ons to make GTK+ widgets OpenGL-capable.")
     (license license:lgpl2.1+)))
@@ -627,7 +627,7 @@ (define-public librsvg
     (home-page "https://wiki.gnome.org/LibRsvg")
     (synopsis "Render SVG files using Cairo")
     (description
-     "librsvg is a C library to render SVG files using the Cairo 2D graphics
+     "Librsvg is a C library to render SVG files using the Cairo 2D graphics
 library.")
     (license license:lgpl2.0+)))
 
@@ -653,10 +653,10 @@ (define-public libidl
        ("bison" ,bison)))
     (home-page "http://freecode.com/projects/libidl")
     (synopsis "Create trees of CORBA Interface Definition Language files")
-    (description  "libidl is a library for creating trees of CORBA Interface
+    (description  "Libidl is a library for creating trees of CORBA Interface
 Definition Language (idl) files, which is a specification for defining
 portable interfaces. libidl was initially written for orbit (the orb from the
-GNOME project, and the primary means of libidl distribution). However, the
+GNOME project, and the primary means of libidl distribution).  However, the
 functionality was designed to be as reusable and portable as possible.") 
     (license license:lgpl2.0+)))
 
@@ -692,7 +692,7 @@ (define-public orbit2
      `(("pkg-config" ,pkg-config)))
     (home-page "https://projects.gnome.org/orbit2/")
     (synopsis "CORBA 2.4-compliant Object Request Broker")
-    (description  "orbit2 is a CORBA 2.4-compliant Object Request Broker (orb)
+    (description  "ORBit2 is a CORBA 2.4-compliant Object Request Broker (orb)
 featuring mature C, C++ and Python bindings.") 
     ;; Licence notice is unclear.  The Web page simply say "GPL" without giving a version.
     ;; SOME of the code files have licence notices for GPLv2+
@@ -772,9 +772,9 @@ (define-public gconf
        ("glib" ,glib "bin")             ; for glib-genmarshal, etc.
        ("pkg-config" ,pkg-config)))
     (home-page "https://projects.gnome.org/gconf/")
-    (synopsis "store application preferences")
-    (description  "gconf is a system for storing application preferences. It
-is intended for user preferences; not arbitrary data storage.") 
+    (synopsis "Store application preferences")
+    (description "Gconf is a system for storing application preferences.  It
+is intended for user preferences; not arbitrary data storage.")
     (license license:lgpl2.0+))) 
 
 
@@ -796,7 +796,7 @@ (define-public gnome-mime-data
      `(("perl" ,perl)
        ("intltool" ,intltool)))
     (home-page "http://www.gnome.org")
-    (synopsis "base MIME and Application database for GNOME")
+    (synopsis "Base MIME and Application database for GNOME")
     (description  "GNOME Mime Data is a module which contains the base MIME
 and Application database for GNOME.  The data stored by this module is
 designed to be accessed through the MIME functions in GnomeVFS.")
@@ -842,9 +842,9 @@ (define-public gnome-vfs
        ("intltool" ,intltool)
        ("pkg-config" ,pkg-config)))
     (home-page "https://developer.gnome.org/gnome-vfs/")
-    (synopsis "access files and folders in GNOME applications")
+    (synopsis "Access files and folders in GNOME applications")
     (description  "GnomeVFS is the core library used to access files and
-folders in GNOME applications. It provides a file system abstraction which
+folders in GNOME applications.  It provides a file system abstraction which
 allows applications to access local and remote files with a single consistent API.")
     (license license:lgpl2.0+)))
 
@@ -979,8 +979,8 @@ (define-public libgnomeui
        ("pkg-config" ,pkg-config)))
     (home-page "https://developer.gnome.org/libgnomeui/")
     (synopsis "Additional widgets for applications")
-    (description  "The libgnomeui library provides additional widgets for
-applications. Many of the widgets from libgnomeui have already been ported to GTK+.")
+    (description "The libgnomeui library provides additional widgets for
+applications.  Many of the widgets from libgnomeui have already been ported to GTK+.")
     (license license:lgpl2.0+)))
 
 (define-public libglade
@@ -1004,8 +1004,8 @@ (define-public libglade
     (native-inputs
      `(("pkg-config" ,pkg-config)))
     (home-page "https://developer.gnome.org/libglade")
-    (synopsis "load glade interfaces and access the glade built widgets")
-    (description  "libglade is a library that provides interfaces for loading
+    (synopsis "Load glade interfaces and access the glade built widgets")
+    (description "Libglade is a library that provides interfaces for loading
 graphical interfaces described in glade files and for accessing the
 widgets built in the loading process.")
     (license license:gpl2+))) ; This is correct.  GPL not LGPL
@@ -1034,8 +1034,8 @@ (define-public libgnomeprint
        ("glib" ,glib "bin")             ; for glib-genmarshal, etc.
        ("pkg-config" ,pkg-config)))
     (home-page "https://projects.gnome.org/gnome-print/home/faq.html")
-    (synopsis "printing framework for GNOME")
-    (description  "Gnome-print is a high-quality printing framework for GNOME.")
+    (synopsis "Printing framework for GNOME")
+    (description "Gnome-print is a high-quality printing framework for GNOME.")
     (license license:lgpl2.0+)))
 
 
diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm
index 927d201d49e..d9f83477dfc 100644
--- a/gnu/packages/gnunet.scm
+++ b/gnu/packages/gnunet.scm
@@ -176,7 +176,7 @@ (define-public gnurl
    (synopsis "Microfork of cURL with support for the HTTP/HTTPS/GnuTLS subset of cURL")
    (description
     "Gnurl is a microfork of cURL, a command line tool for transferring data
-with URL syntax. While cURL supports many crypto backends, libgnurl only
+with URL syntax.  While cURL supports many crypto backends, libgnurl only
 supports HTTPS, HTTPS and GnuTLS.")
    (license (license:bsd-style "file://COPYING"
                        "See COPYING in the distribution."))
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index b90426f83fa..5e7c566bda0 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -50,8 +50,7 @@ (define-public libgpg-error
         "02lv5h865f8if391xjp3njg04k0l4x2pwjkcdbzcwilail1skazq"))))
     (build-system gnu-build-system)
     (home-page "http://gnupg.org")
-    (synopsis
-     "Libgpg-error, a small library that defines common error values for all GnuPG components")
+    (synopsis "Library of error values for GnuPG components")
     (description
      "Libgpg-error is a small library that defines common error values
 for all GnuPG components.  Among these are GPG, GPGSM, GPGME,
@@ -122,7 +121,7 @@ (define-public libassuan
      `(("libgpg-error" ,libgpg-error) ("pth" ,pth)))
     (home-page "http://gnupg.org")
     (synopsis
-     "Libassuan, the IPC library used by GnuPG and related software")
+     "IPC library used by GnuPG and related software")
     (description
      "Libassuan is a small library implementing the so-called Assuan
 protocol.  This protocol is used for IPC between most newer
@@ -156,8 +155,7 @@ (define-public libksba
              (string-append "--with-gpg-error-prefix="
                             (assoc-ref %build-inputs "libgpg-error")))))
     (home-page "http://www.gnupg.org")
-    (synopsis
-     "Libksba is a CMS and X.509 access library under development")
+    (synopsis "CMS and X.509 access library")
     (description
      "KSBA (pronounced Kasbah) is a library to make X.509 certificates
 as well as the CMS easily accessible by other applications.  Both
@@ -251,7 +249,7 @@ (define-public gpgme
        ("libassuan" ,libassuan)))
     (arguments '(#:make-flags '("GPG=gpg2")))
     (home-page "http://www.gnupg.org/related_software/gpgme/")
-    (synopsis "library providing simplified access to GnuPG functionality")
+    (synopsis "Library providing simplified access to GnuPG functionality")
     (description
      "GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG
 easier for applications.  It provides a High-Level Crypto API for encryption,
@@ -303,8 +301,8 @@ (define-public pius
    (synopsis "Programs to simplify GnuPG key signing")
    (description
     "Pius (PGP Individual UID Signer) helps attendees of PGP keysigning
-parties. It is the main utility and makes it possible to quickly and easily
-sign each UID on a set of PGP keys. It is designed to take the pain out of
+parties.  It is the main utility and makes it possible to quickly and easily
+sign each UID on a set of PGP keys.  It is designed to take the pain out of
 the sign-all-the-keys part of PGP Keysigning Party while adding security
 to the process.
 
@@ -375,9 +373,9 @@ (define-public signing-party
                 "gpgparticipants.1" "gpgsigs.1" "gpgwrap.1"
                 "process_keys.1" "pgpring.1" "keyanalyze.1"))))
       %standard-phases)))))
-   (synopsis "collection of scripts for simplifying gnupg key signing")
+   (synopsis "Collection of scripts for simplifying gnupg key signing")
    (description
-    "signing-party is a collection for all kinds of PGP/GnuPG related things,
+    "Signing-party is a collection for all kinds of PGP/GnuPG related things,
 including tools for signing keys, keyring analysis, and party preparation.
 
  * caff: CA - Fire and Forget signs and mails a key
diff --git a/gnu/packages/gperf.scm b/gnu/packages/gperf.scm
index 9d9aaba3ce2..9e2e3c6ec43 100644
--- a/gnu/packages/gperf.scm
+++ b/gnu/packages/gperf.scm
@@ -39,7 +39,7 @@ (define-public gperf
     (home-page "http://www.gnu.org/software/gperf/")
     (synopsis "Perfect hash function generator")
     (description
-     "gperf is a perfect hash function generator.  For a given list of
+     "GNU gperf is a perfect hash function generator.  For a given list of
 strings, it produces a hash function and hash table in C or C++ code.  That
 the hash function is perfect means that no collisions can exist and that
 look-ups can be made by single string comparisons.")
diff --git a/gnu/packages/grub.scm b/gnu/packages/grub.scm
index 398a6d4e490..590041f0ff0 100644
--- a/gnu/packages/grub.scm
+++ b/gnu/packages/grub.scm
@@ -100,7 +100,7 @@ (define-public grub
     (synopsis "GRand Unified Boot loader")
     (description
      "GRUB is a multiboot bootloader.  It is used for initially loading the
-kernel of an operating system and then transferring control to it. The kernel
+kernel of an operating system and then transferring control to it.  The kernel
 then goes on to load the rest of the operating system.  As a multiboot
 bootloader, GRUB handles the presence of multiple operating systems installed
 on the same computer; upon booting the computer, the user is presented with a
diff --git a/gnu/packages/gsasl.scm b/gnu/packages/gsasl.scm
index 8739c0444e3..8fb21eee90a 100644
--- a/gnu/packages/gsasl.scm
+++ b/gnu/packages/gsasl.scm
@@ -39,7 +39,7 @@ (define-public libntlm
             (sha256 (base32
                      "101pr110ardcj2di940g6vaqifsaxc44h6hjn81l63dvmkj5a6ga"))))
    (build-system gnu-build-system)
-   (synopsis "Libntlm, a library that implements NTLM authentication")
+   (synopsis "Library that implements NTLM authentication")
    (description
     "Libntlm is a library that implements NTLM authentication")
    (license lgpl2.1+)
@@ -64,7 +64,7 @@ (define-public gss
    (description
     "The GNU Generic Security Service provides a free implementation of the
 GSS-API specification.  It provides a generic application programming
-interface for programs to access security services. Security services present
+interface for programs to access security services.  Security services present
 a generic, GSS interface, with which the calling application interacts via
 this library, freeing the application developer from needing to know about
 the underlying security implementation.")
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 4dd389ba478..89585049535 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -59,7 +59,7 @@ (define-public atk
    (synopsis "GNOME accessibility toolkit")
    (description
     "ATK provides the set of accessibility interfaces that are implemented
-by other toolkits and applications. Using the ATK interfaces, accessibility
+by other toolkits and applications.  Using the ATK interfaces, accessibility
 tools have full access to view and control running applications.")
    (license license:lgpl2.0+)
    (home-page "https://developer.gnome.org/atk/")))
@@ -101,16 +101,16 @@ (define-public cairo
     "Cairo is a 2D graphics library with support for multiple output devices.
 Currently supported output targets include the X Window System (via both
 Xlib and XCB), Quartz, Win32, image buffers, PostScript, PDF, and SVG file
-output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.
+output.  Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.
 
 Cairo is designed to produce consistent output on all output media while
 taking advantage of display hardware acceleration when available
 eg. through the X Render Extension).
 
 The cairo API provides operations similar to the drawing operators of
-PostScript and PDF. Operations in cairo including stroking and filling cubic
+PostScript and PDF.  Operations in cairo including stroking and filling cubic
 Bézier splines, transforming and compositing translucent images, and
-antialiased text rendering. All drawing operations can be transformed by any
+antialiased text rendering.  All drawing operations can be transformed by any
 affine transformation (scale, rotation, shear, etc.)")
    (license license:lgpl2.1) ; or Mozilla Public License 1.1
    (home-page "http://cairographics.org/")))
@@ -133,7 +133,7 @@ (define-public harfbuzz
    (native-inputs
      `(("pkg-config" ,pkg-config)
       ("python" ,python-wrapper)))
-   (synopsis "opentype text shaping engine")
+   (synopsis "OpenType text shaping engine")
    (description
     "HarfBuzz is an OpenType text shaping engine.")
    (license (license:x11-style "file://COPYING"
@@ -164,7 +164,7 @@ (define-public pango
    (synopsis "GNOME text and font handling library")
    (description
     "Pango is the core text and font handling library used in GNOME
-applications. It has extensive support for the different writing systems
+applications.  It has extensive support for the different writing systems
 used throughout the world.")
    (license license:lgpl2.0+)
    (home-page "https://developer.gnome.org/pango/")))
@@ -190,7 +190,7 @@ (define-public pangox-compat
      `(("intltool" ,intltool)
        ("pkg-config" ,pkg-config)))
     (home-page "https://developer.gnome.org/pango")
-    (synopsis "functions now obsolete in pango")
+    (synopsis "Obsolete pango functions")
     (description  "Pangox was a X backend to pango.  It is now obsolete and no
 longer provided by recent pango releases.  pangox-compat provides the
 functions which were removed.")
@@ -372,7 +372,7 @@ (define-public gtk+-2
    (synopsis "Cross-platform toolkit for creating graphical user interfaces")
    (description
     "GTK+, or the GIMP Toolkit, is a multi-platform toolkit for creating
-graphical user interfaces. Offering a complete set of widgets, GTK+ is
+graphical user interfaces.  Offering a complete set of widgets, GTK+ is
 suitable for projects ranging from small one-off tools to complete
 application suites.")
    (license license:lgpl2.0+)
diff --git a/gnu/packages/guile-wm.scm b/gnu/packages/guile-wm.scm
index 38c5959340c..98e657f75b1 100644
--- a/gnu/packages/guile-wm.scm
+++ b/gnu/packages/guile-wm.scm
@@ -114,5 +114,5 @@ (define-public guile-wm
 have total control of what it does by choosing which modules to include.
 Included with it are a few modules that provide basic TinyWM-like window
 management, some window record-keeping, multi-monitor support, and emacs-like
-keymaps and minibuffer. At this point, it's just enough to get you started.")
+keymaps and minibuffer.  At this point, it's just enough to get you started.")
     (license gpl3+)))
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index 1a5835fed38..e0ff29da409 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -210,9 +210,9 @@ (define (guile-reader guile)
 "Guile-Reader is a simple framework for building readers for GNU Guile.
 
 The idea is to make it easy to build procedures that extend Guile’s read
-procedure. Readers supporting various syntax variants can easily be written,
+procedure.  Readers supporting various syntax variants can easily be written,
 possibly by re-using existing “token readers” of a standard Scheme
-readers. For example, it is used to implement Skribilo’s R5RS-derived
+readers.  For example, it is used to implement Skribilo’s R5RS-derived
 document syntax.
 
 Guile-Reader’s approach is similar to Common Lisp’s “read table”, but
@@ -262,7 +262,7 @@ (define-public guile-ncurses
     (home-page "http://www.gnu.org/software/guile-ncurses/")
     (synopsis "Guile bindings to ncurses")
     (description
-     "guile-ncurses provides Guile language bindings for the ncurses
+     "GNU Guile-Ncurses provides Guile language bindings for the ncurses
 library.")
     (license lgpl3+)))
 
@@ -314,7 +314,7 @@ (define-public guile-lib
     (home-page "http://www.nongnu.org/guile-lib/")
     (synopsis "Collection of useful Guile Scheme modules")
     (description
-     "guile-lib is intended as an accumulation place for pure-scheme Guile
+     "Guile-Lib is intended as an accumulation place for pure-scheme Guile
 modules, allowing for people to cooperate integrating their generic Guile
 modules into a coherent library.  Think \"a down-scaled, limited-scope CPAN
 for Guile\".")
@@ -348,7 +348,7 @@ (define-public guile-json
     (synopsis "JSON module for Guile")
     (description
      "Guile-json supports parsing and building JSON documents according to the
-http:://json.org specification. These are the main features:
+http:://json.org specification.  These are the main features:
 - Strictly complies to http://json.org specification.
 - Build JSON documents programmatically via macros.
 - Unicode support for strings.
diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index aed6f66da53..8ac78d3ece3 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -84,7 +84,7 @@ (define-public mig
      "GNU MIG is the GNU distribution of the Mach 3.0 interface generator
 MIG, as maintained by the GNU Hurd developers for the GNU project.
 You need this tool to compile the GNU Mach and GNU Hurd distributions,
-and to compile the GNU C library for the Hurd. Also,you will need it
+and to compile the GNU C library for the Hurd.  Also, you will need it
 for other software in the GNU system that uses Mach-based inter-process
 communication.")
     (license gpl2+)))
diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm
index e7d5247d6c3..5963fe42764 100644
--- a/gnu/packages/icu4c.scm
+++ b/gnu/packages/icu4c.scm
@@ -75,10 +75,10 @@ (define-public icu4c
                                 (find-files "bin" ".*")
                                 (find-files "sbin" ".*"))))))
         %standard-phases)))))
-   (synopsis "ICU, International Components for Unicode")
+   (synopsis "International Components for Unicode")
    (description
     "ICU is a set of C/C++ and Java libraries providing Unicode and
-globalisation support for software applications. This package contains the
+globalisation support for software applications.  This package contains the
 C/C++ part.")
    (license x11)
    (home-page "http://site.icu-project.org/")))
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index e4f831e2938..71a2e8c984e 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -57,7 +57,7 @@ (define-public libpng
    (synopsis "Library for handling PNG files")
    (description
     "Libpng is the official PNG (Portable Network Graphics) reference
-library. It supports almost all PNG features and is extensible.")
+library.  It supports almost all PNG features and is extensible.")
    (license license:zlib)
    (home-page "http://www.libpng.org/pub/png/libpng.html")))
 
@@ -72,7 +72,7 @@ (define-public libjpeg
             (sha256 (base32
                      "19q5zr4n60sjcvfbyv06n4pcl1mai3ipvnd2akflayciinj3wx9s"))))
    (build-system gnu-build-system)
-   (synopsis "Libjpeg, a library for handling JPEG files")
+   (synopsis "Library for handling JPEG files")
    (description
     "Libjpeg implements JPEG image encoding, decoding, and transcoding.
 JPEG is a standardized compression method for full-color and gray-scale
@@ -111,7 +111,7 @@ (define-public libtiff
       (list (string-append "--with-jpeg-include-dir="
                            (assoc-ref %build-inputs "libjpeg-8")
                            "/include"))))
-   (synopsis "Libtiff, a library for handling TIFF files")
+   (synopsis "Library for handling TIFF files")
    (description
     "Libtiff provides support for the Tag Image File Format (TIFF), a format
 used for storing image data.
@@ -260,7 +260,7 @@ (define-public giflib
                   %standard-phases))))
     (synopsis "Tools and library for working with GIF images")
     (description
-     "giflib is a library for reading and writing GIF images.  It is API and
+     "GIFLIB is a library for reading and writing GIF images.  It is API and
 ABI compatible with libungif which was in wide use while the LZW compression
 algorithm was patented.  Tools are also included to convert, manipulate,
 compose, and analyze GIF images.")
@@ -336,7 +336,7 @@ (define-public giblib
     (home-page "http://linuxbrit.co.uk/software/") ; no real home-page
     (synopsis "Wrapper library for imlib2")
     (description
-     "giblib is a simple library which wraps imlib2's context API, avoiding
+     "Giblib is a simple library which wraps imlib2's context API, avoiding
 all the context_get/set calls, adds fontstyles to the truetype renderer and
 supplies a generic doubly-linked list and some string functions.")
     ;; This license removes a clause about X Consortium from the original
diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm
index e557893faf2..d8af61cdda1 100644
--- a/gnu/packages/imagemagick.scm
+++ b/gnu/packages/imagemagick.scm
@@ -84,9 +84,9 @@ (define-public imagemagick
     (synopsis "Create, edit, compose, or convert bitmap images")
     (description
      "ImageMagick® is a software suite to create, edit, compose, or convert
-bitmap images. It can read and write images in a variety of formats (over 100)
+bitmap images.  It can read and write images in a variety of formats (over 100)
 including DPX, EXR, GIF, JPEG, JPEG-2000, PDF, PhotoCD, PNG, Postscript, SVG,
-and TIFF. Use ImageMagick to resize, flip, mirror, rotate, distort, shear and
+and TIFF.  Use ImageMagick to resize, flip, mirror, rotate, distort, shear and
 transform images, adjust image colors, apply various special effects, or draw
 text, lines, polygons, ellipses and Bézier curves.")
     (license (fsf-free "http://www.imagemagick.org/script/license.php"))))
diff --git a/gnu/packages/irssi.scm b/gnu/packages/irssi.scm
index da71bea5ced..c97fd07e053 100644
--- a/gnu/packages/irssi.scm
+++ b/gnu/packages/irssi.scm
@@ -59,8 +59,8 @@ (define-public irssi
      `(("pkg-config" ,pkg-config)
        ("perl" ,perl)))
     (home-page "http://www.irssi.org/")
-    (synopsis "Irssi, a terminal-based IRC client")
+    (synopsis "Terminal-based IRC client")
     (description
-     "Irssi is a terminal based IRC client for UNIX systems. It also supports
+     "Irssi is a terminal based IRC client for UNIX systems.  It also supports
 SILC and ICB protocols via plugins.")
     (license gpl2+)))
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 6ed8c9342fc..3500b0a9727 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -53,8 +53,8 @@ (define-public automoc4
     (arguments
      `(#:tests? #f)) ; no check target
     (home-page "http://techbase.kde.org/Development/Tools/Automoc4")
-    (synopsis "build tool for KDE")
-    (description "KDE desktop environment")
+    (synopsis "Build tool for KDE")
+    (description "AutoMoc4 automatically generates moc-files for KDE.")
     (license bsd-2)))
 
 (define-public phonon
diff --git a/gnu/packages/libdaemon.scm b/gnu/packages/libdaemon.scm
index 24f5b51b293..81cf6e58ba8 100644
--- a/gnu/packages/libdaemon.scm
+++ b/gnu/packages/libdaemon.scm
@@ -51,8 +51,8 @@ (define-public libdaemon
 
     (synopsis "Lightweight C library that eases the writing of UNIX daemons")
     (description
-     "libdaemon is a lightweight C library that eases the writing of UNIX
-daemons. It consists of the following parts:
+     "Libdaemon is a lightweight C library that eases the writing of UNIX
+daemons.  It consists of the following parts:
 
   • A wrapper around fork() which does the correct daemonization procedure of
     a process
@@ -68,6 +68,6 @@ (define-public libdaemon
   • An API for running subprocesses with STDOUT and STDERR redirected to
     syslog.
 
-APIs like these are used in most daemon software available. It is not that
+APIs like these are used in most daemon software available.  It is not that
 simple to get it done right and code duplication is not a goal.")
     (license lgpl2.1+)))
diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm
index 7b8adbace44..27416a0e599 100644
--- a/gnu/packages/libevent.scm
+++ b/gnu/packages/libevent.scm
@@ -47,8 +47,7 @@ (define-public libevent
        ("which" ,which)
        ("python" ,python-wrapper)))
     (home-page "http://libevent.org/")
-    (synopsis
-     "libevent, an event notification library")
+    (synopsis "Event notification library")
     (description
      "The libevent API provides a mechanism to execute a callback
 function when a specific event occurs on a file descriptor or after a
diff --git a/gnu/packages/libidn.scm b/gnu/packages/libidn.scm
index 1cef883c0c9..02e15e50fbb 100644
--- a/gnu/packages/libidn.scm
+++ b/gnu/packages/libidn.scm
@@ -37,7 +37,7 @@ (define-public libidn
 ;; FIXME: No Java and C# libraries are currently built.
    (synopsis "Internationalized string processing library")
    (description
-    "libidn is a library implementing of the Stringprep, Punycode and IDNA
+    "GNU Libidn is a library implementing of the Stringprep, Punycode and IDNA
 specifications.  These are used to encode and decode internationalized domain
 names.  It includes native C, C# and Java libraries.")
    (license lgpl2.1+)
diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm
index 86ead7b22e4..0d4f797c6a6 100644
--- a/gnu/packages/libusb.scm
+++ b/gnu/packages/libusb.scm
@@ -37,7 +37,7 @@ (define-public libusb
         "16sz34ix6hw2wwl3kqx6rf26fg210iryr68wc439dc065pffw879"))))
     (build-system gnu-build-system)
     (home-page "http://www.libusb.org")
-    (synopsis "Libusb, a user-space USB library")
+    (synopsis "User-space USB library")
     (description
      "Libusb is a library that gives applications easy access to USB
 devices on various operating systems.")
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 8bd21712310..f24ba521f1c 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -367,10 +367,10 @@ (define-public psmisc
     (inputs `(("ncurses" ,ncurses)))
     (home-page "http://psmisc.sourceforge.net/")
     (synopsis
-     "set of utilities that use the proc filesystem, such as fuser, killall, and pstree")
+     "Small utilities that use the proc filesystem")
     (description
      "This PSmisc package is a set of some small useful utilities that
-use the proc filesystem. We're not about changing the world, but
+use the proc filesystem.  We're not about changing the world, but
 providing the system administrator with some help in common tasks.")
     (license gpl2+)))
 
@@ -415,7 +415,7 @@ (define-public util-linux
     (home-page "https://www.kernel.org/pub/linux/utils/util-linux/")
     (synopsis "Collection of utilities for the Linux kernel")
     (description
-     "util-linux is a random collection of utilities for the Linux kernel.")
+     "Util-linux is a random collection of utilities for the Linux kernel.")
 
     ;; Note that util-linux doesn't use the same license for all the
     ;; code.  GPLv2+ is the default license for a code without an
@@ -471,7 +471,7 @@ (define-public procps
     (home-page "http://procps.sourceforge.net/")
     (synopsis "Utilities that give information about processes")
     (description
-     "procps is the package that has a bunch of small useful utilities
+     "Procps is the package that has a bunch of small useful utilities
 that give information about processes using the Linux /proc file system.
 The package includes the programs ps, top, vmstat, w, kill, free,
 slabtop, and skill.")
@@ -861,7 +861,7 @@ (define-public libcap
     (home-page "https://sites.google.com/site/fullycapable/")
     (synopsis "Library for working with POSIX capabilities")
     (description
-     "libcap2 provides a programming interface to POSIX capabilities on
+     "Libcap2 provides a programming interface to POSIX capabilities on
 Linux-based operating systems.")
 
     ;; License is BSD-3 or GPLv2, at the user's choice.
@@ -1328,7 +1328,7 @@ (define-public kmod
                  %standard-phases)))
     (home-page "https://www.kernel.org/")
     (synopsis "Kernel module tools")
-    (description "kmod is a set of tools to handle common tasks with Linux
+    (description "Kmod is a set of tools to handle common tasks with Linux
 kernel modules like insert, remove, list, check properties, resolve
 dependencies and aliases.
 
@@ -1571,7 +1571,7 @@ (define-public lm-sensors
     (home-page "http://www.lm-sensors.org/")
     (synopsis "Utilities to read temperature/voltage/fan sensors")
     (description
-     "lm-sensors is a hardware health monitoring package for Linux.  It allows
+     "Lm-sensors is a hardware health monitoring package for Linux.  It allows
 you to access information from temperature, voltage, and fan speed sensors.
 It works with most newer systems.")
     (license gpl2+)))
@@ -1608,7 +1608,7 @@ (define-public xsensors
     (home-page "http://www.linuxhardware.org/xsensors/")
     (synopsis "Hardware health information viewer")
     (description
-     "xsensors reads data from the libsensors library regarding hardware
+     "Xsensors reads data from the libsensors library regarding hardware
 health such as temperature, voltage and fan speed and displays the information
 in a digital read-out.")
     (license gpl2+)))
diff --git a/gnu/packages/lout.scm b/gnu/packages/lout.scm
index 1121f1674b6..f6715c88d69 100644
--- a/gnu/packages/lout.scm
+++ b/gnu/packages/lout.scm
@@ -106,9 +106,9 @@ (define out
                              'install 'install-doc
                              ,doc-phase
                              %standard-phases)))))
-    (synopsis "Lout, a document layout system similar in style to LaTeX")
+    (synopsis "Document layout system")
     (description
-"The Lout document formatting system is now reads a high-level description of
+"The Lout document formatting system reads a high-level description of
 a document similar in style to LaTeX and produces a PostScript or plain text
 output file.
 
diff --git a/gnu/packages/lsh.scm b/gnu/packages/lsh.scm
index 1b4dfd051bc..a931a111add 100644
--- a/gnu/packages/lsh.scm
+++ b/gnu/packages/lsh.scm
@@ -48,8 +48,8 @@ (define-public liboop
     (home-page "http://www.lysator.liu.se/liboop/")
     (synopsis "Event loop library")
     (description "Liboop is a low-level event loop management library for
-POSIX-based operating systems. It supports the development of modular,
-multiplexed applications which may respond to events from several sources. It
+POSIX-based operating systems.  It supports the development of modular,
+multiplexed applications which may respond to events from several sources.  It
 replaces the \"select() loop\" and allows the registration of event handlers
 for file and network I/O, timers and signals.  Since processes use these
 mechanisms for almost all external communication, liboop can be used as the
diff --git a/gnu/packages/lsof.scm b/gnu/packages/lsof.scm
index 3611a456a0e..f7e5ec07de0 100644
--- a/gnu/packages/lsof.scm
+++ b/gnu/packages/lsof.scm
@@ -63,7 +63,7 @@ (define-public lsof
            (copy-file "lsof.8" (string-append out "/share/man/man8/lsof.8"))
          ))
        %standard-phases)))))
-   (synopsis "lsof displays information about open files")
+   (synopsis "Display information about open files")
    (description
     "Lsof stands for LiSt Open Files, and it does just that.
 It lists information about files that are open by the processes running
diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm
index 2bc627a3e45..eda69f93ba5 100644
--- a/gnu/packages/lua.scm
+++ b/gnu/packages/lua.scm
@@ -61,7 +61,7 @@ (define-public lua
     (description
      "Lua is a powerful, fast, lightweight, embeddable scripting language.  Lua
 combines simple procedural syntax with powerful data description constructs
-based on associative arrays and extensible semantics. Lua is dynamically typed,
+based on associative arrays and extensible semantics.  Lua is dynamically typed,
 runs by interpreting bytecode for a register-based virtual machine, and has
 automatic memory management with incremental garbage collection, making it ideal
 for configuration, scripting, and rapid prototyping.")
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index a2a85c2fb74..10f26698bc7 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -267,9 +267,9 @@ (define-public gnuplot
     (home-page "http://www.gnuplot.info")
     (synopsis "Command-line driven graphing utility")
     (description "Gnuplot is a portable command-line driven graphing
-utility. It was originally created to allow scientists and students to
+utility.  It was originally created to allow scientists and students to
 visualize mathematical functions and data interactively, but has grown to
-support many non-interactive uses such as web scripting. It is also used as a
+support many non-interactive uses such as web scripting.  It is also used as a
 plotting engine by third-party applications like Octave.")
     ;;  X11 Style with the additional restriction that derived works may only be
     ;;  distributed as patches to the original.
diff --git a/gnu/packages/mcrypt.scm b/gnu/packages/mcrypt.scm
index 12a4827224f..ad67302fcc0 100644
--- a/gnu/packages/mcrypt.scm
+++ b/gnu/packages/mcrypt.scm
@@ -97,9 +97,9 @@ (define-public libmhash
     (home-page "http://mhash.sourceforge.net/")
     (synopsis "Thread-safe hash library")
     (description
-     "mhash is a thread-safe hash library, implemented in C, and provides a
-uniform interface to a large number of hash algorithms. These algorithms can
-be used to compute checksums, message digests, and other signatures. The HMAC
+     "Mhash is a thread-safe hash library, implemented in C, and provides a
+uniform interface to a large number of hash algorithms.  These algorithms can
+be used to compute checksums, message digests, and other signatures.  The HMAC
 support implements the basics for message authentication, following RFC 2104.
 
 Algorithms currently supplied are:
diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm
index 38606016234..54b81955d98 100644
--- a/gnu/packages/mp3.scm
+++ b/gnu/packages/mp3.scm
@@ -58,7 +58,7 @@ (define-public libmad
           ;; remove option that is not supported by gcc any more
           (substitute* "configure" ((" -fforce-mem") "")))
        %standard-phases)))
-   (synopsis "libmad, an MPEG audio decoder")
+   (synopsis "MPEG audio decoder")
    (description
     "MAD (MPEG Audio Decoder) supports MPEG-1 and the MPEG-2 extension to
 lower sampling frequencies, as well as the de facto MPEG 2.5 format.
@@ -83,9 +83,9 @@ (define-public libid3tag
               "0lb1w883dc46dajbdvnia5870brl5lvnlk7g7y58y9wpg5p4znk3"))))
    (build-system gnu-build-system)
    (inputs `(("zlib" ,zlib)))
-   (synopsis "libid3tag, a library for reading ID3 tags")
+   (synopsis "Library for reading ID3 tags")
    (description
-    "libid3tag is a library for reading ID3 tags, both ID3v1 and the various
+    "Libid3tag is a library for reading ID3 tags, both ID3v1 and the various
 versions of ID3v2")
    (license license:gpl2+)
    (home-page "http://www.underbit.com/products/mad/")))
@@ -119,10 +119,10 @@ (define-public id3lib
           (substitute* "examples/test_io.cpp"
             (("dami;") "dami;\nusing namespace std;")))
          %standard-phases)))
-   (synopsis "a library for reading, writing, and manipulating ID3v1 and ID3v2 tags")
+   (synopsis "Library for reading, writing, and manipulating ID3v1 and ID3v2 tags")
    (description
-    "id3lib is a cross-platform software development library for reading,
-writing, and manipulating ID3v1 and ID3v2 tags. It is an on-going project
+    "Id3lib is a cross-platform software development library for reading,
+writing, and manipulating ID3v1 and ID3v2 tags.  It is an on-going project
 whose primary goals are full compliance with the ID3v2 standard, portability
 across several platforms, and providing a powerful and feature-rich API with
 a highly stable and efficient implementation.")
@@ -150,12 +150,12 @@ (define-public libmp3splt
              ("pcre" ,pcre)))
    (native-inputs
      `(("pkg-config" ,pkg-config)))
-   (synopsis "libmp3splt, a library for splitting mp3 and ogg vorbis files")
+   (synopsis "Library for splitting mp3 and ogg vorbis files")
    (description
     "Mp3splt is a utility to split mp3 and ogg vorbis files selecting a begin
-and an end time position, without decoding. For splitting an album, one may
+and an end time position, without decoding.  For splitting an album, one may
 select split points and filenames manually or obtain them automatically from
-CDDB (internet or a local file) or from .cue files. The tool also supports
+CDDB (internet or a local file) or from .cue files.  The tool also supports
 automatic silence split, that can be used also to adjust cddb/cue splitpoints.
 
 This package contains the library.")
@@ -176,12 +176,12 @@ (define-public mp3splt
               "106dnka56prlc9nsfh300f8841am2lmkwlzgl9lkr25mgnc35wwh"))))
    (build-system gnu-build-system)
    (inputs `(("libmp3splt" ,libmp3splt)))
-   (synopsis "mp3splt, a utiliy for splitting mp3 and ogg vorbis files")
+   (synopsis "Utiliy for splitting mp3 and ogg vorbis files")
    (description
     "Mp3splt is a utility to split mp3 and ogg vorbis files selecting a begin
-and an end time position, without decoding. For splitting an album, one may
+and an end time position, without decoding.  For splitting an album, one may
 select split points and filenames manually or obtain them automatically from
-CDDB (internet or a local file) or from .cue files. The tool also supports
+CDDB (internet or a local file) or from .cue files.  The tool also supports
 automatic silence split, that can be used also to adjust cddb/cue splitpoints.
 
 This package contains the binary.")
@@ -207,7 +207,7 @@ (define-public mpg123
     (home-page "http://www.mpg123.org/")
     (synopsis "Console MP3 player and decoder library")
     (description
-     "mpg123 is a real time MPEG 1.0/2.0/2.5 audio player/decoder for layers
+     "Mpg123 is a real time MPEG 1.0/2.0/2.5 audio player/decoder for layers
 1,2 and 3 (MPEG 1.0 layer 3 aka MP3 most commonly tested).  It comes with a
 command-line tool as well as a C library, libmpg123.")
     (license license:lgpl2.1)))
@@ -232,7 +232,7 @@ (define-public mpg321
        ("libao" ,ao)))
     (home-page "http://mpg321.sourceforge.net/")
     (synopsis "Command-line MP3 player")
-    (description "mpg321 is a command-line mp3 player.  mpg321 is used for
+    (description "Mpg321 is a command-line mp3 player.  mpg321 is used for
 frontends, as an mp3 player and as an mp3 to wave file decoder (primarily for
 use with CD-recording software).")
     (license license:gpl2)))
@@ -285,8 +285,8 @@ (define-public ripperx
    (synopsis "GTK program to rip and encode CD audio tracks")
    (description
     "RipperX is a GTK program to rip CD audio tracks and encode them to the
-Ogg, MP3, or FLAC formats. It's goal is to be easy to use, requiring only
-a few mouse clicks to convert an entire album. It supports CDDB lookups
+Ogg, MP3, or FLAC formats.  Its goal is to be easy to use, requiring only
+a few mouse clicks to convert an entire album.  It supports CDDB lookups
 for album and track information.")
    (license license:gpl2)
    (home-page "http://sourceforge.net/projects/ripperx/")))
@@ -349,6 +349,6 @@ (define-public mpc123
     (home-page "http://mpc123.sourceforge.net/")
     (synopsis "Audio player for Musepack-formatted files")
     (description
-     "mpc123 is a command-line player for files in the Musepack audio
+     "Mpc123 is a command-line player for files in the Musepack audio
 compression format (.mpc files.)")
     (license license:gpl2+)))
diff --git a/gnu/packages/netpbm.scm b/gnu/packages/netpbm.scm
index 21bef5fd885..0fdcf4ceae8 100644
--- a/gnu/packages/netpbm.scm
+++ b/gnu/packages/netpbm.scm
@@ -114,7 +114,7 @@ (define-public netpbm
            (for-each delete-file
                      '("config_template" "pkginfo" "README" "VERSION")))))
       %standard-phases)))))
-   (synopsis "Netpbm, a toolkit for manipulation of images")
+   (synopsis "Toolkit for manipulation of images")
    (description
     "Netpbm is a toolkit for the manipulation of graphic images, including
 the conversion of images between a variety of different formats.
diff --git a/gnu/packages/noweb.scm b/gnu/packages/noweb.scm
index 155639f57e6..be90e2dc643 100644
--- a/gnu/packages/noweb.scm
+++ b/gnu/packages/noweb.scm
@@ -86,7 +86,7 @@ (define-public noweb
     (home-page "http://www.cs.tufts.edu/~nr/noweb/")
     (synopsis "Literate programming tool")
     (description
-     "noweb is designed to meet the needs of literate programmers while
+     "Noweb is designed to meet the needs of literate programmers while
 remaining as simple as possible.  Its primary advantages are simplicity,
 extensibility, and language-independence—especially noticeable when compared
 with other literate-programming tools.  noweb uses 5 control sequences to
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index b4e48ccc4cc..2b4821ed42c 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -78,7 +78,7 @@ (define-public ocaml
     (synopsis "The OCaml programming language")
     (description
      "OCaml is a general purpose industrial-strength programming language with
-an emphasis on expressiveness and safety. Developed for more than 20 years at
+an emphasis on expressiveness and safety.  Developed for more than 20 years at
 Inria it benefits from one of the most advanced type systems and supports
 functional, imperative and object-oriented styles of programming.")
     (license (list qpl gpl2))))
diff --git a/gnu/packages/openssl.scm b/gnu/packages/openssl.scm
index fd6bfcb4500..563290d9460 100644
--- a/gnu/packages/openssl.scm
+++ b/gnu/packages/openssl.scm
@@ -62,7 +62,7 @@ (define-public openssl
               (("/bin/rm")
                "rm"))))
         %standard-phases))))
-   (synopsis "OpenSSL, an SSL/TLS implementation")
+   (synopsis "SSL/TLS implementation")
    (description
     "OpenSSL is an implementation of SSL/TLS")
    (license license:openssl)
diff --git a/gnu/packages/pcre.scm b/gnu/packages/pcre.scm
index 94df45499b6..54a3e2277c3 100644
--- a/gnu/packages/pcre.scm
+++ b/gnu/packages/pcre.scm
@@ -44,10 +44,10 @@ (define-public pcre
                           "--enable-pcregrep-libz"
                           "--enable-pcregrep-libbz2"
                           "--enable-pcretest-libreadline")))
-   (synopsis "PCRE, Perl Compatible Regular Expressions")
+   (synopsis "Perl Compatible Regular Expressions")
    (description
     "The PCRE library is a set of functions that implement regular expression
-pattern matching using the same syntax and semantics as Perl 5. PCRE has its
+pattern matching using the same syntax and semantics as Perl 5.  PCRE has its
 own native API, as well as a set of wrapper functions that correspond to the
 POSIX regular expression API.")
    (license license:bsd-3)
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 5a0a3fa48e5..f0a739b4066 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -76,7 +76,7 @@ (define-public poppler
       #:configure-flags
        '("--enable-xpdf-headers" ; to install header files
          "--enable-zlib")))
-   (synopsis "Poppler, a pdf rendering library")
+   (synopsis "PDF rendering library")
    (description
     "Poppler is a PDF rendering library based on the xpdf-3.0 code base.")
    (license license:gpl2+)
diff --git a/gnu/packages/pkg-config.scm b/gnu/packages/pkg-config.scm
index eb5f748bdaa..8317136a246 100644
--- a/gnu/packages/pkg-config.scm
+++ b/gnu/packages/pkg-config.scm
@@ -48,14 +48,13 @@ (define-public %pkg-config
                           "share/pkgconfig")))))
    (home-page "http://www.freedesktop.org/wiki/Software/pkg-config")
    (license gpl2+)
-   (synopsis "a helper tool used when compiling applications and
-libraries")
+   (synopsis "Helper tool used when compiling applications and libraries")
    (description
     "pkg-config is a helper tool used when compiling applications and
 libraries.  It helps you insert the correct compiler options on the
 command line so an application can use gcc -o test test.c `pkg-config
 --libs --cflags glib-2.0` for instance, rather than hard-coding values
-on where to find glib (or other libraries). It is language-agnostic, so
+on where to find glib (or other libraries).  It is language-agnostic, so
 it can be used for defining the location of documentation tools, for
 instance.")))
 
diff --git a/gnu/packages/pretty-print.scm b/gnu/packages/pretty-print.scm
index 07837eb1ac6..bd38a4b53df 100644
--- a/gnu/packages/pretty-print.scm
+++ b/gnu/packages/pretty-print.scm
@@ -89,7 +89,7 @@ (define-public a2ps
     (synopsis "Any file to PostScript, including pretty-printing")
     (description
      "GNU a2ps converts almost anything to a PostScript file, ready for
-printing. It accomplishes this by being able to delegate files to external
+printing.  It accomplishes this by being able to delegate files to external
 handlers, such as Groff and Gzip.  It handles as many steps as is necessary to
 produce a pretty-printed file.  It also includes some extra abilities for
 special cases, such as pretty-printing \"--help\" output.")
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index c995c1b703a..c34bdc3bd0d 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -178,7 +178,7 @@ (define-public python-2
             (directories '("lib/python2.7/site-packages")))))
     (home-page "http://python.org")
     (synopsis
-     "Python, a high-level dynamically-typed programming language")
+     "High-level, dynamically-typed programming language")
     (description
      "Python is a remarkably powerful dynamic programming language that
 is used in a wide variety of application domains.  Some of its key
@@ -414,7 +414,7 @@ (define-public python-pycrypto
     (description
      "Pycrypto is a collection of both secure hash functions (such as SHA256
 and RIPEMD160), and various encryption algorithms (AES, DES, RSA, ElGamal,
-etc.). The package is structured to make adding new modules easy.")
+etc.).  The package is structured to make adding new modules easy.")
     (license public-domain)))
 
 (define-public python-keyring
@@ -452,7 +452,7 @@ (define-public python-keyring
     (synopsis "Store and access your passwords safely")
     (description
      "The Python keyring lib provides a easy way to access the system keyring
-service from python. It can be used in any application that needs safe
+service from python.  It can be used in any application that needs safe
 password storage.")
     ;; "MIT" and PSF dual license
     (license x11)))
@@ -475,10 +475,10 @@ (define-public python-six
     (home-page "http://pypi.python.org/pypi/six/")
     (synopsis "Python 2 and 3 compatibility utilities")
     (description
-     "Six is a Python 2 and 3 compatibility library. It provides utility
+     "Six is a Python 2 and 3 compatibility library.  It provides utility
 functions for smoothing over the differences between the Python versions with
 the goal of writing Python code that is compatible on both Python versions.
-Six supports every Python version since 2.5. It is contained in only one
+Six supports every Python version since 2.5.  It is contained in only one
 Python file, so it can be easily copied into your project.")
     (license x11)))
 
@@ -586,7 +586,7 @@ (define-public python-tzlocal
         %standard-phases)))
     (home-page "https://github.com/regebro/tzlocal")
     (synopsis
-     "tzinfo object for the local timezone")
+     "Local timezone information for Python")
     (description
      "Tzlocal returns a tzinfo object with the local timezone information.
 This module attempts to fix a glaring hole in pytz, that there is no way to
@@ -738,7 +738,7 @@ (define-public python2-dogtail
     (home-page "https://fedorahosted.org/dogtail/")
     (synopsis "GUI test tool and automation framework written in ​Python")
     (description
-     "dogtail is a GUI test tool and automation framework written in Python.
+     "Dogtail is a GUI test tool and automation framework written in Python.
 It uses Accessibility (a11y) technologies to communicate with desktop
 applications. dogtail scripts are written in Python and executed like any
 other Python program.")
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index f57fedb379f..3df0066c4fc 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -54,7 +54,7 @@ (define-public libxkbcommon
     (native-inputs
      `(("bison" ,bison)))
     (home-page "http://xkbcommon.org/")
-    (synopsis "library to handle keyboard descriptions")
+    (synopsis "Library to handle keyboard descriptions")
     (description "Xkbcommon is a library to handle keyboard descriptions,
 including loading them from disk, parsing them and handling their
 state.  It is mainly meant for client toolkits, window systems, and other
diff --git a/gnu/packages/rsync.scm b/gnu/packages/rsync.scm
index 9c1a7a3b342..35bd13fa0b5 100644
--- a/gnu/packages/rsync.scm
+++ b/gnu/packages/rsync.scm
@@ -41,9 +41,9 @@ (define-public rsync
    (build-system gnu-build-system)
    (inputs `(("perl" ,perl)
              ("acl" ,acl)))
-   (synopsis "rsync, a remote (and local) file copying tool")
+   (synopsis "Remote (and local) file copying tool")
    (description
-    "rsync is a fast and versatile file copying tool. It can copy locally,
+    "Rsync is a fast and versatile file copying tool.  It can copy locally,
 to/from another host over any remote shell, or to/from a remote rsync daemon.
 Its delta-transfer algorithm reduces the amount of data sent over the network
 by sending only the differences between the source files and the existing
@@ -73,6 +73,6 @@ (define-public librsync
     "Librsync is a free software library that implements the rsync
 remote-delta algorithm.  This algorithm allows efficient remote updates of a
 file, without requiring the old and new versions to both be present at the
-sending end. The library uses a \"streaming\" design similar to that of zlib
+sending end.  The library uses a \"streaming\" design similar to that of zlib
 with the aim of allowing it to be embedded into many different applications.")
    (license lgpl2.1+)))
diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm
index c67c1e7d373..8e4f6ae3ece 100644
--- a/gnu/packages/scheme.scm
+++ b/gnu/packages/scheme.scm
@@ -205,7 +205,7 @@ (define-public bigloo
     (propagated-inputs
      `(("gmp" ,gmp)))                             ; bigloo.h refers to gmp.h
     (home-page "http://www-sop.inria.fr/indes/fp/Bigloo/")
-    (synopsis "Bigloo, an efficient Scheme compiler")
+    (synopsis "Efficient Scheme compiler")
     (description
      "Bigloo is a Scheme implementation devoted to one goal: enabling
 Scheme based programming style where C(++) is usually
diff --git a/gnu/packages/scrot.scm b/gnu/packages/scrot.scm
index a5bbe187bd4..b842c2dcf0e 100644
--- a/gnu/packages/scrot.scm
+++ b/gnu/packages/scrot.scm
@@ -60,7 +60,7 @@ (define-public scrot
     (home-page "http://linuxbrit.co.uk/software/")
     (synopsis "Command-line screen capture utility for X Window System")
     (description
-     "scrot allows to save a screenshot of a full screen, a window or a part
+     "Scrot allows to save a screenshot of a full screen, a window or a part
 of the screen selected by mouse.")
     ;; This license removes a clause about X Consortium from the original
     ;; X11 license.
diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm
index 9fb40f2edc3..b9b52620c45 100644
--- a/gnu/packages/sdl.scm
+++ b/gnu/packages/sdl.scm
@@ -107,7 +107,7 @@ (define libmikmod
     (synopsis "Library for module sound formats")
     (description
      "MikMod is able to play a wide range of module formats, as well as
-digital sound files. It can take advantage of particular features of your
+digital sound files.  It can take advantage of particular features of your
 system, such as sound redirection over the network.")
     (license lgpl2.1)
     (home-page "http://mikmod.sourceforge.net/")))
diff --git a/gnu/packages/skribilo.scm b/gnu/packages/skribilo.scm
index 6971e792d0a..e0a167c20d2 100644
--- a/gnu/packages/skribilo.scm
+++ b/gnu/packages/skribilo.scm
@@ -81,7 +81,7 @@ (define-public skribilo
 
 The input document can use Skribilo's markup language to provide information
 about the document's structure, which is similar to HTML or LaTeX and does not
-require expertise. Alternatively, it can use a simpler, “markup-less” format
+require expertise.  Alternatively, it can use a simpler, “markup-less” format
 that borrows from Emacs' outline mode and from other conventions used in
 emails, Usenet and text.
 
diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index 2f1bb79c75c..c39d5f82bea 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -111,10 +111,10 @@ (define-public libssh2
    (propagated-inputs `(("libgcrypt" ,libgcrypt)
                         ("zlib" ,zlib)))
    (arguments '(#:configure-flags `("--with-libgcrypt")))
-   (synopsis "libssh2, a client-side C library implementing the SSH2 protocol")
+   (synopsis "Client-side C library implementing the SSH2 protocol")
    (description
     "libssh2 is a library intended to allow software developers access to
-the SSH-2 protocol in an easy-to-use self-contained package. It can be built
+the SSH-2 protocol in an easy-to-use self-contained package.  It can be built
 into an application to perform many different tasks when communicating with
 a server that supports the SSH-2 protocol.")
    (license license:bsd-3)
@@ -159,7 +159,7 @@ (define-public openssh
           ;; install without host keys and system configuration files
           (zero? (apply system* "make" "install-nosysconf" make-flags)))
        %standard-phases)))))
-   (synopsis "OpenSSH, a client and server for the secure shell (ssh) protocol")
+   (synopsis "Client and server for the secure shell (ssh) protocol")
    (description
     "The SSH2 protocol implemented in OpenSSH is standardised by the
 IETF secsh working group and is specified in several RFCs and drafts.
@@ -171,13 +171,13 @@ (define-public openssh
 and optional compression.
 
 The user authentication layer uses the established connection and relies on
-the services provided by the transport layer. It provides several mechanisms
-for user authentication. These include traditional password authentication
+the services provided by the transport layer.  It provides several mechanisms
+for user authentication.  These include traditional password authentication
 as well as public-key or host-based authentication mechanisms.
 
 The connection layer multiplexes many different concurrent channels over the
 authenticated connection and allows tunneling of login sessions and
-TCP-forwarding. It provides a flow control service for these channels.
+TCP-forwarding.  It provides a flow control service for these channels.
 Additionally, various channel-specific options can be negotiated.")
    (license (license:bsd-style "file://LICENSE"
                                "See LICENSE in the distribution."))
@@ -341,7 +341,7 @@ (define-public dropbear
     (inputs `(("zlib" ,zlib)))
     (synopsis "Small SSH server and client")
     (description "Dropbear is a relatively small SSH server and
-client. It runs on a variety of POSIX-based platforms. Dropbear is
-particularly useful for embedded systems, such as wireless routers.")   
+client.  It runs on a variety of POSIX-based platforms.  Dropbear is
+particularly useful for embedded systems, such as wireless routers.")
     (home-page "https://matt.ucc.asn.au/dropbear/dropbear.html")
     (license (license:x11-style "" "See file LICENSE."))))
diff --git a/gnu/packages/stalonetray.scm b/gnu/packages/stalonetray.scm
index 5a53cd832e9..762ac8c99b9 100644
--- a/gnu/packages/stalonetray.scm
+++ b/gnu/packages/stalonetray.scm
@@ -42,7 +42,7 @@ (define-public stalonetray
     (synopsis "Standalone freedesktop.org and KDE systray implementation")
     (description
      "Stalonetray is a stand-alone freedesktop.org and KDE system
-tray (notification area) for X Window System/X11 (e.g. X.Org or XFree86). It
+tray (notification area) for X Window System/X11 (e.g. X.Org or XFree86).  It
 has full XEMBED support and minimal dependencies: an X11 lib only.  Stalonetray
 works with virtually any EWMH-compliant window manager.")
     (license gpl2+)))
diff --git a/gnu/packages/tcl.scm b/gnu/packages/tcl.scm
index 099bad25f9b..d988249c4ce 100644
--- a/gnu/packages/tcl.scm
+++ b/gnu/packages/tcl.scm
@@ -122,8 +122,8 @@ (define-public expect
     (description
      "Expect is a tool for automating interactive applications such as
 telnet, ftp, passwd, fsck, rlogin, tip, etc.  Expect really makes this
-stuff trivial. Expect is also useful for testing these same
-applications. And by adding Tk, you can wrap interactive applications in
+stuff trivial.  Expect is also useful for testing these same
+applications.  And by adding Tk, you can wrap interactive applications in
 X11 GUIs.")
     (license public-domain)))            ; as written in `license.terms'
 
diff --git a/gnu/packages/tcsh.scm b/gnu/packages/tcsh.scm
index d29087af817..f5827139115 100644
--- a/gnu/packages/tcsh.scm
+++ b/gnu/packages/tcsh.scm
@@ -71,8 +71,8 @@ (define-public tcsh
     (synopsis "Unix shell based on csh")
     (description
      "Tcsh is an enhanced, but completely compatible version of the Berkeley
-UNIX C shell (csh). It is a command language interpreter usable both as an
-interactive login shell and a shell script command processor. It includes a
+UNIX C shell (csh).  It is a command language interpreter usable both as an
+interactive login shell and a shell script command processor.  It includes a
 command-line editor, programmable word completion, spelling correction, a
 history mechanism, job control and a C-like syntax.")
     (license bsd-4)))
diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm
index c4d75045cc3..4f2193ce478 100644
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@ -44,7 +44,7 @@ (define-public commoncpp
             (("^// TODO sc.*") "#include <sys/types.h>\n#include <sys/stat.h>\n")))
         %standard-phases)))
    (build-system gnu-build-system)
-   (synopsis "(u)Common C++ framework for threaded applications")
+   (synopsis "Common C++ framework for threaded applications")
    (description "GNU Common C++ is an portable, optimized class framework for
 threaded applications, supporting concurrent synchronization, inter-process
 communications via sockets, and various methods for data handling, such as
@@ -64,12 +64,11 @@ (define-public ucommon
             (sha256 (base32
                      "0hpwxiyd7c3qnzksk6vw94cdig1v8yy6khgcaa87a7hb3zbkv4zg"))))
    (build-system gnu-build-system)
-   (synopsis "(u)Common C++ framework for threaded applications")
-   (description "GNU Common C++ is an portable, optimized class framework for
-threaded applications, supporting concurrent synchronization, inter-process
-communications via sockets, and various methods for data handling, such as
-serialization and XML parsing.  It includes the uCommon C++ library, a smaller
-reimplementation.")
+   (synopsis "Common C++ framework for threaded applications")
+   (description "GNU uCommon C++ is meant as a very light-weight C++ library
+to facilitate using C++ design patterns even for very deeply embedded
+applications, such as for systems using uclibc along with posix threading
+support.")
    (license gpl2+) ; plus runtime exception
    (home-page "http://www.gnu.org/software/commoncpp")))
 
@@ -131,7 +130,7 @@ (define-public exosip
    (inputs `(("osip" ,osip)))
    (synopsis "Sip abstraction library")
    (description "EXosip is a library that hides the complexity of using the
-SIP protocol for mutlimedia session establishement. This protocol is mainly to
+SIP protocol for mutlimedia session establishement.  This protocol is mainly to
 be used by VoIP telephony applications (endpoints or conference server) but
 might be also usefull for any application that wish to establish sessions like
 multiplayer games.")
diff --git a/gnu/packages/texlive.scm b/gnu/packages/texlive.scm
index e562b02598f..86ec30fdac0 100644
--- a/gnu/packages/texlive.scm
+++ b/gnu/packages/texlive.scm
@@ -204,7 +204,7 @@ (define-public rubber
               ("python" ,python-2) ; incompatible with Python 3 (print syntax)
               ("which" ,which)))
     (home-page "https://launchpad.net/rubber")
-    (synopsis "Rubber, a wrapper for LaTeX and friends")
+    (synopsis "Wrapper for LaTeX and friends")
     (description
      "Rubber is a program whose purpose is to handle all tasks related to the
 compilation of LaTeX documents.  This includes compiling the document itself,
diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm
index 8c3a50050b1..0d6f6b360ad 100644
--- a/gnu/packages/tor.scm
+++ b/gnu/packages/tor.scm
@@ -55,7 +55,7 @@ (define-public tor
 network of relays run by volunteers all around the world: it prevents
 somebody watching your Internet connection from learning what sites you
 visit, and it prevents the sites you visit from learning your physical
-location. Tor works with many of your existing applications, including
+location.  Tor works with many of your existing applications, including
 web browsers, instant messaging clients, remote login, and other
 applications based on the TCP protocol.")
     (license bsd-3)))
diff --git a/gnu/packages/valgrind.scm b/gnu/packages/valgrind.scm
index 44a83812354..af798be21a7 100644
--- a/gnu/packages/valgrind.scm
+++ b/gnu/packages/valgrind.scm
@@ -58,7 +58,7 @@ (define-public valgrind
     (description
      "Valgrind is an instrumentation framework for building dynamic analysis
 tools.  There are Valgrind tools that can automatically detect many memory
-management and threading bugs, and profile your programs in detail. You can
+management and threading bugs, and profile your programs in detail.  You can
 also use Valgrind to build new tools.")
     (license gpl2+)
 
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index eed72c4eeb9..0b52f0c2e52 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -84,7 +84,7 @@ (define-public bazaar
     (synopsis "Version control system supporting both distributed and centralized workflows")
     (description
      "GNU Bazaar is a version control system that allows you to record
-changes to project files over time. It supports both a distributed workflow
+changes to project files over time.  It supports both a distributed workflow
 as well as the classic centralized workflow.")
     (license gpl2+)))
 
@@ -337,7 +337,7 @@ (define-public subversion
         ("sqlite" ,sqlite)
         ("zlib" ,zlib)))
     (home-page "http://subversion.apache.org/")
-    (synopsis "Subversion, a revision control system")
+    (synopsis "Revision control system")
     (description
      "Subversion exists to be universally recognized and adopted as a
 centralized version control system characterized by its
@@ -438,7 +438,7 @@ (define-public diffstat
     (home-page "http://invisible-island.net/diffstat/")
     (synopsis "Make histograms from the output of 'diff'")
     (description
-     "diffstat reads the output of 'diff' and displays a histogram of the
+     "Diffstat reads the output of 'diff' and displays a histogram of the
 insertions, deletions, and modifications per-file.  It is useful for reviewing
 large, complex patch files.")
     (license (x11-style "file://COPYING"))))
@@ -563,10 +563,10 @@ (define-public aegis
     (home-page "http://aegis.sourceforge.net")
     (synopsis "Project change supervisor")
     (description "Aegis is a project change supervisor, and performs some of
-the Software Configuration Management needed in a CASE environment. Aegis
+the Software Configuration Management needed in a CASE environment.  Aegis
 provides a framework within which a team of developers may work on many
 changes to a program independently, and Aegis coordinates integrating these
 changes back into the master source of the program, with as little disruption
-as possible. Resolution of contention for source files, a major headache for
+as possible.  Resolution of contention for source files, a major headache for
 any project with more than one developer, is one of Aegis's major functions.")
     (license gpl3+)))
diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm
index 66e0f0ed268..e117fc4dff3 100644
--- a/gnu/packages/vim.scm
+++ b/gnu/packages/vim.scm
@@ -62,11 +62,11 @@ (define-public vim
     (synopsis "Text editor based on vi")
     (description
      "Vim is a highly configurable text editor built to enable efficient text
-editing. It is an improved version of the vi editor distributed with most UNIX
+editing.  It is an improved version of the vi editor distributed with most UNIX
 systems.
 
 Vim is often called a \"programmer's editor,\" and so useful for programming
-that many consider it an entire IDE. It's not just for programmers, though. Vim
-is perfect for all kinds of text editing, from composing email to editing
+that many consider it an entire IDE.  It's not just for programmers, though.
+Vim is perfect for all kinds of text editing, from composing email to editing
 configuration files.")
     (license license:vim)))
diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm
index 480d97712b0..9ff8b638953 100644
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@ -84,9 +84,9 @@ (define-public vpnc
    (synopsis "Client for Cisco VPN concentrators")
    (description
     "vpnc is a VPN client compatible with Cisco's EasyVPN equipment.
-It supports IPSec (ESP) with Mode Configuration and Xauth. It supports only
+It supports IPSec (ESP) with Mode Configuration and Xauth.  It supports only
 shared-secret IPSec authentication with Xauth, AES (256, 192, 128), 3DES,
-1DES, MD5, SHA1, DH1/2/5 and IP tunneling. It runs entirely in userspace.
+1DES, MD5, SHA1, DH1/2/5 and IP tunneling.  It runs entirely in userspace.
 Only \"Universal TUN/TAP device driver support\" is needed in the kernel.")
    (license license:gpl2+) ; some file are bsd-2, see COPYING
    (home-page "http://www.unix-ag.uni-kl.de/~massar/vpnc/")))
diff --git a/gnu/packages/w3m.scm b/gnu/packages/w3m.scm
index 1558d930131..1e72c1d7987 100644
--- a/gnu/packages/w3m.scm
+++ b/gnu/packages/w3m.scm
@@ -69,7 +69,7 @@ (define-public w3m
        ("perl" ,perl)
        ("pkg-config" ,pkg-config)))
     (home-page "http://w3m.sourceforge.net/")
-    (synopsis "w3m, a text-mode web browser")
+    (synopsis "Text-mode web browser")
     (description
      "w3m is a text-based web browser as well as a pager like 'more' or
 'less'.  With w3m you can browse web pages through a terminal emulator
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 86e250126fa..1a426253dde 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -67,10 +67,10 @@ (define-public httpd
     (description
      "The Apache HTTP Server Project is a collaborative software development
 effort aimed at creating a robust, commercial-grade, featureful, and
-freely-available source code implementation of an HTTP (Web) server. The project
-is jointly managed by a group of volunteers located around the world, using the
-Internet and the Web to communicate, plan, and develop the server and its
-related documentation.")
+freely-available source code implementation of an HTTP (Web) server.  The
+project is jointly managed by a group of volunteers located around the world,
+using the Internet and the Web to communicate, plan, and develop the server
+and its related documentation.")
     (license l:asl2.0)
     (home-page "https://httpd.apache.org/")))
 
@@ -136,7 +136,7 @@ (define-public libwebsockets
               ("openssl" ,openssl)))
     (synopsis "WebSockets library written in C")
     (description
-     "libwebsockets is a library that allows C programs to establish client
+     "Libwebsockets is a library that allows C programs to establish client
 and server WebSockets connections---a protocol layered above HTTP that allows
 for efficient socket-like bidirectional reliable communication channels.")
     (home-page "http://libwebsockets.org/")
@@ -493,8 +493,8 @@ (define-public perl-libwww
      "The libwww-perl collection is a set of Perl modules which provides a
 simple and consistent application programming interface to the
 World-Wide Web.  The main focus of the library is to provide classes
-and functions that allow you to write WWW clients. The library also
-contain modules that are of more general use and even classes that
+and functions that allow you to write WWW clients.  The library also
+contains modules that are of more general use and even classes that
 help you implement simple HTTP servers.")
     (home-page "http://search.cpan.org/~gaas/libwww-perl/")))
 
@@ -505,7 +505,8 @@ (define-public tinyproxy
     (source (origin
               (method url-fetch)
               (uri (string-append
-                    "http://www.samba.org/~obnox/" name "/download/" name "-" version ".tar.bz2"))
+                    "http://www.samba.org/~obnox/" name "/download/"
+                    name "-" version ".tar.bz2"))
               (sha256
                (base32
                 "0vl9igw7vm924rs6d6bkib7zfclxnlf9s8rmml1sfwj7xda9nmdy"))))
@@ -543,10 +544,10 @@ (define-public tinyproxy
     (home-page "https://banu.com/tinyproxy/")
     (synopsis "Light-weight HTTP/HTTPS proxy daemon")
     (description "Tinyproxy is a light-weight HTTP/HTTPS proxy
-daemon. Designed from the ground up to be fast and yet small, it is an ideal
+daemon.  Designed from the ground up to be fast and yet small, it is an ideal
 solution for use cases such as embedded deployments where a full featured HTTP
 proxy is required, but the system resources for a larger proxy are
-unavailable.") 
+unavailable.")
     (license l:gpl2+)))
 
 (define-public perl-www-curl
diff --git a/gnu/packages/wordnet.scm b/gnu/packages/wordnet.scm
index cb385d4017a..58831c4259e 100644
--- a/gnu/packages/wordnet.scm
+++ b/gnu/packages/wordnet.scm
@@ -76,8 +76,7 @@ (define-public wordnet
     (inputs `(("tk" ,tk)
               ("tcl" ,tcl)))
     (home-page "http://wordnet.princeton.edu/")
-    (synopsis
-     "WordNet, a lexical database for the English language")
+    (synopsis "Lexical database for the English language")
     (description
      "WordNet® is a large lexical database of English.  Nouns, verbs,
 adjectives and adverbs are grouped into sets of cognitive synonyms
diff --git a/gnu/packages/xiph.scm b/gnu/packages/xiph.scm
index 4ddda7051a0..0dea0050568 100644
--- a/gnu/packages/xiph.scm
+++ b/gnu/packages/xiph.scm
@@ -57,11 +57,11 @@ (define libogg
              (base32
               "16z74q422jmprhyvy7c9x909li8cqzmvzyr8cgbm52xcsp6pqs1z"))))
    (build-system gnu-build-system)
-   (synopsis "libogg, a library for manipulating the ogg multimedia format")
+   (synopsis "Library for manipulating the ogg multimedia format")
    (description
     "The libogg library allows to manipulate the ogg multimedia container
 format, which encapsulates raw compressed data and allows the interleaving of
-audio and video data. In addition to encapsulation and interleaving of
+audio and video data.  In addition to encapsulation and interleaving of
 multiple data streams, ogg provides packet framing, error detection, and
 periodic timestamps for seeking.")
    (license (license:bsd-style "file://COPYING"
@@ -74,8 +74,8 @@ (define libvorbis
    (version "1.3.4")
    (source (origin
             (method url-fetch)
-            (uri (string-append "http://downloads.xiph.org/releases/vorbis/libvorbis-"
-                                version ".tar.xz"))
+            (uri (string-append "http://downloads.xiph.org/releases/vorbis/"
+                                "libvorbis-" version ".tar.xz"))
             (sha256
              (base32
               "0wpk87jnhngcl3nc5i39flkycx1sjzilx8jjx4zc4p8r55ylj19g"))))
@@ -83,7 +83,7 @@ (define libvorbis
    (propagated-inputs `(("libogg" ,libogg)))
    (arguments `(#:configure-flags '("LDFLAGS=-lm")
                 #:parallel-tests? #f))
-   (synopsis "libvorbis, a library implementing the vorbis audio format")
+   (synopsis "Library implementing the vorbis audio format")
    (description
     "The libvorbis library implements the ogg vorbis audio format,
 a fully open, non-proprietary, patent-and-royalty-free, general-purpose
@@ -100,8 +100,8 @@ (define libtheora
     (version "1.1.1")
     (source (origin
              (method url-fetch)
-             (uri (string-append "http://downloads.xiph.org/releases/theora/libtheora-"
-                                 version ".tar.xz"))
+             (uri (string-append "http://downloads.xiph.org/releases/theora/"
+                                 "libtheora-" version ".tar.xz"))
              (sha256
               (base32
                "0q8wark9ribij57dciym5vdikg2464p8q2mgqvfb78ksjh4s8vgk"))
@@ -209,7 +209,7 @@ (define flac
                                              "/share/man"))))
    ;; FIXME: configure also looks for xmms, input could be added once it exists
    (inputs `(("libogg" ,libogg)))
-   (synopsis "flac free lossless audio codec")
+   (synopsis "Free lossless audio codec")
    (description
 "FLAC stands for Free Lossless Audio Codec, an audio format that is lossless,
 meaning that audio is compressed in FLAC without any loss in quality.")
@@ -237,17 +237,17 @@ (define libkate
              ("libpng" ,libpng)
 ("python" ,python-wrapper)
              ("zlib" ,zlib)))
-   (synopsis "kate, a karaoke and text codec for embedding in ogg")
+   (synopsis "Karaoke and text codec for embedding in ogg")
    (description
     "Kate is an overlay codec, originally designed for karaoke and text,
-that can be multiplixed in Ogg. Text and images can be carried by a Kate
-stream, and animated. Most of the time, this would be multiplexed with
+that can be multiplixed in Ogg.  Text and images can be carried by a Kate
+stream, and animated.  Most of the time, this would be multiplexed with
 audio/video to carry subtitles, song lyrics (with or without karaoke data),
 etc., but doesn't have to be.
 
 Series of curves (splines, segments, etc.) may be attached to various
 properties (text position, font size, etc.) to create animated overlays.
-This allows scrolling or fading text to be defined. This can even be used
+This allows scrolling or fading text to be defined.  This can even be used
 to draw arbitrary shapes, so hand drawing can also be represented by a
 Kate stream.")
    (license license:bsd-3)
@@ -259,8 +259,8 @@ (define vorbis-tools
    (version "1.4.0")
    (source (origin
             (method url-fetch)
-            (uri (string-append "http://downloads.xiph.org/releases/vorbis/vorbis-tools-"
-                                version ".tar.gz"))
+            (uri (string-append "http://downloads.xiph.org/releases/vorbis/"
+                                "vorbis-tools-" version ".tar.gz"))
             (sha256
              (base32
               "1g12bnh5ah08v529y72kfdz5lhvy75iaz7f9jskyby23m9dkk2d3"))))
@@ -273,7 +273,7 @@ (define vorbis-tools
              ("libvorbis" ,libvorbis)
              ("pkg-config" ,pkg-config)
              ("speex" ,speex)))
-   (synopsis "ogg vorbis tools")
+   (synopsis "Ogg vorbis tools")
    (description
     "Ogg vorbis is a non-proprietary, patent-and-royalty-free,
 general-purpose compressed audio format.
@@ -300,11 +300,11 @@ (define opus
                (base32
                 "158xprn2086arvdib3vbbygz7z6jqkw2nci7nlywzzwallap0wmr"))))
     (build-system gnu-build-system)
-    (synopsis "highly versatile audio codec")
+    (synopsis "Versatile audio codec")
     (description
-     "Opus is a totally open, royalty-free, highly versatile audio codec. Opus
+     "Opus is a totally open, royalty-free, highly versatile audio codec.  Opus
 is unmatched for interactive speech and music transmission over the Internet,
-but is also intended for storage and streaming applications. It is
+but is also intended for storage and streaming applications.  It is
 standardized by the Internet Engineering Task Force (IETF) as RFC 6716 which
 incorporated technology from Skype's SILK codec and Xiph.Org's CELT codec.")
     (license license:bsd-3)
diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index 688aa3b07b9..63d0ef2132e 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -64,7 +64,7 @@ (define-public libxml2
                "10ib8bpar2pl68aqksfinvfmqknwnk7i35ibq6yjl8dpb0cxj9dd"))))
     (build-system gnu-build-system)
     (home-page "http://www.xmlsoft.org/")
-    (synopsis "libxml2, a C parser for XML")
+    (synopsis "C parser for XML")
     (inputs `(("zlib" ,zlib)))
     (native-inputs `(("perl" ,perl)
                      ("python" ,python-2))) ; incompatible with Python 3 (print syntax)
@@ -103,13 +103,13 @@ (define-public libxslt
                "13029baw9kkyjgr7q3jccw2mz38amq7mmpr5p3bh775qawd1bisz"))))
     (build-system gnu-build-system)
     (home-page "http://xmlsoft.org/XSLT/index.html")
-    (synopsis "libxslt, a C library for applying XSLT stylesheets to XML documents")
+    (synopsis "C library for applying XSLT stylesheets to XML documents")
     (inputs `(("libgcrypt" ,libgcrypt)
               ("libxml2" ,libxml2)
               ("python" ,python-wrapper)
               ("zlib" ,zlib)))
     (description
-     "Libxslt is an XSLT C library developed for the GNOME project. It is
+     "Libxslt is an XSLT C library developed for the GNOME project.  It is
 based on libxml for XML parsing, tree manipulation and XPath support.")
     (license license:x11)))
 
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 498c7ddb08a..9dededbceb5 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -70,7 +70,7 @@ (define-public xeyes
      `(("pkg-config" ,pkg-config)))
     (home-page "http://xeyes.sourcearchive.com/")
     (synopsis "Follow-the-mouse X demo")
-    (description "Xeyes is a demo program for x.org. It shows eyes
+    (description "Xeyes is a demo program for x.org.  It shows eyes
 following the mouse.")
     (license license:x11)))
 
@@ -96,7 +96,7 @@ (define-public pixman
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.pixman.org/")
-    (synopsis "pixman, a low-level pixel manipulation library")
+    (synopsis "Low-level pixel manipulation library")
     (description "Pixman is a low-level software library for pixel
 manipulation, providing features such as image compositing and trapezoid
 rasterisation.")
@@ -124,12 +124,12 @@ (define-public libdrm
     (native-inputs
        `(("pkg-config" ,pkg-config)))
     (home-page "http://dri.freedesktop.org/wiki/")
-    (synopsis "libdrm, direct rendering userspace library")
+    (synopsis "Direct rendering userspace library")
     (description "The Direct Rendering Infrastructure, also known as the DRI,
 is a framework for allowing direct access to graphics hardware under the
-X Window System in a safe and efficient manner. It includes changes to the
+X Window System in a safe and efficient manner.  It includes changes to the
 X server, to several client libraries, and to the kernel (DRM, Direct
-Rendering Manager). The most important use for the DRI is to create fast
+Rendering Manager).  The most important use for the DRI is to create fast
 OpenGL implementations providing hardware acceleration for Mesa.
 Several 3D accelerated drivers have been written to the DRI specification,
 including drivers for chipsets produced by 3DFX, AMD (formerly ATI), Intel
@@ -279,7 +279,7 @@ (define-public bdftopcf
     (native-inputs
        `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -301,7 +301,7 @@ (define-public bigreqsproto
     (build-system gnu-build-system)
     (native-inputs `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -326,7 +326,7 @@ (define-public compositeproto
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -348,7 +348,7 @@ (define-public damageproto
     (build-system gnu-build-system)
     (native-inputs `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -370,7 +370,7 @@ (define-public dmxproto
     (build-system gnu-build-system)
     (native-inputs `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -391,7 +391,7 @@ (define-public dri2proto
             "02drlfqvjm2q7dvkkwli3fs2crb6rdb3kyd13vwx7z0rijrc10md"))))
     (build-system gnu-build-system)
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -413,7 +413,7 @@ (define-public dri3proto
             "0x609xvnl8jky5m8jdklw4nymx3irkv32w99dfd8nl800bblkgh1"))))
     (build-system gnu-build-system)
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license (license:x11-style "file://dri3proto.h"
                                 "See 'dri3proto.h' in the distribution."))))
@@ -439,7 +439,7 @@ (define-public encodings
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:public-domain)))
 
@@ -471,7 +471,7 @@ (define-public font-adobe100dpi
         ;; font-util-?.?.?/share/fonts/X11
         (string-append "--with-fontrootdir=" %output "/share/fonts/X11"))))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -501,7 +501,7 @@ (define-public font-adobe75dpi
       `(#:configure-flags (list
         (string-append "--with-fontrootdir=" %output "/share/fonts/X11"))))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -529,7 +529,7 @@ (define-public font-alias
     (build-system gnu-build-system)
     (native-inputs `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -555,7 +555,7 @@ (define-public font-arabic-misc
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -592,7 +592,7 @@ (define-public font-cronyx-cyrillic
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -625,7 +625,7 @@ (define-public font-dec-misc
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -654,7 +654,7 @@ (define-public font-isas-misc
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -684,7 +684,7 @@ (define-public font-micro-misc
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:public-domain)))
 
@@ -710,7 +710,7 @@ (define-public font-misc-cyrillic
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -735,7 +735,7 @@ (define-public font-misc-ethiopic
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -769,7 +769,7 @@ (define-public font-misc-misc
       `(#:configure-flags (list
         (string-append "--with-fontrootdir=" %output "/share/fonts/X11"))))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:public-domain)))
 
@@ -795,7 +795,7 @@ (define-public font-mutt-misc
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -825,7 +825,7 @@ (define-public font-schumacher-misc
       `(#:configure-flags (list
         (string-append "--with-fontrootdir=" %output "/share/fonts/X11"))))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -851,7 +851,7 @@ (define-public font-screen-cyrillic
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -877,7 +877,7 @@ (define-public font-sony-misc
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -903,7 +903,7 @@ (define-public font-sun-misc
     (native-inputs
      `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -925,7 +925,7 @@ (define-public font-util
     (build-system gnu-build-system)
     (native-inputs `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -951,7 +951,7 @@ (define-public font-winitzki-cyrillic
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:public-domain)))
 
@@ -976,7 +976,7 @@ (define-public font-xfree86-type1
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -998,7 +998,7 @@ (define-public fontsproto
     (build-system gnu-build-system)
     (native-inputs `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -1020,7 +1020,7 @@ (define-public glproto
     (build-system gnu-build-system)
     (native-inputs `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -1045,7 +1045,7 @@ (define-public iceauth
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -1067,7 +1067,7 @@ (define-public inputproto
     (build-system gnu-build-system)
     (native-inputs `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -1089,7 +1089,7 @@ (define-public kbproto
     (build-system gnu-build-system)
     (native-inputs `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -1121,7 +1121,7 @@ (define-public libdmx
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -1147,7 +1147,7 @@ (define-public libfontenc
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -1174,7 +1174,7 @@ (define-public libfs
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -1199,7 +1199,7 @@ (define-public libpciaccess
     (native-inputs
        `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -1221,7 +1221,7 @@ (define-public libpthread-stubs
     (build-system gnu-build-system)
     (native-inputs `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -1249,7 +1249,7 @@ (define-public libsm
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -1277,7 +1277,7 @@ (define-public libwindowswm
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -1305,7 +1305,7 @@ (define-public libxcomposite
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -1330,7 +1330,7 @@ (define-public libxdmcp
     (native-inputs
        `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -1361,7 +1361,7 @@ (define-public libxft
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -1386,7 +1386,7 @@ (define-public libxkbfile
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -1413,7 +1413,7 @@ (define-public libxmu
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -1441,7 +1441,7 @@ (define-public libxpm
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -1469,7 +1469,7 @@ (define-public libxres
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -1497,7 +1497,7 @@ (define-public libxscrnsaver
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -1525,7 +1525,7 @@ (define-public libxxf86dga
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -1553,7 +1553,7 @@ (define-public luit
     (native-inputs
        `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -1577,7 +1577,7 @@ (define-public makedepend
       `(("xproto" ,xproto)))
     (native-inputs `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -1605,7 +1605,7 @@ (define-public mkfontscale
     (native-inputs
        `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -1627,7 +1627,7 @@ (define-public presentproto
             "1kir51aqg9cwazs14ivcldcn3mzadqgykc9cg87rm40zf947sb41"))))
     (build-system gnu-build-system)
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license (license:x11-style "file://presentproto.h"
                                 "See 'presentproto.h' in the distribution."))))
@@ -1650,7 +1650,7 @@ (define-public printproto
     (build-system gnu-build-system)
     (native-inputs `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -1672,7 +1672,7 @@ (define-public randrproto
     (build-system gnu-build-system)
     (native-inputs `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -1694,7 +1694,7 @@ (define-public recordproto
     (build-system gnu-build-system)
     (native-inputs `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -1716,7 +1716,7 @@ (define-public renderproto
     (build-system gnu-build-system)
     (native-inputs `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -1738,7 +1738,7 @@ (define-public resourceproto
     (build-system gnu-build-system)
     (native-inputs `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -1760,7 +1760,7 @@ (define-public scrnsaverproto
     (build-system gnu-build-system)
     (native-inputs `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -1785,7 +1785,7 @@ (define-public sessreg
     (native-inputs
        `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -1817,7 +1817,7 @@ (define-public setxkbmap
                             (assoc-ref %build-inputs "xkeyboard-config")
                             "/share/X11/xkb"))))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -1843,7 +1843,7 @@ (define-public smproxy
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -1881,7 +1881,7 @@ (define-public util-macros
                         (rmdir "share/util-macros"))))
                   %standard-phases))))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -1903,7 +1903,7 @@ (define-public videoproto
     (build-system gnu-build-system)
     (native-inputs `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -1925,7 +1925,7 @@ (define-public windowswmproto
     (build-system gnu-build-system)
     (native-inputs `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -1953,7 +1953,7 @@ (define-public x11perf
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -1981,7 +1981,7 @@ (define-public xauth
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -2008,7 +2008,7 @@ (define-public xbacklight
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -2030,7 +2030,7 @@ (define-public xbitmaps
     (build-system gnu-build-system)
     (native-inputs `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -2053,7 +2053,7 @@ (define-public xcb-proto
     (native-inputs
       `(("pkg-config" ,pkg-config) ("python" ,python-wrapper)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -2075,7 +2075,7 @@ (define-public xcmiscproto
     (build-system gnu-build-system)
     (native-inputs `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -2100,7 +2100,7 @@ (define-public xcmsdb
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -2131,7 +2131,7 @@ (define-public xcursor-themes
                             (assoc-ref %outputs "out")
                             "/share/icons"))))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -2157,7 +2157,7 @@ (define-public xcursorgen
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -2191,7 +2191,7 @@ (define-public xdpyinfo
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -2217,7 +2217,7 @@ (define-public xdriinfo
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -2245,7 +2245,7 @@ (define-public xev
     (native-inputs
      `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -2267,7 +2267,7 @@ (define-public xextproto
     (build-system gnu-build-system)
     (native-inputs `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -2297,7 +2297,7 @@ (define-public xf86-input-evdev
                             (assoc-ref %outputs "out")
                             "/include/xorg"))))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -2325,7 +2325,7 @@ (define-public xf86-input-joystick
                             (assoc-ref %outputs "out")
                             "/include/xorg"))))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -2348,7 +2348,7 @@ (define-public xf86-input-keyboard
     (inputs `(("xorg-server" ,xorg-server)))
     (native-inputs `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -2371,7 +2371,7 @@ (define-public xf86-input-mouse
     (inputs `(("xorg-server" ,xorg-server)))
     (native-inputs `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -2431,7 +2431,7 @@ (define-public xf86-input-void
     (inputs `(("xorg-server" ,xorg-server)))
     (native-inputs `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -2454,7 +2454,7 @@ (define-public xf86-video-ark
     (inputs `(("xorg-server" ,xorg-server)))
     (native-inputs `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -2477,7 +2477,7 @@ (define-public xf86-video-ast
     (inputs `(("xorg-server" ,xorg-server)))
     (native-inputs `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -2502,7 +2502,7 @@ (define-public xf86-video-ati
               ("xorg-server" ,xorg-server)))
     (native-inputs `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -2525,7 +2525,7 @@ (define-public xf86-video-cirrus
     (inputs `(("xorg-server" ,xorg-server)))
     (native-inputs `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -2552,7 +2552,7 @@ (define-public xf86-video-fbdev
     (inputs `(("xorg-server" ,xorg-server)))
     (native-inputs `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -2576,7 +2576,7 @@ (define-public xf86-video-fbdev
 ;;     (inputs `(("pkg-config" ,pkg-config)
 ;;               ("xorg-server" ,xorg-server)))
 ;;     (home-page "http://www.x.org/wiki/")
-;;     (synopsis "xorg implementation of the X Window System")
+;;     (synopsis "Xorg implementation of the X Window System")
 ;;     (description "X.org provides an implementation of the X Window System")
 ;;     (license license:x11)))
 
@@ -2602,7 +2602,7 @@ (define-public xf86-video-fbdev
 ;;     (inputs `(("pkg-config" ,pkg-config)
 ;;               ("xorg-server" ,xorg-server)))
 ;;     (home-page "http://www.x.org/wiki/")
-;;     (synopsis "xorg implementation of the X Window System")
+;;     (synopsis "Xorg implementation of the X Window System")
 ;;     (description "X.org provides an implementation of the X Window System")
 ;;     (license license:x11)))
 
@@ -2626,7 +2626,7 @@ (define-public xf86-video-glint
               ("xorg-server" ,xorg-server)))
     (native-inputs `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -2649,7 +2649,7 @@ (define-public xf86-video-i128
     (inputs `(("xorg-server" ,xorg-server)))
     (native-inputs `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -2675,7 +2675,7 @@ (define-public xf86-video-intel
     (native-inputs
      `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -2701,7 +2701,7 @@ (define-public xf86-video-mach64
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -2726,7 +2726,7 @@ (define-public xf86-video-mga
               ("xorg-server" ,xorg-server)))
     (native-inputs `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -2750,7 +2750,7 @@ (define-public xf86-video-neomagic
               ("xorg-server" ,xorg-server)))
     (native-inputs `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -2773,7 +2773,7 @@ (define-public xf86-video-newport
     (inputs `(("xorg-server" ,xorg-server)))
     (native-inputs `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -2796,7 +2796,7 @@ (define-public xf86-video-nv
     (inputs `(("xorg-server" ,xorg-server)))
     (native-inputs `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -2825,7 +2825,7 @@ (define-public xf86-video-openchrome
     (native-inputs
      `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -2850,7 +2850,7 @@ (define-public xf86-video-r128
               ("xorg-server" ,xorg-server)))
     (native-inputs `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -2875,7 +2875,7 @@ (define-public xf86-video-savage
               ("xorg-server" ,xorg-server)))
     (native-inputs `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -2898,7 +2898,7 @@ (define-public xf86-video-siliconmotion
     (inputs `(("xorg-server" ,xorg-server)))
     (native-inputs `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -2925,7 +2925,7 @@ (define-public xf86-video-sis
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:bsd-3)))
 
@@ -2948,7 +2948,7 @@ (define-public xf86-video-suncg6
     (inputs `(("xorg-server" ,xorg-server)))
     (native-inputs `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -2971,7 +2971,7 @@ (define-public xf86-video-sunffb
     (inputs `(("xorg-server" ,xorg-server)))
     (native-inputs `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -2996,7 +2996,7 @@ (define-public xf86-video-tdfx
               ("xorg-server" ,xorg-server)))
     (native-inputs `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -3020,7 +3020,7 @@ (define-public xf86-video-tga
               ("xorg-server" ,xorg-server)))
     (native-inputs `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -3044,7 +3044,7 @@ (define-public xf86-video-trident
               ("xorg-server" ,xorg-server)))
     (native-inputs `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -3071,7 +3071,7 @@ (define-public xf86-video-vesa
     (inputs `(("xorg-server" ,xorg-server)))
     (native-inputs `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -3097,7 +3097,7 @@ (define-public xf86-video-vmware
     (native-inputs
        `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -3121,7 +3121,7 @@ (define-public xf86-video-voodoo
               ("xorg-server" ,xorg-server)))
     (native-inputs `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -3146,7 +3146,7 @@ (define-public xf86bigfontproto
             "0j0n7sj5xfjpmmgx6n5x556rw21hdd18fwmavp95wps7qki214ms"))))
     (build-system gnu-build-system)
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -3167,7 +3167,7 @@ (define-public xf86dgaproto
             "0l4hx48207mx0hp09026r6gy9nl3asbq0c75hri19wp1118zcpmc"))))
     (build-system gnu-build-system)
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -3188,7 +3188,7 @@ (define-public xf86driproto
             "07v69m0g2dfzb653jni4x656jlr7l84c1k39j8qc8vfb45r8sjww"))))
     (build-system gnu-build-system)
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -3209,7 +3209,7 @@ (define-public xf86vidmodeproto
             "0w47d7gfa8zizh2bshdr2rffvbr4jqjv019mdgyh6cmplyd4kna5"))))
     (build-system gnu-build-system)
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -3235,7 +3235,7 @@ (define-public xgamma
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -3262,7 +3262,7 @@ (define-public xhost
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -3284,7 +3284,7 @@ (define-public xineramaproto
     (build-system gnu-build-system)
     (native-inputs `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -3314,7 +3314,7 @@ (define-public xinput
     (native-inputs
        `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -3341,7 +3341,7 @@ (define xkbcomp-intermediate ; used as input for xkeyboard-config
     (native-inputs
         `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -3379,7 +3379,7 @@ (define-public xkbevd
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -3407,7 +3407,7 @@ (define-public xkbutils
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -3435,7 +3435,7 @@ (define-public xkeyboard-config
       `(("intltool" ,intltool)
         ("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -3461,7 +3461,7 @@ (define-public xkill
     (native-inputs
        `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -3486,7 +3486,7 @@ (define-public xlsatoms
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -3511,7 +3511,7 @@ (define-public xlsclients
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -3538,7 +3538,7 @@ (define-public xmodmap
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -3564,7 +3564,7 @@ (define-public xorg-sgml-doctools
     (build-system gnu-build-system)
     (native-inputs `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -3591,7 +3591,7 @@ (define-public xpr
     (native-inputs
         `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -3617,7 +3617,7 @@ (define-public xprop
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -3645,7 +3645,7 @@ (define-public xrandr
     (native-inputs
      `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -3671,7 +3671,7 @@ (define-public xrdb
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -3696,7 +3696,7 @@ (define-public xrefresh
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -3724,7 +3724,7 @@ (define-public xset
     (native-inputs
        `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -3751,7 +3751,7 @@ (define-public xsetroot
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -3773,7 +3773,7 @@ (define-public xtrans
     (build-system gnu-build-system)
     (native-inputs `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -3800,7 +3800,7 @@ (define-public xvinfo
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -3826,7 +3826,7 @@ (define-public xwd
     (native-inputs
        `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -3852,7 +3852,7 @@ (define-public xwininfo
     (native-inputs
        `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -3878,7 +3878,7 @@ (define-public xwud
     (native-inputs
        `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -3906,7 +3906,7 @@ (define-public fixesproto
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -3935,7 +3935,7 @@ (define-public libxdamage
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -3963,7 +3963,7 @@ (define-public libxext
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -3991,7 +3991,7 @@ (define-public libxinerama
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -4020,7 +4020,7 @@ (define-public libxp
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -4048,7 +4048,7 @@ (define-public libxrender
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -4077,7 +4077,7 @@ (define-public libxtst
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -4106,7 +4106,7 @@ (define-public libxv
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -4131,7 +4131,7 @@ (define-public mkfontdir
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -4156,7 +4156,7 @@ (define-public xproto
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -4186,7 +4186,7 @@ (define-public libice
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -4211,7 +4211,7 @@ (define-public libxau
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -4238,7 +4238,7 @@ (define-public libxfixes
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -4269,7 +4269,7 @@ (define-public libxfont
     (native-inputs
        `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -4298,7 +4298,7 @@ (define-public libxi
     (native-inputs
        `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -4328,7 +4328,7 @@ (define-public libxrandr
     (native-inputs
        `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -4357,7 +4357,7 @@ (define-public libxvmc
     (native-inputs
        `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -4385,7 +4385,7 @@ (define-public libxxf86vm
     (native-inputs
        `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -4420,7 +4420,7 @@ (define-public libxcb
     (arguments
      `(#:configure-flags '("--enable-xkb")))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -4517,7 +4517,7 @@ (define-public xorg-server
              (apply configure args)))
          %standard-phases)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -4550,7 +4550,7 @@ (define-public libx11
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -4580,7 +4580,7 @@ (define-public libxcursor
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -4609,7 +4609,7 @@ (define-public libxt
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -4639,7 +4639,7 @@ (define-public libxaw
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
@@ -4826,7 +4826,7 @@ (define-public libxaw3d
     (native-inputs
      `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
+    (synopsis "Xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
diff --git a/gnu/packages/zile.scm b/gnu/packages/zile.scm
index 4f198e48490..f1c03fb64cb 100644
--- a/gnu/packages/zile.scm
+++ b/gnu/packages/zile.scm
@@ -60,7 +60,7 @@ (define-public zile
        ("help2man" ,help2man)
        ("pkg-config" ,pkg-config)))
     (home-page "http://www.gnu.org/software/zile/")
-    (synopsis "Zile is lossy Emacs, a lightweight Emacs clone")
+    (synopsis "Lightweight Emacs clone")
     (description
      "GNU Zile is a lightweight Emacs clone.  It usage is similar to the
 default Emacs configuration, but it carries a much lighter feature set.")
diff --git a/gnu/packages/zip.scm b/gnu/packages/zip.scm
index e8de7b3a329..29ab555ae45 100644
--- a/gnu/packages/zip.scm
+++ b/gnu/packages/zip.scm
@@ -53,18 +53,18 @@ (define-public zip
                    (zero? (apply system* "make" "generic_gcc" make-flags)))
                  (alist-delete 'configure %standard-phases))))
     (home-page "http://www.info-zip.org/Zip.html")
-    (synopsis "Zip compression and file packing utility")
+    (synopsis "Compression and file packing utility")
     (description
-     "Zip is a compression and file packaging/archive utility. Zip is useful
+     "Zip is a compression and file packaging/archive utility.  Zip is useful
 for packaging a set of files for distribution, for archiving files, and for
 saving disk space by temporarily compressing unused files or directories.
 Zip puts one or more compressed files into a single ZIP archive, along with
 information about the files (name, path, date, time of last modification,
-protection, and check information to verify file integrity). An entire
+protection, and check information to verify file integrity).  An entire
 directory structure can be packed into a ZIP archive with a single command.
 
 Zip has one compression method (deflation) and can also store files without
-compression. Zip automatically chooses the better of the two for each file.
+compression.  Zip automatically chooses the better of the two for each file.
 Compression ratios of 2:1 to 3:1 are common for text files.")
   (license (license:bsd-style "file://LICENSE"
                                "See LICENSE in the distribution."))))
@@ -95,15 +95,15 @@ (define-public unzip
                (("/man/") "/share/man/"))))
         %standard-phases)))
     (home-page "http://www.info-zip.org/UnZip.html")
-    (synopsis "Unzip decompression and file extraction utility")
+    (synopsis "Decompression and file extraction utility")
     (description
-     "UnZip is an extraction utility for archives compressed in .zip format
-(also called \"zipfiles\").
+     "UnZip is an extraction utility for archives compressed in .zip format,
+also called \"zipfiles\".
 
-UnZip lists, tests, or extracts files from a .zip archive. The default
-behaviour (with no options) is to extract into the current directory
-(and subdirectories below it) all files from the specified zipfile.
-UnZip recreates the stored directory structure by default.")
+UnZip lists, tests, or extracts files from a .zip archive.  The default
+behaviour (with no options) is to extract into the current directory, and
+subdirectories below it, all files from the specified zipfile.  UnZip
+recreates the stored directory structure by default.")
   (license (license:bsd-style "file://LICENSE"
                                "See LICENSE in the distribution."))))
 
@@ -131,9 +131,9 @@ (define-public zziplib
     (arguments
      `(#:parallel-tests? #f)) ; since test files are created on the fly
     (home-page "http://zziplib.sourceforge.net/")
-    (synopsis "zziplib, a library for accessing zip files")
+    (synopsis "Library for accessing zip files")
     (description
-     "zziplib is a library based on zlib for accessing zip files.")
+     "ZZipLib is a library based on zlib for accessing zip files.")
     (license license:lgpl2.0+)))
 
 
diff --git a/gnu/packages/zsh.scm b/gnu/packages/zsh.scm
index 778085c3c23..63913a3e2ab 100644
--- a/gnu/packages/zsh.scm
+++ b/gnu/packages/zsh.scm
@@ -63,7 +63,7 @@ (define-public zsh
     (synopsis "Powerful shell for interactive use and scripting")
     (description "The Z shell (zsh) is a Unix shell that can be used
 as an interactive login shell and as a powerful command interpreter
-for shell scripting. Zsh can be thought of as an extended Bourne shell
+for shell scripting.  Zsh can be thought of as an extended Bourne shell
 with a large number of improvements, including some features of bash,
 ksh, and tcsh.")
     (home-page "http://www.zsh.org/")
-- 
GitLab