Merge from trunk.

2 files changed, 16 insertions, 6 deletions

diff --git a/admin/notes/bugtracker b/admin/notes/bugtracker
index dd1ea46ceb2..3c24212ea10 100644
--- a/admin/notes/bugtracker
+++ b/admin/notes/bugtracker
@@ -640,3 +640,14 @@ 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/lel-TODO b/admin/notes/lel-TODO
index 065a10f20e4..139aa09e919 100644
--- a/admin/notes/lel-TODO
+++ b/admin/notes/lel-TODO
@@ -7,6 +7,7 @@ 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