Merge from trunkpending

11 files changed, 79 insertions, 82 deletions

diff --git a/admin/notes/bugtracker b/admin/notes/bugtracker
index 04721e4cec3..3c24212ea10 100644
--- a/admin/notes/bugtracker
+++ b/admin/notes/bugtracker
@@ -632,3 +632,22 @@ mytest       my.email.address
 
 Then if you do all your testing with 'Package: mytest', the resulting
 mails should only go to your email address.
+
+** Adding new tags
+
+Add them to @gTags in /etc/debbugs/config.
+I think you also have to add them to 'tags' and 'tags_single_letter'
+in /usr/share/perl5/Debbugs/Config.pm.
+And update /var/www/Developer.html with a description of what the tag means.
+And the "valid tags" list in /var/www/index.html.
+
+** Backups
+
+The FSF sysadmins handle multi-generational backups of the filesystem
+on debbugs.gnu.org.  But if you really want to have your own backup of
+the bug database, you can use rsync (this requires login access to
+debbugs.gnu.org):
+
+ rsync -azvv -e ssh USER@debbugs.gnu.org:/var/lib/debbugs/ DEST
+
+Note that this occupies well over 1G of disk space.
diff --git a/admin/notes/bzr b/admin/notes/bzr
index 2fdbc2854f8..50eaf3710ee 100644
--- a/admin/notes/bzr
+++ b/admin/notes/bzr
@@ -72,18 +72,20 @@ removes a file, then remove the corresponding files by hand.
 The following description uses bound branches, presumably it works in
 a similar way with unbound ones.
 
-0) (First time only) Get the bzr changelog_merge plugin
-(this will be included by default in bzr 2.4 onwards):
+0) (This step is only necessary if using bzr older than 2.4.0.)
+Get the bzr changelog_merge plugin:
 
 cd ~/.bazaar/plugins
-bzr branch http://bazaar.launchpad.net/~spiv/bzr-changelog-merge/trunk 
-mv trunk changelog_merge
+bzr branch http://bazaar.launchpad.net/~spiv/bzr-changelog-merge/trunk changelog_merge
 
-This should make merging ChangeLogs smoother.  It merges new entries
-to the top of the file, rather than trying to fit them in mid-way
-through.  Newer versions of the plugin should also be able to deal
-with changes to *old* ChangeLog entries, that should not be floated to
-the head of the file (see launchpad#723968).
+This plugin should make merging ChangeLogs smoother.  It merges new
+entries to the top of the file, rather than trying to fit them in
+mid-way through.  Newer versions of the plugin should also be able to
+deal with changes to *old* ChangeLog entries, that should not be
+floated to the head of the file (see launchpad#723968).
+
+It is included in bzr from 2.4.0 onwards, so remember to delete the
+copy in ~/.bazaar if you upgrade bzr.
 
 Maybe the default Emacs behavior without this plugin is better,
 though, it's not clear yet.
@@ -171,7 +173,7 @@ This restores file, but without its history (`bzr log file' will be
 very short).  This is because file gets re-added with a new file-id
 (use `bzr file-id file' to see the id).
 
-Insteading of adding the file, try:
+Instead of adding the file, try:
 
 bzr revert -rN file; bzr commit
 
diff --git a/admin/notes/changelogs b/admin/notes/changelogs
index 2c3749244fb..2e954570ce8 100644
--- a/admin/notes/changelogs
+++ b/admin/notes/changelogs
@@ -1,3 +1,7 @@
+If installing changes written by someone else, make the ChangeLog
+entry in their name, not yours.
+
+
 http://lists.gnu.org/archive/html/emacs-devel/2007-09/msg00793.html
   There is no need to make change log entries for files such as NEWS,
   MAINTAINERS, and FOR-RELEASE.
diff --git a/admin/notes/commits b/admin/notes/commits
index f37c3e020be..2c6f80c56f0 100644
--- a/admin/notes/commits
+++ b/admin/notes/commits
@@ -17,7 +17,7 @@ Date: 	 Tue, 31 Mar 2009 12:21:20 +0900
     files), not one-by-one.  This is pretty easy using vc-dir now.
 
 (2) Make the log message describe the entire changeset, perhaps
-    including relevant changelog entiries (I often don't bother with
+    including relevant changelog entries (I often don't bother with
     the latter if it's a trivial sort of change).
 
     Many modern source-control systems vaguely distinguish the first
diff --git a/admin/notes/copyright b/admin/notes/copyright
index 39eb003a07d..72b7d7e2d23 100644
--- a/admin/notes/copyright
+++ b/admin/notes/copyright
@@ -1,4 +1,4 @@
-Copyright (C) 2007-2011  Free Software Foundation, Inc.
+Copyright (C) 2007-2012  Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
@@ -24,9 +24,8 @@ the file.
 
 2. When installing code written by someone else, the ChangeLog entry
 should be in the name of the author of the code, not the person who
-installs it.  I think it is helpful to put the author (if not yourself)
-in the commit log as well (you can also use bzr commit's "--author"
-option); and to not install any of your own changes in the same commit.
+installs it.  Also use bzr commit's "--author" option.
+Do not install any of your own changes in the same commit.
 
 3. With images, add the legal info to a README file in the directory
 containing the image.
@@ -143,7 +142,7 @@ m4/*.m4
 lib/Makefile.in
  - copyright FSF, with MIT-like license
 
-install-sh
+build-aux/install-sh
  - this file is copyright MIT, which is OK. Leave the copyright alone.
 
 etc/refcards/*.tex
@@ -545,16 +544,17 @@ of writing) GPL >= 2. rms says may as well leave the licenses of these
 alone (may import them from Gnulib again). These are:
 
     Gnulib:
-    arg-nonnull.h
-    c++defs.h
-    compile
-    config.guess
-    config.sub
-    depcomp
+    build-aux/compile
+    build-aux/config.guess
+    build-aux/config.sub
+    build-aux/depcomp
+    build-aux/missing
+    build-aux/move-if-change
+    build-aux/snippet/_Noreturn.h
+    build-aux/snippet/arg-nonnull.h
+    build-aux/snippet/c++defs.h
+    build-aux/snippet/warn-on-use.h
     doc/man/texinfo.tex
-    missing
-    move-if-change
-    warn-on-use.h
     lib/*.[ch]
     lib/gnulib.mk
     src/gmalloc.c
diff --git a/admin/notes/documentation b/admin/notes/documentation
index f2e2aab73e7..09476ad6962 100644
--- a/admin/notes/documentation
+++ b/admin/notes/documentation
@@ -112,3 +112,6 @@ The kind of change for which the user really needs help from Antinews
 is where a feature works _differently_ in the previous version.
 In those cases, the user might have trouble figuring out how to use
 the old version without some sort of help.
+
+** To indicate possession, write Emacs's rather than Emacs'.
+http://lists.gnu.org/archive/html/emacs-devel/2012-02/msg00649.html
diff --git a/admin/notes/font-backend b/admin/notes/font-backend
index d51d3ec1c3b..ec2dc11345b 100644
--- a/admin/notes/font-backend
+++ b/admin/notes/font-backend
@@ -1,4 +1,4 @@
-Copyright (C) 2002-2011  Free Software Foundation, Inc.
+Copyright (C) 2002-2012  Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
diff --git a/admin/notes/lel-TODO b/admin/notes/lel-TODO
index c03d0f6fdfb..139aa09e919 100644
--- a/admin/notes/lel-TODO
+++ b/admin/notes/lel-TODO
@@ -1,12 +1,13 @@
 Some lisp/emacs-lisp/ Features and Where They Are Documented
 
-Copyright (C) 2007-2011 Free Software Foundation, Inc.
+Copyright (C) 2007-2012 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
 * Status Key
   -      -- as yet unknown
   n/a    -- not applicable (internal, uninteresting, etc)
+  obsolete -- an obsolete feature, to be removed in future
   todo   -- not documented but should be
   NODE   -- documented in or under info node NODE
 
@@ -26,7 +27,6 @@ See the end of the file for license conditions.
   bytecomp                (elisp) Compilation Functions
   checkdoc                (elisp) Documentation Tips
   cl                      (cl)
-  cl-19                   n/a
   cl-compat               n/a
   cl-specs                n/a
   copyright               -
@@ -47,13 +47,12 @@ See the end of the file for license conditions.
   generic                 (elisp) Generic Modes
   gulp                    n/a
   helper                  -
-  levents                 -
+  levents                 obsolete
   lisp-float-type         -
   lisp-mnt                -
   lisp-mode               n/a
-  lmenu                   -
-  lselect                 -
-  lucid                   -
+  lmenu                   obsolete
+  lucid                   obsolete
   macroexp                (elisp) Expansion
   pp                      (emacs) Program Indent
   re-builder              -
@@ -62,7 +61,7 @@ See the end of the file for license conditions.
   ring                    (elisp) Rings
   rx                      -
   shadow                  -
-  sregex                  -
+  sregex                  obsolete
   syntax                  (elisp) Position Parse
   testcover               -
   timer                   (elisp) Timers
diff --git a/admin/notes/multi-tty b/admin/notes/multi-tty
index 85babb903b9..4146c8ffa58 100644
--- a/admin/notes/multi-tty
+++ b/admin/notes/multi-tty
@@ -1,6 +1,6 @@
 -*- coding: utf-8; mode: text; -*-
 
-Copyright (C) 2007-2011  Free Software Foundation, Inc.
+Copyright (C) 2007-2012  Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 From README.multi-tty in the multi-tty branch.
@@ -160,7 +160,7 @@ I use the following two bash scripts to handle my Emacs sessions:
 
 name="$1"
 shift
-    
+
 if [ -z "$name" ]; then
     echo "Usage: connect_emacs <name> <args>..." >&2
     exit 1
@@ -184,7 +184,7 @@ screendir="/var/run/screen/S-$USER"
 serverdir="/tmp/emacs$UID"
 emacs=/usr/bin/emacs-multi-tty # Or wherever you installed your multi-tty Emacs
 
-if [ -z "$name" ]; then 
+if [ -z "$name" ]; then
     echo "Usage: preload_emacs <name> [<waitp>]" >&2
     exit 1
 fi
@@ -314,7 +314,7 @@ THINGS TO DO
    Emacs with GTK support.  If you want to play around with GTK
    multidisplay (and don't mind core dumps), you can edit src/config.h
    and define HAVE_GTK_MULTIDISPLAY there by hand.
-   
+
         http://bugzilla.gnome.org/show_bug.cgi?id=85715
 
    Update: Han reports that GTK+ version 2.8.9 almost gets display
@@ -414,7 +414,7 @@ THINGS TO DO
    sometimes; Emacs does not respond to stimuli from other keyboards.
    At least a beep or a message would be important, if the single-mode
    is still required to prevent interference.  (Reported by Dan
-   Nicolaescu.)  
+   Nicolaescu.)
 
    Update: selecting a region with the mouse enables single_kboard
    under X.  This is very confusing.
@@ -521,7 +521,7 @@ THINGS TO DO
 
 ** Very strange bug: visible-bell does not work on secondary
    terminals in xterm and konsole.  The screen does flicker a bit,
-   but it's so quick it isn't noticable.
+   but it's so quick it isn't noticeable.
 
    (Update: This is probably some problem with padding or whatnot on
    the secondary terminals.)
@@ -542,7 +542,7 @@ THINGS TO DO
    are not useful; before starting work on DOS support, revert to
    pristine, pre-multi-tty versions.
 
-** Fix Windows support. Currently bootstraping works on w32, but Emacs
+** Fix Windows support. Currently bootstrapping works on w32, but Emacs
    crashes on startup and none of the multi-tty features are
    implemented. Many XXX comments mark things that probably need
    updating, ChangeLogs will help in spotting changes to X specific
@@ -585,7 +585,7 @@ DIARY OF CHANGES
 -- other-frame should cycle through the frames on the `current'
    terminal only.
 
-   (Done, by trivially modifiying next_frame and prev_frame.)
+   (Done, by trivially modifying next_frame and prev_frame.)
 
 -- Support different terminal sizes.
 
@@ -789,7 +789,7 @@ DIARY OF CHANGES
    frame's kboard from there.)
 
 -- Fix rif issue with X-tty combo sessions.  IMHO the best thing to do
-   is to get rid of that global variable (and use the value value in
+   is to get rid of that global variable (and use the value in
    display_method, which is guaranteed to be correct).
 
    (Done, did exactly that.  Core dumps during combo sessions became
@@ -984,7 +984,7 @@ DIARY OF CHANGES
    wrt foreground/background process groups.)
 
 -- There is a flicker during the startup of `emacs -nw'; it's as if
-   the terminal is initialized, reset and then initialialized again.
+   the terminal is initialized, reset and then initialized again.
    Debug this.  (Hint: narrow_foreground_group is called twice during
    startup.)
 
@@ -1026,7 +1026,7 @@ DIARY OF CHANGES
    settings as Emacs itself.  This may lead to bogus results in a
    multi-locale setup. (E.g., while logging in from a remote client
    with a different locale.)
-   (Update after new bugreport by Friedrich Delgado Friedrichs: 
+   (Update after new bugreport by Friedrich Delgado Friedrichs:
    (at least) the structs terminal_coding and keyboard_coding in
    coding.c must be moved to struct display, and the Lisp interface
    [set-]keyboard-coding-system must be adapted for the change.)
@@ -1088,7 +1088,7 @@ DIARY OF CHANGES
 -- Miles Bader suggests that C-x C-c on an emacsclient frame should
    only close the frame, not exit the entire Emacs session.  Update:
    see above for a function that does this.  Maybe this should be the
-   new default?  
+   new default?
 
    (Done.  This is the new default.  No complaints so far.)
 
@@ -1131,7 +1131,7 @@ DIARY OF CHANGES
    from exiting Emacs. (Reported by Mnemonikk on freenode.)
 
    (Done, I hope.)
-   
+
 
 -- Having {reset,init}_all_sys_modes in set-input-mode breaks arrow
    keys on non-selected terminals under screen, and sometimes on other
@@ -1157,7 +1157,7 @@ DIARY OF CHANGES
         > Cursor mode. Applications have to send the smkx and rmkx terminfo
         > strings to switch between the 2 modes. So Emacs (and emacsclient) have
         > to send smkx when initializing and rmkx when quitting (or on
-        > suspend). 
+        > suspend).
 
    (I think patch-370 fixed this.)
 
@@ -1166,7 +1166,7 @@ DIARY OF CHANGES
 
         emacs
                 M-x server-start
-        
+
         # From another xterm:
         emacsclient -e '(y-or-n-p "Do you want me to crash? ")'
                 # Notice how the answer ends up in the *scratch* buffer
@@ -1205,7 +1205,7 @@ DIARY OF CHANGES
    it is not recognized correctly.  May be related to the bug below.
 
    (Seems to have been fixed as a side effect of patch-434.  "The bug
-   below" was the set-input-mode madness.)  
+   below" was the set-input-mode madness.)
 
    (Update: this bug was fixed for good in patch-449.  It was tracked
    down to a bug in `read_key_sequence': it failed to reinitialize its
@@ -1359,4 +1359,3 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
diff --git a/admin/notes/nextstep b/admin/notes/nextstep
index 462101f9abf..a2e5ce2c9b0 100644
--- a/admin/notes/nextstep
+++ b/admin/notes/nextstep
@@ -78,12 +78,12 @@ Text Rendering and Font Handling
 nsfont.m implements the font driver, responsible for managing fonts and
 rendering text.  Fonts are obtained through NSFontManager.  Rendering must be
 done at a low level due to emacs' fine control over this process, therefore
-there are different approachs under Cocoa and GNUstep.  Under GNUstep, the
+there are different approaches under Cocoa and GNUstep.  Under GNUstep, the
 original NeXT Display PostScript (DPS) APIs are available and used.  Under
 Cocoa, these were removed and Quartz drawing functions replaced them.
 
 In both cases, font glyphs are accessed through UTF8 character
-representations.  It would be preferable to use unicode indices, but prior
+representations.  It would be preferable to use Unicode indices, but prior
 attempts at this have failed.
 
 Multi-script fontsets are auto-created in nsfont_make_fontset_for_font() using
@@ -156,4 +156,3 @@ EmacsPrefsController : NSObject
 EmacsSavePanel : NSSavePanel
 EmacsOpenPanel : NSOpenPanel
   - utility override for panel notifications
-
diff --git a/admin/notes/unicode b/admin/notes/unicode
index ce7d3732f03..dda6ec4cc93 100644
--- a/admin/notes/unicode
+++ b/admin/notes/unicode
@@ -1,6 +1,6 @@
                                             -*-mode: text; coding: latin-1;-*-
 
-Copyright (C) 2002-2011  Free Software Foundation, Inc.
+Copyright (C) 2002-2012 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 Problems, fixmes and other unicode-related issues
@@ -62,14 +62,6 @@ regard to completeness.
         dumped emacs.  But, those maps (char tables) generated while
         temacs is running can't be removed from the dumped emacs.
 
- * Translation tables for {en,de}code currently aren't supported.
-
-        This should be fixed by the changes of 2002-10-14.
-
- * Defining CCL coding systems currently doesn't work.
-
-        This should be fixed by the changes of 2003-01-30.
-
  * iso-2022 charsets get unified on i/o.
 
         With the change on 2003-01-06, decoding routines put `charset'
@@ -88,8 +80,6 @@ regard to completeness.
    handle more scripts specifically (à la Devanagari).  There are
    issues with canonicalization.
 
- * Bidi is a separate issue with no support currently.
-
  * We need tabular input methods, e.g. for maths symbols.  (Not
    specific to Unicode.)
 
@@ -102,27 +92,9 @@ regard to completeness.
    worry about what happens when double-width charsets covering
    non-CJK characters are unified.
 
- * Emacs 20/21 .elc files are currently not loadable.  It may or may
-   not be possible to do this properly.
-
-        With the change on 2002-07-24, elc files generated by Emacs
-        20.3 and later are correctly loaded (including those
-        containing multibyte characters and compressed).  But, elc
-        files generated by 20.2 and the primer are still not loadable.
-        Is it really worth working on it?
-
- * Rmail won't work with non-ASCII text.  Encoding issues for Babyl
-   files need sorting out, but rms says Babyl will go before this is
-   released.
-
- * Gnus still needs some attention, and we need to get changes
-   accepted by Gnus maintainers...
-
  * There are type errors lurking, e.g. in
    Fcheck_coding_systems_region.  Define ENABLE_CHECKING to find them.
 
- * You can grep the code for lots of fixmes.
-
  * Old auto-save files, and similar files, such as Gnus drafts,
    containing non-ASCII characters probably won't be re-read correctly.