aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2014-02-18 13:15:29 -0500
committerGlenn Morris2014-02-18 13:15:29 -0500
commit6cdb34f31fcccb19e0a9e5f2853c1d5fffc87a11 (patch)
tree9ef25c05c5521272a0489a05e170233b946a58f9
parentb28df58ce5da592a41c23a1563fd68446ed80aa4 (diff)
downloademacs-6cdb34f31fcccb19e0a9e5f2853c1d5fffc87a11.tar.gz
emacs-6cdb34f31fcccb19e0a9e5f2853c1d5fffc87a11.zip
* doc/emacs/trouble.texi (Contributing) [WWW_GNU_ORG]: Link to gnu.org version
of etc/CONTRIBUTE in html output.
-rw-r--r--doc/emacs/ChangeLog3
-rw-r--r--doc/emacs/trouble.texi13
2 files changed, 15 insertions, 1 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index fbb2dbbf092..c16920d38df 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,5 +1,8 @@
12014-02-18 Glenn Morris <rgm@gnu.org> 12014-02-18 Glenn Morris <rgm@gnu.org>
2 2
3 * trouble.texi (Contributing) [WWW_GNU_ORG]: Link to
4 gnu.org version of etc/CONTRIBUTE in html output.
5
3 * misc.texi (Saving Emacs Sessions): Mention desktop-auto-save-timeout. 6 * misc.texi (Saving Emacs Sessions): Mention desktop-auto-save-timeout.
4 7
52014-02-17 Stefan Monnier <monnier@iro.umontreal.ca> 82014-02-17 Stefan Monnier <monnier@iro.umontreal.ca>
diff --git a/doc/emacs/trouble.texi b/doc/emacs/trouble.texi
index eeb810fccb7..e7bff6c28a4 100644
--- a/doc/emacs/trouble.texi
+++ b/doc/emacs/trouble.texi
@@ -1174,7 +1174,18 @@ repository where it is actively maintained by a group of developers.
1174See the Emacs project page 1174See the Emacs project page
1175@url{http://savannah.gnu.org/projects/emacs/} for details. 1175@url{http://savannah.gnu.org/projects/emacs/} for details.
1176 1176
1177For more information on how to contribute, see the @file{etc/CONTRIBUTE} 1177For more information on how to contribute, see the
1178@ifset WWW_GNU_ORG
1179@ifhtml
1180@url{http://gnu.org/software/emacs/CONTRIBUTE, etc/CONTRIBUTE}
1181@end ifhtml
1182@ifnothtml
1183@file{etc/CONTRIBUTE}
1184@end ifnothtml
1185@end ifset
1186@ifclear WWW_GNU_ORG
1187@file{etc/CONTRIBUTE}
1188@end ifclear
1178file in the Emacs distribution. 1189file in the Emacs distribution.
1179 1190
1180@node Service 1191@node Service