aboutsummaryrefslogtreecommitdiffstats
path: root/doc/misc
diff options
context:
space:
mode:
authorPaul Eggert2013-01-02 08:37:04 -0800
committerPaul Eggert2013-01-02 08:37:04 -0800
commit9ff99d22a01be4cafc27064ad8474672eb2fe09b (patch)
tree3e8e69c0cbf6db321ef58c9dc5ac6924a5b6f368 /doc/misc
parent09b8afb6c8b235279dac6cdc7ffee68b782712ac (diff)
downloademacs-9ff99d22a01be4cafc27064ad8474672eb2fe09b.tar.gz
emacs-9ff99d22a01be4cafc27064ad8474672eb2fe09b.zip
Merge from gnulib.
Diffstat (limited to 'doc/misc')
-rw-r--r--doc/misc/texinfo.tex7
1 files changed, 4 insertions, 3 deletions
diff --git a/doc/misc/texinfo.tex b/doc/misc/texinfo.tex
index b5f31415771..d64f45bbee9 100644
--- a/doc/misc/texinfo.tex
+++ b/doc/misc/texinfo.tex
@@ -3,11 +3,11 @@
3% Load plain if necessary, i.e., if running under initex. 3% Load plain if necessary, i.e., if running under initex.
4\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi 4\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
5% 5%
6\def\texinfoversion{2012-11-08.11} 6\def\texinfoversion{2013-01-01.15}
7% 7%
8% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, 8% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
9% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 9% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
10% 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. 10% 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
11% 11%
12% This texinfo.tex file is free software: you can redistribute it and/or 12% This texinfo.tex file is free software: you can redistribute it and/or
13% modify it under the terms of the GNU General Public License as 13% modify it under the terms of the GNU General Public License as
@@ -24,7 +24,8 @@
24% 24%
25% As a special exception, when this file is read by TeX when processing 25% As a special exception, when this file is read by TeX when processing
26% a Texinfo source document, you may use the result without 26% a Texinfo source document, you may use the result without
27% restriction. (This has been our intent since Texinfo was invented.) 27% restriction. This Exception is an additional permission under section 7
28% of the GNU General Public License, version 3 ("GPLv3").
28% 29%
29% Please try the latest version of texinfo.tex before submitting bug 30% Please try the latest version of texinfo.tex before submitting bug
30% reports; you can get the latest version from: 31% reports; you can get the latest version from: