Various experimental changes to automate the distribution-building

process; documentation update.

3 files changed, 51 insertions, 30 deletions

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 2edc9ad4..af2c8d20 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -45,33 +45,23 @@ DISTFILES = Makefile.in dotlock.man  	\
 	muttrc.man			\
 	manual.sgml.head		\
 	manual.sgml.tail		\
-	manual.sgml
+	manual.sgml			\
+	manual.html
 
 srcdir_DOCFILES = PGP-Notes.txt applying-patches.txt	\
-	devel-notes.txt	\
-	manual.txt
+	devel-notes.txt
+
 
 topsrcdir_DOCFILES = COPYRIGHT GPL INSTALL ChangeLog	\
 	README NEWS TODO README.SECURITY
 
-DOCFILES = manual.txt
-
-
 all: try-html try-txt
 
-complete: all html
-
-# We don't ship the html stuff, but we build and install it
-# if sgml2html is available.  Instead of nifty autoconf magic,
-# we just do this in the makefile. ;)
-
 try-html:
-	-$(MAKE) html
+	test -f manual.html || $(MAKE) manual.html || cp $(srcdir)/manual*.html ./
 
 try-txt:
-	-$(MAKE) manual.txt
-
-html: manual.html
+	test -f manual.txt || $(MAKE) manual.txt || cp $(srcdir)/manual.txt ./
 
 install: all
 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
@@ -80,17 +70,17 @@ install: all
 	$(INSTALL) -m 644 dotlock.man $(DESTDIR)$(mandir)/man1/mutt_dotlock.1
 	$(INSTALL) -m 644 muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5
 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)
-	for f in $(DOCFILES) ; do $(INSTALL) -m 644 $$f $(DESTDIR)$(docdir) ; done
-	for f in $(srcdir_DOCFILES) ; do $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; done
-	for f in $(topsrcdir_DOCFILES) ; do $(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; done
-	if [ -f manual.html ] ; then \
-		$(MAKE) install-html ; \
-	fi
-		
-install-html: html
+	for f in $(srcdir_DOCFILES) ; do \
+		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
+	done
+	for f in $(topsrcdir_DOCFILES) ; do \
+		$(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \
+	done
+	$(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir)
 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/html
-	for f in manual*.html ; do $(INSTALL) -m 644 $$f $(DESTDIR)$(docdir)/html ; done
-
+	for file in manual*.html ; do	\
+		$(INSTALL) -m 644 $$file $(DESTDIR)$(docdir)/html/	;\
+	done
 
 uninstall:
 	-rm -f $(DESTDIR)$(mandir)/man1/mutt.1
@@ -125,6 +115,10 @@ dist distdir: Makefile $(DISTFILES)
 		ln $(srcdir)/$$file $(distdir) 2> /dev/null 	\
 			|| cp -p $(srcdir)/$$file $(distdir); 	\
 	done
+	for file in $(srcdir)/manual-*.html ; do		\
+		ln $$file $(distdir) 2> /dev/null 		\
+		|| cp -p $$file $(distdir) ;			\
+	done
 
 ../makedoc: $(top_srcdir)/makedoc.c
 	(cd .. && make makedoc)
@@ -132,7 +126,7 @@ dist distdir: Makefile $(DISTFILES)
 # hack around autoconf mixing up patterns.
 at=@
 
-update-doc:  ../makedoc stamp-doc-sgml stamp-doc-man
+update-doc:  ../makedoc stamp-doc-sgml stamp-doc-man manual.txt manual.html
 
 stamp-doc-man: ../makedoc $(top_srcdir)/init.h muttrc.man.head muttrc.man.tail
 	$(MAKEDOC_CPP) $(top_srcdir)/init.h | ../makedoc -m | 	    \
diff --git a/doc/manual.sgml b/doc/manual.sgml
index 3e301430..54f5e400 100644
--- a/doc/manual.sgml
+++ b/doc/manual.sgml
@@ -360,7 +360,7 @@ you misspelled the passphrase.
 <p><bf/list-reply/<label id="list-reply"> (default: L)<newline>
 
 Reply to the current or tagged message(s) by extracting any addresses which
-match the addresses given by the <ref id="lists" name="subscribe"> command.
+match the addresses given by the <ref id="lists" name="lists"> command.
 Using this when replying to messages posted to mailing lists help avoid
 duplicate copies being sent to the author of the message you are replying
 to.
@@ -1979,8 +1979,8 @@ If a message contains URLs (<em/unified ressource locator/ = address in the
 WWW space like <em>http://www.mutt.org/</em>), it is efficient to get
 a menu with all the URLs and start a WWW browser on one of them.  This
 functionality is provided by the external urlview program which can be
-retrieved at <htmlurl url="ftp://ftp.cs.hmc.edu/pub/me/"
-name="ftp://ftp.cs.hmc.edu/pub/me/"> and the configuration commands:
+retrieved at <htmlurl url="ftp://ftp.guug.de/pub/mutt/contrib/"
+name="ftp://ftp.guug.de/pub/mutt/contrib/"> and the configuration commands:
 <tscreen><verb>
 macro index \cb |urlview\n
 macro pager \cb |urlview\n
@@ -3301,6 +3301,19 @@ Your login name on the IMAP server.
 This variable defaults to your user name on the local machine.
 
 
+<sect2>imap&lowbar;cramkey<label id="imap_cramkey">
+<p>
+Type: string<newline>
+Default: &dquot;&dquot;
+
+<p>
+Sets your CRAM secret, for use with the CRAM-MD5 IMAP authentication
+method (this is the IMAP equivelent of APOP). This method will be
+attempted automatically if the server supports it, in preference to the
+less secure login technique. If you use CRAM-MD5, you do not need to set
+<em>imap&lowbar;pass</em>.
+
+
 <sect2>imap&lowbar;pass<label id="imap_pass">
 <p>
 Type: string<newline>
diff --git a/doc/muttrc.man b/doc/muttrc.man
index dfc40134..76913056 100644
--- a/doc/muttrc.man
+++ b/doc/muttrc.man
@@ -1238,6 +1238,20 @@ This variable defaults to your user name on the local machine.
 
 
 .TP
+.B imap_cramkey
+.nf
+Type: string
+Default: \(lq\(rq
+.fi
+.IP
+Sets your CRAM secret, for use with the CRAM-MD5 IMAP authentication
+method (this is the IMAP equivelent of APOP). This method will be
+attempted automatically if the server supports it, in preference to the
+less secure login technique. If you use CRAM-MD5, you do not need to set
+\fIimap_pass\fP.
+
+
+.TP
 .B imap_pass
 .nf
 Type: string