From: yamaoka <yamaoka>
Date: Wed, 30 Mar 2005 11:26:18 +0000 (+0000)
Subject: Synch to No Gnus 200503300817.
X-Git-Tag: t-gnus-6_17_4-quimby-~520
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=156b094016dc1b58167eb987b9b56c7ce79fc6a5;p=elisp%2Fgnus.git-

Synch to No Gnus 200503300817.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 07996c2..fef2bcb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -14,6 +14,16 @@
 	mm-xemacs-find-mime-charset-1 if we have the mule feature
 	available at runtime.
 
+2005-03-25  Werner Lemberg  <wl@gnu.org>
+
+	* nnmaildir.el: Replace `illegal' with `invalid'.
+
+2005-03-22  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* gnus-start.el (gnus-display-time-event-handler):
+	Check display-time-timer at runtime rather than only at load time
+	in case display-time-mode is turned off in the mean time.
+
 2005-03-16  Reiner Steib  <Reiner.Steib@gmx.de>
 
 	* nnimap.el (nnimap-open-connection): Print which authinfo file is
@@ -27,8 +37,8 @@
 
 2005-03-15  Reiner Steib  <Reiner.Steib@gmx.de>
 
-	* nnmaildir.el (nnmaildir-request-accept-article): Use
-	`nnheader-cancel-timer' for compatibility with current XEmacs.
+	* nnmaildir.el (nnmaildir-request-accept-article):
+	Use `nnheader-cancel-timer' for compatibility with current XEmacs.
 
 2005-03-13  Steve Youngs  <steve@sxemacs.org>
 
@@ -47,8 +57,7 @@
 
 2005-03-10  Arne J,Ax(Brgensen <arne@arnested.dk>  (tiny change)
 
-	* nnimap.el (nnimap-retrieve-headers-from-server): Fix off-by-one
-	flaw.
+	* nnimap.el (nnimap-retrieve-headers-from-server): Fix off-by-one flaw.
 
 2005-03-09  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
diff --git a/lisp/gnus-start.el b/lisp/gnus-start.el
index 8d812d6..3f8a3fd 100644
--- a/lisp/gnus-start.el
+++ b/lisp/gnus-start.el
@@ -1,5 +1,5 @@
 ;;; gnus-start.el --- startup functions for Gnus
-;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -3278,12 +3278,10 @@ If this variable is nil, don't do anything."
 	    (file-name-as-directory (expand-file-name gnus-default-directory))
 	  default-directory)))
 
-(eval-and-compile
-(defalias 'gnus-display-time-event-handler
-  (if (gnus-boundp 'display-time-timer)
-      'display-time-event-handler
-    (lambda () "Does nothing as `display-time-timer' is not bound.
-Would otherwise be an alias for `display-time-event-handler'." nil))))
+(defun gnus-display-time-event-handler ()
+  (if (and (fboundp 'display-time-event-handler)
+	   (gnus-boundp 'display-time-timer))
+      (display-time-event-handler)))
 
 ;;;###autoload
 (defun gnus-fixup-nnimap-unread-after-getting-new-news ()
diff --git a/lisp/nnmaildir.el b/lisp/nnmaildir.el
index 390084e..ab9a915 100644
--- a/lisp/nnmaildir.el
+++ b/lisp/nnmaildir.el
@@ -1030,7 +1030,7 @@ by nnmaildir-request-article.")
 	(throw 'return nil))
       (when (save-match-data (string-match "[\0/\t]" gname))
 	(setf (nnmaildir--srv-error nnmaildir--cur-server)
-	      (concat "Illegal characters (null, tab, or /) in group name: "
+	      (concat "Invalid characters (null, tab, or /) in group name: "
 		      gname))
 	(throw 'return nil))
       (setq groups (nnmaildir--srv-groups nnmaildir--cur-server))
@@ -1075,7 +1075,7 @@ by nnmaildir-request-article.")
 	(throw 'return nil))
       (when (save-match-data (string-match "[\0/\t]" new-name))
 	(setf (nnmaildir--srv-error nnmaildir--cur-server)
-	      (concat "Illegal characters (null, tab, or /) in group name: "
+	      (concat "Invalid characters (null, tab, or /) in group name: "
 		      new-name))
 	(throw 'return nil))
       (if (string-equal gname new-name) (throw 'return t))
diff --git a/lisp/time-date.el b/lisp/time-date.el
index 7414ede..bf80680 100644
--- a/lisp/time-date.el
+++ b/lisp/time-date.el
@@ -1,5 +1,5 @@
 ;;; time-date.el --- Date and time handling functions
-;; Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;	Masanobu Umeda <umerin@mse.kyutech.ac.jp>
@@ -24,11 +24,73 @@
 
 ;;; Commentary:
 
+;; Time values come in three formats.  The oldest format is a cons
+;; cell of the form (HIGH . LOW).  This format is obsolete, but still
+;; supported.  The two other formats are the lists (HIGH LOW) and
+;; (HIGH LOW MICRO).  The first two formats specify HIGH * 2^16 + LOW
+;; seconds; the third format specifies HIGH * 2^16 + LOW + MICRO /
+;; 1000000 seconds.  We should have 0 <= MICRO < 1000000 and 0 <= LOW
+;; < 2^16.  If the time value represents a point in time, then HIGH is
+;; nonnegative.  If the time value is a time difference, then HIGH can
+;; be negative as well.  The macro `with-decoded-time-value' and the
+;; function `encode-time-value' make it easier to deal with these
+;; three formats.  See `time-subtract' for an example of how to use
+;; them.
+
 ;;; Code:
 
 (eval-when-compile (require 'cl))
 
-(require 'parse-time)
+(defmacro with-decoded-time-value (varlist &rest body)
+  "Decode a time value and bind it according to VARLIST, then eval BODY.
+
+The value of the last form in BODY is returned.
+
+Each element of the list VARLIST is a list of the form
+\(HIGH-SYMBOL LOW-SYMBOL MICRO-SYMBOL [TYPE-SYMBOL] TIME-VALUE).
+The time value TIME-VALUE is decoded and the result it bound to
+the symbols HIGH-SYMBOL, LOW-SYMBOL and MICRO-SYMBOL.
+
+The optional TYPE-SYMBOL is bound to the type of the time value.
+Type 0 is the cons cell (HIGH . LOW), type 1 is the list (HIGH
+LOW), and type 3 is the list (HIGH LOW MICRO)."
+  (declare (indent 1)
+	   (debug ((&rest (symbolp symbolp symbolp &or [symbolp form] form))
+		   body)))
+  (if varlist
+      (let* ((elt (pop varlist))
+	     (high (pop elt))
+	     (low (pop elt))
+	     (micro (pop elt))
+	     (type (unless (eq (length elt) 1)
+		     (pop elt)))
+	     (time-value (car elt))
+	     (gensym (make-symbol "time")))
+	`(let* ,(append `((,gensym ,time-value)
+			  (,high (pop ,gensym))
+			  ,low ,micro)
+			(when type `(,type)))
+	   (if (consp ,gensym)
+	       (progn
+		 (setq ,low (pop ,gensym))
+		 (if ,gensym
+		     ,(append `(setq ,micro (car ,gensym))
+			      (when type `(,type 2)))
+		   ,(append `(setq ,micro 0)
+			    (when type `(,type 1)))))
+	     ,(append `(setq ,low ,gensym ,micro 0)
+		      (when type `(,type 0))))
+	   (with-decoded-time-value ,varlist ,@body)))
+    `(progn ,@body)))
+
+(defun encode-time-value (high low micro type)
+  "Encode HIGH, LOW, and MICRO into a time value of type TYPE.
+Type 0 is the cons cell (HIGH . LOW), type 1 is the list (HIGH LOW),
+and type 3 is the list (HIGH LOW MICRO)."
+  (cond
+   ((eq type 0) (cons high low))
+   ((eq type 1) (list high low))
+   ((eq type 2) (list high low micro))))
 
 (autoload 'timezone-make-date-arpa-standard "timezone")
 
@@ -50,33 +112,37 @@
 (defun time-to-seconds (time)
   "Convert time value TIME to a floating point number.
 You can use `float-time' instead."
-  (+ (* (car time) 65536.0)
-     (cadr time)
-     (/ (or (nth 2 time) 0) 1000000.0)))
+  (with-decoded-time-value ((high low micro time))
+    (+ (* 1.0 high #x10000)
+       low
+       (/ micro 1000000.0))))
 
 ;;;###autoload
 (defun seconds-to-time (seconds)
   "Convert SECONDS (a floating point number) to a time value."
-  (list (floor seconds 65536)
-	(floor (mod seconds 65536))
+  (list (floor seconds #x10000)
+	(floor (mod seconds #x10000))
 	(floor (* (- seconds (ffloor seconds)) 1000000))))
 
 ;;;###autoload
 (defun time-less-p (t1 t2)
   "Say whether time value T1 is less than time value T2."
-  (or (< (car t1) (car t2))
-      (and (= (car t1) (car t2))
-	   (< (nth 1 t1) (nth 1 t2)))))
+  (with-decoded-time-value ((high1 low1 micro1 t1)
+			    (high2 low2 micro2 t2))
+    (or (< high1 high2)
+	(and (= high1 high2)
+	     (or (< low1 low2)
+		 (and (= low1 low2)
+		      (< micro1 micro2)))))))
 
 ;;;###autoload
 (defun days-to-time (days)
   "Convert DAYS into a time value."
   (let* ((seconds (* 1.0 days 60 60 24))
-	 (rest (expt 2 16))
-	 (ms (condition-case nil (floor (/ seconds rest))
-	       (range-error (expt 2 16)))))
-    (list ms (condition-case nil (round (- seconds (* ms rest)))
-	       (range-error (expt 2 16))))))
+	 (high (condition-case nil (floor (/ seconds #x10000))
+		 (range-error most-positive-fixnum))))
+    (list high (condition-case nil (floor (- seconds (* 1.0 high #x10000)))
+		 (range-error #xffff)))))
 
 ;;;###autoload
 (defun time-since (time)
@@ -85,11 +151,7 @@ TIME should be either a time value or a date-time string."
   (when (stringp time)
     ;; Convert date strings to internal time.
     (setq time (date-to-time time)))
-  (let* ((current (current-time))
-	 (rest (when (< (nth 1 current) (nth 1 time))
-		 (expt 2 16))))
-    (list (- (+ (car current) (if rest -1 0)) (car time))
-	  (- (+ (or rest 0) (nth 1 current)) (nth 1 time)))))
+  (time-subtract (current-time) time))
 
 ;;;###autoload
 (defalias 'subtract-time 'time-subtract)
@@ -98,37 +160,36 @@ TIME should be either a time value or a date-time string."
 (defun time-subtract (t1 t2)
   "Subtract two time values.
 Return the difference in the format of a time value."
-  (let ((borrow (< (cadr t1) (cadr t2))))
-    (list (- (car t1) (car t2) (if borrow 1 0))
-	  (- (+ (if borrow 65536 0) (cadr t1)) (cadr t2)))))
+  (with-decoded-time-value ((high low micro type t1)
+			    (high2 low2 micro2 type2 t2))
+    (setq high (- high high2)
+	  low (- low low2)
+	  micro (- micro micro2)
+	  type (max type type2))
+    (when (< micro 0)
+      (setq low (1- low)
+	    micro (+ micro 1000000)))
+    (when (< low 0)
+      (setq high (1- high)
+	    low (+ low #x10000)))
+    (encode-time-value high low micro type)))
 
 ;;;###autoload
 (defun time-add (t1 t2)
   "Add two time values.  One should represent a time difference."
-  (let ((high (car t1))
-	(low (if (consp (cdr t1)) (nth 1 t1) (cdr t1)))
-	(micro (if (numberp (car-safe (cdr-safe (cdr t1))))
-		   (nth 2 t1)
-		 0))
-	(high2 (car t2))
-	(low2 (if (consp (cdr t2)) (nth 1 t2) (cdr t2)))
-	(micro2 (if (numberp (car-safe (cdr-safe (cdr t2))))
-		    (nth 2 t2)
-		  0)))
-    ;; Add
-    (setq micro (+ micro micro2))
-    (setq low (+ low low2))
-    (setq high (+ high high2))
-
-    ;; Normalize
-    ;; `/' rounds towards zero while `mod' returns a positive number,
-    ;; so we can't rely on (= a (+ (* 100 (/ a 100)) (mod a 100))).
-    (setq low (+ low (/ micro 1000000) (if (< micro 0) -1 0)))
-    (setq micro (mod micro 1000000))
-    (setq high (+ high (/ low 65536) (if (< low 0) -1 0)))
-    (setq low (logand low 65535))
-
-    (list high low micro)))
+  (with-decoded-time-value ((high low micro type t1)
+			    (high2 low2 micro2 type2 t2))
+    (setq high (+ high high2)
+	  low (+ low low2)
+	  micro (+ micro micro2)
+	  type (max type type2))
+    (when (>= micro 1000000)
+      (setq low (1+ low)
+	    micro (- micro 1000000)))
+    (when (>= low #x10000)
+      (setq high (1+ high)
+	    low (- low #x10000)))
+    (encode-time-value high low micro type)))
 
 ;;;###autoload
 (defun date-to-day (date)
@@ -181,7 +242,7 @@ The Gregorian date Sunday, December 31, 1bce is imaginary."
 (defun time-to-number-of-days (time)
   "Return the number of days represented by TIME.
 The number of days will be returned as a floating point number."
-  (/ (+ (* 1.0 65536 (car time)) (cadr time)) (* 60 60 24)))
+  (/ (time-to-seconds time) (* 60 60 24)))
 
 ;;;###autoload
 (defun safe-date-to-time (date)
diff --git a/texi/ChangeLog b/texi/ChangeLog
index 5586848..32ed305 100644
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,18 @@
+2005-03-29  Reiner Steib  <Reiner.Steib@gmx.de>
+
+	* Makefile.in (gnus-booklet.dvi, gnus-booklet.pdf)
+	(gnus-refcard.dvi, gnus-refcard.pdf): New targets replacing
+	refcard.* and booklet.*.
+
+	* gnus-refcard.tex: Merged from refcard.tex and gnusref.tex.
+	Removed refcard.tex gnusref.tex booklet.tex bk-lt.tex bk-a4.tex.
+
+	* gnus-logo.eps: Renamed from gnuslogo-booklet.eps.
+	gnuslogo-refcard.eps: Removed.
+
+	* Makefile.in (gnus-faq.texi): Depend on xml2texi.*.  Fix sed
+	command.
+
 2005-03-23  Reiner Steib  <Reiner.Steib@gmx.de>
 
 	* Makefile.in (gnus-faq-full-update, gnus-faq-clean)
diff --git a/texi/Makefile.in b/texi/Makefile.in
index 91c4d05..779958b 100644
--- a/texi/Makefile.in
+++ b/texi/Makefile.in
@@ -23,6 +23,8 @@ INFO_DEPS=gnus message emacs-mime sieve
 INFO_DEPS_JA=gnus-ja message-ja
 INFO_DEPS_INFO=gnus.info message.info emacs-mime.info sieve.info
 INFO_DEPS_JA_INFO=gnus-ja.info message-ja.info
+REFCARD=gnus-refcard
+LOGO=gnus-logo
 
 all: $(INFO_DEPS)
 all-info: $(INFO_DEPS_INFO)
@@ -84,9 +86,9 @@ GNUS-NEWS:	gnus-news.texi gnus-news.el
 	$(EMACSCOMP) -l $(srcdir)/gnus-news.el -f batch-gnus-news $< $@
 	mv $@ ../$@
 
-dvi: gnus.dvi message.dvi refcard.dvi emacs-mime.dvi sieve.dvi
+dvi: gnus.dvi message.dvi $(REFCARD).dvi emacs-mime.dvi sieve.dvi
 
-pdf: gnus.pdf message.pdf refcard.pdf emacs-mime.pdf sieve.pdf
+pdf: gnus.pdf message.pdf $(REFCARD).pdf emacs-mime.pdf sieve.pdf
 
 .texi.dvi :
 	sed -e '/@iflatex/,/@end iflatex/d' $< > gnustmp.texi
@@ -103,30 +105,35 @@ pdf: gnus.pdf message.pdf refcard.pdf emacs-mime.pdf sieve.pdf
 	cp gnustmp.pdf $*.pdf
 	rm -f gnustmp.*
 
-refcard.dvi: refcard.tex gnuslogo-refcard.eps gnusref.tex
-	TEXINPUTS=$(srcdir):$$TEXINPUTS $(LATEX) refcard.tex
+$(LOGO).pdf:	$(LOGO).eps
+	epstopdf $< --outfile=$@
 
-refcard.pdf: refcard.tex gnuslogo-refcard.eps gnusref.tex
-	epstopdf $(srcdir)/gnuslogo-refcard.eps --outfile=gnuslogo-refcard.pdf
-	TEXINPUTS=$(srcdir):$$TEXINPUTS $(PDFLATEX) refcard.tex
+$(REFCARD).dvi: $(REFCARD).tex $(LOGO).eps
+	TEXINPUTS=$(srcdir):$$TEXINPUTS:: $(LATEX) $(REFCARD).tex
 
-booklet.dvi: booklet.tex gnuslogo-refcard.eps gnusref.tex
+$(REFCARD).pdf: $(REFCARD).tex $(LOGO).pdf
+	TEXINPUTS=$(srcdir):$$TEXINPUTS:: $(PDFLATEX) $(REFCARD).tex
+
+gnus-booklet.dvi: $(REFCARD).tex $(LOGO).eps
 	if [ "$(PAPERTYPE)" == a4 ]; then \
-		TEXINPUTS=$(srcdir):$$TEXINPUTS $(LATEX) bk-a4.tex && \
-		mv bk-a4.dvi booklet.dvi ;\
+	  TEXINPUTS=$(srcdir):$$TEXINPUTS:: \
+          $(LATEX) '\def\booklettrue{}\input{$(REFCARD)}' && \
+	  mv $(REFCARD).dvi $@ ;\
 	else \
-		TEXINPUTS=$(srcdir):$$TEXINPUTS $(LATEX) bk-lt.tex && \
-		mv bk-lt.dvi booklet.dvi;\
+	  TEXINPUTS=$(srcdir):$$TEXINPUTS:: \
+          $(LATEX) '\def\booklettrue{}\def\letterpapertrue{}\input{$(REFCARD)}' && \
+	  mv $(REFCARD).dvi $@ ;\
 	fi
 
-booklet.pdf: booklet.tex gnuslogo-refcard.eps gnusref.tex
-	epstopdf $(srcdir)/gnuslogo-booklet.eps --outfile=gnuslogo-booklet.pdf
+gnus-booklet.pdf: $(REFCARD).tex  $(LOGO).pdf
 	if [ "$(PAPERTYPE)" == a4 ]; then \
-		TEXINPUTS=$(srcdir):$$TEXINPUTS $(PDFLATEX) bk-a4.tex &&\
-		mv bk-a4.pdf booklet.pdf ;\
+	  TEXINPUTS=$(srcdir):$$TEXINPUTS:: \
+          $(PDFLATEX) '\def\booklettrue{}\input{$(REFCARD)}' && \
+	  mv -v $(REFCARD).pdf $@ ;\
 	else \
-		TEXINPUTS=$(srcdir):$$TEXINPUTS $(PDFLATEX) bk-lt.tex &&\
-		mv bk-lt.pdf booklet.pdf ;\
+	  TEXINPUTS=$(srcdir):$$TEXINPUTS:: \
+          $(PDFLATEX) '\def\booklettrue{}\def\letterpapertrue{}\input{$(REFCARD)}' && \
+	  mv -v $(REFCARD).pdf $@ ;\
 	fi
 
 gnus-faq-full-update:  gnus-faq-clean gnus-faq.texi
@@ -138,12 +145,12 @@ gnus-faq.xml:
 	  { echo "Update of $@ failed."; : rm $@.tmp; exit 1; }
 	mv $@.tmp $@
 
-gnus-faq.texi: gnus-faq.xml
+gnus-faq.texi: gnus-faq.xml xml2texi.sh xml2texi.scm
 	./xml2texi.sh $< $@.tmp
 	@echo
 # FIXME: This should be done in xml2texi.scm or gnus-faq.xml should be
 # changed:
-	sed '/\$$Id: Makefile.in,v 7.12 2005/03/24 09:14:37 miles Exp $$/d' < $@.tmp > $@
+	sed '/[$$]Id:.*[$$]/d' < $@.tmp > $@
 
 gnus-faq-clean:
 	rm -f gnus-faq.xml gnus-faq.*.tmp gnus-faq.texi
diff --git a/texi/bk-a4.tex b/texi/bk-a4.tex
deleted file mode 100644
index 20d13ab..0000000
--- a/texi/bk-a4.tex
+++ /dev/null
@@ -1,20 +0,0 @@
-% Reference Booklet for (ding) Gnus, A4 format.
-% To be processed with latex 2e
-\documentclass{article}
-
-\usepackage{supertabular}
-
-\newlength{\logowidth} \setlength{\logowidth}{6.861in}
-\newlength{\logoheight} \setlength{\logoheight}{7.013in}
-
-\def\Guide{Card}\def\guide{card}
-\def\logoscale{0.25}
-
-\usepackage{epsfig}
-
-\textwidth 4.9in \textheight 7.35in \topmargin -1.0in
-\oddsidemargin -0.5in \evensidemargin -0.5in
-\begin{document}
-\small%\footnotesize
-\input{booklet}
-\end{document}
diff --git a/texi/bk-lt.tex b/texi/bk-lt.tex
deleted file mode 100644
index 0329059..0000000
--- a/texi/bk-lt.tex
+++ /dev/null
@@ -1,20 +0,0 @@
-% Reference Booklet for (ding) Gnus, Letter format.
-% To be processed with latex 2e
-\documentclass{article}
-
-\usepackage{supertabular}
-
-\newlength{\logowidth} \setlength{\logowidth}{6.861in}
-\newlength{\logoheight} \setlength{\logoheight}{7.013in}
-
-\def\Guide{Card}\def\guide{card}
-\def\logoscale{0.25}
-
-\usepackage{epsfig}
-
-\textwidth 4.5in \textheight 7.5in \topmargin -1.0in
-\oddsidemargin -0.5in \evensidemargin -0.5in
-\begin{document}
-\small%\footnotesize
-\input{booklet}
-\end{document}
diff --git a/texi/booklet.tex b/texi/booklet.tex
deleted file mode 100644
index b6ee207..0000000
--- a/texi/booklet.tex
+++ /dev/null
@@ -1,172 +0,0 @@
-% include file for the Reference Booklet (16 pages).
-\def\Guide{Booklet}\def\guide{booklet}
-\def\logoscale{0.5}
-\def\sec{\section}
-\def\subsec{\subsection}
-\def\subsubsec{\subsubsection}
-\def\blankpage{\vspace*{\fill}\par
-%\centerline{(This page intentionally left blank.)}
-\par\vspace*{\fill}\pagebreak}
-
-\input{gnusref}
-
-\setcounter{page}{0}
-\thispagestyle{empty}
-\vspace*{\fill}
-\Title
-\vspace{0.4in}
-\Logo{booklet}
-\vspace*{\fill}
-\pagebreak
-
-% TODO: how does this work ?
-%\tableofcontents
-
-\Notes
-%
-\section*{Group-Mode}
-\GroupModeGeneral
-    \subsection*{Group Subscribedness-Levels}
-    \GroupLevels
-    \subsection*{List Groups}
-    \ListGroups
-    \subsection*{Create/Edit Foreign Groups}
-    \CreateEditGroups
-    \subsection*{Unsubscribe, Kill and Yank Groups}
-    \SubscribeKillYankGroups
-    \subsection*{Mark Groups}
-    \MarkGroups
-    \subsection*{Group-Unplugged}
-    \GroupUnplugged
-% topics in group-mode
-    \subsection*{Group Topics}
-    \GroupTopicsGeneral
-    \subsubsection*{Topic Sorting}
-    \TopicSorting
-\pagebreak
-% summary-mode
-\section*{Summary-Mode}
-\SummaryModeGeneral
-    \subsection*{Select Articles}
-    \SelectArticles
-%
-    \subsection*{Threading}
-    \Threading
-%
-    \subsection*{Limiting}
-    \Limiting
-    \subsection*{Sort the Summary-Buffer}
-    \SortSummary
-    \subsection*{Score (Value) Commands}
-    \Scoring
-% 
-    \subsection*{MIME operations from the Summary-Buffer}
-    \MIMESummary
-    \subsection*{Extract Series (Uudecode etc)}
-    \ExtractSeries
-    \subsection*{Output Articles}
-    \OutputArticles
-%
-    \subsection*{Post, Followup, Reply, Forward, Cancel}
-    \PostReplyetc
-    \subsection*{Message-Composition}
-    \MsgCompositionGeneral
-        \subsubsection*{Jumping in message-buffer}
-        \MsgCompositionMovementArticle
-        \subsubsection*{Attachments/MML}
-        \MsgCompositionMML
-% marking articles
-    \subsection*{Mark Articles}
-    \MarkArticlesGeneral
-        \subsubsection*{Mark Based on Score}
-        \MarkByScore
-        \subsubsection*{The Process Mark}
-        \ProcessMark
-        \subsubsection*{Mark Indication-Characters}
-        \MarkCharacters
-%
-    \subsection*{Summary-Unplugged}
-    \SummaryUnplugged
-    \subsection*{Mail-Group Commands}
-    \MailGroups
-    \subsection*{Draft-Group Commands}
-    \DraftGroup
-% exiting
-    \subsection*{Exit the Summary-Buffer}
-    \ExitSummary
-%
-%
-\section*{Article Mode (reading)}
-\ArticleModeGeneral
-    \subsection*{Wash the Article-Buffer}
-    \WashArticle
-    \subsubsection*{Blank Lines and Whitespace}
-    \BlankAndWhitespace
-    \subsubsection*{Picons, X-faces, Smileys}
-    \Picons
-    \subsubsection*{Time and Date}
-    \TimeAndDate
-    \subsection*{Hide/Highlight Parts of the Article}
-    \HideHighlightArticle
-    \subsection*{MIME operations from the Article-Buffer (reading)}
-    \MIMEArticleMode
-%
-%
-\section*{Server Mode}
-\ServerMode
-    \subsection*{Unplugged-Server}
-    \ServerUnplugged
-%
-%
-\section*{Browse Server Mode}
-\BrowseServer
-
-%\pagebreak
-\vspace*{\fill}
-\Copyright
-
-%% \pagebreak
-%% \Notes
-%% \GroupLevels
-%% \Marks
-%% \General
-%% \ServerMode
-%% \BrowseServer
-%% \ArticleMode
-%% \pagebreak
-
-%% \GroupMode
-%% \ListGroups     
-%% \CreateGroups   
-%% \SortGroups     
-%% \SOUP           
-%% \MarkGroups     
-%% \Unsubscribe    
-%% \GroupTopics    
-%% \SummaryMode    
-%% \SortSummary    
-%% \Article        
-%% \MailGroup      
-%% \Limit          
-%% \GotoArticle    
-%% \MarkArticles   
-%% \MarkScore      
-%% \ProcessMark    
-%% \OutputArticles 
-%% \Send           
-%% \Exit           
-%% \Thread         
-%% \Score          
-%% \Wash           
-%% \Hide           
-%% \Highlight      
-%% \Extract        
-%% \PickAndRead    
-
-%% %\pagebreak
-%% %\sec{Personal Notes}
-%% %\blankpage
-
-%% \thispagestyle{empty}
-%% \vspace*{\fill}
-%% \CopyRight
diff --git a/texi/gnus.texi b/texi/gnus.texi
index 654af9b..569c5de 100644
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -18800,7 +18800,7 @@ that most will look for it here, this variable tells the summary
 buffer how to maneuver around undownloaded (only headers stored in the
 agent) and unfetched (neither article nor headers stored) articles.
 
-The legal values are @code{nil} (maneuver to any article),
+The valid values are @code{nil} (maneuver to any article),
 @code{undownloaded} (maneuvering while unplugged ignores articles that
 have not been fetched), @code{always-undownloaded} (maneuvering always
 ignores articles that have not been fetched), @code{unfetched}
diff --git a/texi/gnusref.tex b/texi/gnusref.tex
deleted file mode 100644
index d7d32af..0000000
--- a/texi/gnusref.tex
+++ /dev/null
@@ -1,1185 +0,0 @@
-%% include file for the Gnus refcard and booklet
-
-\def\progver{5.10}\def\refver{5.10-1} % program and refcard versions
-\def\date{Dec, 2004}
-\def\author{Gnus Bugfixing Girls + Boys $<$bugs@gnus.org$>$}
-
-%%
-\newlength{\keycolwidth}
-\newenvironment{keys}[1]% #1 is the widest key
-{\nopagebreak%\noindent%
-  \settowidth{\keycolwidth}{#1}%
-  \addtolength{\keycolwidth}{\tabcolsep}%
-  \addtolength{\keycolwidth}{-\columnwidth}%
-  \begin{supertabular}{@{}l@{\hspace{\tabcolsep}}p{-\keycolwidth}@{}}}%
-  {\end{supertabular}\\}
-
-%% uncomment the first definition if you do not want pagebreaks in maps
-%%\newcommand{\esamepage}{\samepage}
-\newcommand{\esamepage}{}
-
-\newcommand*{\B}[1]{{\bf#1})}    % bold l)etter
-
-\newcommand{\Title}{%
-  \begin{center}
-    {\bf\LARGE Gnus \progver\ Reference \Guide\\}
-                                %{\normalsize \Guide\ version \refver}
-  \end{center}
-  }
-
-\newcommand*{\Logo}[1]{\centerline{%
-    \makebox[\logoscale\logowidth][l]{\vbox to \logoscale\logoheight
-      {\vfill\epsfig{figure=gnuslogo-#1}}\vspace{-\baselineskip}}}}
-
-\newcommand{\Copyright}{%
-  \begin{center}
-    Copyright \copyright\ 1995 Free Software Foundation, Inc.\\*
-    Copyright \copyright\ 1995 Vladimir Alexiev
-    $<$vladimir@cs.ualberta.ca$>$.\\*
-    Copyright \copyright\ 2000 Felix Natter $<$fnatter@gmx.net$>$.\\*
-    Copyright \copyright\ 2001, 2002, 2003, 2004 \author.\\*
-    Created from the Gnus manual Copyright \copyright\ 1994 Lars Magne
-    Ingebrigtsen.\\*
-    and the Emacs Help Bindings feature (C-h b).\\*
-    Gnus logo copyright \copyright\ 1995 Luis Fernandes.\\*
-  \end{center}
-
-  Permission is granted to make and distribute copies of this reference
-  \guide{} provided the copyright notice and this permission are preserved on
-  all copies.  Please send corrections, additions and suggestions to the
-  current maintainer's email address. \Guide{} last edited on \date.
-  }
-
-\newcommand{\Notes}{%
-  \subsection*{Notes}
-  {\esamepage
-    Gnus is complex. Currently it has some 876 interactive (user-callable)
-    functions. Of these 618 are in the two major modes (Group and
-    Summary/Article). Many of these functions have more than one binding, some
-    have 3 or even 4 bindings. The total number of keybindings is 677. So in
-    order to save 40\% space, every function is listed only once on this
-    \guide, under the ``more logical'' binding. Alternative bindings are given
-    in parentheses in the beginning of the description.
-
-    Many Gnus commands are affected by the numeric prefix. Normally you enter a
-    prefix by holding the Meta key and typing a number, but in most Gnus modes
-    you don't need to use Meta since the digits are not self-inserting. The
-    prefixed behavior of commands is given in [brackets]. Often the prefix is
-    used to specify:
-
-    \quad [distance] How many objects to move the point over.
-
-    \quad [scope] How many objects to operate on (including the current one).
-
-    \quad [p/p] The ``Process/Prefix Convention'': If a prefix is given then it
-    determines how many objects to operate on. Else if there are some objects
-    marked with the process mark \#, these are operated on. Else only the
-    current object is affected.
-
-    \quad [level] A group subscribedness level. Only groups with a lower or
-    equal level will be affected by the operation. If no prefix is given,
-    `gnus-group-default-list-level' is used.  If
-    `gnus-group-use-permanent-levels', then a prefix to the `g' and `l'
-    commands will also set the default level.
-
-    \quad [score] An article score. If no prefix is given,
-    `gnus-summary-default-score' is used. \\*[\baselineskip]
-                                % some keys
-    Gnus startup-commands:
-    \begin{keys}{M-x gnus-unplugged}
-      M-x gnus           & start Gnus. \\
-      M-x gnus-no-server & start Gnus without connecting to server
-      (i.e. to read mail). \\
-    \end{keys}
-    Additionally, there are the two commands \texttt{gnus-plugged} and
-    \texttt{gnus-unplugged}, which are only used if you want to download
-    news and/or read previously downloaded news offline (see C-c C-i g Gnus
-    Unplugged RET). Note: \texttt{gnus-no-server} ignores the stuff in
-    \texttt{gnus-agent-directory}, and thus does not allow you to use Gnus
-    Unplugged.
-                                %
-    \begin{keys}{C-c C-i}
-      C-c C-i & Go to the Gnus online {\bf info}.\\
-      C-c C-b & Send a Gnus {\bf bug} report.\\
-    \end{keys}
-    }}
-
-\newcommand{\GroupLevels}{%
-  The table below assumes that you use the default Gnus levels.
-  Fill your user-specific levels in the blank cells.\\[1\baselineskip]
-  \begin{tabular}{|c|l|l|}
-    \hline
-    Level & Groups & Status \\
-    \hline
-    1 & draft/mail groups   &              \\
-    2 & mail groups         &              \\
-    3 &                     & subscribed   \\
-    4 &                     &              \\
-    5 & default list level  &              \\
-    \hline
-    6 &                     & unsubscribed \\
-    7 &                     &              \\
-    \hline
-    8 &                     & zombies      \\
-    \hline
-    9 &                     & killed       \\
-    \hline
-  \end{tabular}}
-
-\newcommand{\MarkCharacters}{%
-  {\esamepage If a command directly sets a mark, it is shown in parentheses.\\*
-    \newlength{\markcolwidth}
-    \settowidth{\markcolwidth}{` '}% widest character
-    \addtolength{\markcolwidth}{4\tabcolsep}
-    \addtolength{\markcolwidth}{-\columnwidth}
-    \newlength{\markdblcolwidth}
-    \setlength{\markdblcolwidth}{\columnwidth}
-    \addtolength{\markdblcolwidth}{-2\tabcolsep}
-    \begin{tabular}{|c|p{-\markcolwidth}|}
-      \hline
-      \multicolumn{2}{|p{\markdblcolwidth}|}{{\bf ``Read'' Marks.}
-        All these marks appear in the first column of the summary line, and so
-        are mutually exclusive.}\\ 
-      \hline
-      ` ' & (M-u, M SPC, M c) Not read.\\
-      !   & (!, M !, M t) Ticked (interesting).\\
-      ?   & (?, M ?) Dormant (only followups are interesting).\\
-      E   & (E, M e, M x) {\bf Expirable}. Only has effect in mail groups.\\
-      G   & (C, B DEL) Canceled article (or deleted in mailgroups).\\
-      \$  & (M-d, M s x, S x).  Marked as spam.\\
-      \hline\hline
-      \multicolumn{2}{|p{\markdblcolwidth}|}
-      {The marks below mean that the article
-        is read (killed, uninteresting), and have more or less the same effect.
-        Some commands however explicitly differentiate between them (e.g.\ M
-        M-C-r, adaptive scoring).}\\
-      \hline
-      r   & (d, M d, M r) Deleted (marked as {\bf read}).\\
-      C   & (M C; M C-c; M H; c, Z c; Z n; Z C) Killed by {\bf catch-up}.\\
-      F   & SOUPed article. See the manual.\\
-      O   & {\bf Old} (read in a previous session).\\
-      K   & (k, M k; C-k, M K) {\bf Killed}.\\
-      M   & Article marked as read by duplicate suppression.\\
-      Q   & Article is part of a sparse thread (see ``Threading''
-      in the manual).\\
-      R   & {\bf Read} (viewed in actuality).\\
-      X   & Killed by a kill file.\\
-      Y   & Killed due to low score.\\
-      \hline\multicolumn{2}{c}{\vspace{1ex}}\\\hline
-      \multicolumn{2}{|p{\markdblcolwidth}|}
-      {{\bf Marks not affecting visibility}}\\
-      \hline
-      \#  & (\#, M \#, M P p) Processable (will be affected by the next operation).
-      [2]\\
-      A   & {\bf Answered} (followed-up or replied). [2]\\
-      F   & Forwarded. [2]\\
-      $\ast$  & Cached. [2]\\
-      S   & Saved. [2]\\
-      N   & Recently arrived. [2]\\
-      .   & Unseen. [2]\\
-      +   & Over default score. [3]\\
-      $-$ & Under default score. [3]\\
-      $=$ & Has children (thread underneath it). Add `\%e' to
-      `gnus-summary-line-format'. [3]\\
-      \hline
-    \end{tabular}
-    }}
-
-\newcommand{\GroupModeGeneral}{%
-  \begin{keys}{C-c M-C-x}
-    RET     & (=) Enter this group. [Prefix: how many (read) articles to fetch.
-    Positive: newest articles, negative: oldest ones; non-numerical:
-    view all articles, not just unread]\\
-    M-RET   & Enter group quickly.\\
-    M-SPC   & Same as RET but does not expunge and hide dormants.\\
-    M-C-RET & Enter group without any processing, changes will not be permanent.\\
-    SPC     & Select this group and display the first (unread) article. [Same
-    prefix as above.]\\
-    ?       & Give a very short help message.\\
-    $<$     & Go to the beginning of the Group buffer.\\
-    $>$     & Go to the end of the Group buffer.\\
-    ,       & Jump to the lowest-level group with unread articles.\\
-    .       & Jump to the first group with unread articles.\\
-    \^{}      & Enter the Server buffer mode.\\
-    a       & Post an {\bf article} to a group
-              [Prefix: use group under point to find posting-style].\\
-    b       & Find {\bf bogus} groups and delete them.\\
-    c       & Mark all unticked articles in this group as read ({\bf catch-up}).
-    [p/p]\\ 
-    g       & Check the server for new articles ({\bf get}). [level]\\
-    M-g     & Check the server for new articles in this group ({\bf get}). [p/p]\\
-    j       & {\bf Jump} to a group.\\
-    m       & {\bf Mail} a message to someone
-              [Prefix: use group under point to find posting-style].\\
-    n       & Go to the {\bf next} group with unread articles. [distance]\\
-    M-n     & Go to the {\bf next} group on the same or lower level.
-    [distance]\\ 
-    p       & (DEL) Go to the {\bf previous} group with unread articles.
-    [distance]\\ 
-    M-p     & Go to the {\bf previous} group on the same or lower level. [distance]\\ 
-    q       & {\bf Quit} Gnus.\\
-    r       & Re-read the init file ({\bf reset}).\\
-    s       & {\bf Save} the `.newsrc.eld' file (and `.newsrc' if
-    `gnus-save-newsrc-file').\\ 
-    z       & Suspend (kill all buffers of) Gnus.\\
-    B       & {\bf Browse} a foreign server.\\
-    C       & Mark all articles in this group as read ({\bf Catch-up}). [p/p]\\
-    F       & {\bf Find} new groups and process them.\\
-    N       & Go to the {\bf next} group. [distance]\\
-    P       & Go to the {\bf previous} group. [distance]\\
-    Q       & {\bf Quit} Gnus without saving any startup (.newsrc) files.\\
-    R       & {\bf Restart} Gnus.\\
-    Z       & Clear the dribble buffer.\\
-    M-c     & Clear data from group (marks and list of read articles). \\
-    C-c C-s & {\bf Sort} the groups by name, number of unread articles, or level
-    (depending on `gnus-group-sort-function').\\
-    C-c C-x & Run all expirable articles in this group through the {\bf expiry} 
-    process.\\
-    C-c M-C-x & Run all articles in all groups through the {\bf expiry} process.\\
-    C-c M-g & Activate all {\bf groups}.\\
-    C-c C-i & Gnus online-manual ({\bf info}).\\
-    C-x C-t & {\bf Transpose} two groups.\\
-    H f     & Fetch this group's {\bf FAQ} (using ange-ftp).\\
-    H c     & Display this group's {\bf charter}. [Prefix: query for group]\\
-    H C     & Display this group's {\bf control message} (using
-    ange-ftp). [Prefix: query for group]\\
-    H v     & (V) Display the Gnus {\bf version} number.\\
-    H d     & (C-c C-d) Show the {\bf description} of this group
-    [Prefix: re-read from server].\\ 
-    M-d     & {\bf Describe} all groups. [Prefix: re-read from server]\\
-    D g     & Regenerate a Sieve script from group parameters.\\
-    D u     & Regenerate Sieve script and {\bf upload} to server.\\
-  \end{keys}
-  }
-
-\newcommand{\ListGroups}{%
-  {\esamepage
-    \begin{keys}{A M}
-      A d     & (C-c C-M-a) List all groups whose names or {\bf descriptions} match a regexp.\\ 
-      A k     & (C-c C-l) List all {\bf killed} groups.
-      [Prefix: look at active-file from server]\\
-      A l     & List all groups on a specific level.
-      [Prefix: also list groups with no unread articles]\\
-      A a     & (C-c C-a) List all groups whose names match a regexp
-      ({\bf apropos}).\\ 
-      A A     & List the server's active-file.\\
-      A M     & List groups that {\bf match} a regexp.\\
-      A m     & List groups that {\bf match} a regexp and have unread articles. 
-      [level]\\ 
-      A s     & (l) List all {\bf subscribed} groups with unread articles.
-      [level; 5 and lower is the default]\\
-      A u     & (L) List all groups (including read and {\bf unsubscribed}).
-      [level; 7 and lower is the default]\\
-      A z     & List all {\bf zombie} groups.\\
-      A c     & List all groups with cached articles. [level]\\
-      A ?     & List all groups with dormant articles. [level]\\
-    \end{keys}
-    }
-
-  \newcommand{\CreateEditGroups}{%
-    {\esamepage
-      The select methods are indicated in parentheses.\\*
-      \begin{keys}{G DEL}
-        G a     & Make the Gnus list {\bf archive} group. (nndir over ange-ftp)\\
-        G c     & {\bf Customize} this group's parameters.\\
-        G d     & Make a {\bf directory} group (every file must be a posting and files
-        must have numeric names). (nndir)\\
-        G D     & Enter a {\bf directory} as a (temporary) group.
-        (nneething without recording articles read)\\
-        G e     & (M-e) {\bf Edit} this group's select method.\\
-        G E     & {\bf Edit} this group's info (select method, articles read, etc).\\
-        G f     & Make a group based on a {\bf file}. (nndoc)\\
-        G h     & Make the Gnus {\bf help} (documentation) group. (nndoc)\\
-        G k     & Make a {\bf kiboze} group. (nnkiboze)\\
-        G m     & {\bf Make} a new group.\\
-        G p     & Edit this group's {\bf parameters}.\\
-        G r     & Rename this group (does not work with read-only groups!).\\
-        G u     & Create one of the groups mentioned in gnus-{\bf useful}-groups.\\
-        G v     & Add this group to a {\bf virtual} group. [p/p]\\
-        G V     & Make a new empty {\bf virtual} group. (nnvirtual)\\
-        G w     & Create ephemeral group based on web-search. [Prefix: make solid group
-        instead]\\
-        G R     & Make an {\bf RSS} group.\\
-        G DEL   & {\bf Delete} group [Prefix: delete all articles as well].\\
-        G x     & Expunge all deleted articles in an nnimap mailbox.\\
-        G l     & Edit ACL (Access Control {\bf List}) for an nnimap mailbox.\\
-      \end{keys}
-      You can also create mail-groups and read your mail with Gnus (very useful
-      if you are subscribed to mailing lists), using one of the methods
-      nnmbox, nnbabyl, nnml, nnmh, or nnfolder. Read about it in the online info
-      (C-c C-i g Reading Mail RET).
-      }}
-
-                                % TODO:
-  \newcommand{\SoupCommands}{%
-    \begin{keys}{G s w}
-      G s b   & gnus-group-brew-soup: not documented.\\
-      G s p   & gnus-soup-pack-packet: not documented.\\
-      G s r   & nnsoup-pack-replies: not documented.\\
-      G s s   & gnus-soup-send-replies: not documented.\\
-      G s w   & gnus-soup-save-areas: not documented.\\
-    \end{keys}}
-
-  \newcommand{\MarkGroups}{%
-    \begin{keys}{M m}
-      M m     & (\#) Set the process {\bf mark} on this group. [scope]\\
-      M r     & Mark all groups matching regular expression.\\
-      M u     & (M-\#) Remove the process mark from this group ({\bf unmark}).
-      [scope]\\ 
-      M U     & Remove the process mark from all groups (\textbf{umark all}).\\
-      M w     & Mark all groups in the current region. [prefix: unmark]\\
-      M b     & Mark all groups in the {\bf buffer}. [prefix: unmark]\\
-    \end{keys}}
-
-  \newcommand{\GroupTopicsGeneral}{%
-    {\esamepage
-      Topics are ``categories'' for groups. Press t in the group-buffer to
-      toggle gnus-topic-mode (C-c C-i g Group Topics RET).\\*
-      \begin{keys}{C-c C-x}
-        T n     & Prompt for topic {\bf name} and create it.\\
-        T m     & {\bf Move} the current group to some other topic [p/p].\\
-        T j     & {\bf Jump} to a topic.\\
-        T c     & {\bf Copy} the current group to some other topic [p/p].\\
-        T D     & Remove (not delete) the current group [p/p].\\
-        T M     & {\bf Move} all groups matching a regexp to a topic.\\
-        T C     & {\bf Copy} all groups matching a regexp to a topic.\\
-        T H     & Toggle {\bf hiding} of empty topics.\\
-        T r     & {\bf Rename} a topic.\\
-        T DEL   & Delete an empty topic.\\
-        T \#    & Mark all groups in the current topic with the process-mark.\\
-        T M-\#  & Remove the process-mark from all groups in the current topic.\\
-        T TAB   & (TAB) Indent current topic [Prefix: unindent].\\ 
-        M-TAB   & Unindent the current topic.\\
-        RET     & (SPC) Either unfold topic or enter group [level].\\
-        T s     & {\bf Show} the current topic. [Prefix: show permanently]\\
-        T h     & {\bf Hide} the current topic. [Prefix: hide permanently]\\
-        C-c C-x & Expire all articles in current group or topic.\\
-        C-k     & {\bf Kill} a group or topic.\\
-        C-y     & {\bf Yank} a group or topic.\\
-        A T     & List active-file using {\bf topics}.\\
-        G p     & Edit topic-{\bf parameters}.\\
-        T M-n   & Go to {\bf next} topic. [distance]\\
-        T M-p   & Go to {\bf previous} topic. [distance]\\
-      \end{keys}
-      }
-    }
-
-  \newcommand{\TopicSorting}{%
-    {\esamepage
-      \begin{keys}{T S m}
-        T S a  & Sort {\bf alphabetically}.\\
-        T S u  & Sort by number of {\bf unread} articles.\\
-        T S l  & Sort by group {\bf level}.\\
-        T S v  & Sort by group score ({\bf value}).\\
-        T S r  & Sort by group {\bf rank}.\\
-        T S m  & Sort by {\bf method}.\\
-        T S e  & Sort by {\bf server} name.\\
-        T S s  & Sort according to `gnus-group-sort-function'.\\
-      \end{keys}
-      With a prefix these commands will sort in reverse order.
-      }
-    }
-
-  \newcommand{\SubscribeKillYankGroups}{%
-    {\esamepage
-      \begin{keys}{S C-k}
-        S k     & (C-k) {\bf Kill} this group.\\
-        S l     & Set the {\bf level} of this group. [p/p]\\
-        S s     & (U) Prompt for a group and toggle its {\bf subscription}.\\
-        S t     & (u) {\bf Toggle} subscription to this group. [p/p]\\
-        S w     & (C-w) Kill all groups in the region.\\
-        S y     & (C-y) {\bf Yank} the last killed group.\\
-        S z     & Kill all {\bf zombie} groups.\\
-        S C-k   & Kill all groups on a certain level.\\
-      \end{keys}
-      }
-    }
-
-  \newcommand{\SummaryModeGeneral}{%
-    {\esamepage
-      \begin{keys}{M-RET}
-        SPC     & (A SPC, A n) Select an article, scroll it one page, move to the
-        next one.\\ 
-        DEL     & (A DEL, A p, b) Scroll this article one page back. [distance]\\
-        RET     & (A RET) Scroll this article one line forward. [distance]\\
-        M-RET   & (A M-RET) Scroll this article one line backward. [distance]\\
-        =       & Expand the Summary window (fullsize).
-        [Prefix: shrink to display article window]\\
-                                %
-        \&      & Execute a command on all articles whose header matches a regexp.
-        [Prefix: move backwards]\\
-        M-\&    & Execute a command on all articles having the process mark.\\
-                                %
-        M-n     & (G M-n) Go to the {\bf next} summary line of an unread article.
-        [distance]\\ 
-        M-p     & (G M-p) Go to the {\bf previous} summary line of an unread article. 
-        [distance]\\ 
-        M-s     & {\bf Search} through all subsequent articles for a regexp.\\
-        M-r     & Search through all previous articles for a regexp.\\
-                                %
-        A P     & {\bf Postscript}-print current buffer.\\
-                                %
-        M-k     & Edit this group's {\bf kill} file.\\
-        M-K     & Edit the general {\bf kill} file.\\
-                                %
-        C-t     & Toggle {\bf truncation} of summary lines.\\
-        Y g     & Regenerate the summary-buffer.\\
-        Y c     & Insert all cached articles into the summary-buffer.\\
-                                %
-        M-C-e   & {\bf Edit} the group-parameters.\\
-        M-C-a   & Customize the group-parameters.\\
-                                %
-                                % article handling
-                                %
-        A $<$   & ($<$, A b) Scroll to the beginning of this article.\\
-        A $>$   & ($>$, A e) Scroll to the end of this article.\\
-        A s     & (s) Perform an i{\bf search} in the article buffer.\\
-                                %
-        A D     & (C-d) Un{\bf digestify} this article into a separate group.
-        [Prefix: force digest]\\
-        M-C-d   & Like C-d, but open several documents in nndoc-groups, wrapped
-        in an nnvirtual group [p/p]\\
-                                %
-        A g     & (g) (Re)fetch this article ({\bf get}). [Prefix: get raw version]\\ 
-        A r     & (\^{}, A \^{}) Fetch the parent(s) of this article.
-        [Prefix: if positive fetch \textit{n} ancestors;
-        negative: fetch only the \textit{n}th ancestor]\\
-        A t     & {\bf Translate} this article.\\
-        A R     & Fetch all articles mentioned in the {\bf References}-header.\\
-        A T     & Fetch full \textbf{thread} in which the current article appears.\\
-        M-\^{}  & Fetch the article with a given Message-ID.\\
-        S y     & {\bf Yank} the current article into an existing message-buffer.
-        [p/p]\\
-        A M     & Setup group parameters for {\bf mailing} lists from
-        headers. [Prefix: replace old settings]\\
-      \end{keys}
-      }
-    }
-
-  \newcommand{\MIMESummary}{%
-    {\esamepage
-      For the commands operating on one MIME part (a subset of gnus-article-*), a
-      prefix selects which part to operate on. If the point is placed over a
-      MIME button in the article buffer, use the corresponding bindings for the
-      article buffer instead.
-      \begin{keys}{W M w}
-        K v      & (b, W M b) {\bf View} the MIME-part.\\
-        K o      & {\bf Save} the MIME part.\\
-        K c      & {\bf Copy} the MIME part.\\
-        K e      & View the MIME part {\bf externally}.\\
-        K i      & View the MIME part {\bf internally}.\\
-        K $\mid$ & Pipe the MIME part to an external command.\\
-        K b      & Make all the MIME parts have buttons in front of them.\\
-        K m      & Try to repair {\bf multipart-headers}.\\
-        K C      & View the MIME part using a different {\bf charset}.\\
-        X m      & Save all parts matching a MIME type to a directory. [p/p]\\
-        M-t      & Toggle the buttonized display of the article buffer.\\
-        W M w    & Decode RFC2047-encoded words in the article headers.\\
-        W M c    & Decode encoded article bodies. [Prefix: prompt for charset]\\
-        W M v    & View all MIME parts in the current article.\\
-      \end{keys}
-      }
-    }
-
-  \newcommand{\SortSummary}{%
-    {\esamepage
-      \begin{keys}{C-c C-s C-a}
-        C-c C-s C-a & Sort the summary-buffer by {\bf author}.\\
-        C-c C-s C-t & Sort the summary-buffer by {\bf recipient}.\\
-        C-c C-s C-d & Sort the summary-buffer by {\bf date}.\\
-        C-c C-s C-i & Sort the summary-buffer by article score.\\
-        C-c C-s C-l & Sort the summary-buffer by amount of {\bf lines}.\\
-        C-c C-s C-c & Sort the summary-buffer by length.\\
-        C-c C-s C-n & Sort the summary-buffer by article {\bf number}.\\
-        C-c C-s C-s & Sort the summary-buffer by {\bf subject}.\\
-        C-c C-s C-r & Sort the summary-buffer {\bf randomly}.\\
-        C-c C-s C-o & Sort the summary-buffer using the default method.\\
-      \end{keys}
-      With a prefix these functions sort in reverse order.
-      }
-    }
-
-  \newcommand{\MailGroups}{% formerly \Bsubmap
-    {\esamepage
-      These commands (except `B c') are only valid in a mail group.\\*
-      \begin{keys}{B M-C-e}
-        B DEL   & (B backspace, B delete) {\bf Delete} the mail article from disk (!).
-        [p/p]\\
-        B B     & Crosspost this article to another group.\\
-        B c     & {\bf Copy} this article from any group to a mail group. [p/p]\\
-        B e     & {\bf Expire} all expirable articles in this group. [p/p]\\
-        B i     & {\bf Import} a random file into this group.\\
-        B I     & Create an empty article in this group.\\
-        B m     & {\bf Move} the article from one mail group to another. [p/p]\\
-        B p     & Query whether the article was {\bf posted} as well.\\
-        B q     & {\bf Query} where the article will end up after fancy splitting\\
-        B r     & {\bf Respool} this mail article. [p/p]\\
-        B t     & {\bf Trace} the fancy splitting patterns applied to this article.\\
-        B w     & (e) Edit this article.\\
-        B M-C-e & {\bf Expunge} (delete from disk) all expirable articles in this group
-        (!). [p/p]\\ 
-        K E     & {\bf Encrypt} article body. [p/p]\\
-      \end{keys}
-      }
-    }
-
-  \newcommand{\DraftGroup}{% formerly \Dsubmap
-    {\esamepage
-      The ``drafts''-group contains messages that have been saved but not sent
-      and rejected articles. \\*
-      \begin{keys}{B DEL}
-        D e      & \textbf{edit} message.\\
-        D s      & \textbf{Send} message. [p/p]\\
-        D S      & \textbf{Send} all messages.\\
-        D t      & \textbf{Toggle} sending (mark as unsendable).\\
-        B DEL    & \textbf{Delete} message (like in mailgroup).\\
-      \end{keys}
-      }
-    }
-
-  \newcommand{\SelectArticles}{% formerly \Gsubmap
-    {\esamepage
-      These commands select the target article. They do not understand the prefix.\\*
-      \begin{keys}{G C-n}
-        h       & Enter article-buffer.\\
-        G b     & (,) Go to the {\bf best} article (the one with highest score).\\
-        G f     & (.) Go to the {\bf first} unread article.\\
-        G n     & (n) Go to the {\bf next} unread article.\\
-        G p     & (p) Go to the {\bf previous} unread article.\\
-                                %
-        G N     & (N) Go to {\bf the} next article.\\
-        G P     & (P) Go to the {\bf previous} article.\\
-                                %
-        G C-n   & (M-C-n) Go to the {\bf next} article with the same subject.\\
-        G C-p   & (M-C-p) Go to the {\bf previous} article with the same subject.\\
-                                %
-        G l     & (l) Go to the previously read article ({\bf last-read-article}).\\
-        G o     & Pop an article off the summary history and go to it.\\
-                                %
-        G g     & Search an article via subject.\\
-        G j     & (j) Search an article via Message-Id or subject.\\
-      \end{keys}
-      }
-    }
-
-  \newcommand{\ArticleModeGeneral}{%
-    {\esamepage
-      The normal navigation keys work in Article mode. Some additional keys are:\\
-      \begin{keys}{C-c RET}
-        C-c \^{} & Get the article with the Message-ID near point.\\
-        C-c RET & Send reply to address near point.\\
-        h       & Go to the \textbf{header}-line of the article in the
-        summary-buffer.\\
-        s       & Go to \textbf{summary}-buffer.\\
-        RET     & (middle mouse button) Activate the button at point to follow
-        an URL or Message-ID.\\
-        TAB     & Move the point to the next button.\\
-        M-TAB   & Move point to previous button.\\
-      \end{keys}
-      }
-    }
-
-  \newcommand{\WashArticle}{% formerly \Wsubmap
-    {\esamepage
-      \begin{keys}{W W H}
-        W 6     & Translate a base64 article.\\
-        W a     & Strip certain {\bf headers} from body.\\
-        W b     & Make Message-IDs and URLs in the article mouse-clickable
-        {\bf buttons}.\\  
-        W c     & Translate CRLF-pairs to LF and then the remaining CR's to LF's.\\
-        W d     & Treat {\bf dumbquotes}.\\
-        W e     & Treat {\bf emphasized} text.\\
-        W h     & Treat {\bf HTML}.\\
-        W l     & (w) Remove page breaks ({\bf\^{}L}) from the article.\\
-        W m     & {\bf Morse} decode article.\\
-        W o     & Treat {\bf overstrike} or underline (\^{}H\_) in the article.\\
-        W p     & Verify X-{\bf PGP}-Sig header.\\
-        W q     & Treat {\bf quoted}-printable in the article.\\
-        W r     & (C-c C-r) Do a Caesar {\bf rotate} (rot13) on the article.\\
-        W s     & Verify (and decrypt) a {\bf signed} message.\\
-        W t     & (t) {\bf Toggle} display of all headers.\\
-        W u     & {\bf Unsplit} broken URLs.\\
-        W v     & (v) Toggle permanent {\bf verbose} displaying of all headers.\\
-        W w     & Do word {\bf wrap} in the article.\\
-        W B     & Add clickable {\bf buttons} to the article headers.\\
-        W C     & {\bf Capitalize} first word in each sentence.\\
-        W Q     & Fill long lines.\\
-        W Z     & Translate a HZ-encoded article.\\
-                                %
-        W G u   & {\bf Unfold} folded header lines.\\
-        W G f   & {\bf Fold} all header lines.\\
-        W G n   & Unfold {\bf Newsgroups:} and Follow-Up-To:.\\
-                                %
-        W Y c   & Repair broken {\bf citations}.\\
-        W Y a   & Repair broken {\bf attribution} lines.\\
-        W Y u   & {\bf Unwrap} broken citation lines.\\
-        W Y f   & Do a {\bf full} deuglification (W Y c, W Y a, W Y u).\\
-      \end{keys}
-      }
-    }
-
-  \newcommand{\BlankAndWhitespace}{% 
-    {\esamepage
-      \begin{keys}{W E w}
-        W E l   & Strip blank {\bf lines} from the beginning of the article.\\
-        W E m   & Replace blank lines with empty lines and remove {\bf multiple}
-        blank lines.\\
-        W E t   & Remove {\bf trailing} blank lines.\\
-        W E a   & Strip blank lines at the beginning and the end
-        (W E l, W E m and W E t).\\
-        W E A   & Strip {\bf all} blank lines.\\
-        W E s   & Strip leading blank lines from the article body.\\
-        W E e   & Strip trailing blank lines from the article body.\\
-        W E w   & Remove leading {\bf whitespace} from all headers.\\
-      \end{keys}
-      }
-    }
-
-  \newcommand{\Picons}{% 
-    {\esamepage
-      \begin{keys}{W D D}
-        W D s   & (W g) Display {\bf smilies}.\\
-        W D x   & (W f) Look for and display any X-{\bf Face} headers.\\
-        W D d   & Display any Face headers.\\
-        W D n   & Toggle picons in {\bf Newsgroups} and Followup-To.\\
-        W D m   & Toggle picons in {\bf mail} headers (To and Cc).\\
-        W D f   & Toggle picons in {\bf From}.\\
-        W D D   & Remove all images from the article buffer.\\
-      \end{keys}
-      }
-    }
-
-  \newcommand{\TimeAndDate}{% 
-    {\esamepage
-      \begin{keys}{W T u}
-        W T u   & (W T z) Display the article timestamp in GMT ({\bf UT, ZULU}).\\
-        W T i   & Display the article timestamp in {\bf ISO} 8601.\\
-        W T l   & Display the article timestamp in the {\bf local} timezone.\\
-        W T s   & Display according to `gnus-article-time-format'.\\
-        W T e   & Display the time {\bf elapsed} since it was sent.\\
-        W T o   & Display the {\bf original} timestamp.\\
-        W T p   & Display the date in format that's {\bf
-          pronounceable} in English.\\        
-      \end{keys}
-      }
-    }
-
-  \newcommand{\HideHighlightArticle}{%
-    {\esamepage
-      \begin{keys}{W W C-c}
-        W W a   & Hide {\bf all} unwanted parts. Calls W W h, W W s, W W C-c.\\
-        W W h   & Hide article {\bf headers}.\\
-        W W b   & Hide {\bf boring} headers.\\
-        W W s   & Hide {\bf signature}.\\
-        W W l   & Hide {\bf list} identifiers in subject-header.\\
-        W W P   & Hide {\bf PEM} (privacy enhanced messages).\\
-        W W B   & Hide banner specified by group parameter.\\
-        W W c   & Hide {\bf citation}.\\
-        W W C-c & Hide {\bf citation} using a more intelligent algorithm.\\
-        W W C   & Hide cited text in articles that aren't roots.\\
-        W H a   & Highlight {\bf all} parts. Calls W b, W H c, W H h, W H s.\\
-        W H c   & Highlight article {\bf citations}.\\
-        W H h   & Highlight article {\bf headers}.\\
-        W H s   & Highlight article {\bf signature}.\\
-      \end{keys}
-      For all hiding-commands: A positive prefix always hides, and a negative
-      prefix will show what was previously hidden.
-      }}
-
-  \newcommand{\MIMEArticleMode}{%
-    {\esamepage
-      \begin{keys}{RET}
-        RET     & (BUTTON-2) Toggle display of the MIME object.\\
-        v       & Prompt for a method and then view object using this method.\\
-        o       & Prompt for a filename and save the MIME object.\\
-        C-o     & Prompt for a filename to save the MIME object to and remove it.\\
-        d       & {\bf Delete} the MIME object.\\
-        c       & {\bf Copy} the MIME object to a new buffer and display this buffer.\\
-        i       & Display the MIME object in this buffer.\\
-        C       & Copy the MIME object to a new buffer and display this buffer using {\bf Charset} \\
-        E       & View internally. \\
-        e       & View {\bf externally}. \\
-        t       & View the MIME object as a different {\bf type}.\\
-        p       & {\bf Print} the MIME object.\\
-        $\mid$  & Pipe the MIME object to a process.\\
-        .       & Take action on the MIME object.\\
-      \end{keys}
-      }
-    }
-
-  %% end of article mode for reading ..........................................
-
-  \newcommand{\MarkArticlesGeneral}{% formerly \Msubmap
-    {\esamepage
-      \begin{keys}{M M-C-r}
-        d       & (M d, M r) Mark this article as read and move to the next one.
-        [scope]\\ 
-        D       & Mark this article as read and move to the previous one. [scope]\\
-        !       & (u, M !, M t) Tick this article (mark it as interesting) and move
-        to the next one. [scope]\\
-        U       & Tick this article and move to the previous one. [scope]\\ 
-        M ?     & (?) Mark this article as dormant (only followups are
-        interesting). [scope]\\ 
-        M D     & Show all {\bf dormant} articles (normally they are hidden unless they
-        have any followups).\\
-        M M-D   & Hide all {\bf dormant} articles.\\
-        C-w     & Mark all articles between point and mark as read.\\
-        M-u     & (M SPC, M c) Clear all marks from this article and move to the next
-        one. [scope]\\ 
-        M-U     & Clear all marks from this article and move to the previous one.
-        [scope]\\
-                                %
-        M e     & (E, M x) Mark this article as {\bf expirable}. [scope]\\
-                                %
-        M k     & (k) {\bf Kill} all articles with the same subject then select the
-        next unread one.\\ 
-        M K     & (C-k) {\bf Kill} all articles with the same subject as this one.\\
-                                %
-        M C     & {\bf Catch-up} the articles that are not ticked and not dormant.\\
-        M C-c   & {\bf Catch-up} all articles in this group.\\
-        M H     & {\bf Catch-up} (mark read) this group to point (to-{\bf here}).\\
-                                %
-        M b     & Set a {\bf bookmark} in this article.\\
-        M B     & Remove the {\bf bookmark} from this article.\\
-                                %
-        M M-r   & (x) Expunge all {\bf read} articles from this group.\\
-        M M-C-r & Expunge all articles having a given mark.\\
-        M S     & (C-c M-C-s) {\bf Show} all expunged articles.\\
-        M M C-h & Displays some more keys doing ticking slightly differently.\\
-      \end{keys}
-      The variable `gnus-summary-goto-unread' controls what happens after a mark
-      has been set (C-x C-i g Setting Marks RET)
-      }}
-
-  \newcommand{\MarkByScore}{%
-    \begin{keys}{M V m}
-      M V c   & {\bf Clear} all marks from all high-scored articles. [score]\\
-      M V k   & {\bf Kill} all low-scored articles. [score]\\
-      M V m   & Mark all high-scored articles with a given {\bf mark}. [score]\\
-      M V u   & Mark all high-scored articles as interesting (tick them). [score]\\
-    \end{keys}
-    }
-  }
-
-\newcommand{\ProcessMark}{%
-  {\esamepage 
-    These commands set and remove the process mark (\#). You only need to use
-    it if the set of articles you want to operate on is non-contiguous. Else
-    use a numeric prefix.\\*
-    \begin{keys}{M P R}
-      M P p   & (\#, M \#) Mark this article.\\
-      M P u   & (M-\#, M M-\#) \textbf{unmark} this article.\\
-      M P b   & Mark all articles in {\bf buffer}.\\
-      M P r   & Mark all articles in the {\bf region}.\\
-      M P g   & Unmark all articles in the region.\\
-      M P R   & Mark all articles matching a {\bf regexp}.\\
-      M P G   & Unmark all articles matching a regexp.\\
-      M P t   & Mark all articles in this (sub){\bf thread}.\\
-      M P T   & Unmark all articles in this (sub){\bf thread}.\\
-      M P s   & Mark all articles in the current {\bf series}.\\
-      M P S   & Mark all {\bf series} that already contain a marked article.\\
-      M P a   & Mark {\bf all} articles (in series order).\\
-      M P U   & \textbf{unmark} all articles.\\
-      M P i   & {\bf Invert} the list of process-marked articles.\\
-      M P k   & Push the current process-mark set onto stack and unmark
-      all articles.\\
-      M P y   & Pop process-mark set from stack and restore it.\\
-      M P w   & Push process-mark set on the stack.\\
-      M P v   & Mark all articles with score over the default score. [Prefix: score]\\
-    \end{keys}
-    }
-  }
-
-\newcommand{\Limiting}{%
-  {\esamepage
-    \begin{keys}{/M}
-      //   & (/s) Limit the summary-buffer to articles matching {\bf subject}.\\
-      /a   & Limit the summary-buffer to articles matching {\bf author}.\\
-      /R   & Limit the summary-buffer to articles matching {\bf recipient}.\\
-      /x   & Limit depending on ``extra'' headers.\\
-      /u   & (x) Limit to {\bf unread} articles.
-      [Prefix: also exclude ticked and dormant articles]\\
-      /.   & Limit to unseen articles.\\
-      /m   & Limit to articles marked with specified {\bf mark}.\\
-      /t   & Ask for a number and exclude articles younger than that many days.
-      [Prefix: exclude older articles]\\
-      /n   & Limit to current article. [p/p]\\
-      /w   & Pop the previous limit off the stack and restore it.
-      [Prefix: pop all limits]\\
-      /v   & Limit to score. [score]\\
-      /E   & (M S) Include all expunged articles in the limit.\\
-      /D   & Include all dormant articles in the limit.\\
-      /*   & Limit to cached articles.\\
-      Y C  & Include all cached articles in the limit.\\
-      /d   & Exclude all dormant articles from the limit.\\
-      /M   & Exclude all marked articles.\\
-      /T   & Include all articles from the current thread in the limit.\\
-      /c   & Exclude all dormant articles that have no children from the limit.\\
-      /C   & Mark all excluded unread articles as read.
-      [Prefix: also mark ticked and dormant articles]\\
-      /o   & Insert all {\bf old} articles. [Prefix: how many]\\
-      /N   & Insert all {\bf new} articles.\\
-      /p   & Limit to articles {\bf predicated} in the `display' group parameter.\\
-      /r   & Limit to {\bf replied} articles. [Prefix: unreplied]\\
-    \end{keys}
-    }
-  }
-
-\newcommand{\OutputArticles}{% formerly \Osubmap
-  {\esamepage
-    \begin{keys}{O m}
-      O o     & (o, C-o) Save this article using the default article saver. [p/p]\\
-      O b     & Save this article's {\bf body} in plain file format [p/p]\\
-      O f     & Save this article in plain {\bf file} format. [p/p]\\
-      O F     & like O f, but overwrite file's contents. [p/p]\\
-      O h     & Save this article in {\bf mh} folder format. [p/p]\\
-      O m     & Save this article in {\bf mail} format. [p/p]\\
-      O r     & Save this article in {\bf rmail} format. [p/p]\\
-      O v     & Save this article in {\bf vm} format. [p/p]\\
-      O p     & ($\mid$) {\bf Pipe} this article to a shell command. [p/p]\\
-      O P     & \textbf{Print} this article using Muttprint. [p/p]\\
-    \end{keys}
-    }
-  }
-
-\newcommand{\PostReplyetc}{% formerly \Ssubmap
-  {\esamepage
-    These commands put you in a separate news or mail buffer. See the section
-    about composing messages for more information.\\*
-                                %After
-                                %editing the article, send it by pressing C-c C-c.  If you are in a
-                                %foreign group and want to post the article using the foreign server, give
-                                %a prefix to C-c C-c.\\* 
-    \begin{keys}{S O m}
-      S p     & (a) {\bf Post} an article to this group.\\
-      S f     & (f) Post a {\bf followup} to this article.\\
-      S F     & (F) Post a {\bf followup} and include the original. [p/p]\\
-      S o p   & Forward this article as a {\bf post} to a newsgroup.\\
-      S M-c   & Send a complaint about excessive crossposting to the author of this
-      article. [p/p]\\
-                                %
-      S m     & (m) Send a {\bf mail} to some other person.\\
-      S r     & (r) Mail a {\bf reply} to the author of this article.\\
-      S R     & (R) Mail a {\bf reply} and include the original. [p/p]\\
-      S B r   & Like S r but ignore the Reply-To: header.\\
-      S B R   & Like S R but ignore the Reply-To: header.\\
-      S w     & Mail a {\bf wide} reply to this article.\\
-      S W     & Mail a {\bf wide} reply to this article and include
-      the original.\\
-      S v     & Mail a {\bf very} wide reply to this article.\\
-      S V     & Mail a {\bf very} wide reply to this article and include the original.\\
-      S o m   & (C-c C-f) Forward this article by {\bf mail} to a person.\\
-      S D b   & Resend {\bf bounced} mail.\\
-      S D r   & {\bf Resend} mail to a different person.\\
-      S D e   & {\bf Edit} and resend.\\
-                                %
-      S n     & Post a followup via {\bf news} even if you got the message
-      through mail.\\
-      S N     & Post a followup via {\bf news} and include the original mail.
-      [p/p]\\
-                                %
-      S c     & (C) {\bf Cancel} this article (only works if it is
-      your own). [p/p]\\
-      S s     & {\bf Supersede} this article with a new one (only for own
-      articles).\\
-                                %
-      S O m   & Digest these series and forward by {\bf mail}. [p/p]\\
-      S O p   & Digest these series and forward as a {\bf post} to a newsgroup.
-      [p/p]\\ 
-                                %
-      S u     & {\bf Uuencode} a file and post it as a series.\\
-    \end{keys}
-    If you want to cancel or supersede an article you just posted (before it
-    has appeared on the server), go to the *post-news* buffer, change
-    `Message-ID' to `Cancel' or `Supersedes' and send it again with C-c C-c.
-    }}
-
-\newcommand{\Threading}{% formerly \Tsubmap
-  {\esamepage
-    \begin{keys}{T M-\#}
-      T \#    & Mark this thread with the process mark.\\
-      T M-\#  & Remove process-marks from this thread.\\
-                                %
-      T t     & Re-{\bf thread} the current article's thread.\\
-      T \^{}  & Make the current article child of the marked (or previous) article.\\
-                                % movement
-      T n     & (M-C-f, M-down) Go to the {\bf next} thread. [distance]\\
-      T p     & (M-C-b, M-up) Go to the {\bf previous} thread. [distance]\\
-      T d     & {\bf Descend} this thread. [distance]\\
-      T u     & Ascend this thread ({\bf up}-thread). [distance]\\
-      T o     & Go to the top of this thread.\\
-                                %
-      T s     & {\bf Show} the thread hidden under this article.\\
-      T h     & {\bf Hide} this (sub)thread.\\
-                                %
-      T i     & {\bf Increase} the score of this thread.\\
-      T l     & (M-C-l) {\bf Lower} the score of this thread.\\
-                                %
-      T k     & (M-C-k) {\bf Kill} the current (sub)thread. [Negative prefix:
-      tick it, positive prefix: unmark it.]\\
-                                %
-      T H     & {\bf Hide} all threads.\\
-      T S     & {\bf Show} all hidden threads.\\
-      T T     & (M-C-t) {\bf Toggle} threading.\\
-    \end{keys}
-    }
-  }
-
-\newcommand{\Scoring}{% formerly \Vsubmap
-  {\esamepage
-    Read about Adaptive Scoring in the online info.\\*
-    \begin{keys}{\bf A p m l}
-      V a     & {\bf Add} a new score entry, specifying all elements.\\
-      V c     & Specify a new score file as {\bf current}.\\
-      V e     & {\bf Edit} the current score alist.\\
-      V f     & Edit a score {\bf file} and make it the current one.\\
-      V m     & {\bf Mark} all articles below a given score as read.\\
-      V s     & Set the {\bf score} of this article.\\
-      V t     & Display all score rules applied to this article ({\bf track}).\\
-      W w     & List {\bf words} used in scoring.\\
-      V x     & {\bf Expunge} all low-scored articles. [score]\\
-      V C     & {\bf Customize} the current score file through a user-friendly
-      interface.\\
-      V F     & {\bf Flush} the cache of score files.\\
-      V R     & {\bf Re-score} the summary buffer.\\
-      V S     & Display the {\bf score} of this article.\\
-      \bf A p m l& Make a scoring entry based on this article.\\
-    \end{keys}
-    The four letters stand for:\\*
-    \quad \B{A}ction: I)ncrease, L)ower;\\*
-    \quad \B{p}art: a)uthor (from), s)ubject, x)refs (cross-posting), d)ate, l)ines,
-    message-i)d, t)references (parent), f)ollowup, b)ody, h)ead (all headers);\\*
-    \quad \B{m}atch type:\\*
-    \qquad string: s)ubstring, e)xact, r)egexp, f)uzzy,\\*
-    \qquad date: b)efore, a)t, n)this,\\*
-    \qquad number: $<$, =, $>$;\\*
-    \quad \B{l}ifetime: t)emporary, p)ermanent, i)mmediate.
-
-    If you type the second letter in uppercase, the remaining two are assumed
-    to be s)ubstring and t)emporary. 
-    If you type the third letter in uppercase, the last one is assumed to be 
-    t)emporary.
-
-    \quad Extra keys for manual editing of a score file:\\*
-    \begin{keys}{C-c C-c}
-      C-c C-c & Finish editing the score file.\\
-      C-c C-d & Insert the current {\bf date} as number of days.\\
-    \end{keys}
-    }
-  }
-
-\newcommand{\ExtractSeries}{% formerly \Xsubmap
-  {\esamepage
-    Gnus recognizes if the current article is part of a series (multipart
-    posting whose parts are identified by numbers in their subjects, e.g.{}
-    1/10\dots10/10) and processes the series accordingly. You can mark and
-    process more than one series at a time. If the posting contains any
-    archives, they are expanded and gathered in a new group.\\*
-    \begin{keys}{X p}
-      X b     & Un-{\bf binhex} these series. [p/p]\\
-      X o     & Simply {\bf output} these series (no decoding). [p/p]\\ 
-      X p     & Unpack these {\bf postscript} series. [p/p]\\
-      X s     & Un-{\bf shar} these series. [p/p]\\
-      X u     & {\bf Uudecode} these series. [p/p]\\
-    \end{keys}
-
-    Each one of these commands has four variants:\\*
-    \begin{keys}{X v \bf Z}
-      X   \bf z & Decode these series. [p/p]\\
-      X   \bf Z & Decode and save these series. [p/p]\\
-      X v \bf z & Decode and view these series. [p/p]\\
-      X v \bf Z & Decode, save and view these series. [p/p]\\
-    \end{keys}
-    where {\bf z} or {\bf Z} identifies the decoding method (b, o, p, s, u).
-
-    An alternative binding for the most-often used of these commands is\\*
-    \begin{keys}{C-c C-v C-v}
-      C-c C-v C-v & (X v u) Uudecode and view these series. [p/p]\\
-    \end{keys}
-    }}
-
-\newcommand{\ExitSummary}{% formerly \Zsubmap
-  {\esamepage
-    \begin{keys}{Z G}
-      Z Z     & (q, Z Q) Exit this group.\\
-      Z E     & (Q) {\bf Exit} without updating the group information.\\
-                                %
-      Z c     & (c) Mark all unticked articles as read ({\bf catch-up}) and exit.\\
-      Z C     & Mark all articles as read ({\bf catch-up}) and exit.\\
-                                %
-      Z n     & Mark all articles as read and go to the {\bf next} group.\\
-      Z N     & Exit and go to {\bf the} next group.\\
-      Z P     & Exit and go to the {\bf previous} group.\\
-                                %
-      Z G     & (M-g) Check for new articles in this group ({\bf get}).\\
-      Z R     & (C-x C-s) Exit this group, and then enter it again ({\bf reenter}).
-      [Prefix: select all articles, read and unread.]\\
-      Z s     & Update and save the dribble buffer. [Prefix: save .newsrc* as well]\\
-    \end{keys}
-    }
-  }
-
-\newcommand{\MsgCompositionGeneral}{%
-  Press C-c ? in the composition-buffer to get this information.\\*
-  {\esamepage
-    \begin{keys}{C-c C-m}
-                                % sending
-      C-c C-c & Send message and exit. [Prefix: send via foreign server]\\
-      C-c C-s & Send message. [Prefix: send via foreign server]\\
-      C-c C-d & Don't send message (save as \textbf{draft}).\\
-      C-c C-k & \textbf{Kill} message-buffer.\\
-      C-c C-m & {\bf Mail} reply to the address near point.
-      [Prefix: include the original]\\
-                                % modify headers/body
-      C-c C-o & Sort headers.\\
-      C-c C-e & \textbf{Elide} region.\\
-      C-c C-v & Kill everything outside region.\\
-      C-c C-r & Do a \textbf{Rot-13} on the body.\\
-      C-c C-w & Insert signature (from `message-signature-file').\\
-      C-c C-z & Kill everything up to signature.\\
-      C-c C-y & \textbf{Yank} original message.\\
-      C-c C-q & Fill the yanked message.\\
-      C-c M-C-y & \textbf{Yank} a buffer and quote it.\\
-      M-RET   & Insert four newlines and format quoted text. [Prefix:
-      justify as well]\\
-      C-c M-r & \textbf{Rename} message buffer. [Prefix: ask for new name]\\
-    \end{keys}
-    }
-  }
-
-\newcommand{\MsgCompositionMovementArticle}{%
-  The following functions create the header-field if necessary.\\*
-  {\esamepage
-    \begin{keys}{C-c C-f C-u}
-      C-c TAB & Move to \textbf{signature}.\\
-      C-c C-b & Move to \textbf{body}.\\
-      C-c C-f C-t & (C-c C-t) Move to \textbf{To:}.\\
-      C-c C-f C-c & Move to \textbf{Cc:}.\\
-      C-c C-f C-b & Move to \textbf{Bcc:}.\\
-      C-c C-f C-w & Move to \textbf{Fcc:}.\\
-      C-c C-f C-s & Move to \textbf{Subject:}.\\
-      C-c C-f C-r & Move to \textbf{Reply-To:}.\\
-      C-c C-f C-f & Move to \textbf{Followup-To:}.\\
-      C-c C-f C-n & (C-c C-n) Move to \textbf{Newsgroups:}.\\
-      C-c C-f C-u & Move to \textbf{Summary:}.\\
-      C-c C-f C-k & Move to \textbf{Keywords:}.\\
-      C-c C-f C-d & Move to \textbf{Distribution:}.\\
-      C-c C-f C-m & Move to \textbf{Mail-Followup-To:}.\\
-      C-c C-f C-o & Move to \textbf{From:}.\\
-      C-c C-f C-a & Insert a reasonable \textbf{Mail-Followup-To:} for
-      an unsubscribed list. [Prefix: include addresses in \textbf{Cc:}]\\
-      C-c C-f TAB & (C-c C-u) Move to \textbf{Importance:}.\\
-      C-c M-n     & Insert \textbf{Disposition-Notification-To:}
-      (request receipt).\\
-    \end{keys}
-    }
-  }
-
-\newcommand{\MsgCompositionMML}{%
-  {\esamepage
-    \begin{keys}{C-c C-m P}
-      C-c C-m f   & (C-c C-a) Attach \textbf{file}.\\
-      C-c C-m b   & Attach contents of \textbf{buffer}.\\
-      C-c C-m e   & Attach \textbf{external} file (ftp..).\\
-      C-c C-m P   & Create MIME-\textbf{preview} (new
-      buffer). [Prefix: show raw MIME preview]\\
-      C-c C-m v   & \textbf{Validate} article.\\
-      C-c C-m p   & Insert \textbf{part}.\\
-      C-c C-m m   & Insert \textbf{multi}-part.\\
-      C-c C-m q   & \textbf{Quote} region.\\
-      C-c C-m c s & Encrypt message using \textbf{S/MIME}.\\
-      C-c C-m c o & Encrypt message using PGP.\\
-      C-c C-m c p & Encrypt message using \textbf{PGP/MIME}.\\
-      C-c C-m s s & Sign message using \textbf{S/MIME}.\\
-      C-c C-m s o & Sign message using PGP.\\
-      C-c C-m s p & Sign message using \textbf{PGP/MIME}.\\
-      C-c C-m C-n & Remove security related MML tags from message.\\
-                                % TODO: narrow headers (C-c C-m n) ?
-    \end{keys}
-    }
-  }
-
-%% TODO:
-\newcommand{\ServerMode}{%
-  {\esamepage
-    To enter this mode, press \^{} while in Group mode.\\*
-    \begin{keys}{SPC}
-      SPC     & (RET) Browse this server.\\
-      a       & {\bf Add} a new server.\\
-      c       & {\bf Copy} this server.\\
-      e       & {\bf Edit} a server.\\
-      k       & {\bf Kill} this server. [scope]\\
-      l       & {\bf List} all servers.\\
-      q       & Return to the group buffer ({\bf quit}).\\
-      s       & Request that the server scan its sources for new articles.\\
-      g       & Request that the server regenerate its data.\\
-      y       & {\bf Yank} the previously killed server.\\
-      O       & Try to {\bf open} a connection to this server.\\
-      C       & {\bf Close} connection to this server.\\
-      D       & Mark this server as unreachable ({\bf deny}).\\
-      M-o     & {\bf Open} the connection to all servers.\\
-      M-c     & {\bf Close} the connection to all servers.\\
-      R       & Make all denied servers into closed servers.\\
-      L       & Set server status to offline.\\
-    \end{keys}
-    }
-  }
-
-\newcommand{\BrowseServer}{%
-  {\esamepage
-    To enter this mode, press `B' while in Group mode.\\*
-    \begin{keys}{RET}
-      RET     & Enter the current group.\\
-      SPC     & Enter the current group and display the first article.\\
-      ?       & Give a very short help message.\\
-      n       & Go to the {\bf next} group. [distance]\\
-      p       & Go to the {\bf previous} group. [distance]\\
-      q       & (l) {\bf Quit} browse mode.\\
-      u       & Subscribe to the current group. [scope]\\
-    \end{keys}
-    }
-  }
-
-\newcommand{\GroupUnplugged}{%
-  {\esamepage
-    \begin{keys}{J S}
-      J j & Toggle plugged-state.\\
-      J s & Fetch articles from all groups for offline-reading.\\
-      J u & Fetch all eligible articles from this group.\\
-      J S & \textbf{Send} all sendable messages in the drafts group.\\
-                                %
-      J c & Enter \textbf{category} buffer.\\
-      J a & \textbf{Add} this group to an Agent category [p/p].\\
-      J r & \textbf{Remove} this group from its Agent category [p/p].\\
-      J Y & Synchronize flags changed while unplugged with remote server.\\
-    \end{keys}
-    }
-  }
-
-\newcommand{\SummaryUnplugged}{%
-  {\esamepage
-    \begin{keys}{J M-\#}
-      J \#   & \textbf{Mark} the article for downloading.\\
-      J M-\# & \textbf{Unmark} the article for downloading.\\
-      @      & \textbf{Toggle} whether to download the article.\\
-      J c    & Mark all undownloaded articles as read (\textbf{catch-up}).\\
-      J u    & Download all downloadable articles from group.\\
-    \end{keys}
-    }
-  }
-
-\newcommand{\ServerUnplugged}{%
-  {\esamepage
-    \begin{keys}{J a}
-      J a & \textbf{Add} the current server to the list of servers covered
-      by the agent.\\
-      J r & \textbf{Remove} the current server from the list of servers covered
-      by the agent.\\
-    \end{keys}
-    }
-  }
-
-%%% Local Variables:
-%%% mode: latex
-%%% TeX-master: "refcard.tex"
-%%% End:
diff --git a/texi/refcard.tex b/texi/refcard.tex
deleted file mode 100644
index 8028687..0000000
--- a/texi/refcard.tex
+++ /dev/null
@@ -1,186 +0,0 @@
-% Reference Card for Oort Gnus: to be processed with LaTeX2e
-\documentclass{article}
-
-\usepackage{supertabular}
-
-\def\Guide{Card}\def\guide{card}
-\def\logoscale{0.25}
-\newlength{\logowidth} \setlength{\logowidth}{6.861in}
-\newlength{\logoheight} \setlength{\logoheight}{7.013in}
-
-\raggedbottom\raggedright
-
-\usepackage{epsfig}
-
-\setlength{\textwidth}{7.26in} \setlength{\textheight}{10in}
-\setlength{\topmargin}{-1.0in}
-% the same settings work for A4, although there is a bit of space at the
-% top and bottom of the page. 
-\setlength{\oddsidemargin}{-0.5in} \setlength{\evensidemargin}{-0.5in}
-
-
-% README (for refcard + booklet)
-% This is a 5+ page reference card. In addition there is a booklet
-% (bk-a4.tex for A4 and bk-lt.tex for Letter).
-%
-% *** files for the refcard
-% refcard.tex (this file), gnusref.tex ("include"-file) and
-% gnuslogo-refcard.eps (Gnus logo).
-%
-% *** printing (about 5 pages now: write me if you can make it shorter..)
-% if you are using latex-mode, you do C-c C-f (process with latex),
-% C-c C-v (view using xdvi/dvi2tty) and C-c C-p (print)
-% the original author has set up the page dimensions cleverly so that this
-% should print on both letter and a4 (see note above)
-% $latex refcard.tex
-% this creates a file refcard.dvi which you can preview using
-% $xdvi refcard.dvi [C-c C-v]
-% and print using something like
-% $dvips refcard.dvi 
-%
-% If you want to print the booklet, you need to use `pstops' from the
-% `psutils' package (TODO: somebody write a howto ?)
-%
-% *** customization:
-
-% the part following \begin{document} in this file consists of a macro for
-% each section and section-headers (\section*{..}). It should be easy to
-% reorder things and/or remove sections (put '%' at the beginning of the line).
-% (i.e. you might want to omit \notes in the printed version)
-% The same goes for the booklet: Its contents are defined in booklet.tex.
-% If you think that the order is not logical and you have ideas for
-% improvements, please send mail to the current maintainer.
-
-% *** TODO:
-% o some things might not be updated: scoring and server modes, maybe more
-% o Gnus Unplugged category-buffer commands need to be written
-
-\begin{document}
-
-\def\progver{5.10}\def\refver{5.10-1} % program and refcard versions
-\def\date{Mar 23rd, 2002}
-\def\author{Gnus Bugfixing Girls + Boys $<$bugs@gnus.org$>$}
-\raggedbottom\raggedright
-
-\twocolumn
-% use \tiny to shrink it to 4 pages (needs a high-resolution printer though)
-%\tiny
-\scriptsize
-\pagestyle{plain}
-
-% this contains a set of commands containing the actual sections
-% (and some explanations).
-\input{gnusref}
-
-\Title
-\par
-\Logo{refcard}
-\Notes
-%
-%
-\section*{Group-Mode}
-\GroupModeGeneral
-    \subsection*{Group Subscribedness-Levels}
-    \GroupLevels
-    \subsection*{List Groups}
-    \ListGroups
-    \subsection*{Create/Edit Foreign Groups}
-    \CreateEditGroups
-    \subsection*{Unsubscribe, Kill and Yank Groups}
-    \SubscribeKillYankGroups
-    \subsection*{Mark Groups}
-    \MarkGroups
-    \subsection*{Group-Unplugged}
-    \GroupUnplugged
-% topics in group-mode
-    \subsection*{Group Topics}
-    \GroupTopicsGeneral
-    \subsubsection*{Topic Sorting}
-    \TopicSorting
-%
-% summary-mode
-\section*{Summary-Mode}
-\SummaryModeGeneral
-    \subsection*{Select Articles}
-    \SelectArticles
-%
-    \subsection*{Threading}
-    \Threading
-%
-    \subsection*{Limiting}
-    \Limiting
-    \subsection*{Sort the Summary-Buffer}
-    \SortSummary
-    \subsection*{Score (Value) Commands}
-    \Scoring
-    \subsection*{Output Articles}
-    \OutputArticles
-    \subsection*{Extract Series (Uudecode etc)}
-    \ExtractSeries
-    \subsection*{MIME operations from the Summary-Buffer}
-    \MIMESummary     
-%
-    \subsection*{Post, Followup, Reply, Forward, Cancel}
-    \PostReplyetc
-    \newpage
-      \subsection*{Message Composition}
-      \MsgCompositionGeneral
-        \subsubsection*{Jumping in message-buffer}
-        \MsgCompositionMovementArticle
-        \subsubsection*{Attachments/MML}
-        \MsgCompositionMML
-% marking articles
-    \subsection*{Mark Articles}
-    \MarkArticlesGeneral
-        \subsubsection*{Mark Based on Score}
-        \MarkByScore
-        \subsubsection*{The Process Mark}
-        \ProcessMark
-        \subsubsection*{Mark Indication-Characters}
-        \MarkCharacters
-%
-    \subsection*{Summary-Unplugged}
-    \SummaryUnplugged
-    \subsection*{Mail-Group Commands}
-    \MailGroups
-    \subsection*{Draft-Group Commands}
-    \DraftGroup
-% exiting
-    \subsection*{Exit the Summary-Buffer}
-    \ExitSummary
-%
-%
-\section*{Article Mode (reading)}
-\ArticleModeGeneral
-    \subsection*{Wash the Article-Buffer}
-    \WashArticle
-    \subsubsection*{Blank Lines and Whitespace}
-    \BlankAndWhitespace
-    \subsubsection*{Picons, X-faces, Smileys}
-    \Picons
-    \subsubsection*{Time and Date}
-    \TimeAndDate
-    \subsection*{Hide/Highlight Parts of the Article}
-    \HideHighlightArticle
-    \subsection*{MIME operations from the Article-Buffer (reading)}
-    \MIMEArticleMode
-%
-%
-\section*{Server Mode}
-\ServerMode
-    \subsection*{Unplugged-Server}
-    \ServerUnplugged
-%
-%
-\section*{Browse Server Mode}
-\BrowseServer
-
-%\pagebreak
-\vspace*{\fill}
-\Copyright
-
-\end{document}
-
-%%% Local Variables:
-%%% mode: latex
-%%% End: