[gnus git] branch master updated: =2= Merge branch 'master' of https://git.gnus.org/gnus ; WEBHACKDEVEL work
Ted Zlatanov <[email protected]>
| Newsgroups | gmane.emacs.gnus.cvs |
|---|---|
| Message-ID | <[email protected]> |
via c53e620be69a4971be0082fe5ed0c96c467340f6 (commit)
via 293540b6b900616ad92f22e87874f83ddefa383e (commit)
from 0818e4b2112e08b043f47fd3c5e950a2f12f691a (commit)
- Log -----------------------------------------------------------------
commit c53e620be69a4971be0082fe5ed0c96c467340f6
Merge: 293540b 0818e4b
Author: Ted Zlatanov <[email protected]>
Date: Fri Feb 4 13:21:58 2011 -0600
Merge branch 'master' of https://git.gnus.org/gnus
Conflicts:
texi/ChangeLog
texi/gnus.texi
diff --cc texi/ChangeLog
index b1c11bb,c0c35d0..926511b
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@@ -1,24 -1,7 +1,28 @@@
+2011-02-04 Teodor Zlatanov <[email protected]>
+
+ * overrides.texi: New file to set or clear WEBHACKDEVEL.
+
+ * sieve.texi: Use WEBHACKDEVEL.
+
+ * sasl.texi: Use WEBHACKDEVEL.
+
+ * pgg.texi: Use WEBHACKDEVEL.
+
+ * message.texi: Use WEBHACKDEVEL.
+
+ * gnus.texi: Use WEBHACKDEVEL.
+
+ * emacs-mime.texi: Use WEBHACKDEVEL.
+
+ * auth.texi: Use WEBHACKDEVEL.
+
+ * Makefile.in (webhack, nowebhack): Hacks to produce for-the-web
+ manuals.
+
+ 2011-02-04 Lars Ingebrigtsen <[email protected]>
+
+ * gnus.texi: Add DEVEL header (suggested by Andreas Schwab).
+
2011-02-03 Lars Ingebrigtsen <[email protected]>
* gnus.texi (Article Date): Remove mention of gnus-stop-date-timer,
commit 293540b6b900616ad92f22e87874f83ddefa383e
Author: Ted Zlatanov <[email protected]>
Date: Fri Feb 4 13:19:08 2011 -0600
WEBHACKDEVEL work
* Makefile.in (webhack, nowebhack): Hacks to produce for-the-web
manuals.
* auth.texi: Use WEBHACKDEVEL.
* emacs-mime.texi: Use WEBHACKDEVEL.
* gnus.texi: Use WEBHACKDEVEL.
* message.texi: Use WEBHACKDEVEL.
* pgg.texi: Use WEBHACKDEVEL.
* sasl.texi: Use WEBHACKDEVEL.
* sieve.texi: Use WEBHACKDEVEL.
* overrides.texi: New file to set or clear WEBHACKDEVEL.
diff --git a/texi/ChangeLog b/texi/ChangeLog
index 5c4f0d0..b1c11bb 100644
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,24 @@
+2011-02-04 Teodor Zlatanov <[email protected]>
+
+ * overrides.texi: New file to set or clear WEBHACKDEVEL.
+
+ * sieve.texi: Use WEBHACKDEVEL.
+
+ * sasl.texi: Use WEBHACKDEVEL.
+
+ * pgg.texi: Use WEBHACKDEVEL.
+
+ * message.texi: Use WEBHACKDEVEL.
+
+ * gnus.texi: Use WEBHACKDEVEL.
+
+ * emacs-mime.texi: Use WEBHACKDEVEL.
+
+ * auth.texi: Use WEBHACKDEVEL.
+
+ * Makefile.in (webhack, nowebhack): Hacks to produce for-the-web
+ manuals.
+
2011-02-03 Lars Ingebrigtsen <[email protected]>
* gnus.texi (Article Date): Remove mention of gnus-stop-date-timer,
diff --git a/texi/Makefile.in b/texi/Makefile.in
index 5b10e04..832350c 100644
--- a/texi/Makefile.in
+++ b/texi/Makefile.in
@@ -25,6 +25,12 @@ LOGO=gnus-logo
all: $(INFO_DEPS)
+webhack: clean
+ echo '@set WEBHACKDEVEL' > overrides.texi
+
+nowebhack: clean
+ echo '@clear WEBHACKDEVEL' > overrides.texi
+
most: texi2latex.elc latex latexps
.SUFFIXES: .texi .dvi .ps .pdf .latexi .dvi-x .pdf-x
diff --git a/texi/auth.texi b/texi/auth.texi
index 1f88d4c..d5d75bb 100644
--- a/texi/auth.texi
+++ b/texi/auth.texi
@@ -1,4 +1,7 @@
\input texinfo @c -*-texinfo-*-
+
+@include overrides.texi
+
@setfilename auth
@settitle Emacs auth-source Library @value{VERSION}
@@ -35,7 +38,12 @@ license to the document, as described in section 6 of the license.
@end direntry
@titlepage
+@ifset WEBHACKDEVEL
+@title Emacs auth-source Library (DEVELOPMENT VERSION)
+@end ifset
+@ifclear WEBHACKDEVEL
@title Emacs auth-source Library
+@end ifclear
@author by Ted Zlatanov
@page
@vskip 0pt plus 1filll
diff --git a/texi/emacs-mime.texi b/texi/emacs-mime.texi
index 45efc29..fd0a1d8 100644
--- a/texi/emacs-mime.texi
+++ b/texi/emacs-mime.texi
@@ -1,5 +1,7 @@
\input texinfo
+@include overrides.texi
+
@setfilename emacs-mime
@settitle Emacs MIME Manual
@synindex fn cp
@@ -38,7 +40,12 @@ developing GNU and promoting software freedom.''
@setchapternewpage odd
@titlepage
+@ifset WEBHACKDEVEL
+@title Emacs MIME Manual (DEVELOPMENT VERSION)
+@end ifset
+@ifclear WEBHACKDEVEL
@title Emacs MIME Manual
+@end ifclear
@author by Lars Magne Ingebrigtsen
@page
diff --git a/texi/gnus.texi b/texi/gnus.texi
index d89493c..d54ea50 100644
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -1,5 +1,7 @@
\input texinfo
+@include overrides.texi
+
@setfilename gnus
@settitle Gnus Manual
@syncodeindex fn cp
@@ -329,7 +331,12 @@ developing GNU and promoting software freedom.''
@titlepage
+@ifset WEBHACKDEVEL
+@title Gnus Manual (DEVELOPMENT VERSION)
+@end ifset
+@ifclear WEBHACKDEVEL
@title Gnus Manual
+@end ifclear
@author by Lars Magne Ingebrigtsen
@page
diff --git a/texi/message.texi b/texi/message.texi
index df437dc..30127d8 100644
--- a/texi/message.texi
+++ b/texi/message.texi
@@ -1,5 +1,7 @@
\input texinfo @c -*-texinfo-*-
+@include overrides.texi
+
@setfilename message
@settitle Message Manual
@synindex fn cp
@@ -34,7 +36,12 @@ developing GNU and promoting software freedom.''
@end iftex
@titlepage
+@ifset WEBHACKDEVEL
+@title Message Manual (DEVELOPMENT VERSION)
+@end ifset
+@ifclear WEBHACKDEVEL
@title Message Manual
+@end ifclear
@author by Lars Magne Ingebrigtsen
@page
diff --git a/texi/overrides.texi b/texi/overrides.texi
new file mode 100644
index 0000000..369462b
--- /dev/null
+++ b/texi/overrides.texi
@@ -0,0 +1 @@
+@clear WEBHACKDEVEL
diff --git a/texi/pgg.texi b/texi/pgg.texi
index 482fd0f..d67823b 100644
--- a/texi/pgg.texi
+++ b/texi/pgg.texi
@@ -1,5 +1,7 @@
\input texinfo @c -*-texinfo-*-
+@include overrides.texi
+
@setfilename pgg
@settitle PGG @value{VERSION}
@@ -31,7 +33,12 @@ developing GNU and promoting software freedom.''
@end direntry
@titlepage
+@ifset WEBHACKDEVEL
+@title PGG (DEVELOPMENT VERSION)
+@end ifset
+@ifclear WEBHACKDEVEL
@title PGG
+@end ifclear
@author by Daiki Ueno
@page
diff --git a/texi/sasl.texi b/texi/sasl.texi
index 67b55dd..6d6ed9d 100644
--- a/texi/sasl.texi
+++ b/texi/sasl.texi
@@ -1,5 +1,7 @@
\input texinfo @c -*-texinfo-*-
+@include overrides.texi
+
@setfilename sasl.info
@set VERSION 0.2
@@ -38,7 +40,12 @@ license to the document, as described in section 6 of the license.
@titlepage
+@ifset WEBHACKDEVEL
+@title Emacs SASL Library @value{VERSION} (DEVELOPMENT VERSION)
+@end ifset
+@ifclear WEBHACKDEVEL
@title Emacs SASL Library @value{VERSION}
+@end ifclear
@author by Daiki Ueno
@page
diff --git a/texi/sieve.texi b/texi/sieve.texi
index 4481955..c30539d 100644
--- a/texi/sieve.texi
+++ b/texi/sieve.texi
@@ -1,5 +1,7 @@
\input texinfo @c -*-texinfo-*-
+@include overrides.texi
+
@setfilename sieve
@settitle Emacs Sieve Manual
@synindex fn cp
@@ -35,7 +37,12 @@ developing GNU and promoting software freedom.''
@setchapternewpage odd
@titlepage
+@ifset WEBHACKDEVEL
+@title Emacs Sieve Manual (DEVELOPMENT VERSION)
+@end ifset
+@ifclear WEBHACKDEVEL
@title Emacs Sieve Manual
+@end ifclear
@author by Simon Josefsson
@page
-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.
Summary of changes:
texi/ChangeLog | 21 +++++++++++++++++++++
texi/Makefile.in | 6 ++++++
texi/auth.texi | 8 ++++++++
texi/emacs-mime.texi | 7 +++++++
texi/gnus.texi | 11 +++++++----
texi/message.texi | 7 +++++++
texi/overrides.texi | 1 +
texi/pgg.texi | 7 +++++++
texi/sasl.texi | 7 +++++++
texi/sieve.texi | 7 +++++++
10 files changed, 78 insertions(+), 4 deletions(-)
create mode 100644 texi/overrides.texi
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".
The branch, master has been updated
hooks/post-receive
--
Gnus Project