Edited DESCR in the case of:

 File too long (should be no more than 24 lines).
 Line too long (should be no more than 80 characters).
 Trailing empty lines.
 Trailing white-space.
Trucated the long files as best as possible while preserving the most info
contained in them.

91 files changed, 691 insertions, 1240 deletions

diff --git a/archivers/ark/DESCR b/archivers/ark/DESCR
index 30029004a96..28db2a990f6 100644
--- a/archivers/ark/DESCR
+++ b/archivers/ark/DESCR
@@ -1,5 +1,5 @@
 Ark is a program for managing various archive formats within the KDE
-environment. 
+environment.
 
 Archives can be viewed, extracted, created and modified from within Ark.
 The program can handle various formats such as tar, gzip, bzip2, zip, rar
diff --git a/audio/alsa-utils/DESCR b/audio/alsa-utils/DESCR
index 4fea94817a5..8be16180c98 100644
--- a/audio/alsa-utils/DESCR
+++ b/audio/alsa-utils/DESCR
@@ -9,6 +9,6 @@ significant features:
     * User space library (alsa-lib) to simplify application programming and
       provide higher level functionality.
     * Support for the older Open Sound System (OSS) API, providing binary
-      compatibility for most OSS programs. 
+      compatibility for most OSS programs.
 
 This package provides utilities for configuring and using ALSA.
diff --git a/benchmarks/bonnie/DESCR b/benchmarks/bonnie/DESCR
index b87a95cc821..472b647a37b 100644
--- a/benchmarks/bonnie/DESCR
+++ b/benchmarks/bonnie/DESCR
@@ -1,5 +1,3 @@
-Bonnie: A simple Filesystem Benchmark Program
-
 Bonnie tests the speed of sequential file I/O using standard C library
 calls.  It does reads and writes of characters using STDIO; and of
 blocks using system calls.  Then it does a sequential pass of reading
diff --git a/biology/mpqc/DESCR b/biology/mpqc/DESCR
index d1dd84519d8..4482fa7fb38 100644
--- a/biology/mpqc/DESCR
+++ b/biology/mpqc/DESCR
@@ -1,28 +1,24 @@
-MPQC is the Massively Parallel Quantum Chemistry Program.
-It computes properties of atoms and molecules from first
-principles using the time independent Schroedinger equation.
-It runs on a wide range of architectures ranging from single
-many-core computers to massively parallel computers. Its design
-is object oriented, using the C++ programming language.
+MPQC is the Massively Parallel Quantum Chemistry Program. It computes properties
+of atoms and molecules from first principles using the time independent
+Schroedinger equation. It runs on a wide range of architectures ranging from
+single many-core computers to massively parallel computers. Its design is object
+oriented, using the C++ programming language.
 
-Capabilities
+Capabilities:
 
-  * Closed shell, unrestricted and general restricted open shell
-    Hartree-Fock energies and gradients
-  * Closed shell, unrestricted and general restricted open shell
-    density functional theory energies and gradients
-  * Second order open shell perturbation theory (OPT2[2]) and
-    Z-averaged perturbation theory (ZAPT2) energies.
-  * Second order closed shell Moller-Plesset perturbation
-    theory energies and gradients.
-  * Second order Moller-Plesset perturbation theory
-    including an R12/F12 correlation factor. Energies of closed-
-    and open-shell systems are supported.
-  * Explicitly-correlated R12/F12 coupled-cluster methods via
-    interface to Psi3 code and via native (experimental)
-    implementation.
-  * Explicitly-correlated multireference methods (MRCI, CASPT2)
-    via interfaces to GAMESS and MOLCAS codes.
-  * Robust internal coordinate geometry optimizer that efficiently
-    optimizes molecules with many degrees of freedom. Nearly
-    arbitrary internal coordinate constraints can be handled.
+ * Closed shell, unrestricted and general restricted open shell Hartree-Fock
+   energies and gradients
+ * Closed shell, unrestricted and general restricted open shell density
+   functional theory energies and gradients
+ * Second order open shell perturbation theory (OPT2[2]) and Z-averaged
+   perturbation theory (ZAPT2) energies.
+ * Second order closed shell Moller-Plesset perturbation theory energies and
+   gradients.
+ * Second order Moller-Plesset perturbation theory including an R12/F12
+   correlation factor. Energies of closed- and open-shell systems are supported.
+ * Explicitly-correlated R12/F12 coupled-cluster methods via interface to Psi3
+   code and via native (experimental) implementation.
+ * Explicitly-correlated multireference methods (MRCI, CASPT2) via interfaces to   GAMESS and MOLCAS codes.
+ * Robust internal coordinate geometry optimizer that efficiently optimizes
+   molecules with many degrees of freedom. Nearly arbitrary internal coordinate
+   constraints can be handled.
diff --git a/comms/jpilot/DESCR b/comms/jpilot/DESCR
index f4c53dd6be7..77e888a5358 100644
--- a/comms/jpilot/DESCR
+++ b/comms/jpilot/DESCR
@@ -1,40 +1,23 @@
-J-Pilot is a desktop organizer application for the palm pilot that
-runs under Linux and Unix.  It is similar in functionality to the one
-that 3com distributes for a well known rampant legacy operating
-system.  Features include:
+J-Pilot is a desktop organizer application for the palm pilot that runs under
+Linux and Unix. It is similar in functionality to the one that 3com distributes
+for a well known rampant legacy operating system. Features include:
 
-  * Phone Dialer
-  * Syncronization of categories and editing categories on desktop
-  * Export of iCalendar format from ToDo and Datebook
-  * Export of vCard format from Address book
-  * Export of ldif format from Address book
-  * Supports Datebook, Address, To Do List, and Memo Pad
-  * Support for Palm OS 4.x passwords and USB
-  * Import and Export
-  * Supports some DateBk3 tags
-  * Support for PEdit palm app
-  * Postscript printing
-  * Monthly and Weekly Views of the datebook
-  * Plugin support - comes with Expense plugin
-  * Synctime plugin for setting the time on the palm
-  * KeyRing plugin for GNU KeyRing encryption Palm app
-  * Small and fast, designed to take up little screen space
-  * 2 way Syncing, fast and slow syncs
-  * Support for multiple backups
-  * Palm Pilot preferences are used so that things appearin the same way as
-    they do on the palm pilot.  i.e. Sorting orderof addresses, todos, memos,
-    etc.
-  * Does a Full Backup, or just a Sync of supported apps
-  * Restore capability
-  * Global Search (Find)
-  * Installation of files to the palm pilot, will install Graffiti Shortcuts
-  * Limited support for Japanese Kanji characters SJIS-> EUC -> SJIS
-  * Support for color scheme files
-  * Quick find in address application
-  * Datebook support for repeating events and exceptionsto those events
-  * Datebook support for modification of a single occurrence of a reoccurring
-    event
-  * Datebook support for "By Day" reoccurring eventseven when its on the last
-    day of the month, and not the 4th.  i.e. Try adding a monthly repeating
-    appointment "By Day" on the 4th week ofa month when there is no 5th
-    occurrence of that day in the month
+ * Phone Dialer
+ * Syncronization of categories and editing categories on desktop
+ * Export of iCalendar format from ToDo and Datebook
+ * Export of vCard format from Address book
+ * Export of ldif format from Address book
+ * Supports Datebook, Address, To Do List, and Memo Pad
+ * Support for Palm OS 4.x passwords and USB
+ * Import and Export
+ * Supports some DateBk3 tags
+ * Support for PEdit palm app
+ * Postscript printing
+ * Monthly and Weekly Views of the datebook
+ * Plugin support - comes with Expense plugin
+ * Synctime plugin for setting the time on the palm
+ * KeyRing plugin for GNU KeyRing encryption Palm app
+ * Small and fast, designed to take up little screen space
+ * 2 way Syncing, fast and slow syncs
+ * Support for multiple backups
+ * ...and much more!
diff --git a/comms/op_panel/DESCR b/comms/op_panel/DESCR
index e298965276e..acb44277339 100644
--- a/comms/op_panel/DESCR
+++ b/comms/op_panel/DESCR
@@ -1,28 +1,24 @@
 The Flash Operator panel is a 'switchboard' application for the Asterisk PBX
-system. It displays information about your Asterisk PBX activity in real
-time via a standard web browser with Flash plugin. The display and button
-layout is configurable, you can have more than a 100 buttons on the screen
-at once.
+system. It displays information about your Asterisk PBX activity in real time
+via a standard web browser with Flash plugin. The display and button layout is
+configurable, you can have more than a 100 buttons on the screen at once.
 
 You can see at a glance:
-
-   * What extensions are busy, ringing or available
-   * Who is talking and to whom (clid, context, priority)
-   * SIP registration status and reachability
-   * Meetme room status (number of users) in the room
-   * Queue status (number of users waiting)
-   * Parked extensions
-   * Call duration Timers
-   * Logged in Agents
+ * What extensions are busy, ringing or available
+ * Who is talking and to whom (clid, context, priority)
+ * SIP registration status and reachability
+ * Meetme room status (number of users) in the room
+ * Queue status (number of users waiting)
+ * Parked extensions
+ * Call duration Timers
+ * Logged in Agents
 
 You can perform these actions:
-
-   * Hang-up a channel (double click the colored dot on the button)
-   * Transfer a call leg via drag&drop (drag the phone icon on a button to
-     another button)
-   * Originate calls via drag&drop
-   * Drag an available extension to an ongoing conversation and conference
-     the three together.
-   * Change the callerid text to something meaningfull when transferring or
-     originating a call
-   * Mute/Unmute meetme participants
+ * Hang-up a channel (double click the colored dot on the button)
+ * Transfer a call leg via drag&drop (drag the phone icon on a button to another   button)
+ * Originate calls via drag&drop
+ * Drag an available extension to an ongoing conversation and conference the
+   three together.
+ * Change the callerid text to something meaningfull when transferring or
+   originating a call
+ * Mute/Unmute meetme participants
diff --git a/databases/phppgadmin/DESCR b/databases/phppgadmin/DESCR
index 2ffbdcd176a..de8526eb55c 100644
--- a/databases/phppgadmin/DESCR
+++ b/databases/phppgadmin/DESCR
@@ -1,7 +1,5 @@
-phpPgAdmin is a web-based administration tool for PostgreSQL. It is perfect
-for PostgreSQL DBAs, newbies and hosting services.
-
-Features include:
+phpPgAdmin is a web-based administration tool for PostgreSQL. It is perfect for
+PostgreSQL DBAs, newbies and hosting services. Features include:
 - Administer multiple servers
 - Support for PostgreSQL 7.4.x, 8.0.x, 8.1.x, 8.2.x, 8.3.x, 8.4.x, 9.0.x
 - Manage all aspects of:
diff --git a/databases/postgresql90-datatypes/DESCR b/databases/postgresql90-datatypes/DESCR
index 0fd1fb2d6cd..1e4f644bc64 100644
--- a/databases/postgresql90-datatypes/DESCR
+++ b/databases/postgresql90-datatypes/DESCR
@@ -1,43 +1,24 @@
-This package provides the following PostgreSQL modules:
-  - citext
-  - hstore
-  - intarray
-  - isn
-  - ltree
-  - lo
-  - uuid-ossp
-  - unaccent
+This package provides the following PostgreSQL modules: citext, hstore,
+intarray, isn, ltree, lo, uuid-ossp, and unaccent. The "citext" module provides
+a case-insensitive character string type, citext.
 
-The "citext" module provides a case-insensitive character string type,
-citext. Essentially, it internally calls lower when comparing values.
-Otherwise, it behaves almost exactly like text.
+The "hstore" module implements the "hstore" data type for storing sets of
+key/value pairs within a single PostgreSQL value.
 
-The "hstore" module implements the "hstore" data type for storing sets
-of key/value pairs within a single PostgreSQL value. This can be useful
-in various scenarios, such as rows with many attributes that are rarely
-examined, or semi-structured data. Keys and values are simply text strings.
+The "intarray" module provides a number of useful functions and operators for
+manipulating one-dimensional arrays of integers.
 
-The "intarray" module provides a number of useful functions and operators
-for manipulating one-dimensional arrays of integers. There is also support
-for indexed searches using some of the operators.
+The "isn" module provides data types for the following international product
+numbering standards: EAN13, UPC, ISBN (books), ISMN (music), and ISSN (serials).
 
-The "isn" module provides data types for the following international
-product numbering standards: EAN13, UPC, ISBN (books), ISMN (music),
-and ISSN (serials). Numbers are validated on input, and correctly
-hyphenated on output.
+The "ltree" module implements a data type ltree for representing labels of data
+stored in a hierarchical tree-like structure.
 
-The "ltree" module implements a data type ltree for representing
-labels of data stored in a hierarchical tree-like structure.
-Extensive facilities for searching through label trees are provided.
-
-The "lo" module provides support for managing Large Objects (also called
-LOs or BLOBs). This includes a data type "lo" and a trigger "lo_manage."
+The "lo" module provides support for managing Large Objects (also called LOs or
+BLOBs). This includes a data type "lo" and a trigger "lo_manage."
 
 The "uuid-ossp" module provides functions to generate universally unique
-identifiers (UUIDs) using one of several standard algorithms. There are
-also functions to produce certain special UUID constants.
+identifiers (UUIDs) using one of several standard algorithms.
 
 "unaccent" is a text search dictionary that removes accents (diacritic signs)
-from lexemes. It's a filtering dictionary, which means its output is always
-passed to the next dictionary (if any), unlike the normal behavior of
-dictionaries. This allows accent-insensitive processing for full text search.
+from lexemes.
diff --git a/databases/postgresql91-datatypes/DESCR b/databases/postgresql91-datatypes/DESCR
index 0fd1fb2d6cd..1e4f644bc64 100644
--- a/databases/postgresql91-datatypes/DESCR
+++ b/databases/postgresql91-datatypes/DESCR
@@ -1,43 +1,24 @@
-This package provides the following PostgreSQL modules:
-  - citext
-  - hstore
-  - intarray
-  - isn
-  - ltree
-  - lo
-  - uuid-ossp
-  - unaccent
+This package provides the following PostgreSQL modules: citext, hstore,
+intarray, isn, ltree, lo, uuid-ossp, and unaccent. The "citext" module provides
+a case-insensitive character string type, citext.
 
-The "citext" module provides a case-insensitive character string type,
-citext. Essentially, it internally calls lower when comparing values.
-Otherwise, it behaves almost exactly like text.
+The "hstore" module implements the "hstore" data type for storing sets of
+key/value pairs within a single PostgreSQL value.
 
-The "hstore" module implements the "hstore" data type for storing sets
-of key/value pairs within a single PostgreSQL value. This can be useful
-in various scenarios, such as rows with many attributes that are rarely
-examined, or semi-structured data. Keys and values are simply text strings.
+The "intarray" module provides a number of useful functions and operators for
+manipulating one-dimensional arrays of integers.
 
-The "intarray" module provides a number of useful functions and operators
-for manipulating one-dimensional arrays of integers. There is also support
-for indexed searches using some of the operators.
+The "isn" module provides data types for the following international product
+numbering standards: EAN13, UPC, ISBN (books), ISMN (music), and ISSN (serials).
 
-The "isn" module provides data types for the following international
-product numbering standards: EAN13, UPC, ISBN (books), ISMN (music),
-and ISSN (serials). Numbers are validated on input, and correctly
-hyphenated on output.
+The "ltree" module implements a data type ltree for representing labels of data
+stored in a hierarchical tree-like structure.
 
-The "ltree" module implements a data type ltree for representing
-labels of data stored in a hierarchical tree-like structure.
-Extensive facilities for searching through label trees are provided.
-
-The "lo" module provides support for managing Large Objects (also called
-LOs or BLOBs). This includes a data type "lo" and a trigger "lo_manage."
+The "lo" module provides support for managing Large Objects (also called LOs or
+BLOBs). This includes a data type "lo" and a trigger "lo_manage."
 
 The "uuid-ossp" module provides functions to generate universally unique
-identifiers (UUIDs) using one of several standard algorithms. There are
-also functions to produce certain special UUID constants.
+identifiers (UUIDs) using one of several standard algorithms.
 
 "unaccent" is a text search dictionary that removes accents (diacritic signs)
-from lexemes. It's a filtering dictionary, which means its output is always
-passed to the next dictionary (if any), unlike the normal behavior of
-dictionaries. This allows accent-insensitive processing for full text search.
+from lexemes.
diff --git a/databases/postgresql92-datatypes/DESCR b/databases/postgresql92-datatypes/DESCR
index 0fd1fb2d6cd..1e4f644bc64 100644
--- a/databases/postgresql92-datatypes/DESCR
+++ b/databases/postgresql92-datatypes/DESCR
@@ -1,43 +1,24 @@
-This package provides the following PostgreSQL modules:
-  - citext
-  - hstore
-  - intarray
-  - isn
-  - ltree
-  - lo
-  - uuid-ossp
-  - unaccent
+This package provides the following PostgreSQL modules: citext, hstore,
+intarray, isn, ltree, lo, uuid-ossp, and unaccent. The "citext" module provides
+a case-insensitive character string type, citext.
 
-The "citext" module provides a case-insensitive character string type,
-citext. Essentially, it internally calls lower when comparing values.
-Otherwise, it behaves almost exactly like text.
+The "hstore" module implements the "hstore" data type for storing sets of
+key/value pairs within a single PostgreSQL value.
 
-The "hstore" module implements the "hstore" data type for storing sets
-of key/value pairs within a single PostgreSQL value. This can be useful
-in various scenarios, such as rows with many attributes that are rarely
-examined, or semi-structured data. Keys and values are simply text strings.
+The "intarray" module provides a number of useful functions and operators for
+manipulating one-dimensional arrays of integers.
 
-The "intarray" module provides a number of useful functions and operators
-for manipulating one-dimensional arrays of integers. There is also support
-for indexed searches using some of the operators.
+The "isn" module provides data types for the following international product
+numbering standards: EAN13, UPC, ISBN (books), ISMN (music), and ISSN (serials).
 
-The "isn" module provides data types for the following international
-product numbering standards: EAN13, UPC, ISBN (books), ISMN (music),
-and ISSN (serials). Numbers are validated on input, and correctly
-hyphenated on output.
+The "ltree" module implements a data type ltree for representing labels of data
+stored in a hierarchical tree-like structure.
 
-The "ltree" module implements a data type ltree for representing
-labels of data stored in a hierarchical tree-like structure.
-Extensive facilities for searching through label trees are provided.
-
-The "lo" module provides support for managing Large Objects (also called
-LOs or BLOBs). This includes a data type "lo" and a trigger "lo_manage."
+The "lo" module provides support for managing Large Objects (also called LOs or
+BLOBs). This includes a data type "lo" and a trigger "lo_manage."
 
 The "uuid-ossp" module provides functions to generate universally unique
-identifiers (UUIDs) using one of several standard algorithms. There are
-also functions to produce certain special UUID constants.
+identifiers (UUIDs) using one of several standard algorithms.
 
 "unaccent" is a text search dictionary that removes accents (diacritic signs)
-from lexemes. It's a filtering dictionary, which means its output is always
-passed to the next dictionary (if any), unlike the normal behavior of
-dictionaries. This allows accent-insensitive processing for full text search.
+from lexemes.
diff --git a/databases/ruby-pg/DESCR b/databases/ruby-pg/DESCR
index 0e984fc2754..90bba233500 100644
--- a/databases/ruby-pg/DESCR
+++ b/databases/ruby-pg/DESCR
@@ -1,3 +1,2 @@
 This is the extension library to access a PostgreSQL database from Ruby.
 This library works with PostgreSQL 7.4 and later.
-
diff --git a/devel/fossil/DESCR b/devel/fossil/DESCR
index 02ba8a7b937..cb27d9a1430 100644
--- a/devel/fossil/DESCR
+++ b/devel/fossil/DESCR
@@ -1,44 +1,23 @@
-There are plenty of open-source version control systems available
-on the internet these days. What makes Fossil worthy of attention?
+There are plenty of open-source version control systems available on the
+Internet these days. What makes Fossil worthy of attention?
 
-   1. Bug Tracking And Wiki - In addition to doing distributed
-   version control like Git and Mercurial, Fossil also supports
-   distributed bug tracking and distributed wiki all in a single
-   integrated package.
+ 1. Bug Tracking And Wiki - In addition to doing distributed version control
+ like Git and Mercurial, Fossil also supports distributed bug tracking and
+ distributed wiki all in a single integrated package.
 
-   2. Web Interface - Fossil has a built-in and easy-to-use web
-   interface that simplifies project tracking and promotes situational
-   awareness. Simply type "fossil ui" from within any check-out
-   and Fossil automatically opens your web browser in a page that
-   gives detailed history and status information on that project.
+ 2. Web Interface - Fossil has a built-in and easy-to-use web interface that
+ simplifies project tracking and promotes situational awareness. Simply type
+ "fossil ui" from within any check-out and Fossil automatically opens your web
+ browser in a page that gives detailed history and status information on that
+ project.
 
-   3. Autosync - Fossil supports "autosync" mode which helps to
-   keep projects moving forward by reducing the amount of needless
-   forking and merging often associated distributed projects.
+ 3. Autosync - Fossil supports "autosync" mode which helps to keep projects
+ moving forward by reducing the amount of needless forking and merging often
+ associated distributed projects.
 
-   4. Self-Contained - Fossil is a single stand-alone executable
-   that contains everything needed to do configuration management.
-   Installation is trivial: simply download a precompiled binary
-   for Linux, Mac, or Windows and put it on your $PATH. Easy-to-compile
-   source code is available for users on other platforms. Fossil
-   sources are also mostly self-contained, requiring only the "zlib"
-   library and the standard C library to build.
-
-   5. Simple Networking - Fossil uses plain old HTTP (with proxy
-   support) for all network communications, meaning that it works
-   fine from behind restrictive firewalls. The protocol is bandwidth
-   efficient to the point that Fossil can be used comfortably over
-   a dial-up internet connection.
-
-   6. CGI Enabled - No server is required to use fossil. But a
-   server does make collaboration easier. Fossil supports three
-   different yet simple server configurations. The most popular is
-   a 2-line CGI script. This is the approach used by the self-hosting
-   fossil repositories.
-
-   7. Robust & Reliable - Fossil stores content in an SQLite database
-   so that transactions are atomic even if interrupted by a power
-   loss or system crash. Furthermore, automatic self-checks verify
-   that all aspects of the repository are consistent prior to each
-   commit. In over two years of operation, no work has ever been
-   lost after having been committed to a Fossil repository.
+ 4. Self-Contained - Fossil is a single stand-alone executable that contains
+ everything needed to do configuration management. Installation is trivial:
+ simply download a precompiled binary for Linux, Mac, or Windows and put it on
+ your $PATH. Easy-to-compile source code is available for users on other
+ platforms. Fossil sources are also mostly self-contained, requiring only the
+ "zlib" library and the standard C library to build.
diff --git a/devel/p5-Autodia/DESCR b/devel/p5-Autodia/DESCR
index 598154374fb..989af9f922b 100644
--- a/devel/p5-Autodia/DESCR
+++ b/devel/p5-Autodia/DESCR
@@ -1,7 +1,7 @@
-AutoDia is an open-source, auto-documentation and auto-diagramming 
+AutoDia is an open-source, auto-documentation and auto-diagramming
 system allowing you to automatically generate Images, XML, HTML or Dia files.
 
-It has been written to make GNOME Dia and any Diagram Application that 
+It has been written to make GNOME Dia and any Diagram Application that
 can use similar XML more powerful. I hope to make Dia more popular than
 the commercial equivilents because of the ability to vastly extend it in
 this way.
@@ -13,7 +13,7 @@ designed to generate xml for documents in a batch processing manner, not
 an interactive manner, and is a single user application for use from the
 console.
 
-AutoDia has been previously known as autodial. The output file is still 
+AutoDia has been previously known as autodial. The output file is still
 called autodia.out.dia by default. The executable files are now called
 autodia.pl and autodia_java.pl, the only difference being an additional
 section near the start of the latter to enable INLINE::Java.
diff --git a/devel/p5-Method-Signatures/DESCR b/devel/p5-Method-Signatures/DESCR
index 4cd36cc9c44..73e535fa7ed 100644
--- a/devel/p5-Method-Signatures/DESCR
+++ b/devel/p5-Method-Signatures/DESCR
@@ -10,6 +10,7 @@ can write subroutines with signatures instead of having to spell out my
 
 Also allows signatures, very similar to Perl 6 signatures.
 
-Also does type checking, understanding all the types that Moose (or Mouse) would understand.
+Also does type checking, understanding all the types that Moose (or Mouse) would
+understand.
 
 And it does all this with no source filters.
diff --git a/devel/p5-MooseX-Has-Options/DESCR b/devel/p5-MooseX-Has-Options/DESCR
index d562f86d48c..e08ddde3450 100644
--- a/devel/p5-MooseX-Has-Options/DESCR
+++ b/devel/p5-MooseX-Has-Options/DESCR
@@ -22,7 +22,3 @@ This will converted into:
         isa => 'Str',
         ...
     );
-
-Options must come in the beginning of the argument list.
-MooseX::Has::Options will stop searching for options after the
-first alphanumeric string that does not start with a colon.
diff --git a/devel/p5-MooseX-Types-URI/DESCR b/devel/p5-MooseX-Types-URI/DESCR
index 40a3848aeda..7af8095a6e6 100644
--- a/devel/p5-MooseX-Types-URI/DESCR
+++ b/devel/p5-MooseX-Types-URI/DESCR
@@ -1,7 +1,5 @@
 This package provides Moose types for fun with URIs.
 
-It has slightly DWIMier types than the URI classes have due to
-implementation details, so the types should be more forgiving when
-ducktyping will work anyway (e.g. URI::WithBase does not inherit
-URI).
-
+It has slightly DWIMier types than the URI classes have due to implementation
+details, so the types should be more forgiving when ducktyping will work anyway
+(e.g. URI::WithBase does not inherit URI).
diff --git a/devel/p5-Safe-Isa/DESCR b/devel/p5-Safe-Isa/DESCR
index 3cc9dcf88b1..16a7bb9cc76 100644
--- a/devel/p5-Safe-Isa/DESCR
+++ b/devel/p5-Safe-Isa/DESCR
@@ -1 +1 @@
-Safe::Isa - Call isa, can, does and DOES safely on things that may not be objects.
+Call isa, can, does and DOES safely on things that may not be objects.
diff --git a/devel/ruby-i18n/DESCR b/devel/ruby-i18n/DESCR
index 1b3c59c9c1c..6538edfe389 100644
--- a/devel/ruby-i18n/DESCR
+++ b/devel/ruby-i18n/DESCR
@@ -1,8 +1,4 @@
-Ruby I18n
-
-Ruby Internationalization and localization solution.
-
-Features:
+Ruby Internationalization and localization solution. Features:
 
 * translation and localization
 * interpolation of values to translations (Ruby 1.9 compatible syntax)
@@ -16,7 +12,6 @@ Features:
 * extensible architecture with a swappable backend
 
 Pluggable features:
-
 * Cache
 * Pluralization: lambda pluralizers stored as translation data
 * Locale fallbacks, RFC4647 compliant (optionally: RFC4646 locale validation)
@@ -24,7 +19,6 @@ Pluggable features:
 * Translation metadata
 
 Alternative backends:
-
 * Chain
 * ActiveRecord (optionally: ActiveRecord::Missing and ActiveRecord::StoreProcs)
 * KeyValue (uses active_support/json and cannot store procs)
diff --git a/devel/ruby-metaclass/DESCR b/devel/ruby-metaclass/DESCR
index 02e964696fd..0ad45de3709 100644
--- a/devel/ruby-metaclass/DESCR
+++ b/devel/ruby-metaclass/DESCR
@@ -5,7 +5,6 @@ Motivations :-
 * Even though WhyTheLuckyStiff's [metaid gem]
   (https://rubygems.org/gems/metaid) does something similar, apparently the
   metaclass method without underscores [doesn't play well with Rails v2.3]
-  (https://github.com/floehopper/mocha/commit/f0749d6d291164cc9280aa8ba16f33d652d45fe1#commitcomment-475799).
 
 * I'm trying to extract code out of the [mocha gem]
   (https://github.com/floehopper/mocha) and this is an obvious candidate.
diff --git a/devel/ruby-thrift_client/DESCR b/devel/ruby-thrift_client/DESCR
index caa8ba59617..c06b3a4b1a3 100644
--- a/devel/ruby-thrift_client/DESCR
+++ b/devel/ruby-thrift_client/DESCR
@@ -1 +1 @@
-A Thrift client wrapper for Ruby that encapsulates some common failover behavior.
+Thrift client wrapper for Ruby that encapsulates some common failover behaviour.
diff --git a/editors/texmaker/DESCR b/editors/texmaker/DESCR
index acd3a250d93..38266eee833 100644
--- a/editors/texmaker/DESCR
+++ b/editors/texmaker/DESCR
@@ -1,9 +1,7 @@
 Texmaker is a free LaTeX editor, that integrates many tools needed to develop
-documents with LaTeX, in just one application.  Texmaker runs on UNIX, MacOS X
-and Windows systems and is released under the GPL license.
-
-Features:
-* an unicode editor to write your LaTeX source files (syntax highlighting,
+documents with LaTeX, in just one application. Texmaker runs on UNIX, MacOS X
+and Windows systems and is released under the GPL license. Features:
+* a unicode editor to write your LaTeX source files (syntax highlighting,
   undo-redo, search-replace, spell checker...)
 * the principal LaTex tags can be inserted directly with the "LaTeX" and "Math"
   menus
diff --git a/fonts/gentium-ttf/DESCR b/fonts/gentium-ttf/DESCR
index 61f98b6aebf..946729ece16 100644
--- a/fonts/gentium-ttf/DESCR
+++ b/fonts/gentium-ttf/DESCR
@@ -1,34 +1,15 @@
 Gentium ("belonging to the nations" in Latin) is a Unicode typeface family
-designed to enable the many diverse ethnic groups around the world who use
-the Latin script to produce readable, high-quality publications. The design
-is intended to be highly readable, reasonably compact, and visually
-attractive. Gentium has won a "Certificate of Excellence in Typeface Design"
-in two major international typeface design competitions: bukva:raz! (2001),
-TDC2003 (2003).
+designed to enable the many diverse ethnic groups around the world who use the
+Latin script to produce readable, high-quality publications. The design is
+intended to be highly readable, reasonably compact, and visually attractive.
+Gentium has won a "Certificate of Excellence in Typeface Design" in two major
+international typeface design competitions: bukva:raz! (2001), TDC2003 (2003).
 
 Gentium provides glyphs for a wide range of Latin and Greek characters. The
 additional 'extended' Latin letters are designed to naturally harmonize with
 the traditional 26 ones. Diacritics are treated with careful thought and
 attention to their use. Gentium also supports both ancient and modern Greek,
-including a number of alternate forms. It currently supports the following
-ranges of Unicode 3.0 (completely unless noted):
-
-Range           Description
-U+0020-U+007F   Basic Latin
-U+00A0-U+00FF   Latin-1 Supplement
-U+0100-U+017F   Latin Extended-A
-U+0180-U+021F   Latin Extended-B
-U+0222-U+0233   Latin Extended-B (continued)
-U+0250-U+02AD   IPA Extensions
-U+02B0-U+02FF   Spacing Modifier Letters
-U+0300-U+036F   Combining Diacritical Marks
-U+0370-U+03D5   Greek (not including archaic or Coptic)
-U+1E00-U+1EFF   Latin Extended Additional
-U+1F00-U+1FFF   Greek Extended
-U+2000-U+203A   General Punctuation (partial)
-U+2070-U+209F   Superscripts and Subscripts
-U+20A0-U+20CF   Currency Symbols (partial)
-U+2100-U+214F   Letterlike Symbols (only a couple)
+including a number of alternate forms.
 
 Gentium Regular also includes some Cyrillic glyphs, but they are only early
 drafts. A future version will include a completely revised set, including
diff --git a/games/blinken/DESCR b/games/blinken/DESCR
index b26e7995594..ce3150fc319 100644
--- a/games/blinken/DESCR
+++ b/games/blinken/DESCR
@@ -2,4 +2,3 @@ Blinken is the KDE version of the well-known game Simon Says.
 Follow the pattern of sounds and lights as long as you can! Press the start
 game button to begin. Watch the computer and copy the pattern it makes.
 Complete the sequence in the right order to win.
- 
diff --git a/games/kdegames3/DESCR b/games/kdegames3/DESCR
index 81238e3be89..43db8d5c933 100644
--- a/games/kdegames3/DESCR
+++ b/games/kdegames3/DESCR
@@ -3,8 +3,8 @@ distribution:
 
 * kasteroids: shoot at those nasty asteroids
 * katomic: build complex atoms with a minimal amount of moves
-* kbackgammon: play backgammon against a local human player, via a
-               game server or against GNU Backgammon (not included)
+* kbackgammon: play backgammon against a local human player, via a game server
+  or against GNU Backgammon (not included)
 * kbattleship: battleship game with built-in game server
 * kblackbox: find atoms in a grid by shooting electrons
 * kbounce: claim areas and don't get disturbed
@@ -21,15 +21,4 @@ distribution:
 * ksame: collect pieces of the same color
 * kshisen: patience game where you take away all pieces
 * ksirtet: very known if spelt this backwards
-* ksmiletris: another Tetris-like game
-* ksnake: don't bite yourself, eat apples!
-* ksokoban: move all storage boxes into the cabinet
-* kspaceduel: two player game with shooting spaceships flying around a sun
-* ktron: like ksnake, but without fruits
-* ktuberling: kids game: make your own potato (NO french fries!)
-* kwin4: place 4 pieces in a row
-* libkdegames: KDE game library used by many of these programs
-* lskat: lieutnant skat
-
-There is also a directory libkdegames that contains card decks as well as
-some functions for game programmers.
+  ...and more!
diff --git a/games/kdetoys4/DESCR b/games/kdetoys4/DESCR
index 457f6f5cc2e..253c26b308c 100644
--- a/games/kdetoys4/DESCR
+++ b/games/kdetoys4/DESCR
@@ -1,5 +1,5 @@
-This package provides some toy applications that are part of the
-standard KDE environment:
+This package provides some toy applications that are part of the standard KDE
+environment:
 
 * amor: Amusing Misuse Of Resources put's comic figures above your windows
 * kmoon: system tray applet showing the moon phase
@@ -7,5 +7,4 @@ standard KDE environment:
 * ktux: Tux-in-a-Spaceship screen saver
 * kweather: kicker applet that will display the current weather outside
 * kworldclock: application and kicker applet showing daylight area on the world
-               globe
-
+  globe
diff --git a/geography/qlandkartem/DESCR b/geography/qlandkartem/DESCR
index 56e97746af9..66ff5e72e82 100644
--- a/geography/qlandkartem/DESCR
+++ b/geography/qlandkartem/DESCR
@@ -5,9 +5,9 @@ QLandkarte GT. It's user interface is optimized to the few buttons of a
 typical PDA.
 
 This is experimental pre-alpha software and not targeted towards end-users
-in this stage of developement! This package is provided as a convenience to 
+in this stage of developement! This package is provided as a convenience to
 QLandkarte M developers only.
 
 Copy or hard-link the qlm executable to a user-writable directory as qlm
-wants to put its data files in the same directory as the executable, 
-otherwise it will dump core.
+wants to put its data files in the same directory as the executable, otherwise
+it will dump core.
diff --git a/graphics/asymptote/DESCR b/graphics/asymptote/DESCR
index fe73c518731..c7d7c09caeb 100644
--- a/graphics/asymptote/DESCR
+++ b/graphics/asymptote/DESCR
@@ -1,12 +1,8 @@
-Asymptote is a powerful descriptive vector graphics language that
-provides a natural coordinate-based framework for technical drawing.
-Labels and equations are typeset with LaTeX, for high-quality
-PostScript output.
-
-A major advantage of Asymptote over other graphics packages is that
-it is a programming language, as opposed to just a graphics program.
-
-Features of Asymptote:
+Asymptote is a powerful descriptive vector graphics language that provides a
+natural coordinate-based framework for technical drawing. Labels and equations
+are typeset with LaTeX, for high-quality PostScript output. A major advantage of
+Asymptote over other graphics packages is that it is a programming language, as
+opposed to just a graphics program. Features of Asymptote:
 
 # provides a portable standard for typesetting mathematical figures,
 just as TeX/LaTeX has become the standard for typesetting equations;
@@ -18,21 +14,11 @@ programming syntax and floating-point numerics;
 
 # runs on all major platforms (UNIX, MacOS, Microsoft Windows);
 
-# mathematically oriented (e.g. rotation of vectors by complex
-multiplication);
+# mathematically oriented (e.g. rotation of vectors by complex multiplication);
 
 # LaTeX typesetting of labels (for document consistency);
 
 # uses simplex method and deferred drawing to solve overall size
 constraint issues between fixed-sized objects (labels and arrowheads)
 and objects that should scale with figure size;
-
-# fully generalizes MetaPost path construction algorithms to three
-dimensions;
-
-# compiles commands into virtual machine code for speed without
-sacrificing portability;
-
-# high-level graphics commands are implemented in the Asymptote
-language itself, allowing them to be easily tailored to specific
-applications.
+  ...and more!
diff --git a/graphics/digikam/DESCR b/graphics/digikam/DESCR
index 0191893f24c..1fab131ea62 100644
--- a/graphics/digikam/DESCR
+++ b/graphics/digikam/DESCR
@@ -1,35 +1,21 @@
-digiKam is an advanced digital photo management application for
-KDE, which makes importing and organizing digital photos a "snap".
-The photos are organized in albums which can be sorted chronologically,
-by folder layout or by custom collections.
+digiKam is an advanced digital photo management application for KDE, which makes
+importing and organizing digital photos a "snap". The photos are organized in
+albums which can be sorted chronologically, by folder layout or by custom
+collections.
 
-You tag your images which can be spread out across multiple folders,
-and digiKam provides fast and intuitive ways to browse these tagged
-images. You can also add comments to your images.  digiKam makes
-use of a fast and robust database to store these meta-informations
-which makes adding and editing of comments and tags very reliable.
+You tag your images which can be spread out across multiple folders, and digiKam
+provides fast and intuitive ways to browse these tagged images. You can also add
+comments to your images.  digiKam makes use of a fast and robust database to
+store these meta-informations which makes adding and editing of comments and
+tags very reliable.
 
-An easy-to-use interface is provided that enables you to connect
-to your camera and preview, download and/or delete your images.
-Basic auto-transformations can be deployed on the fly during image
-downloading.
+An easy-to-use interface is provided that enables you to connect to your camera
+and preview, download and/or delete your images. Basic auto-transformations can
+be deployed on the fly during image downloading.
 
-Another tool, which most artists and photographers will be familiar
-with, is a Light Table. This tool assists artists and photographers
-with reviewing their work ensuring the highest quality only. A
-classical light table will show the artist the place on the images
-to touch up. Well in digiKam, the light table function provides
-the user a similar experience. You can import a photo, drag it onto
-the light table, and touch up only the areas that need it.
-
-The digiKam Image Editor has its own plugin subsystem with some
-common tools e.g. red eye correction or Gamma correction. Additional
-plugins are provided with the main application to process advanced
-corrections on image like color management, noise reduction, or
-special effects. digiKam Image Editor supports all camera RAW file
-formats, 16 bits color depth, Exif/Makernote/IPTC/GPS metadata,
-Color management, tagging/rating/comments pictures, etc.
-
-A stand-alone image editor version named ShowFoto is also available.
-It runs without digiKam images database support, but provides all
-Image Editor functions.
+Another tool, which most artists and photographers will be familiar with, is a
+Light Table. This tool assists artists and photographers with reviewing their
+work ensuring the highest quality only. A classical light table will show the
+artist the place on the images to touch up. Well in digiKam, the light table
+function provides the user a similar experience. You can import a photo, drag it
+onto the light table, and touch up only the areas that need it.
diff --git a/graphics/jpeg_ls/DESCR b/graphics/jpeg_ls/DESCR
index f7d883f126e..5ab81692c4a 100644
--- a/graphics/jpeg_ls/DESCR
+++ b/graphics/jpeg_ls/DESCR
@@ -1,25 +1,22 @@
-This software package contains an implementation of JPEG-LS, the
-emerging lossless/near-lossless compression standard for continuous-tone
-images being developed by ISO/IEC JTC1/SC29/WG1 (draft document
-FCD14495 as of November 1997). The names of the executables in the
-software package derive from the acronym LOCO, as the core of the
-new standard is based on the LOCO-I algorithm (LOw COmplexity
-LOssless COmpression for Images) developed at Hewlett-Packard
-Laboratories (reference: M. Weinberger, G. Seroussi, G. Sapiro,
-"LOCO-I: A Low Complexity, Context-Based, Lossless Image Compression
-Algorithm," Proc. IEEE Data Compression Conference, Snowbird, Utah,
-March-April 1996).
+This software package contains an implementation of JPEG-LS, the emerging
+lossless/near-lossless compression standard for continuous-tone images being
+developed by ISO/IEC JTC1/SC29/WG1 (draft document FCD14495 as of November
+1997). The names of the executables in the software package derive from the
+acronym LOCO, as the core of the new standard is based on the LOCO-I algorithm
+(LOw COmplexity LOssless COmpression for Images) developed at Hewlett-Packard
+Laboratories (reference: M. Weinberger, G. Seroussi, G. Sapiro, "LOCO-I: A Low
+Complexity, Context-Based, Lossless Image Compression Algorithm," Proc. IEEE
+Data Compression Conference, Snowbird, Utah, March-April 1996).
 
-The term "near-lossless compression" refers to a lossy algorithm
-for which each decompressed image sample differs from the corresponding
-original image sample by not more than a pre-specified value, the
-(usually small) "loss."  Lossless compression corresponds to loss=0.
-Even though the term "continuous-tone image" refers in principle
-to any image whose components have more than one bit per sample,
-palletized images may require a reordering of the color palette
-for best compression results using LOCO-I on the array of color
-indices. This functionality is not implemented in the present
-software, although it is supported by the new standard, and is easy
-enough to implement with the tools given. Notice, however, that
-LOCO-I and JPEG-LS were not designed, and might not give optimal
-performance, for images that have been palletized through dithering.
+The term "near-lossless compression" refers to a lossy algorithm for which each
+decompressed image sample differs from the corresponding original image sample
+by not more than a pre-specified value, the (usually small) "loss." Lossless
+compression corresponds to loss=0. Even though the term "continuous-tone image"
+refers in principle to any image whose components have more than one bit per
+sample, palletized images may require a reordering of the color palette for best
+compression results using LOCO-I on the array of color indices. This
+functionality is not implemented in the present software, although it is
+supported by the new standard, and is easy enough to implement with the tools
+given. Notice, however, that LOCO-I and JPEG-LS were not designed, and might not
+give optimal performance, for images that have been palletized through
+dithering.
diff --git a/graphics/libkface/DESCR b/graphics/libkface/DESCR
index 3e648b28849..b209346b418 100644
--- a/graphics/libkface/DESCR
+++ b/graphics/libkface/DESCR
@@ -1,4 +1,4 @@
 Libkface is a Qt/C++ wrapper around LibFace library to perform face recognition
-and detection over pictures 
+and detection over pictures.
 
 This library is used by kipi-plugins, digiKam and others kipi host programs.
diff --git a/graphics/ljpeg/DESCR b/graphics/ljpeg/DESCR
index b1a152d2e8d..dabb3ca6f4e 100644
--- a/graphics/ljpeg/DESCR
+++ b/graphics/ljpeg/DESCR
@@ -1,30 +1,24 @@
-In 1992, a joint ISO/CCITT committee known as JPEG (Joint Photographic
-Experts Group) established and published the first draft international
-standard (DIS) for compressing continuous-tone still images, both
-grayscale and color. JPEG has defined four mode of operations,
-summarized them as follows.
-
+In 1992, a joint ISO/CCITT committee known as JPEG (Joint Photographic Experts
+Group) established and published the first draft international standard (DIS)
+for compressing continuous-tone still images, both grayscale and color. JPEG has
+defined four mode of operations, summarized them as follows:
 (1) Sequential encoding: each image component is encoded in a single
     left-to-right, top-to-bottom scan;
 (2) Progressive encoding: the image is encoded in multiple scans for
-    applications in which transmission time is long, and the viewer
-    prefers to watch the image build up in multiple coarse-to-clear
-    passes;
-(3) Lossless encoding: the images is encoded to guarantee exact recovery
-    of every source image sample value (even though the result is low
-    compression compared to the lossy modes);
-(4) Hierarchical encoding: the image is encoded at multiple resolutions
-    so that lower-resolution versions may be accessed without first having
-    to decompress the image at its full resolution.
-
-Our lossless JPEG encoding program has an automatic prediction
-selection value (PSV) selector which selects the best PSV among a
-user provided or default set of PSVs. This selector guarantees the
-best compression ratio for lossless JPEG.
+    applications in which transmission time is long, and the viewer prefers to
+    watch the image build up in multiple coarse-to-clear passes;
+(3) Lossless encoding: the images is encoded to guarantee exact recovery of
+    every source image sample value (even though the result is low compression
+    compared to the lossy modes);
+(4) Hierarchical encoding: the image is encoded at multiple resolutions so that
+    lower-resolution versions may be accessed without first having to decompress
+    the image at its full resolution.
+Our lossless JPEG encoding program has an automatic prediction selection value
+(PSV) selector which selects the best PSV among a user provided or default set
+of PSVs. This selector guarantees the best compression ratio for lossless JPEG.
 
-The encoding program "pnmtoljpg" compresses a Portable Pixmap or
-Portable Graymap image to a lossles JPEG (ljpg) image using the
-JPEG standard (DIS) lossless mode of operation. The decoding program
-"ljpgtopnm" decodes a ljpg image to either a Portable Pixmap or
-Portable Graymap image depending on the number of color components
-stored in the ljpg image file.
+The encoding program "pnmtoljpg" compresses a Portable Pixmap or Portable
+Graymap image to a lossles JPEG (ljpg) image using the JPEG standard (DIS)
+lossless mode of operation. The decoding program "ljpgtopnm" decodes a ljpg
+image to either a Portable Pixmap or Portable Graymap image depending on the
+number of color components stored in the ljpg image file.
diff --git a/graphics/p5-GDGraph-boxplot/DESCR b/graphics/p5-GDGraph-boxplot/DESCR
index 7ee52d3e700..9bfbf1b7e5d 100644
--- a/graphics/p5-GDGraph-boxplot/DESCR
+++ b/graphics/p5-GDGraph-boxplot/DESCR
@@ -1,3 +1,3 @@
-GD::Graph::boxplot is a perl5 module that uses GD::Graph, GD, and 
-Statistics::Descriptive to create and display PNG output for box 
-and whisker graphs.
+GD::Graph::boxplot is a perl5 module that uses GD::Graph, GD, and
+Statistics::Descriptive to create and display PNG output for box and whisker
+graphs.
diff --git a/lang/elisp-manual/DESCR b/lang/elisp-manual/DESCR
index 18dc500b390..52bbfe5659c 100644
--- a/lang/elisp-manual/DESCR
+++ b/lang/elisp-manual/DESCR
@@ -1,25 +1,22 @@
-  Most of the GNU Emacs text editor is written in the programming
-language called Emacs Lisp.  You can write new code in Emacs Lisp and
-install it as an extension to the editor.  However, Emacs Lisp is more
-than a mere ``extension language''; it is a full computer programming
-language in its own right.  You can use it as you would any other
-programming language.
+Most of the GNU Emacs text editor is written in the programming language called
+Emacs Lisp. You can write new code in Emacs Lisp and install it as an extension
+to the editor. However, Emacs Lisp is more than a mere "extension language"; it
+is a full computer programming language in its own right. You can use it as you
+would any other programming language.
 
-  Because Emacs Lisp is designed for use in an editor, it has special
-features for scanning and parsing text as well as features for handling
-files, buffers, displays, subprocesses, and so on.  Emacs Lisp is
-closely integrated with the editing facilities; thus, editing commands
-are functions that can also conveniently be called from Lisp programs,
-and parameters for customization are ordinary Lisp variables.
+Because Emacs Lisp is designed for use in an editor, it has special features for
+scanning and parsing text as well as features for handling files, buffers,
+displays, subprocesses, and so on. Emacs Lisp is closely integrated with the
+editing facilities; thus, editing commands are functions that can also
+conveniently be called from Lisp programs, and parameters for customization are
+ordinary Lisp variables.
 
-  This manual attempts to be a full description of Emacs Lisp.  For a
-beginner's introduction to Emacs Lisp, see ``An Introduction to
-Emacs Lisp Programming,'' by Bob Chassell, also published by the Free
-Software Foundation.  This manual presumes considerable familiarity with
-the use of Emacs for editing; see ``The GNU Emacs Manual'' for this
-basic information.
+This manual attempts to be a full description of Emacs Lisp. For a beginner's
+introduction to Emacs Lisp, see "An Introduction to Emacs Lisp Programming," by
+Bob Chassell, also published by the Free Software Foundation. This manual
+presumes considerable familiarity with the use of Emacs for editing; see "The
+GNU Emacs Manual" for this basic information.
 
-  Generally speaking, the earlier chapters describe features of Emacs
-Lisp that have counterparts in many programming languages, and later
-chapters describe features that are peculiar to Emacs Lisp or relate
-specifically to editing.
+Generally speaking, the earlier chapters describe features of Emacs Lisp that
+have counterparts in many programming languages, and later chapters describe
+features that are peculiar to Emacs Lisp or relate specifically to editing.
diff --git a/lang/scala/DESCR b/lang/scala/DESCR
index 062658d5366..d328fd35a27 100644
--- a/lang/scala/DESCR
+++ b/lang/scala/DESCR
@@ -1,4 +1,4 @@
-Scala is a general purpose programming language designed to express common 
-programming patterns in a concise, elegant, and type-safe way. It smoothly 
-integrates features of object-oriented and functional languages, enabling 
-Java and other programmers to be more productive.
+Scala is a general purpose programming language designed to express common
+programming patterns in a concise, elegant, and type-safe way. It smoothly
+integrates features of object-oriented and functional languages, enabling Java
+and other programmers to be more productive.
diff --git a/mail/fml/DESCR b/mail/fml/DESCR
index 24300d8952c..8890f7032e0 100644
--- a/mail/fml/DESCR
+++ b/mail/fml/DESCR
@@ -1,73 +1,23 @@
-fml8 Features
-
-  * fml8 configuration file format is changed to new Postfix style format
-    configuration files (.cf files).
-
-  * usage of CUI is almost same as fml4 (it is same as could as possible). You
-    can use CUI (makefml and fml command)
-
-            to create/remove an ML,
-            to add/remove/change an addresse of ML members,
-            to add/remove/change an address of remote administrators,
-            to see log and member list,
-            et.al.
-
-
-    Makefml and fml are same programs except for argument order.
-
-    See  the Section called Difference Between fml4 And fml8: CUI in Chapter 8
-    on the CUI usage difference between fml4 and fml8.
-
-  * GUI (CGI) interface. The functions are a subset of CUI ones.
-
-            to create/remove an ML,
-            to add/remove/change an address of ML members,
-            to add/remove/change an address of remote administrators,
-            to see log and member list,
-            et.al.
-
-
-    The configuration file editing is incomplete yet.
-
-  * article delivery, header rewriting and several filters ( corresponding with
-    fml4's envelope filter and content filter ).
-
-  * command mail for users.
-
-            to add/remove/change the address,
-            get article summary,
-            get old articles,
-            et.al.
-
-
-  * command mail (admin command mail) for remote administratoin by mail.
-
-            to add/remove/change an addresse of ML members,
-            to add/remove/change an address of remote administrators,
-            to see log and member list,
-            et.al.
-
-
-  * automatic analyzer of error messages.
-
-  * IPv6 ready.
-
-  * tiny thread track system.
-
-  * built-in module for HTML converter of articles. support automatic
-    conversion by default.
-
-    fmlhtmlify and makefml supports html conversion functions.
-
-  * main programs (fml/libexec): distribute command error
-
-  * utilities: fmladdr fmlailas fmlconf fmldoc makefml fml
-
-  * fml4 emulation: if you replace fml.pl of fml4 and fml.pl of fml8, fml8 runs
-    as fml4.
-
-  * After 2004 summer, the queueing system is implemanted. Currently the
-    delivery system is queuing based. So, fml8 is a MTA in fact.
-
-  * Abstracted IO layer to get member list in unified way from a file, /etc/
-    group, NIS, SQL.
+fml8 Features:
+ * fml8 configuration file format is changed to new Postfix style format
+   configuration files (.cf files).
+ * usage of CUI is almost same as fml4 (it is same as could as possible). You
+   can use CUI (makefml and fml command)
+     to create/remove an ML,
+     to add/remove/change an addresse of ML members,
+     to add/remove/change an address of remote administrators,
+     to see log and member list,
+     et.al.
+Makefml and fml are same programs except for argument order. See the Section
+called Difference Between fml4 And fml8: CUI in Chapter 8 on the CUI usage
+difference between fml4 and fml8.
+ * GUI (CGI) interface. The functions are a subset of CUI ones.
+     to create/remove an ML,
+     to add/remove/change an address of ML members,
+     to add/remove/change an address of remote administrators,
+     to see log and member list,
+     et.al.
+The configuration file editing is incomplete yet.
+ * article delivery, header rewriting and several filters ( corresponding with
+   fml4's envelope filter and content filter ).
+   ...and more!
diff --git a/mail/gmime/DESCR b/mail/gmime/DESCR
index 9238064afd0..adedb88cec9 100644
--- a/mail/gmime/DESCR
+++ b/mail/gmime/DESCR
@@ -1,19 +1,14 @@
-GMime is a set of utilities for parsing and creating messages using
-the Multipurpose Internet Mail Extension (MIME) as defined by the
-following RFCs:
-
+GMime is a set of utilities for parsing and creating messages using the
+Multipurpose Internet Mail Extension (MIME) as defined by the following RFCs:
  * 0822: Standard for the Format of Arpa Internet Text Messages
- * 1521: MIME (Multipurpose Internet Mail Extensions) Part One:
-         Mechanisms for Specifying and Describing the Format of
-         Internet Message Bodies
- * 1847: Security Multiparts for MIME: Multipart/Signed and
-         Multipart/Encrypted
+ * 1521: MIME (Multipurpose Internet Mail Extensions) Part One: Mechanisms for
+         Specifying and Describing the Format of Internet Message Bodies
+ * 1847: Security Multiparts for MIME: Multipart/Signed and Multipart/Encrypted
  * 1864: The Content-MD5 Header Field (Obsoletes rfc1544)
  * 2015: MIME Security with Pretty Good Privacy (PGP)
  * 2045: Multipurpose Internet Mail Extensions (MIME) Part One:
          Format of Internet Message Bodies
- * 2046: Multipurpose Internet Mail Extensions (MIME) Part Two:
-         Media Types
+ * 2046: Multipurpose Internet Mail Extensions (MIME) Part Two: Media Types
  * 2047: Multipurpose Internet Mail Extensions (MIME) Part Three:
          Message Header Extensions for Non-ASCII Text
  * 2048: Multipurpose Internet Mail Extensions (MIME) Part Four:
diff --git a/mail/gmime24/DESCR b/mail/gmime24/DESCR
index 9238064afd0..adedb88cec9 100644
--- a/mail/gmime24/DESCR
+++ b/mail/gmime24/DESCR
@@ -1,19 +1,14 @@
-GMime is a set of utilities for parsing and creating messages using
-the Multipurpose Internet Mail Extension (MIME) as defined by the
-following RFCs:
-
+GMime is a set of utilities for parsing and creating messages using the
+Multipurpose Internet Mail Extension (MIME) as defined by the following RFCs:
  * 0822: Standard for the Format of Arpa Internet Text Messages
- * 1521: MIME (Multipurpose Internet Mail Extensions) Part One:
-         Mechanisms for Specifying and Describing the Format of
-         Internet Message Bodies
- * 1847: Security Multiparts for MIME: Multipart/Signed and
-         Multipart/Encrypted
+ * 1521: MIME (Multipurpose Internet Mail Extensions) Part One: Mechanisms for
+         Specifying and Describing the Format of Internet Message Bodies
+ * 1847: Security Multiparts for MIME: Multipart/Signed and Multipart/Encrypted
  * 1864: The Content-MD5 Header Field (Obsoletes rfc1544)
  * 2015: MIME Security with Pretty Good Privacy (PGP)
  * 2045: Multipurpose Internet Mail Extensions (MIME) Part One:
          Format of Internet Message Bodies
- * 2046: Multipurpose Internet Mail Extensions (MIME) Part Two:
-         Media Types
+ * 2046: Multipurpose Internet Mail Extensions (MIME) Part Two: Media Types
  * 2047: Multipurpose Internet Mail Extensions (MIME) Part Three:
          Message Header Extensions for Non-ASCII Text
  * 2048: Multipurpose Internet Mail Extensions (MIME) Part Four:
diff --git a/math/R-ncdf/DESCR b/math/R-ncdf/DESCR
index f2658375a57..f9fff4c466b 100644
--- a/math/R-ncdf/DESCR
+++ b/math/R-ncdf/DESCR
@@ -5,4 +5,4 @@ files can be opened and data sets read in easily.  It is also easy to
 create new netCDF dimensions, variables, and files, or manipulate
 existing netCDF files.  This interface provides considerably more
 functionality than the old "netCDF" package for R, and is not
-compatible with the old "netCDF" package for R.  
+compatible with the old "netCDF" package for R.
diff --git a/math/arpack/DESCR b/math/arpack/DESCR
index ded552c3db2..3205bcda348 100644
--- a/math/arpack/DESCR
+++ b/math/arpack/DESCR
@@ -1,35 +1,23 @@
-ARPACK is a collection of Fortran77 subroutines designed to solve large
-scale eigenvalue problems.
-
-The package is designed to compute a few eigenvalues and corresponding
-eigenvectors of a general n by n matrix A. It is most appropriate for large
-sparse or structured matrices A where structured means that a matrix-vector
-product w <- Av requires order n rather than the usual order n**2 floating
-point operations. This software is based upon an algorithmic variant of the
-Arnoldi process called the Implicitly Restarted Arnoldi Method (IRAM). When
-the matrix A is symmetric it reduces to a variant of the Lanczos process
-called the Implicitly Restarted Lanczos Method (IRLM). These variants may be
-viewed as a synthesis of the Arnoldi/Lanczos process with the Implicitly
-Shifted QR technique that is suitable for large scale problems. For many
-standard problems, a matrix factorization is not required. Only the action
-of the matrix on a vector is needed.  ARPACK software is capable of solving
-large scale symmetric, nonsymmetric, and generalized eigenproblems from
-significant application areas. The software is designed to compute a few (k)
-eigenvalues with user specified features such as those of largest real part
-or largest magnitude.  Storage requirements are on the order of n*k locations.
-No auxiliary storage is required. A set of Schur basis vectors for the desired
-k-dimensional eigen-space is computed which is numerically orthogonal to working
-precision. Numerically accurate eigenvectors are available on request.
-
-Important Features:
-
-    o  Reverse Communication Interface.
-    o  Single and Double Precision Real Arithmetic Versions for Symmetric,
-       Non-symmetric, Standard or Generalized Problems.
-    o  Single and Double Precision Complex Arithmetic Versions for Standard
-       or Generalized Problems.
-    o  Routines for Banded Matrices - Standard or Generalized Problems.
-    o  Routines for The Singular Value Decomposition.
-    o  Example driver routines that may be used as templates to implement
-       numerous Shift-Invert strategies for all problem types, data types
-       and precision.
+ARPACK is a collection of Fortran77 subroutines designed to solve large scale
+eigenvalue problems. The package is designed to compute a few eigenvalues and
+corresponding eigenvectors of a general n by n matrix A. It is most appropriate
+for large sparse or structured matrices A where structured means that a
+matrix-vector product w <- Av requires order n rather than the usual order n**2
+floating point operations. This software is based upon an algorithmic variant of
+the Arnoldi process called the Implicitly Restarted Arnoldi Method (IRAM). When
+the matrix A is symmetric it reduces to a variant of the Lanczos process called
+the Implicitly Restarted Lanczos Method (IRLM). These variants may be viewed as
+a synthesis of the Arnoldi/Lanczos process with the Implicitly Shifted QR
+technique that is suitable for large scale problems. For many standard problems,
+a matrix factorization is not required. Only the action of the matrix on a
+vector is needed. ARPACK software is capable of solving large scale symmetric,
+nonsymmetric, and generalized eigenproblems from significant application areas.
+The software is designed to compute a few (k) eigenvalues with user specified
+features such as those of largest real part or largest magnitude.  Storage
+requirements are on the order of n*k locations. No auxiliary storage is
+required. A set of Schur basis vectors for the desired k-dimensional eigen-space
+is computed which is numerically orthogonal to working precision. Numerically accurate eigenvectors are available on request. Important Features:
+ o Reverse Communication Interface.
+ o Single and Double Precision Real Arithmetic Versions for Symmetric,
+   Non-symmetric, Standard or Generalized Problems.
+   ...and more!
diff --git a/math/eigen2/DESCR b/math/eigen2/DESCR
index 38332b7f76d..f6a63080ae5 100644
--- a/math/eigen2/DESCR
+++ b/math/eigen2/DESCR
@@ -8,24 +8,17 @@ related algorithms. It is:
   o both plain matrices/vectors and abstract expressions.
   o both column-major (the default) and row-major matrix storage.
   o both basic matrix/vector manipulation and many more advanced, specialized
-    modules providing algorithms for linear algebra, geometry, quaternions,
-    or advanced array manipulation.
+    modules providing algorithms for linear algebra, geometry, quaternions, or
+    advanced array manipulation.
 * Fast.
   o Expression templates allow to intelligently remove temporaries and enable
     lazy evaluation, when that is appropriate -- Eigen takes care of this
     automatically and handles aliasing too in most cases.
   o Explicit vectorization is performed for the SSE (2 and later) and AltiVec
-    instruction sets, with graceful fallback to non-vectorized code.
-    Expression templates allow to perform these optimizations globally for
-    whole expressions.
+    instruction sets, with graceful fallback to non-vectorized code. Expression
+    templates allow to perform these optimizations globally for whole
+    expressions.
   o With fixed-size objects, dynamic memory allocation is avoided, and the
     loops are unrolled when that makes sense.
   o For large matrices, special attention is paid to cache-friendliness.
-* Elegant. The API is extremely clean and expressive, thanks to expression
-  templates. Implementing an algorithm on top of Eigen feels like just copying
-  pseudocode. You can use complex expressions and still rely on Eigen to
-  produce optimized code: there is no need for you to manually decompose
-  expressions into small steps.
-* Compiler-friendy. Eigen has very reasonable compilation times at least with
-  GCC, compared to other C++ libraries based on expression templates and heavy
-  metaprogramming. Eigen is also standard C++ and supports various compilers.
+...and more!
diff --git a/math/eigen3/DESCR b/math/eigen3/DESCR
index 60e78c89451..b6dbd3900c7 100644
--- a/math/eigen3/DESCR
+++ b/math/eigen3/DESCR
@@ -21,11 +21,4 @@ related algorithms. It is:
   o With fixed-size objects, dynamic memory allocation is avoided, and the
     loops are unrolled when that makes sense.
   o For large matrices, special attention is paid to cache-friendliness.
-* Elegant. The API is extremely clean and expressive, thanks to expression
-  templates. Implementing an algorithm on top of Eigen feels like just copying
-  pseudocode. You can use complex expressions and still rely on Eigen to
-  produce optimized code: there is no need for you to manually decompose
-  expressions into small steps.
-* Compiler-friendy. Eigen has very reasonable compilation times at least with
-  GCC, compared to other C++ libraries based on expression templates and heavy
-  metaprogramming. Eigen is also standard C++ and supports various compilers.
+...and more!
diff --git a/misc/buffer/DESCR b/misc/buffer/DESCR
index 00f61412db7..b62749726a1 100644
--- a/misc/buffer/DESCR
+++ b/misc/buffer/DESCR
@@ -1,20 +1,17 @@
-This is a program designed to speed up writing tapes on remote tape
-drives.  Requirements are shared memory and locks which normally
-means that these are supported in your kernel.
+This is a program designed to speed up writing tapes on remote tape drives.
+Requirements are shared memory and locks which normally means that these are
+supported in your kernel. [for FreeBSD/NetBSD, this means you MUST have a kernel
+with options SYSVSHM compiled in - markm]
 
-[for Free/NetBSD, this means you MUST have a kernel with
- options SYSVSHM
- compiled in - markm]
+Buffer has been tested under SunOS 4.0.*, SunOS 4.1.*, Solarix, HP-UX 7.0, and
+Gould UTX 2.1A (sv universe).
 
-Buffer has been tested under SunOS 4.0.*, SunOS 4.1.*, Solarix, HP-UX 7.0,
-and Gould UTX 2.1A (sv universe).
-
-The program splits itself into two processes.  The first process reads
-(and reblocks) from stdin into a shared memory buffer.  The second
-writes from the shared memory buffer to stdout.  Doing it this way
-means that the writing side effectly sits in a tight write loop and
-doesn't have to wait for input.  Similarly for the input side.  It is
-this waiting that slows down other reblocking processes, like dd.
+The program splits itself into two processes. The first process reads (and
+reblocks) from stdin into a shared memory buffer. The second writes from the
+shared memory buffer to stdout. Doing it this way means that the writing side
+effectly sits in a tight write loop and doesn't have to wait for input.
+Similarly for the input side. It is this waiting that slows down other
+reblocking processes, like dd.
 
 I run an archive and need to write large chunks out to tape regularly
 with an ethernet in the way.  Using 'buffer' in a command like:
diff --git a/misc/fbreader/DESCR b/misc/fbreader/DESCR
index 2aa821abeaf..81af67b059f 100644
--- a/misc/fbreader/DESCR
+++ b/misc/fbreader/DESCR
@@ -21,11 +21,4 @@ Main features:
   * Automatically generated contents table.
   * Embedded images support.
   * Footnotes/hyperlinks support.
-  * Position indicator.
-  * Keeps the last open book and the last read positions for all opened
-    books between runs.
-  * List of last opened books.
-  * Automatic hyphenations.
-  * Text search.
-  * Full-screen mode.
-  * Screen rotation by 90, 180 and 270 degrees.
+...and more!
diff --git a/misc/kdepim3/DESCR b/misc/kdepim3/DESCR
index 2e994aead55..b9e86f356c6 100644
--- a/misc/kdepim3/DESCR
+++ b/misc/kdepim3/DESCR
@@ -1,25 +1,24 @@
 This package provides personal information management applications that are
 part of the standard KDE environment:
 
-* kmail: a full-featured email client
-* kmailcvt: converts addressbooks to kmail format
-* knode: online newsreader
-* korn: new mail notification tool
-* kandy: sync phone book entries between your cell phone and computer
-         ("kandy" comes from "Handy", the german word used for a cellular)
-* korganizer: a calendar-of-events and todo-list manager
-* kpilot: to sync with your PalmPilot
-* kalarm: gui for setting up personal alarm/reminder messages
-* kalarmd: personal alarm/reminder messages daemon
-* knotes: yellow notes application
+ * kmail: a full-featured email client
+ * kmailcvt: converts addressbooks to kmail format
+ * knode: online newsreader
+ * korn: new mail notification tool
+ * kandy: sync phone book entries between your cell phone and computer
+   ("kandy" comes from "Handy", the german word used for a cellular)
+ * korganizer: a calendar-of-events and todo-list manager
+ * kpilot: to sync with your PalmPilot
+ * kalarm: gui for setting up personal alarm/reminder messages
+ * kalarmd: personal alarm/reminder messages daemon
+ * knotes: yellow notes application
 
 There is also quite an amount of infrastructure in this package:
-
-* ldif: a parser for LDIF, the LDAP Information Interchange Format
-* libdif: dito, one of them is superfluous
-* libical: a basic iCalendar protocol implementation, see RFCs 2245,2246
-* libimap: IMAP handling
-* libkcal: C++ api for the iCalendar and vCalendar formats
-* librmm: an Internet mail message parser (RFC 822 -> Class hierarchy)
-* kgantt: lib to display and manage Gantt diagrams
-* ksync: library for syncing collections of data entries
+ * ldif: a parser for LDIF, the LDAP Information Interchange Format
+ * libdif: dito, one of them is superfluous
+ * libical: a basic iCalendar protocol implementation, see RFCs 2245,2246
+ * libimap: IMAP handling
+ * libkcal: C++ api for the iCalendar and vCalendar formats
+ * librmm: an Internet mail message parser (RFC 822 -> Class hierarchy)
+ * kgantt: lib to display and manage Gantt diagrams
+ * ksync: library for syncing collections of data entries
diff --git a/misc/kdepim4/DESCR b/misc/kdepim4/DESCR
index bb0d067dfbf..41fac224715 100644
--- a/misc/kdepim4/DESCR
+++ b/misc/kdepim4/DESCR
@@ -1,14 +1,7 @@
-Anything relating to the KDE-PIM project. See also http://pim.kde.org.
-
 The KDE-PIM project aims to bring together those who wish to help design,
 implement, test, etc. anything that's to do with personal information
-management.
-
-This rather broad scope encompasses mail clients, addressbooks, usenet news,
-scheduling and even sticky notes.
-
-What it is
-----------
+management. This rather broad scope encompasses mail clients, addressbooks,
+usenet news, scheduling and even sticky notes.
 
 * kaddressbook: The KDE addressbook application.
 * kmail: the KDE mail client
@@ -27,13 +20,4 @@ What it is
 * akregator: Feed reader
 * kjots: manager for several "books" with a subject and notes
 
-
-There is also quite an amount of infrastructure in this package:
-
-* libkdepim: Common code for different kdepim apps
-* mimelib: MIME messages library
-* kpgp: A library for pgp
-* libkpimexchange: connecting to Exchange2000 servers
-* kdgantt: alternative lib for Gantt diagrams, used by the free/busy view of
-           KOrganizer (yes, we should decide for one of the Gantt libs)
-* kontactinterfaces: The glue for embedding KParts into Kontact
+There is also quite an amount of infrastructure in this package.
diff --git a/misc/kdepimlibs4/DESCR b/misc/kdepimlibs4/DESCR
index 960dc82e0db..cfa371a72f6 100644
--- a/misc/kdepimlibs4/DESCR
+++ b/misc/kdepimlibs4/DESCR
@@ -1,12 +1,8 @@
 The kdepimlibs package includes libraries that are central to the development
-and execution of a KDE-PIM application.
-
-The KDE-PIM project aims to bring together those who wish to help design,
-implement, test, etc. anything that's to do with personal information
-management.
-
-This rather broad scope encompasses mail clients, addressbooks, usenet news,
-scheduling and even sticky notes.
+and execution of a KDE-PIM application. The KDE-PIM project aims to bring
+together those who wish to help design, implement, test, etc. anything that's to
+do with personal information management. This rather broad scope encompasses
+mail clients, addressbooks, usenet news, scheduling and even sticky notes.
 
 Here is an alphabetical list:
 
diff --git a/misc/kdeutils3/DESCR b/misc/kdeutils3/DESCR
index d5b8baf9f96..2828c67e4ce 100644
--- a/misc/kdeutils3/DESCR
+++ b/misc/kdeutils3/DESCR
@@ -1,12 +1,11 @@
-This package provides utility applications that are part of the standard
-KDE environment:
-
+This package provides utility applications that are part of the standard KDE
+environment:
 * ark: manager for compressed files and archives
 * kab: address book
 * karm: tracks time spend per task or project
 * kcalc: scientific calculator
-* kcharselect: select special characters from any fonts and put them into
-               the clipboard
+* kcharselect: select special characters from any fonts and put them into the
+  clipboard
 * charselectapplet: dito, but as a Kicker applet
 * kcardtools:
 * kdepasswd: like 'passwd', a graphical password changer
@@ -23,4 +22,3 @@ KDE environment:
 * knotes: paste yellow notes all over your screen, virtually of course
 * kpm: combines 'ps', 'top' and 'kill' into a visual process watcher
 * kregexpeditor: graphical regular expression editor
-* ktimer: execute programs after some time
diff --git a/misc/klettres/DESCR b/misc/klettres/DESCR
index 5ab41d64838..52ff747bbd4 100644
--- a/misc/klettres/DESCR
+++ b/misc/klettres/DESCR
@@ -1,9 +1,9 @@
 KLettres aims to help to learn the alphabet and then to read some syllables
 in different languages. It is meant to help learning the very first sounds
 of a new language, for children or for adults.
- 
+
 Currently 25 languages are available: Arabic, Czech, Brazilian Portuguese,
 Danish, Dutch, British English, English, English Phonix, French, German,
 Hebrew, Hungarian, Italian, Kannada, Hebrew, Hindi Romanized, Low Saxon,
-Luganda, Malayalam, Norwegian Bokmål, Punjabi, Spanish, Slovak, Ukrainian
-and Telugu, you can choose them using the Languages menu. 
+Luganda, Malayalam, Norwegian Bokmal, Punjabi, Spanish, Slovak, Ukrainian
+and Telugu, you can choose them using the Languages menu.
diff --git a/misc/kmousetool/DESCR b/misc/kmousetool/DESCR
index 920ef9aeaed..e855c8ba94e 100644
--- a/misc/kmousetool/DESCR
+++ b/misc/kmousetool/DESCR
@@ -2,4 +2,3 @@ Kmousetool is a KDE mouse manipulation tool aimed to help aid
 disabled people but useful for many. It includes features and
 options that provide artificial intelligence on common mouse
 gestures to perform actions.
-
diff --git a/misc/kremotecontrol/DESCR b/misc/kremotecontrol/DESCR
index 05ec3b66f48..19045d03485 100644
--- a/misc/kremotecontrol/DESCR
+++ b/misc/kremotecontrol/DESCR
@@ -2,4 +2,4 @@ KRemoteControl (formerly known as KDELirc) is a KDE frontend for your
 remote controls. It allows to configure actions for button presses on
 remotes. All types of remotes supported by the Solid module in the KDE
 platform are also supported by KRemoteControl (e.g. with the Linux
-Infrared Remote Control system (LIRC) as backend). 
+Infrared Remote Control system (LIRC) as backend).
diff --git a/multimedia/pspvc/DESCR b/multimedia/pspvc/DESCR
index bba8f7df327..07eb953f3b4 100644
--- a/multimedia/pspvc/DESCR
+++ b/multimedia/pspvc/DESCR
@@ -5,4 +5,4 @@ Formats:
 
     * MPEG4/SP (all firmware)
     * H264/AVC (firmware 2.0+)
-    * H264/AVC 480x272 (firmware 3.03-OE-B+) 
+    * H264/AVC 480x272 (firmware 3.03-OE-B+)
diff --git a/net/adns/DESCR b/net/adns/DESCR
index c1b923fbe43..9925a8b165d 100644
--- a/net/adns/DESCR
+++ b/net/adns/DESCR
@@ -21,6 +21,4 @@ library.  The adns library has the following features:
   environment variables (for setuid programs), disable hostname
   syntax sanity checks to return arbitrary data, override or ignore
   resolv.conf in favour of supplied configuration, etc.
-* Believed to be correct ! For example, will correctly back off to
-  TCP in case of long replies or queries, or to other nameservers if
-  several are available. It has sensible handling of bad responses etc.
+...and more!
diff --git a/net/ether2dns/DESCR b/net/ether2dns/DESCR
index 4cb8e39636e..1359b1089f3 100644
--- a/net/ether2dns/DESCR
+++ b/net/ether2dns/DESCR
@@ -1,4 +1,4 @@
-This is a quickie used by me to create IPv6 DNS entries for our 
+This is a quickie used by me to create IPv6 DNS entries for our
 machines assuming stateless address auto-configuration.
 
 Input format is standard /etc/ethers format.
diff --git a/net/kdenetwork4/DESCR b/net/kdenetwork4/DESCR
index 987d7e7cb84..3925384c65f 100644
--- a/net/kdenetwork4/DESCR
+++ b/net/kdenetwork4/DESCR
@@ -9,4 +9,3 @@ standard KDE environment:
 * KPPP: dialer and front end for pppd
 * KRDC: a client for Desktop Sharing
 * Krfb: Desktop Sharing server, allow others to access your desktop via VNC
-
diff --git a/net/kftpgrabber/DESCR b/net/kftpgrabber/DESCR
index 6085b84f8fd..e7a6e3174c5 100644
--- a/net/kftpgrabber/DESCR
+++ b/net/kftpgrabber/DESCR
@@ -21,8 +21,4 @@ Here are some of the features:
   - Encrypted bookmark support (password can be saved to KWallet)
   - Distributed FTP support (PRET)
   - SSCN and CPSV support
-  - Skiplist
-  - ZeroConf (aka. Rendezvous) support for local site discovery
-  - Bookmark sharing with Kopete contacts (KDE >= 3.3)
-  - Bookmark import plugins
-  - Support for SFTP protocol [experimental]
+...and more!
diff --git a/net/mDNSResponder/DESCR b/net/mDNSResponder/DESCR
index 33481f81181..e23abd5927a 100644
--- a/net/mDNSResponder/DESCR
+++ b/net/mDNSResponder/DESCR
@@ -1,10 +1,8 @@
-The mDNSResponder project is a component of Bonjour,
-Apple's ease-of-use IP networking initiative:
-<http://developer.apple.com/bonjour/>
+The mDNSResponder project is a component of Bonjour, Apple's ease-of-use IP
+networking initiative: <http://developer.apple.com/bonjour/>
 
-Apple's Bonjour software derives from the ongoing standardization
-work of the IETF Zero Configuration Networking Working Group:
-<http://zeroconf.org/>
+Apple's Bonjour software derives from the ongoing standardization work of the
+IETF Zero Configuration Networking Working Group: <http://zeroconf.org/>
 
 The Zeroconf Working Group has identified three requirements for Zero
 Configuration Networking:
@@ -23,10 +21,3 @@ Requirement 3 is met by DNS Service Discovery (DNS-SD).
 Self-assigned link-local address capability has been available since
 1998, when it first appeared in Windows '98 and in Mac OS 8.5.
 Implementations for other platforms also exist.
-
-The mDNSResponder project allows us to meet requirements 2 and 3.
-It provides the ability for the user to identify hosts using names
-instead of dotted-decimal IP addresses, even if the user doesn't have a
-conventional DNS server set up. It also provides the ability for the
-user to discover what services are being advertised on the network,
-without having to know about them in advance, or configure the machines.
diff --git a/net/wide-dhcpv6/DESCR b/net/wide-dhcpv6/DESCR
index 314ce9fb2e8..2c77c0667e9 100644
--- a/net/wide-dhcpv6/DESCR
+++ b/net/wide-dhcpv6/DESCR
@@ -1,28 +1,24 @@
-WIDE-DHCPv6 is an open-source implementation of Dynamic Host
-Configuration Protocol for IPv6 (DHCPv6) developed by the KAME
-project.
+WIDE-DHCPv6 is an open-source implementation of Dynamic Host Configuration
+Protocol for IPv6 (DHCPv6) developed by the KAME project.
 
 The implementation mainly conforms to the following standards:
 
 - RFC3315: Dynamic Host Configuration Protocol for IPv6 (DHCPv6)
 - RFC3319: Dynamic Host Configuration Protocol (DHCPv6) Options
 	   for Session Initiation Protocol (SIP) Servers
-- RFC3633: IPv6 Prefix Options for Dynamic Host Configuration
-	   Protocol (DHCP)
+- RFC3633: IPv6 Prefix Options for Dynamic Host Configuration Protocol (DHCP)
 - RFC3646: DNS Configuration options for Dynamic Host
 	   Configuration Protocol for IPv6 (DHCPv6)
-- RFC4075: Simple Network Time Protocol (SNTP) Configuration
-	   Option for DHCPv6
+- RFC4075: Simple Network Time Protocol (SNTP) Configuration Option for DHCPv6
 - RFC4242: Information Refresh Time Option for Dynamic Host
 	   Configuration Protocol for IPv6 (DHCPv6)
 
-All the components of the main protocol are provided, i.e.,
-DHCPv6 clients, servers, and relay agents.
+All the components of the main protocol are provided, i.e., DHCPv6 clients,
+servers, and relay agents. Supported message types are as follows:
 
-Supported message types are as follows:
   Solicit, Advertise, Request, Renew, Rebind, Release, Reply,
   Information-request, Relay-forward and Relay-reply.
 
-Note that the current implementation does not support IPv6
-temporary address allocation by DHCPv6, and there is no plan to
-implement that feature at the moment.
+Note that the current implementation does not support IPv6 temporary address
+allocation by DHCPv6, and there is no plan to implement that feature at the
+moment.
diff --git a/parallel/openmpi/DESCR b/parallel/openmpi/DESCR
index df10ebe8f58..de15eec9f07 100644
--- a/parallel/openmpi/DESCR
+++ b/parallel/openmpi/DESCR
@@ -1,14 +1,10 @@
-The Open MPI Project is an open source MPI-2 implementation
-that is developed and maintained by a consortium of academic,
-research, and industry partners. Open MPI is therefore able to
-combine the expertise, technologies, and resources from all
-across the High Performance Computing community in order to
-build the best MPI library available. Open MPI offers advantages
-for system and software vendors, application developers and
-computer science researchers.
-
-Features implemented or in short-term development for Open MPI
-include:
+The Open MPI Project is an open source MPI-2 implementation that is developed
+and maintained by a consortium of academic, research, and industry partners.
+Open MPI is therefore able to combine the expertise, technologies, and resources
+from all across the High Performance Computing community in order to build the
+best MPI library available. Open MPI offers advantages for system and software
+vendors, application developers and computer science researchers. Features
+implemented or in short-term development for Open MPI include:
 
   - Full MPI-2 standards conformance
   - Thread safety and concurrency
diff --git a/pkgtools/pkg_summary-utils/DESCR b/pkgtools/pkg_summary-utils/DESCR
index 5d901abd874..0fed441d251 100644
--- a/pkgtools/pkg_summary-utils/DESCR
+++ b/pkgtools/pkg_summary-utils/DESCR
@@ -1,5 +1,4 @@
 A collection of utilities for manipulating pkg_summary(5) files.
-
 pkg_list_all_pkgs       - list (in PKGPATH form) all packages in pkgsrc tree
 pkg_src_summary         - create a full pkg_src_summary
                           for given (in PKGPATH form) packages
@@ -16,8 +15,7 @@ pkg_update_summary      - updates pkg_summary(5) by analysing the modification
 pkg_update_src_summary  - efficiently updates pkg_src_summary for all
                           packages in pkgsrc tree
 pkg_summary4view        - convert a summary file to human readable format
-pkg_refresh_summary     - output an information about latest/newest version
-                          of packages
+pkg_refresh_summary -- information about latest/newest version of packages
 pkg_cleanup_distdir     - remove old unused distfiles
 pkg_uniq_summary        - filter out repeated package summaries
 pkg_summary2deps        - summary to dependency graph converter
diff --git a/print/ja-vflib-lib/DESCR b/print/ja-vflib-lib/DESCR
index af62818cf82..6c99cec1878 100644
--- a/print/ja-vflib-lib/DESCR
+++ b/print/ja-vflib-lib/DESCR
@@ -1,21 +1,16 @@
-VFlib is the Japanese vector font library, supporting TrueType, Zeit,
-JG, and BDF fonts.  The Watanabe-vector font(pkgsrc/fonts/watanabe_vfont)
-is used by default for mincho(min) and gothic(goth).
-
-You can use your own fonts by installing them (/usr/share/font is
-recommended) and adding them to ${PREFIX}/lib/VFlib/vfontcap.
-
-See ${PREFIX}/lib/VFlib/doc/man.ps or the website for more details
-(in Japanese).
+VFlib is the Japanese vector font library, supporting TrueType, Zeit, JG, and
+BDF fonts. The Watanabe-vector font(pkgsrc/fonts/watanabe_vfont) is used by
+default for mincho(min) and gothic(goth). You can use your own fonts by
+installing them (/usr/share/font is recommended) and adding them to
+${PREFIX}/lib/VFlib/vfontcap. See ${PREFIX}/lib/VFlib/doc/man.ps or the
+website for more details (in Japanese).
 
 This port supports the FreeType library.  Freetype makes use of hinting
 information in TrueType font files so that clearer output is possible.
 To use Freetype with TrueType fonts, simply modify
 ${PREFIX}/lib/VFlib/vfontcap as follows:
-
 	1.  Change `truetype' to `freetype', then
 	2.  Add .ttf or .ttc to the font file path.
-
 For example:
 
 # Before...
diff --git a/print/qpdf/DESCR b/print/qpdf/DESCR
index 7a3c5981e86..216c4bac6ec 100644
--- a/print/qpdf/DESCR
+++ b/print/qpdf/DESCR
@@ -1,35 +1,21 @@
 QPDF is a command-line program that does structural, content-preserving
-transformations on PDF files.  It could have been called something
-like pdf-to-pdf. It also provides many useful capabilities to
-developers of PDF-producing software or for people who just want
-to look at the innards of a PDF file to learn more about how they
-work.
+transformations on PDF files.  It could have been called something like
+pdf-to-pdf. It also provides many useful capabilities to developers of
+PDF-producing software or for people who just want to look at the innards of a
+PDF file to learn more about how they work.
 
-QPDF is capable of creating linearized (also known as web-optimized)
-files and encrypted files. It is also capable of converting PDF
-files with object streams (also known as compressed objects) to
-files with no compressed objects or to generate object streams from
-files that don't have them (or even those that already do). QPDF
-also supports a special mode designed to allow you to edit the
-content of PDF files in a text editor. For more details, please
-see the documentation links below.
+QPDF is capable of creating linearized (also known as web-optimized) files and
+encrypted files. It is also capable of converting PDF files with object streams
+(also known as compressed objects) to files with no compressed objects or to
+generate object streams from files that don't have them (or even those that
+already do). QPDF also supports a special mode designed to allow you to edit the
+content of PDF files in a text editor. For more details, please see the
+documentation links below.
 
-QPDF includes support for merging and splitting PDFs through the
-ability to copy objects from one PDF file into another and to
-manipulate the list of pages in a PDF file. The QPDF library also
-makes it possible for you to create PDF files from scratch. In this
-mode, you are responsible for supplying all the contents of the
-file, while the QPDF library takes care off all the syntactical
-representation of the objects, creation of cross references tables
-and, if you use them, object streams, encryption, linearization,
-and other syntactic details.
-
-QPDF is not a PDF content creation library, a PDF viewer, or a
-program capable of converting PDF into other formats. In particular,
-QPDF knows nothing about the semantics of PDF content streams. If
-you are looking for something that can do that, you should look
-elsewhere. However, once you have a valid PDF file, QPDF can be
-used to transform that file in ways perhaps your original PDF
-creation can't handle. For example, programs generate simple PDF
-files but can't password-protect them, web-optimize them, or perform
-other transformations of that type.
+QPDF includes support for merging and splitting PDFs through the ability to copy
+objects from one PDF file into another and to manipulate the list of pages in a
+PDF file. The QPDF library also makes it possible for you to create PDF files
+from scratch. In this mode, you are responsible for supplying all the contents
+of the file, while the QPDF library takes care off all the syntactical
+representation of the objects, creation of cross references tables and, if you
+use them, object streams, encryption, linearization and other syntactic details.
diff --git a/print/tex-biblatex/DESCR b/print/tex-biblatex/DESCR
index ef47f5caeb6..45842efc080 100644
--- a/print/tex-biblatex/DESCR
+++ b/print/tex-biblatex/DESCR
@@ -1,31 +1,24 @@
-The biblatex package is a complete reimplementation of the
-bibliographic facilities provided by LaTeX in conjunction with
-BibTeX. It redesigns the way in which LaTeX interacts with
-BibTeX at a fairly fundamental level. With biblatex, BibTeX is
-only used (if it is used at all) to sort the bibliography and
-to generate labels. Instead of being implemented in BibTeX's
-style files, the formatting of the bibliography is entirely
-controlled by TeX macros. Good working knowledge in LaTeX
-should be sufficient to design new bibliography and citation
-styles -- there is no need to learn BibTeX's postfix stack
-language. Just like the bibliography styles, all citation
-commands may be freely (re)defined. In fact, users need not
-remain bound to BibTeX for use with biblatex: an alternative
-bibliography processor biblatex-biber is available. Development
-of biblatex and biblatex-biber is closely coupled; the present
-release of biblatex is designed to work with biblatex-biber
-version 0.9.3. The package needs e-TeX, and uses the author's
-etoolbox and logreq packages. For users of biblatex-biber,
-version 0.9 is required (at least; refer to the notes for the
-version of biblatex-biber that you are using). Apart from the
-features unique to biblatex, the package also incorporates core
-features of the following packages: babelbib, bibtopic,
-bibunits, chapterbib, cite, inlinebib, mcite and mciteplus,
-mlbib, multibib, splitbib. There are also some conceptual
-parallels to the natbib and amsrefs packages. The biblatex
-package supports split bibliographies, multiple bibliographies
-within one document, and separate lists of bibliographic
-shorthands. Bibliographies may be subdivided into parts (by
-chapter, by section, etc.) and/or segmented by topics (by type,
-by keyword, etc.). The package is fully localized and can
-interface with the babel package.
+The biblatex package is a complete reimplementation of the bibliographic
+facilities provided by LaTeX in conjunction with BibTeX. It redesigns the way in
+which LaTeX interacts with BibTeX at a fairly fundamental level. With biblatex,
+BibTeX is only used (if it is used at all) to sort the bibliography and to
+generate labels. Instead of being implemented in BibTeX's style files, the
+formatting of the bibliography is entirely controlled by TeX macros. Good
+working knowledge in LaTeX should be sufficient to design new bibliography and
+citation styles - there is no need to learn BibTeX's postfix stack language.
+Just like the bibliography styles, all citation commands may be freely
+(re)defined. In fact, users need not remain bound to BibTeX for use with
+biblatex: an alternative bibliography processor biblatex-biber is available.
+Development of biblatex and biblatex-biber is closely coupled; the present
+release of biblatex is designed to work with biblatex-biber version 0.9.3. The
+package needs e-TeX, and uses the author's etoolbox and logreq packages. For
+users of biblatex-biber, version 0.9 is required (at least; refer to the notes
+for the version of biblatex-biber that you are using). Apart from the features
+unique to biblatex, the package also incorporates core features of the following
+packages: babelbib, bibtopic, bibunits, chapterbib, cite, inlinebib, mcite and
+mciteplus, mlbib, multibib, splitbib. There are also some conceptual parallels
+to the natbib and amsrefs packages. The biblatex package supports split
+bibliographies, multiple bibliographies within one document, and separate lists
+of bibliographic shorthands. Bibliographies may be subdivided into parts (by
+chapter, by section, etc.) and/or segmented by topics (by type, by keyword,
+etc.). The package is fully localized and can interface with the babel package.
diff --git a/print/tex-fancyhdr/DESCR b/print/tex-fancyhdr/DESCR
index 8aa5ce88c1a..7ca8311bb0d 100644
--- a/print/tex-fancyhdr/DESCR
+++ b/print/tex-fancyhdr/DESCR
@@ -1,3 +1,3 @@
 The package provides extensive facilities, both for constructing
 headers and footers, and for controlling their use (for example, at
-times when LaTeX would automatically change the heading style in use). 
+times when LaTeX would automatically change the heading style in use).
diff --git a/security/gtk-systrace/DESCR b/security/gtk-systrace/DESCR
index 5dda8e1a34e..e7c24b74fa0 100644
--- a/security/gtk-systrace/DESCR
+++ b/security/gtk-systrace/DESCR
@@ -1,28 +1,24 @@
-GTK frontend for systrace.
+Systrace enforces system call policies for applications by constraining the
+application's access to the system. The policy is generated interactively.
+Operations not covered by the policy raise an alarm and allow an user to refine
+the currently configured policy.
 
-Systrace enforces system call policies for applications by constraining
-the application's access to the system.  The policy is generated
-interactively. Operations not covered by the policy raise an alarm
-and allow an user to refine the currently configured policy.
+For complicated applications, it is difficult to know the correct policy before
+running them. Initially, Systrace notifies the user about all system calls that
+an applications tries to execute. The user configures a policy for the specific
+system call that caused the warning. After a few minutes, a policy is generated
+that allows the application to run without any warnings. However, events that
+are not covered still generate a warning. Normally, that is an indication of a
+security problem.  Systrace improves cyber security by providing intrusion
+prevention.
 
-For complicated applications, it is difficult to know the correct
-policy before running them.  Initially, Systrace notifies the user
-about all system calls that an applications tries to execute.  The
-user configures a policy for the specific system call that caused
-the warning.  After a few minutes, a policy is generated that allows
-the application to run without any warnings.  However, events that
-are not covered still generate a warning.  Normally, that is an
-indication of a security problem.  Systrace improves cyber security
-by providing intrusion prevention.
+With systrace untrusted binary applications can be sandboxed. Their access to
+the system can be restricted almost arbitrarily. Sandboxing applications
+available only as binaries is only sensible as it is not possible to directly
+analyze what they are designed to do. However, constraining the system calls
+large open-source applications are allowed to execute is useful too as it is
+very difficult to determine their correctness.
 
-With systrace untrusted binary applications can be sandboxed.
-Their access to the system can be restricted almost arbitrarily.
-Sandboxing applications available only as binaries is only sensible
-as it is not possible to directly analyze what they are designed
-to do.  However, constraining the system calls large open-source
-applications are allowed to execute is useful too as it is very
-difficult to determine their correctness.
-
-System call arguments can be rewritten dynamically.  This effects
-a virtual chroot for the sandboxed application.  It also prevents
-race conditions in the argument evaluation.
+System call arguments can be rewritten dynamically. This effects a virtual
+chroot for the sandboxed application. It also prevents race conditions in the
+argument evaluation.
diff --git a/security/libtomcrypt/DESCR b/security/libtomcrypt/DESCR
index 1ca5401493f..139c7a02ff3 100644
--- a/security/libtomcrypt/DESCR
+++ b/security/libtomcrypt/DESCR
@@ -1,12 +1,11 @@
-LibTomCrypt is a fairly comprehensive, modular and portable
-cryptographic toolkit that provides developers with a vast array of
-well known published block ciphers, one-way hash functions, chaining
-modes, pseudo-random number generators, public key cryptography and a
-plethora of other routines.  LibTomCrypt has been designed from the
-ground up to be very simple to use.  It has a modular and standard API
-that allows new ciphers, hashes and PRNGs to be added or removed
-without change to the overall end application.  It features easy to
-use functions and a complete user manual which has many source snippet
+LibTomCrypt is a fairly comprehensive, modular and portable cryptographic
+toolkit that provides developers with a vast array of well known published block
+ciphers, one-way hash functions, chaining modes, pseudo-random number
+generators, public key cryptography and a plethora of other routines.
+LibTomCrypt has been designed from the ground up to be very simple to use. It
+has a modular and standard API that allows new ciphers, hashes and PRNGs to be
+added or removed without change to the overall end application. It features easy
+to use functions and a complete user manual which has many source snippet
 examples.
 
 * Block Ciphers
@@ -27,49 +26,4 @@ examples.
     * Khazad
     * KASUMI
     * SEED
-* Chaining Modes
-    * ECB
-    * CBC
-    * OFB
-    * CFB
-    * CTR
-    * IEEE LRW mode
-    * F8 Chaining Mode
-* One-Way Hash Functions
-    * MD2
-    * MD4
-    * MD5
-    * SHA-1
-    * SHA-224/256/384/512
-    * TIGER-192
-    * RIPE-MD 128/160/256/320
-    * WHIRLPOOL
-* Message Authentication
-    * FIPS-198 HMAC (supports all hashes)
-    * CMAC, also known as OMAC1 (supports all ciphers)
-    * PMAC Authentication
-    * F9-MAC
-    * Pelican MAC
-* Message Encrypt+Authenticate Modes
-    * EAX Mode
-    * OCB Mode
-    * CCM Mode (NIST spec)
-    * GCM Mode (IEEE spec)
-* Pseudo-Random Number Generators
-    * Yarrow (based algorithm)
-    * RC4
-    * Support for /dev/random, /dev/urandom and the Win32 CSP RNG
-    * Fortuna
-    * SOBER-128
-* Public Key Algorithms
-    * RSA (using PKCS #1 v1.5 and v2.1)
-    * ECC (EC-DSA X9.62 signatures, X9.63 EC-DH)
-          o With fast Fixed Point ECC support as well
-          o X9.63 import/export of public keys
-    * DSA (Users make their own groups)
-    * The math routines are pluggable which means you can use your own
-      math provider if you want.
-* Other standards
-    * PKCS #1 (v1.5 and v2.1 padding)
-    * PKCS #5
-    * ASN.1 DER
+...and more!
diff --git a/security/ruby-bcrypt/DESCR b/security/ruby-bcrypt/DESCR
index 8845fe6c228..649f7083aba 100644
--- a/security/ruby-bcrypt/DESCR
+++ b/security/ruby-bcrypt/DESCR
@@ -1,6 +1,6 @@
-bcrypt() is a sophisticated and secure hash algorithm designed by The
-OpenBSD project for hashing passwords. bcrypt-ruby provides a simple,
-humane wrapper for safely handling passwords.
+bcrypt() is a sophisticated and secure hash algorithm designed by The OpenBSD
+project for hashing passwords. bcrypt-ruby provides a simple, humane wrapper for
+safely handling passwords.
 
 = bcrypt-ruby
 
@@ -11,15 +11,14 @@ An easy way to keep your users' passwords secure.
 
 == Why you should use bcrypt
 
-If you store user passwords in the clear, then an attacker who steals
-a copy of your database has a giant list of emails and passwords. Some
-of your users will only have one password -- for their email account,
-for their banking account, for your application. A simple hack could
-escalate into massive identity theft.
+If you store user passwords in the clear, then an attacker who steals a copy of
+your database has a giant list of emails and passwords. Some of your users will
+only have one password - for their email account, for their banking account, for
+your application. A simple hack could escalate into massive identity theft.
 
-It's your responsibility as a web developer to make your web
-application secure -- blaming your users for not being security
-experts is not a professional response to risk.
+It's your responsibility as a web developer to make your web application secure
+- blaming your users for not being security experts is not a professional
+response to risk.
 
 bcrypt allows you to easily harden your application against these
 kinds of attacks.
diff --git a/sysutils/agedu/DESCR b/sysutils/agedu/DESCR
index cd7823b2a44..ed74862ddf6 100644
--- a/sysutils/agedu/DESCR
+++ b/sysutils/agedu/DESCR
@@ -1,30 +1,24 @@
-Suppose you're running low on disk space. You need to free some
-up, by finding something that's a waste of space and deleting it
-(or moving it to an archive medium). How do you find the right
-stuff to delete, that saves you the maximum space at the cost of
-minimum inconvenience?
+Suppose you're running low on disk space. You need to free some up, by finding
+something that's a waste of space and deleting it (or moving it to an archive
+medium). How do you find the right stuff to delete, that saves you the maximum
+space at the cost of minimum inconvenience?
 
-Unix provides the standard du utility, which scans your disk and
-tells you which directories contain the largest amounts of data.
-That can help you narrow your search to the things most worth
-deleting.
+Unix provides the standard du utility, which scans your disk and tells you which
+directories contain the largest amounts of data. That can help you narrow your
+search to the things most worth deleting.
 
-However, that only tells you what's big. What you really want to
-know is what's too big. By itself, du won't let you distinguish
-between data that's big because you're doing something that needs
-it to be big, and data that's big because you unpacked it once and
-forgot about it.
+However, that only tells you what's big. What you really want to know is what's
+too big. By itself, du won't let you distinguish between data that's big because
+you're doing something that needs it to be big, and data that's big because you
+unpacked it once and forgot about it.
 
-Most Unix file systems, in their default mode, helpfully record
-when a file was last accessed. Not just when it was written or
-modified, but when it was even read. So if you generated a large
-amount of data years ago, forgot to clean it up, and have never
-used it since, then it ought in principle to be possible to use
-those last-access time stamps to tell the difference between that
-and a large amount of data you're still using regularly.
+Most Unix file systems, in their default mode, helpfully record when a file was
+last accessed. Not just when it was written or modified, but when it was even
+read. So if you generated a large amount of data years ago, forgot to clean it
+up, and have never used it since, then it ought in principle to be possible to
+use those last-access time stamps to tell the difference between that and a
+large amount of data you're still using regularly.
 
-agedu is a program which does this. It does basically the same sort
-of disk scan as du, but it also records the last-access times of
-everything it scans. Then it builds an index that lets it efficiently
-generate reports giving a summary of the results for each subdirectory,
-and then it produces those reports on demand.
+agedu does same disk scan as du, but also records the last-access times of
+everything. Then it builds an index that lets it efficiently generate reports
+giving a summary of the results for each subdirectory.
diff --git a/sysutils/bup/DESCR b/sysutils/bup/DESCR
index 5512feb9597..69824b2d487 100644
--- a/sysutils/bup/DESCR
+++ b/sysutils/bup/DESCR
@@ -1,41 +1,22 @@
-bup is a program that backs things up.  bup has a few advantages
-over other backup software:
-
-It uses a rolling checksum algorithm (similar to rsync) to split
-large files into chunks. The most useful result of this is you can
-backup huge virtual machine (VM) disk images, databases, and XML
-files incrementally, even though they're typically all in one huge
-file, and not use tons of disk space for multiple versions.
-
-It uses the packfile format from git (the open source version
-control system), so you can access the stored data even if you
-don't like bup's user interface.
-
-Unlike git, it writes packfiles directly (instead of having a
-separate garbage collection / repacking stage) so it's fast even
-with gratuitously huge amounts of data. bup's improved index formats
-also allow you to track far more filenames than git (millions) and
-keep track of far more objects (hundreds or thousands of gigabytes).
-
-Data is "automagically" shared between incremental backups without
-having to know which backup is based on which other one - even if
-the backups are made from two different computers that don't even
-know about each other. You just tell bup to back stuff up, and it
-saves only the minimum amount of data needed.
-
-You can back up directly to a remote bup server, without needing
-tons of temporary disk space on the computer being backed up.  And
-if your backup is interrupted halfway through, the next run will
-pick up where you left off. And it's easy to set up a bup server:
-just install bup on any machine where you have ssh access.
-
-Bup can use "par2" redundancy to recover corrupted backups even if
-your disk has undetected bad sectors.
-
-Even when a backup is incremental, you don't have to worry about
-restoring the full backup, then each of the incrementals in turn;
-an incremental backup acts as if it's a full backup, it just takes
-less disk space.
-
-You can mount your bup repository as a FUSE filesystem and access
-the content that way, and even export it over Samba.
+bup is a program that backs things up.  bup has a few advantages over other
+backup software:
+
+It uses a rolling checksum algorithm (similar to rsync) to split large files
+into chunks. The most useful result of this is you can backup huge virtual
+machine (VM) disk images, databases, and XML files incrementally, even though
+they're typically all in one huge file, and not use tons of disk space for
+multiple versions.
+
+It uses the packfile format from git (the open source version control system),
+so you can access the stored data even if you don't like bup's user interface.
+
+Unlike git, it writes packfiles directly (instead of having a separate garbage
+collection/repacking stage) so it's fast even with gratuitously huge amounts of 
+data. bup's improved index formats also allow you to track far more filenames
+than git (millions) and keep track of far more objects (hundreds or thousands of
+gigabytes).
+
+Data is "automagically" shared between incremental backups without having to
+know which backup is based on which other one - even if the backups are made
+from two different computers that don't even know about each other. You just
+tell bup to back stuff up, and it saves only the minimum amount of data needed.
diff --git a/sysutils/gkrellm-server/DESCR b/sysutils/gkrellm-server/DESCR
index 094dfd3f201..0928bcb7742 100644
--- a/sysutils/gkrellm-server/DESCR
+++ b/sysutils/gkrellm-server/DESCR
@@ -1,28 +1,24 @@
 With a single process, GKrellM manages multiple stacked monitors and supports
-applying themes to match the monitors appearance to your window manager,
-Gtk, or any other theme.
-
-  * SMP CPU, Disk, Proc, and active net interface monitors with LEDs.
-  * Internet monitor that displays current and charts historical port hits
-
-  * Memory and swap space usage meters and a system uptime monitor.
-  * File system meters show capacity/free space and can mount/umount.
-  * A mailbox monitor which can launch mail reader, remote mail fetch.
-  * Clock/calendar and hostname display.
-  * APM laptop battery monitor.
-  * CPU/motherboard temperature display if lm_sensors modules installed.
-
-  * Multiple monitors managed by a single process to reduce system load.
-  * A timer button that can execute PPP or ISDN logon/logoff scripts.
-  * Charts are autoscaling with configurable grid line resolution, or
-    can be set to a fixed scale mode.
-  * Separate colors for "in" and "out" data.  The in color is used for
-    CPU user time, disk read, forks, and net receive data.  The out color
-    is used for CPU sys time, disk write, load, and net transmit data.
-  * Commands can be configured to run when monitor labels are clicked.
-  * GKrellM is plugin capable so special interest monitors can be created.
-  * A different theme can be created with the GIMP.
-
-The gkrellm2-server package installs the monitoring part of GKrellM, which
-can be made to run as a daemon to be polled over the network by the GKrellM
-client as found in the gkrellm2 package.
+applying themes to match the monitors appearance to your window manager, Gtk, or
+any other theme.
+ * SMP CPU, Disk, Proc, and active net interface monitors with LEDs.
+ * Internet monitor that displays current and charts historical port hits
+ * Memory and swap space usage meters and a system uptime monitor.
+ * File system meters show capacity/free space and can mount/umount.
+ * A mailbox monitor which can launch mail reader, remote mail fetch.
+ * Clock/calendar and hostname display.
+ * APM laptop battery monitor.
+ * CPU/motherboard temperature display if lm_sensors modules installed.
+ * Multiple monitors managed by a single process to reduce system load.
+ * A timer button that can execute PPP or ISDN logon/logoff scripts.
+ * Charts are autoscaling with configurable grid line resolution, or can be set
+   to a fixed scale mode.
+ * Separate colors for "in" and "out" data.  The in color is used for CPU user
+   time, disk read, forks, and net receive data.  The out color is used for CPU
+   sys time, disk write, load, and net transmit data.
+ * Commands can be configured to run when monitor labels are clicked.
+ * GKrellM is plugin capable so special interest monitors can be created.
+ * A different theme can be created with the GIMP.
+The gkrellm2-server package installs the monitoring part of GKrellM, which can
+be made to run as a daemon to be polled over the network by the GKrellM client
+as found in the gkrellm2 package.
diff --git a/sysutils/gkrellm-share/DESCR b/sysutils/gkrellm-share/DESCR
index 9a5cc549218..4414758d43b 100644
--- a/sysutils/gkrellm-share/DESCR
+++ b/sysutils/gkrellm-share/DESCR
@@ -1,29 +1,24 @@
 With a single process, GKrellM manages multiple stacked monitors and supports
-applying themes to match the monitors appearance to your window manager,
-Gtk, or any other theme.
-
-  * SMP CPU, Disk, Proc, and active net interface monitors with LEDs.
-  * Internet monitor that displays current and charts historical port hits
-
-  * Memory and swap space usage meters and a system uptime monitor.
-  * File system meters show capacity/free space and can mount/umount.
-  * A mailbox monitor which can launch mail reader, remote mail fetch.
-  * Clock/calendar and hostname display.
-  * APM laptop battery monitor.
-  * CPU/motherboard temperature display if lm_sensors modules installed.
-
-  * Multiple monitors managed by a single process to reduce system load.
-  * A timer button that can execute PPP or ISDN logon/logoff scripts.
-  * Charts are autoscaling with configurable grid line resolution, or
-    can be set to a fixed scale mode.
-  * Separate colors for "in" and "out" data.  The in color is used for
-    CPU user time, disk read, forks, and net receive data.  The out color
-    is used for CPU sys time, disk write, load, and net transmit data.
-  * Commands can be configured to run when monitor labels are clicked.
-  * GKrellM is plugin capable so special interest monitors can be created.
-  * A different theme can be created with the GIMP.
-
-GKrellM can either monitor the host it is running on or poll a server
-over the network.  Both packages, gkrellm2 and gkrellm2-server, share a
-certain amount of data, notably i18n files which are included in the
-gkrellm2-share package.
+applying themes to match the monitors appearance to your window manager, Gtk, or
+any other theme.
+ * SMP CPU, Disk, Proc, and active net interface monitors with LEDs.
+ * Internet monitor that displays current and charts historical port hits
+ * Memory and swap space usage meters and a system uptime monitor.
+ * File system meters show capacity/free space and can mount/umount.
+ * A mailbox monitor which can launch mail reader, remote mail fetch.
+ * Clock/calendar and hostname display.
+ * APM laptop battery monitor.
+ * CPU/motherboard temperature display if lm_sensors modules installed.
+ * Multiple monitors managed by a single process to reduce system load.
+ * A timer button that can execute PPP or ISDN logon/logoff scripts.
+ * Charts are autoscaling with configurable grid line resolution, or can be set
+   to a fixed scale mode.
+ * Separate colors for "in" and "out" data.  The in color is used for CPU user
+   time, disk read, forks, and net receive data.  The out color is used for CPU
+   sys time, disk write, load, and net transmit data.
+ * Commands can be configured to run when monitor labels are clicked.
+ * GKrellM is plugin capable so special interest monitors can be created.
+ * A different theme can be created with the GIMP.
+GKrellM can either monitor the host it is running on or poll a server over the
+network. Both packages, gkrellm2 and gkrellm2-server, share a certain amount of
+data, notably i18n files which are included in the gkrellm2-share package.
diff --git a/sysutils/heirloom-doc/DESCR.common b/sysutils/heirloom-doc/DESCR.common
index 6157bca6b3f..0f85df7717c 100644
--- a/sysutils/heirloom-doc/DESCR.common
+++ b/sysutils/heirloom-doc/DESCR.common
@@ -1,4 +1,3 @@
-The Heirloom Project provides traditional implementations of standard
-Unix utilities. In many cases, they have been derived from original
-Unix material released as Open Source by Caldera and Sun.
-
+The Heirloom Project provides traditional implementations of standard Unix
+utilities. In many cases, they have been derived from original Unix material
+released as Open Source by Caldera and Sun.
diff --git a/sysutils/xenkernel41/DESCR b/sysutils/xenkernel41/DESCR
index db6df31f21a..a1e45de75cf 100644
--- a/sysutils/xenkernel41/DESCR
+++ b/sysutils/xenkernel41/DESCR
@@ -1,10 +1,9 @@
-Xen is a virtual machine monitor which supports running multiple
-guests operating systems on a single machine.  Guest OSes (also called "domains")
-require a modified kernel which supports Xen hypercalls in replacement
-to access to the physical hardware.  At boot, the xen kernel is loaded
-along with the guest kernel for the first domain (called domain0).
-domain0 has privileges to access the physical hardware (PCI
-and ISA devices), administrate other domains and provide virtual
-devices (disks and network) to other domains.
+Xen is a virtual machine monitor which supports running multiple guests
+operating systems on a single machine. Guest OSes (also called "domains")
+require a modified kernel which supports Xen hypercalls in replacement to access
+to the physical hardware. At boot, the xen kernel is loaded along with the guest
+kernel for the first domain (called domain0). domain0 has privileges to access
+the physical hardware (PCI and ISA devices), administrate other domains and
+provide virtual devices (disks and network) to other domains.
 
 This package contains the Xen4 kernel itself.
diff --git a/textproc/php-enchant/DESCR b/textproc/php-enchant/DESCR
index 18c096607da..fa6258267dd 100644
--- a/textproc/php-enchant/DESCR
+++ b/textproc/php-enchant/DESCR
@@ -6,7 +6,7 @@ API for many spell libraries:
 
 	- aspell/pspell (intended to replace ispell)
 	- hspell (hebrew)
-	- ispell 
+	- ispell
 	- myspell/hunspell (OpenOffice project, mozilla)
 	- uspell (primarily Yiddish, Hebrew, and Eastern European languages)
 
diff --git a/textproc/xhtmldiff/DESCR b/textproc/xhtmldiff/DESCR
index b1e2532afff..448de8db7a9 100644
--- a/textproc/xhtmldiff/DESCR
+++ b/textproc/xhtmldiff/DESCR
@@ -1,4 +1,3 @@
 XHTMLDiff is a tool and library for taking valid XHTML documents as
 input, and generating redlined, valid XHTML text highlighting the
 changes between them as output.
-
diff --git a/time/cal/DESCR b/time/cal/DESCR
index e2c4d5d57c4..8d669fdfc14 100644
--- a/time/cal/DESCR
+++ b/time/cal/DESCR
@@ -1,38 +1,24 @@
-CAL is a nicely-enhanced version of the unix `cal' command.
-Features:
-
+CAL is a nicely-enhanced version of the unix `cal' command. Features:
  * Hilights today's date when displaying a monthly calendar.
-
- * Displays an optional user-definable list of `special day'
-   descriptions (like appointments) to the right of the monthly
-   calendar display.  Cal can be set optionally to ignore appointments
-   older than the current day.  Next month's appointments are shown if
-   there is room to do so.  Multiple appointment data files may also
-   be specified on the commandline.
-
+ * Displays an optional user-definable list of `special day' descriptions (like
+   appointments) to the right of the monthly calendar display. Cal can be set
+   optionally to ignore appointments older than the current day. Next month's
+   appointments are shown if there is room to do so. Multiple appointment data
+   files may also be specified on the commandline.
  * You can specify your own appointment and color definition files on the
    commandline, or use the defaults.
-
  * Date descriptions can display "years since" a given year, useful for
    birthdays and anniversaries.
-
- * Completely configurable colors -- eight separate color attributes.
-
- * No ANSI driver needed for colors, and the output may be redirected
-   anywhere, just like the unix version.  However, ANSI color control may
-   be enabled (e.g. for unix) with a #define in the source code.
-
- * Commandline-compatible with unix `cal' command, but with several
-   enhanced switch settings.
-
-Requests, bug reports, suggestions, donations, proposals for
-contract work, and so forth may be sent to:
-
+ * Completely configurable colors - eight separate color attributes.
+ * No ANSI driver needed for colors, and the output may be redirected anywhere,
+   just like the unix version. However, ANSI color control may be enabled (e.g.
+   for unix) with a #define in the source code.
+ * Commandline-compatible with unix `cal' command with enhanced switch settings.
+Requests, bug reports, suggestions, donations, and so forth may be sent to:
         Attn:  Alex Matulich
         Unicorn Research Corporation
         4621 N. Landmark Drive
         Orlando, FL 32817-1235
         USA
         407-657-4974  FAX 407-657-6149
-
 or send e-mail to matulich_a@seaa.navsea.navy.mil.
diff --git a/wm/musca/DESCR b/wm/musca/DESCR
index 676e64efb5f..182023b15d9 100644
--- a/wm/musca/DESCR
+++ b/wm/musca/DESCR
@@ -1,38 +1,24 @@
-A simple dynamic window manager for X, with features nicked from
-ratpoison and dwm:
+Simple dynamic window manager for X with features nicked from ratpoison and dwm:
 
-  * Musca operates as a tiling window manager by default. It uses
-    manual tiling, which means the user determines how the screen is
-    divided into non-overlapping frames, with no restrictions on
-    layout.  Application windows always fill their assigned frame,
-    with the exception of transient windows and popup dialog boxes
-    which float above their parent application at the appropriate
-    size.  Once visible, applications do not change frames unless
-    so instructed.
-  * Since not all applications suit tiling, a more traditional
-    stacking window manager mode is also available, allowing windows
-    to float at any screen location and overlap.
-  * There are no built in status bars, panels, tabs or window
-    decorations to take up screen real estate. If the user wants
-    any of these things, there are plenty of external applications
-    available to do the job. Window decoration is limited to a
-    slender border, which is coloured to indicate keyboard focus.
-  * Windows are placed in named groups which can be used in a
-    similar fashion to virtual desktops. Groups can be added and
-    removed on the fly, and each group has its own frame layout.
-  * The excellent dmenu utility is used to execute commands and
-    launch applications, and it can also act as a window and group
-    switcher. Basic EWMH support allows use of common panels, pagers
-    and wmctrl.
-  * Windows and frames are navigated and focused on any mouse button
-    click, including rolling the wheel, or alternatively driven
-    entirely by the keyboard. Simple key combinations exist for
-    window switching, group switching, frame control and screen
-    switching.
-  * Frames can be dedicated to a single application window, preventing
-    new windows usurping said frame. One frame per group can also
-    be flagged as a catch-all so that all new application windows
-    open there. The frame border colour changes to reflect these
-    modes.
-  * Musca has multi-screen support out of the box, and will
-    automatically create groups for every available screen.
+ * Musca operates as a tiling window manager by default. It uses manual tiling,
+   which means the user determines how the screen is divided into
+   non-overlapping frames, with no restrictions on layout. Application windows
+   always fill their assigned frame, with the exception of transient windows and   popup dialog boxes which float above their parent application at the
+   appropriate size. Once visible, applications do not change frames unless so
+   instructed.
+ * Since not all applications suit tiling, a more traditional stacking window
+   manager mode is also available, allowing windows to float at any screen
+   location and overlap.
+ * There are no built in status bars, panels, tabs or window decorations to take   up screen real estate. If the user wants any of these things, there are
+   plenty of external applications available to do the job. Window decoration is
+   limited to a slender border, which is coloured to indicate keyboard focus.
+ * Windows are placed in named groups which can be used in a similar fashion to
+   virtual desktops. Groups can be added and removed on the fly, and each group
+   has its own frame layout.
+ * The excellent dmenu utility is used to execute commands and launch
+   applications, and it can also act as a window and group switcher. Basic EWMH
+   support allows use of common panels, pagers and wmctrl.
+ * Windows and frames are navigated and focused on any mouse button click,
+   including rolling the wheel, or alternatively driven entirely by the
+   keyboard. Simple key combinations exist for window switching, group
+   switching, frame control and screen switching.
diff --git a/www/aws-demos/DESCR b/www/aws-demos/DESCR
index a1ad8aa8fe7..1eb95e4046e 100644
--- a/www/aws-demos/DESCR
+++ b/www/aws-demos/DESCR
@@ -1,3 +1,2 @@
-This package demonstrates the capability of the Ada Web Server.  More than
-25 small programs built with AWS are installed for educational purposes.
-
+This package demonstrates the capability of the Ada Web Server. More than 25
+small programs built with AWS are installed for educational purposes.
diff --git a/www/heel/DESCR b/www/heel/DESCR
index 2f55b915d5b..598b200e8d7 100644
--- a/www/heel/DESCR
+++ b/www/heel/DESCR
@@ -1,11 +1,10 @@
-Heel is a small static web server for use when you need a quick web
-server for a directory.  Once the server is running, heel will use
-launchy (http://copiousfreetime.rubyforge.org/launchy/) to open your
-browser at the URL of your document root.  Heel is built using
-Rack(http://rack.rubyforge.org) and Thin
-(http://code.macournoyer.com/thin/)
+Heel is a small static web server for use when you need a quick web server for a
+directory. Once the server is running, heel will use launchy
+(http://copiousfreetime.rubyforge.org/launchy/) to open your browser at the URL
+of your document root.  Heel is built using Rack(http://rack.rubyforge.org) and
+Thin (http://code.macournoyer.com/thin/)
 
- % heel
+% heel
 >> Thin web server (v1.0.0 codename That's What She Said)
 >> Threaded mode OFF
 >> Maximum connections set to 1024
@@ -13,8 +12,7 @@ Rack(http://rack.rubyforge.org) and Thin
 
 Launching your browser...
 
-Or run it in the background
-
+Or run it in the background:
 % heel --daemonize Created /Users/jeremy/.heel
 
 heel's PID (/Users/jeremy/.heel/heel.pid) and log file
@@ -24,9 +22,3 @@ at http://0.0.0.0:4331/
 % heel --kill Sending TERM to process 3304
 
 Done.
-
-Heel is a small static web server for use when you need a quick web
-server for a directory.  Heel is built using Rack and Thin.  Beyond
-just serving up webpages, heel uses an ERB template and famfamfam
-icons to create useful index pages.  And to make things even easier it
-launches your browser for you so no cut and paste necessary.
diff --git a/www/kdewebdev4/DESCR b/www/kdewebdev4/DESCR
index fd8cbccf09f..16533ccc9a2 100644
--- a/www/kdewebdev4/DESCR
+++ b/www/kdewebdev4/DESCR
@@ -1,4 +1,5 @@
-The kdewebdev package is the web development package for the K Desktop Environment.
+The kdewebdev package is the web development package for the K Desktop
+Environment.
 
 It contains Quanta Plus and other applications, which are useful for web
 development. They are runtime dependencies of Quanta Plus, and it is
diff --git a/www/p5-HTTP-Response-Encoding/DESCR b/www/p5-HTTP-Response-Encoding/DESCR
index b43ca78eee5..700eabffd88 100644
--- a/www/p5-HTTP-Response-Encoding/DESCR
+++ b/www/p5-HTTP-Response-Encoding/DESCR
@@ -3,4 +3,3 @@ This module adds the following methods to HTTP::Response objects:
   $res->charset
   $res->encoder
   $res->encoding
-
diff --git a/www/py-beautifulsoup4/DESCR b/www/py-beautifulsoup4/DESCR
index 998932a10d0..fa4a88bd402 100644
--- a/www/py-beautifulsoup4/DESCR
+++ b/www/py-beautifulsoup4/DESCR
@@ -1,25 +1,23 @@
-Beautiful Soup is a Python library designed for quick turnaround
-projects like screen-scraping. Three features make it powerful:
+Beautiful Soup is a Python library designed for quick turnaround projects like
+screen-scraping. Three features make it powerful:
 
- * Beautiful Soup provides a few simple methods and Pythonic idioms
- for navigating, searching, and modifying a parse tree: a toolkit
- for dissecting a document and extracting what you need. It doesn't
- take much code to write an application
- * Beautiful Soup automatically converts incoming documents to
- Unicode and outgoing documents to UTF-8. You don't have to think
- about encodings, unless the document doesn't specify an encoding
- and Beautiful Soup can't autodetect one. Then you just have to
- specify the original encoding.
- * Beautiful Soup sits on top of popular Python parsers like lxml
- and html5lib, allowing you to try out different parsing strategies
- or trade speed for flexibility.
+ * Beautiful Soup provides a few simple methods and Pythonic idioms for
+   navigating, searching, and modifying a parse tree: a toolkit for dissecting a
+   document and extracting what you need. It doesn't take much code to write an
+   application
+ * Beautiful Soup automatically converts incoming documents to Unicode and
+   outgoing documents to UTF-8. You don't have to think about encodings, unless
+   the document doesn't specify an encoding and Beautiful Soup can't autodetect
+   one. Then you just have to specify the original encoding.
+ * Beautiful Soup sits on top of popular Python parsers like lxml and html5lib,
+   allowing you to try out different parsing strategies or trade speed for
+   flexibility.
 
-Beautiful Soup parses anything you give it, and does the tree
-traversal stuff for you. You can tell it "Find all the links", or
-"Find all the links of class externalLink", or "Find all the links
-whose urls match "foo.com", or "Find the table heading that's got
-bold text, then give me that text."
+Beautiful Soup parses anything you give it, and does the tree traversal stuff
+for you. You can tell it "Find all the links", or "Find all the links of class
+externalLink", or "Find all the links whose urls match "foo.com", or "Find the
+table heading that's got bold text, then give me that text."
 
-Valuable data that was once locked up in poorly-designed websites
-is now within your reach. Projects that would have taken hours take
-only minutes with Beautiful Soup.
+Valuable data that was once locked up in poorly-designed websites is now within
+your reach. Projects that would have taken hours take only minutes with
+Beautiful Soup.
diff --git a/www/ruby-erubis/DESCR b/www/ruby-erubis/DESCR
index c93f797c01a..a5f9beb9b09 100644
--- a/www/ruby-erubis/DESCR
+++ b/www/ruby-erubis/DESCR
@@ -5,7 +5,8 @@ Erubis is an implementation of eRuby. It has the following features.
 * Auto escaping support
 * Auto trimming spaces around '<% %>'
 * Embedded pattern changeable (default '<% %>')
-* Enable to handle Processing Instructions (PI) as embedded pattern (ex. '<?rb ... ?>')
+* Enable to handle Processing Instructions (PI) as embedded pattern
+  (ex. '<?rb ... ?>')
 * Context object available and easy to combine eRuby template with YAML datafile
 * Print statement available
 * Easy to extend and customize in subclass
diff --git a/www/ruby-rack-rewrite/DESCR b/www/ruby-rack-rewrite/DESCR
index b9b77371ca3..ee8a0064914 100644
--- a/www/ruby-rack-rewrite/DESCR
+++ b/www/ruby-rack-rewrite/DESCR
@@ -1,4 +1,4 @@
 # rack-rewrite
 
-A rack middleware for defining and applying rewrite rules. In many cases you 
-can get away with rack-rewrite instead of writing Apache mod_rewrite rules.
+A rack middleware for defining and applying rewrite rules. In many cases you can
+get away with rack-rewrite instead of writing Apache mod_rewrite rules.
diff --git a/x11/XmHTML/DESCR b/x11/XmHTML/DESCR
index 9b9bc0182e5..d4a147eea9f 100644
--- a/x11/XmHTML/DESCR
+++ b/x11/XmHTML/DESCR
@@ -1,35 +1,23 @@
 XmHTML, a high performance Motif Widget capable of displaying HTML 3.2
 conforming text. Amongst its many features are the following:
-  * builtin image support for X11 bitmaps, X11 pixmaps, GIF87a, GIF89a,
-    JPEG and PNG;
-  * GIF images are decoded using a patent free scheme;
-  * builtin support for animated GIF89a and animated GIF89a with NETSCAPE2.0
-    loop extension. XmHTML supports
-  * all GIF89a disposal methods;
-  * image support covers all X11 visual types and display depths;
-  * delayed image loading;
-  * progressive image loading;
-  * builtin scrolling interface (both keyboard and mouse);
-  * anchors can be displayed as pushbuttons;
-  * anchor can be highlighted for enhanced visual feedback;
-  * autosizing;
-  * capable of displaying text/html, text/plain and standalone images;
-  * supports the full HTML 3.2 standard; as well as the HTML 4.0 <FRAMESET>
-    tags;
-  * an extensive set of callback resources;
-  * full text justification;
-  * smart and user-definable font mapping;
-  * can work with a predefined palette (which it can even create for you);
-  * builtin quantizer using Floyd-Steinberg error diffusion;
-  * four different dithering methods allow one to achieve an optimum
-    balance between performance and image quality;
-  * HTML Table support;
-  * Support for HTML4.0 Events;
-  * fully compatible with LessTif
-
-XmBalloon, a very lightweight "tooltip" Widget to show a one-line string
-in a small popup-window. Features include the following:
-  * Choose between a rectangular or shaped window;
-  * Popup window can be transparent;
-  * User-configurable Popup and popdown delays;
-  * very easy to use;
+ * builtin image support for X11 bitmaps, X11 pixmaps, GIF87a, GIF89a,
+   JPEG and PNG;
+ * GIF images are decoded using a patent free scheme;
+ * builtin support for animated GIF89a and animated GIF89a with NETSCAPE2.0
+   loop extension. XmHTML supports
+ * all GIF89a disposal methods;
+ * image support covers all X11 visual types and display depths;
+ * delayed image loading;
+ * progressive image loading;
+ * builtin scrolling interface (both keyboard and mouse);
+ * anchors can be displayed as pushbuttons;
+ * anchor can be highlighted for enhanced visual feedback;
+ * autosizing;
+ * capable of displaying text/html, text/plain and standalone images;
+ * supports the full HTML 3.2 standard; as well as the HTML 4.0 <FRAMESET> tags;
+ * an extensive set of callback resources;
+ * full text justification;
+ * smart and user-definable font mapping;
+ * can work with a predefined palette (which it can even create for you);
+ * builtin quantizer using Floyd-Steinberg error diffusion;
+...and more!
diff --git a/x11/fltk2/DESCR b/x11/fltk2/DESCR
index f600ff15836..c6f21466edc 100644
--- a/x11/fltk2/DESCR
+++ b/x11/fltk2/DESCR
@@ -6,4 +6,3 @@ program.
 
 FLTK 2.0 is an experimental branch and has been declared inactive,
 superceded by 3.0.
-
diff --git a/x11/gtk2-engines/DESCR b/x11/gtk2-engines/DESCR
index 9553bfa3386..9ba5ea32d2b 100644
--- a/x11/gtk2-engines/DESCR
+++ b/x11/gtk2-engines/DESCR
@@ -1,4 +1,3 @@
 This package provides sample theme engines for GTK version 2:
 Clearlooks, Crux, Industrial, Mist, Redmond95 (looks a bit like
 Microsoft Windows95), and ThinIce.
-
diff --git a/x11/kdelibs4/DESCR b/x11/kdelibs4/DESCR
index 37851e4ce6f..dc66dc7deae 100644
--- a/x11/kdelibs4/DESCR
+++ b/x11/kdelibs4/DESCR
@@ -1,8 +1,7 @@
-kdelibs includes libraries that are central to the development and
-execution of a KDE program, as well as internationalization files for these
-libraries, misc HTML documentation, theme modules, and regression tests.
-Here is an alphabetical list:
-
+kdelibs includes libraries that are central to the development and execution of
+a KDE program, as well as internationalization files for these libraries, misc
+HTML documentation, theme modules, and regression tests  Here is a partial
+alphabetical list:
 * dnssd
     Interface to the DNS-SD (Zeroconf) support.
 * interfaces
@@ -22,42 +21,4 @@ Here is an alphabetical list:
     or hostname changes and takes according actions.
 * kdesu
     Library for password entering and handling
-* kdeui
-    The main collection of misc. user interface classes (widgets).
-* kdewidgets
-    For developers: KDE's custom widgets for Qt Designer.
-* kdoctools
-    Contains mostly stuff convert XML docbook files via XSLT into
-    human readable stuff.
-* khtml
-    The next generation HTML rendering widget designed for Konqueror.
-* kimgio
-    An all purpose extension to the qimgio class that supports various
-    image formats.
-* kinit
-    Process launcher (kdeinit), used for fast KDE startup and to launch
-    kioslaves.
-* kio
-    Classes that fetch and decode URLs are contained here. This library
-    also contains "ksycoca", the system configure cache containing
-    services, applications, servicetypes and mimetypes.
-* kioslave
-    I/O subprocesses to handle files, ftp, http, gzip and bzip2 streams.
-* kjs
-    Implementation of ECMAScript (aka JavaScript).
-* kjsembed
-    A binding of the ECMAScript language to interface with KDE code.
-* knewstuff
-    Allows applications to easily download data from the Internet to add
-    new information to the program. e.g. wallpapers, translation packs, etc.
-* knotify
-    Handles user notifications, including sounds, logging to files, etc.
-* kparts
-    KDE component model.
-* kwallet
-    Client and backend to store values in encrypted files.
-* mimetypes
-    Database of mime types.
-* sonnet
-    Tools for natural language processing, including spell and grammar
-    check. Includes gui widgets.
+...and more!
diff --git a/x11/libICE/DESCR b/x11/libICE/DESCR
index bce9375ab47..59020b4adf7 100644
--- a/x11/libICE/DESCR
+++ b/x11/libICE/DESCR
@@ -2,4 +2,3 @@ This package contains library and header files for the ICE
 extension for X. This is the Inter Client Exchange library.
 
 This is part of modular X.org project.
-
diff --git a/x11/wxGTK24/DESCR b/x11/wxGTK24/DESCR
index 9c14979e7d4..3fab9dcf8ec 100644
--- a/x11/wxGTK24/DESCR
+++ b/x11/wxGTK24/DESCR
@@ -1,25 +1,24 @@
 A GTK+-based implementation of the wxWidgets cross-platform GUI library.
 This package contains the older 2.4 release.
 
-wxWidgets is a set of libraries that allows C++ applications to compile and
-run on several different types of computer, with minimal source code changes.
-There is one library per supported GUI (such as Windows, GTK+, Motif, and
-Mac). As well as providing a common API (Application Programming Interface)
-for GUI functionality, it provides functionality for accessing some
-commonly-used operating system facilities, from copying and deleting files
-to socket and thread support. wxWidgets is a 'framework' in the sense that
-it provides a lot of built-in functionality, which the application can use
-or replace as required, thus saving a great deal of coding effort. Basic data
-structures such as strings, arrays, linked lists and hash tables are also
-supported.
+wxWidgets is a set of libraries that allows C++ applications to compile and run
+on several different types of computer, with minimal source code changes. There
+is one library per supported GUI (such as Windows, GTK+, Motif, and Mac). As
+well as providing a common API (Application Programming Interface) for GUI
+functionality, it provides functionality for accessing some commonly-used
+operating system facilities, from copying and deleting files to socket and
+thread support. wxWidgets is a 'framework' in the sense that it provides a lot
+of built-in functionality, which the application can use or replace as required,
+thus saving a great deal of coding effort. Basic data structures such as
+strings, arrays, linked lists and hash tables are also supported.
 
 Such a toolkit is not unique - there are others to choose from - but wxWidgets
-is free, well-established, well-documented, and very broad in its coverage
-of GUI functionality. It has some extras that make it stand out from the
-crowd, such as the many convenience dialogs, built-in HTML display and
-printing, virtual filesystems, easy-to-use OLE automation controller class,
-Open GL support, and many other features that make it easier to write modern
-and user-friendly applications.
+is free, well-established, well-documented, and very broad in its coverage of
+GUI functionality. It has some extras that make it stand out from the crowd,
+such as the many convenience dialogs, built-in HTML display and printing,
+virtual filesystems, easy-to-use OLE automation controller class, Open GL
+support, and many other features that make it easier to write modern andx
+user-friendly applications.
 
 There is also a python interface available, wxPython (see the py-wxWidgets
 package).
diff --git a/x11/xsetmode/DESCR b/x11/xsetmode/DESCR
index 146fee38b2b..c90f5b47b3e 100644
--- a/x11/xsetmode/DESCR
+++ b/x11/xsetmode/DESCR
@@ -1,3 +1,2 @@
 The xsetroot program is used to switch XInput devices between absolute
 and relative positioning. This is from the modular X.org X11 project.
-
diff --git a/x11/xsetpointer/DESCR b/x11/xsetpointer/DESCR
index 9ef80235269..44d041ab02b 100644
--- a/x11/xsetpointer/DESCR
+++ b/x11/xsetpointer/DESCR
@@ -1,3 +1,2 @@
 The xsetpointer program is used to select an XInput device as the main
 pointer. This is from the modular X.org X11 project.
-