Merge from mainline.

4 files changed, 16 insertions, 8 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index a43dbe931f0..da7ef59e8e6 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
+2010-02-14  Juanma Barranquero  <lekktu@gmail.com>
+
+        * quick-install-emacs (PRUNED): Fix typo in message.
+
 2010-01-20  Glenn Morris  <rgm@gnu.org>
 
         * revdiff: Remove file that only works with CVS, and isn't really
diff --git a/admin/README b/admin/README
index d35ffebc61b..694f206baaf 100644
--- a/admin/README
+++ b/admin/README
@@ -1,5 +1,5 @@
-Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-  Free Software Foundation, Inc.
+Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+  2010  Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
@@ -44,7 +44,7 @@ Build Emacs in various ways.
 
 Install emacs quickly (`incrementally').
 
-** alloc-color.c
+** alloc-colors.c
 
 A utility program that allocates a given number of colors on X.  Can
 be used to debug Emacs with dense colormaps (PseudoColor).
@@ -61,10 +61,6 @@ Tests for custom types and load problems.
 
 Show files added/removed between two tar files.
 
-** revdiff
-
-Get CVS diffs of files.
-
 
 Brief description of sub-directories:
 
diff --git a/admin/notes/commits b/admin/notes/commits
index 2896328c664..f37c3e020be 100644
--- a/admin/notes/commits
+++ b/admin/notes/commits
@@ -1,10 +1,17 @@
 HOW TO COMMIT CHANGES TO EMACS
 
+Most of these points are from:
+
 http://lists.gnu.org/archive/html/emacs-devel/2009-03/msg00555.html
 From:    Miles Bader
 Subject: commit style redux
 Date:    Tue, 31 Mar 2009 12:21:20 +0900
 
+(0) Each commit should correspond to a single change (whether spread
+    over multiple files or not).  Do not mix different changes in the
+    same commit (eg adding a feature in one file, fixing a bug in
+    another should be two commits, not one).
+
 (1) Commit all changed files at once with a single log message (which
     in CVS will result in an identical log message for all committed
     files), not one-by-one.  This is pretty easy using vc-dir now.
@@ -41,6 +48,7 @@ Date: 	 Tue, 31 Mar 2009 12:21:20 +0900
 
 Followup discussion:
 http://lists.gnu.org/archive/html/emacs-devel/2010-01/msg00897.html
+http://lists.gnu.org/archive/html/emacs-devel/2010-02/msg00401.html
 
 
 PREVIOUS GUIDELINES FOR CVS
diff --git a/admin/quick-install-emacs b/admin/quick-install-emacs
index 5e862812c85..2fda74b0832 100755
--- a/admin/quick-install-emacs
+++ b/admin/quick-install-emacs
@@ -276,7 +276,7 @@ for SUBDIR in lisp leim etc lib-src info; do
         if [ -d $DST/$DIR ]; then
           echo Directory $DST/$DIR exists
         else
-          echo Directory $DST/$DIR non-existant
+          echo Directory $DST/$DIR non-existent
           if [ "`echo $DIR | egrep -v "$AVOID_PAT"`" ]; then
             maybe_mkdir $DST/$DIR
           fi