Improve wording of meaning of /contrib directory.

diff --git a/contrib/README b/contrib/README
index d9562b8bcdf3b5bab708d2272df9b74b7549fab9..04b7088baf245f7075960341ef5a1e4510e3e426 100644 (file)
--- a/contrib/README
+++ b/contrib/README
@@ -2,20 +2,18 @@
 The PostgreSQL contrib tree
 ---------------------------
 
-This subtree contains tools, modules, and examples that are not
-maintained as part of the core PostgreSQL system, mainly because
-they only address a limited audience or are too inelegant to be
-sold as an official feature.  That, however, does not preclude
-their usefulness.
+This subtree contains utilities, conversion tools, and features that are
+not part of the core PostgreSQL system, mainly because they address a
+limited audience or are too experimental to be part of the main source
+tree.  This does not preclude their usefulness.
 
 Each subdirectory contains a README file with information about the
-module.  Most items can be built with `gmake all' and installed
-with `gmake install' in the usual fashion, after you have run the
-`configure' script in the top-level directory.  Some directories
-supply new user-defined functions, operators, or types.  After you
-have installed the files you need to register the new entities in
-the database system by running the commands in the supplied .sql
-file.  For example,
+module.  Most items can be built with `gmake all' and installed with
+`gmake install' in the usual fashion, after you have run the `configure'
+script in the top-level directory.  Some directories supply new
+user-defined functions, operators, or types.  After you have installed
+the files you need to register the new entities in the database system
+by running the commands in the supplied .sql file.  For example,
 
    $ psql -d dbname -f module.sql
 

diff --git a/doc/TODO b/doc/TODO
index 1521e8189ee081ad65733c3f5855deb408506cb3..2d7909516964476010961735b7328fbdd5a77ba5 100644 (file)
--- a/doc/TODO
+++ b/doc/TODO
@@ -466,6 +466,7 @@ SOURCE CODE
 * Evaluate AIX cs() spinlock macro for performance optimizations (Tatsuo)
 * Clarify use of 'application' and 'command' tags in SGML docs
 * Allow ability to easily build only certain interfaces (Marc)
+* Remove or relicense modules that are not under the BSD license, if possible
 
 
 ---------------------------------------------------------------------------