Merge from gnus--rel--5.10

[gnus] / texi / gnus-refcard.tex

diff --git a/texi/gnus-refcard.tex b/texi/gnus-refcard.tex
index 32d7b35..e5f7575 100644 (file)
--- a/texi/gnus-refcard.tex
+++ b/texi/gnus-refcard.tex
@@ -5,10 +5,18 @@
 % gnuslogo-booklet.eps).
 %
 % From this LaTeX file (gnus-refcard.tex) plus a single logo (gnus-logo.eps),
-% we can generate the refcard and the booklet version.  Appropriate Makefile
-% rules were added.  This simplifies to distribute the refcard with Emacs.
+% we can generate the refcard and the booklet version.  This simplifies to
+% distribute the refcard with Emacs.  Appropriate Makefile rules were added in
+% gnus/texi/Makefile.
+
+% For Emacs, we may use the following commands (w/o) using Gnus' Makefile:
 %
-% (Reiner Steib, March 2005)
+%   latex gnus-refcard.tex &&
+%   dvips -t letter -f gnus-refcard.dvi > gnus-refcard.ps
+%   
+%   latex '\def\booklettrue{}\def\letterpapertrue{}\input{gnus-refcard}' &&
+%   mv gnus-refcard.dvi gnus-booklet.dvi &&
+%   dvips -t letter -f gnus-booklet.dvi > gnus-booklet.ps
 
 \usepackage{ifthen}
 \ifthenelse{\isundefined{\booklettrue}}{
@@ -51,17 +59,9 @@
   \def\Guide{Booklet}\def\guide{booklet}
   \def\logoscale{0.5}% FIXME: too large for 2up printing?  --rsteib
   
-  % FIXME: Use geometry package.  --rsteib
-%   \ifthenelse{\isundefined{\letterpapertrue}}{
-%     \textwidth 4.9in \textheight 7.35in \topmargin -1.0in
-%   }{
-%     \textwidth 4.5in \textheight 7.5in \topmargin -1.0in
-%   }
-%   \oddsidemargin -0.5in \evensidemargin -0.5in
   \ifthenelse{\isundefined{\letterpapertrue}}{
     \geometry{a5paper,hmargin=10mm,tmargin=10mm,bmargin=4mm}
   }{
-    % FIXME: Use geometry package.  --rsteib
     \geometry{a5paper,hmargin=20mm,tmargin=10mm,bmargin=4mm}
   }
   
@@ -76,8 +76,9 @@
 % \input{gnusref} % % % % % % % % % % % % % % % % % % % % % % % % % %  
 %% include file for the Gnus refcard and booklet
 
-\def\progver{5.10}\def\refver{5.10-2} % program and refcard versions
-\def\date{Mar, 2005}
+\def\progver{5.10} % program version
+% \def\refver{5.10-2} % refcard version (not used)
+\def\date{April, 2006}
 \def\author{Gnus Bugfixing Girls + Boys $<$bugs@gnus.org$>$}
 
 %%
@@ -110,13 +111,17 @@
 \newcommand*{\Logo}[1]{\centerline{%
     \includegraphics[width=\logoscale\logowidth]{gnus-logo}}}
 
+%%  Contributions by:
+%% 1995 Vladimir Alexiev <vladimir@cs.ualberta.ca>
+%% 2000 Felix Natter <fnatter@gmx.net>
+%% 2001, 2002, 2003, 2005 \author.
+%% Original Gnus manual 1994 Lars Magne Ingebrigtsen
+%% Some material from Emacs Help Bindings feature (C-h b).
+%% Gnus logo by Luis Fernandes.
 \newcommand{\Copyright}{%
   \begin{center}
-    Copyright \copyright\ 1995, 2002, 2003, 2004,
-       2005, 2006 Free Software Foundation, Inc.\\*
-    Copyright \copyright\ 1995 Vladimir Alexiev
-    $<$vladimir@cs.ualberta.ca$>$.\\*
-    Copyright \copyright\ 2000 Felix Natter $<$fnatter@gmx.net$>$.\\*
+    Copyright \copyright\ 1995, 2000, 2002, 2003, 2004,
+       2005, 2006, 2007  Free Software Foundation, Inc.\\*
     Copyright \copyright\ 2001, 2002, 2003, 2004, 2005 \author.\\*
     Created from the Gnus manual Copyright \copyright\ 1994 Lars Magne
     Ingebrigtsen.\\*
@@ -1268,10 +1273,6 @@
 
 \begin{document}
 
-\def\progver{5.10}\def\refver{5.10-1} % program and refcard versions
-\def\date{Jan 10th, 2004}
-\def\author{Gnus Bugfixing Girls + Boys $<$bugs@gnus.org$>$}
-
 \ifthenelse{\isundefined{\booklettrue}}{ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \raggedbottom\raggedright
   \twocolumn