summaryrefslogtreecommitdiff
path: root/gnu/usr.bin/texinfo/doc
diff options
context:
space:
mode:
Diffstat (limited to 'gnu/usr.bin/texinfo/doc')
-rw-r--r--gnu/usr.bin/texinfo/doc/README11
-rw-r--r--gnu/usr.bin/texinfo/doc/fdl.texi225
-rw-r--r--gnu/usr.bin/texinfo/doc/info.128
-rw-r--r--gnu/usr.bin/texinfo/doc/info.52
-rw-r--r--gnu/usr.bin/texinfo/doc/install-info.120
-rw-r--r--gnu/usr.bin/texinfo/doc/makeinfo.151
-rw-r--r--gnu/usr.bin/texinfo/doc/mdate-sh95
-rw-r--r--gnu/usr.bin/texinfo/doc/stamp-18
-rw-r--r--gnu/usr.bin/texinfo/doc/stamp-vti8
-rw-r--r--gnu/usr.bin/texinfo/doc/texi2dvi.130
-rw-r--r--gnu/usr.bin/texinfo/doc/texindex.110
-rw-r--r--gnu/usr.bin/texinfo/doc/texinfo.56
-rw-r--r--gnu/usr.bin/texinfo/doc/txi-cs.tex6
-rw-r--r--gnu/usr.bin/texinfo/doc/txi-de.tex6
-rw-r--r--gnu/usr.bin/texinfo/doc/txi-en.tex4
-rw-r--r--gnu/usr.bin/texinfo/doc/txi-es.tex2
-rw-r--r--gnu/usr.bin/texinfo/doc/txi-fr.tex4
-rw-r--r--gnu/usr.bin/texinfo/doc/txi-it.tex69
-rw-r--r--gnu/usr.bin/texinfo/doc/txi-nl.tex4
-rw-r--r--gnu/usr.bin/texinfo/doc/txi-no.tex2
-rw-r--r--gnu/usr.bin/texinfo/doc/txi-pl.tex73
-rw-r--r--gnu/usr.bin/texinfo/doc/txi-pt.tex4
-rw-r--r--gnu/usr.bin/texinfo/doc/txi-tr.tex82
-rw-r--r--gnu/usr.bin/texinfo/doc/version-stnd.texi8
-rw-r--r--gnu/usr.bin/texinfo/doc/version.texi8
25 files changed, 571 insertions, 195 deletions
diff --git a/gnu/usr.bin/texinfo/doc/README b/gnu/usr.bin/texinfo/doc/README
index dc734a6e104..6ff98d637af 100644
--- a/gnu/usr.bin/texinfo/doc/README
+++ b/gnu/usr.bin/texinfo/doc/README
@@ -1,3 +1,12 @@
+$Id: README,v 1.1.1.5 2006/07/17 16:03:51 espie Exp $
+texinfo/doc/README
+
+ Copyright (C) 2002 Free Software Foundation, Inc.
+
+ Copying and distribution of this file, with or without modification,
+ are permitted in any medium without royalty provided the copyright
+ notice and this notice are preserved.
+
This directory contains documentation on the Texinfo system and the TeX
sources needed to process Texinfo sources. We recommend using the
texi2dvi included in this distribution to run a Texinfo manual through
@@ -23,7 +32,7 @@ ones, you very likely have to update your ls-R file; do this with the
mktexlsr command. In older versions, this was named MakeTeXls-R.
You can get the latest texinfo.tex from
-ftp://ftp.gnu.org/gnu/texinfo.tex (and all GNU mirrors)
+ftp://ftp.gnu.org/gnu/texinfo/texinfo.tex (and all GNU mirrors)
ftp://tug.org/tex/texinfo.tex (and all CTAN mirrors)
or on the FSF machines in /home/gd/gnu/doc/texinfo.tex.
If you have problems with the version in this distribution, please check
diff --git a/gnu/usr.bin/texinfo/doc/fdl.texi b/gnu/usr.bin/texinfo/doc/fdl.texi
index 361f90f7bb5..11737cc89bd 100644
--- a/gnu/usr.bin/texinfo/doc/fdl.texi
+++ b/gnu/usr.bin/texinfo/doc/fdl.texi
@@ -3,10 +3,10 @@
@appendixsec GNU Free Documentation License
@cindex FDL, GNU Free Documentation License
-@center Version 1.1, March 2000
+@center Version 1.2, November 2002
@display
-Copyright @copyright{} 2000 Free Software Foundation, Inc.
+Copyright @copyright{} 2000,2001,2002 Free Software Foundation, Inc.
59 Temple Place, Suite 330, Boston, MA 02111-1307, USA
Everyone is permitted to copy and distribute verbatim copies
@@ -18,12 +18,12 @@ of this license document, but changing it is not allowed.
PREAMBLE
The purpose of this License is to make a manual, textbook, or other
-written document @dfn{free} in the sense of freedom: to assure everyone
-the effective freedom to copy and redistribute it, with or without
-modifying it, either commercially or noncommercially. Secondarily,
-this License preserves for the author and publisher a way to get
-credit for their work, while not being considered responsible for
-modifications made by others.
+functional and useful document @dfn{free} in the sense of freedom: to
+assure everyone the effective freedom to copy and redistribute it,
+with or without modifying it, either commercially or noncommercially.
+Secondarily, this License preserves for the author and publisher a way
+to get credit for their work, while not being considered responsible
+for modifications made by others.
This License is a kind of ``copyleft'', which means that derivative
works of the document must themselves be free in the same sense. It
@@ -41,57 +41,69 @@ principally for works whose purpose is instruction or reference.
@item
APPLICABILITY AND DEFINITIONS
-This License applies to any manual or other work that contains a
-notice placed by the copyright holder saying it can be distributed
-under the terms of this License. The ``Document'', below, refers to any
-such manual or work. Any member of the public is a licensee, and is
-addressed as ``you''.
+This License applies to any manual or other work, in any medium, that
+contains a notice placed by the copyright holder saying it can be
+distributed under the terms of this License. Such a notice grants a
+world-wide, royalty-free license, unlimited in duration, to use that
+work under the conditions stated herein. The ``Document'', below,
+refers to any such manual or work. Any member of the public is a
+licensee, and is addressed as ``you''. You accept the license if you
+copy, modify or distribute the work in a way requiring permission
+under copyright law.
A ``Modified Version'' of the Document means any work containing the
Document or a portion of it, either copied verbatim, or with
modifications and/or translated into another language.
-A ``Secondary Section'' is a named appendix or a front-matter section of
-the Document that deals exclusively with the relationship of the
-publishers or authors of the Document to the Document's overall subject
-(or to related matters) and contains nothing that could fall directly
-within that overall subject. (For example, if the Document is in part a
-textbook of mathematics, a Secondary Section may not explain any
-mathematics.) The relationship could be a matter of historical
+A ``Secondary Section'' is a named appendix or a front-matter section
+of the Document that deals exclusively with the relationship of the
+publishers or authors of the Document to the Document's overall
+subject (or to related matters) and contains nothing that could fall
+directly within that overall subject. (Thus, if the Document is in
+part a textbook of mathematics, a Secondary Section may not explain
+any mathematics.) The relationship could be a matter of historical
connection with the subject or with related matters, or of legal,
commercial, philosophical, ethical or political position regarding
them.
The ``Invariant Sections'' are certain Secondary Sections whose titles
are designated, as being those of Invariant Sections, in the notice
-that says that the Document is released under this License.
+that says that the Document is released under this License. If a
+section does not fit the above definition of Secondary then it is not
+allowed to be designated as Invariant. The Document may contain zero
+Invariant Sections. If the Document does not identify any Invariant
+Sections then there are none.
The ``Cover Texts'' are certain short passages of text that are listed,
as Front-Cover Texts or Back-Cover Texts, in the notice that says that
-the Document is released under this License.
+the Document is released under this License. A Front-Cover Text may
+be at most 5 words, and a Back-Cover Text may be at most 25 words.
A ``Transparent'' copy of the Document means a machine-readable copy,
represented in a format whose specification is available to the
-general public, whose contents can be viewed and edited directly and
+general public, that is suitable for revising the document
straightforwardly with generic text editors or (for images composed of
pixels) generic paint programs or (for drawings) some widely available
drawing editor, and that is suitable for input to text formatters or
for automatic translation to a variety of formats suitable for input
to text formatters. A copy made in an otherwise Transparent file
-format whose markup has been designed to thwart or discourage
-subsequent modification by readers is not Transparent. A copy that is
-not ``Transparent'' is called ``Opaque''.
+format whose markup, or absence of markup, has been arranged to thwart
+or discourage subsequent modification by readers is not Transparent.
+An image format is not Transparent if used for any substantial amount
+of text. A copy that is not ``Transparent'' is called ``Opaque''.
Examples of suitable formats for Transparent copies include plain
-@sc{ascii} without markup, Texinfo input format, La@TeX{} input format,
-@acronym{SGML} or @acronym{XML} using a publicly available
-@acronym{DTD}, and standard-conforming simple @acronym{HTML} designed
-for human modification. Opaque formats include PostScript,
-@acronym{PDF}, proprietary formats that can be read and edited only by
-proprietary word processors, @acronym{SGML} or @acronym{XML} for which
-the @acronym{DTD} and/or processing tools are not generally available,
-and the machine-generated @acronym{HTML} produced by some word
-processors for output purposes only.
+@sc{ascii} without markup, Texinfo input format, La@TeX{} input
+format, @acronym{SGML} or @acronym{XML} using a publicly available
+@acronym{DTD}, and standard-conforming simple @acronym{HTML},
+PostScript or @acronym{PDF} designed for human modification. Examples
+of transparent image formats include @acronym{PNG}, @acronym{XCF} and
+@acronym{JPG}. Opaque formats include proprietary formats that can be
+read and edited only by proprietary word processors, @acronym{SGML} or
+@acronym{XML} for which the @acronym{DTD} and/or processing tools are
+not generally available, and the machine-generated @acronym{HTML},
+PostScript or @acronym{PDF} produced by some word processors for
+output purposes only.
The ``Title Page'' means, for a printed book, the title page itself,
plus such following pages as are needed to hold, legibly, the material
@@ -100,6 +112,21 @@ formats which do not have any title page as such, ``Title Page'' means
the text near the most prominent appearance of the work's title,
preceding the beginning of the body of the text.
+A section ``Entitled XYZ'' means a named subunit of the Document whose
+title either is precisely XYZ or contains XYZ in parentheses following
+text that translates XYZ in another language. (Here XYZ stands for a
+specific section name mentioned below, such as ``Acknowledgements'',
+``Dedications'', ``Endorsements'', or ``History''.) To ``Preserve the Title''
+of such a section when you modify the Document means that it remains a
+section ``Entitled XYZ'' according to this definition.
+
+The Document may include Warranty Disclaimers next to the notice which
+states that this License applies to the Document. These Warranty
+Disclaimers are considered to be included by reference in this
+License, but only as regards disclaiming warranties: any other
+implication that these Warranty Disclaimers may have is void and has
+no effect on the meaning of this License.
+
@item
VERBATIM COPYING
@@ -119,9 +146,10 @@ you may publicly display copies.
@item
COPYING IN QUANTITY
-If you publish printed copies of the Document numbering more than 100,
-and the Document's license notice requires Cover Texts, you must enclose
-the copies in covers that carry, clearly and legibly, all these Cover
+If you publish printed copies (or copies in media that commonly have
+printed covers) of the Document, numbering more than 100, and the
+Document's license notice requires Cover Texts, you must enclose the
+copies in covers that carry, clearly and legibly, all these Cover
Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
the back cover. Both covers must also clearly and legibly identify
you as the publisher of these copies. The front cover must present
@@ -139,16 +167,15 @@ pages.
If you publish or distribute Opaque copies of the Document numbering
more than 100, you must either include a machine-readable Transparent
copy along with each Opaque copy, or state in or with each Opaque copy
-a publicly-accessible computer-network location containing a complete
-Transparent copy of the Document, free of added material, which the
-general network-using public has access to download anonymously at no
-charge using public-standard network protocols. If you use the latter
-option, you must take reasonably prudent steps, when you begin
-distribution of Opaque copies in quantity, to ensure that this
-Transparent copy will remain thus accessible at the stated location
-until at least one year after the last time you distribute an Opaque
-copy (directly or through your agents or retailers) of that edition to
-the public.
+a computer-network location from which the general network-using
+public has access to download using public-standard network protocols
+a complete Transparent copy of the Document, free of added material.
+If you use the latter option, you must take reasonably prudent steps,
+when you begin distribution of Opaque copies in quantity, to ensure
+that this Transparent copy will remain thus accessible at the stated
+location until at least one year after the last time you distribute an
+Opaque copy (directly or through your agents or retailers) of that
+edition to the public.
It is requested, but not required, that you contact the authors of the
Document well before redistributing any large number of copies, to give
@@ -176,7 +203,8 @@ if the original publisher of that version gives permission.
List on the Title Page, as authors, one or more persons or entities
responsible for authorship of the modifications in the Modified
Version, together with at least five of the principal authors of the
-Document (all of its principal authors, if it has less than five).
+Document (all of its principal authors, if it has fewer than five),
+unless they release you from this requirement.
@item
State on the Title page the name of the publisher of the
@@ -202,10 +230,10 @@ and required Cover Texts given in the Document's license notice.
Include an unaltered copy of this License.
@item
-Preserve the section entitled ``History'', and its title, and add to
-it an item stating at least the title, year, new authors, and
+Preserve the section Entitled ``History'', Preserve its Title, and add
+to it an item stating at least the title, year, new authors, and
publisher of the Modified Version as given on the Title Page. If
-there is no section entitled ``History'' in the Document, create one
+there is no section Entitled ``History'' in the Document, create one
stating the title, year, authors, and publisher of the Document as
given on its Title Page, then add an item describing the Modified
Version as stated in the previous sentence.
@@ -220,10 +248,10 @@ least four years before the Document itself, or if the original
publisher of the version it refers to gives permission.
@item
-In any section entitled ``Acknowledgments'' or ``Dedications'',
-preserve the section's title, and preserve in the section all the
-substance and tone of each of the contributor acknowledgments
-and/or dedications given therein.
+For any section Entitled ``Acknowledgements'' or ``Dedications'', Preserve
+the Title of the section, and preserve in the section all the
+substance and tone of each of the contributor acknowledgements and/or
+dedications given therein.
@item
Preserve all the Invariant Sections of the Document,
@@ -231,12 +259,15 @@ unaltered in their text and in their titles. Section numbers
or the equivalent are not considered part of the section titles.
@item
-Delete any section entitled ``Endorsements''. Such a section
+Delete any section Entitled ``Endorsements''. Such a section
may not be included in the Modified Version.
@item
-Do not retitle any existing section as ``Endorsements''
-or to conflict in title with any Invariant Section.
+Do not retitle any existing section to be Entitled ``Endorsements'' or
+to conflict in title with any Invariant Section.
+
+@item
+Preserve any Warranty Disclaimers.
@end enumerate
If the Modified Version includes new front-matter sections or
@@ -246,7 +277,7 @@ of these sections as invariant. To do this, add their titles to the
list of Invariant Sections in the Modified Version's license notice.
These titles must be distinct from any other section titles.
-You may add a section entitled ``Endorsements'', provided it contains
+You may add a section Entitled ``Endorsements'', provided it contains
nothing but endorsements of your Modified Version by various
parties---for example, statements of peer review or that the text has
been approved by an organization as the authoritative definition of a
@@ -274,7 +305,7 @@ License, under the terms defined in section 4 above for modified
versions, provided that you include in the combination all of the
Invariant Sections of all of the original documents, unmodified, and
list them all as Invariant Sections of your combined work in its
-license notice.
+license notice, and that you preserve all their Warranty Disclaimers.
The combined work need only contain one copy of this License, and
multiple identical Invariant Sections may be replaced with a single
@@ -285,11 +316,11 @@ author or publisher of that section if known, or else a unique number.
Make the same adjustment to the section titles in the list of
Invariant Sections in the license notice of the combined work.
-In the combination, you must combine any sections entitled ``History''
-in the various original documents, forming one section entitled
-``History''; likewise combine any sections entitled ``Acknowledgments'',
-and any sections entitled ``Dedications''. You must delete all sections
-entitled ``Endorsements.''
+In the combination, you must combine any sections Entitled ``History''
+in the various original documents, forming one section Entitled
+``History''; likewise combine any sections Entitled ``Acknowledgements'',
+and any sections Entitled ``Dedications''. You must delete all
+sections Entitled ``Endorsements.''
@item
COLLECTIONS OF DOCUMENTS
@@ -310,18 +341,20 @@ AGGREGATION WITH INDEPENDENT WORKS
A compilation of the Document or its derivatives with other separate
and independent documents or works, in or on a volume of a storage or
-distribution medium, does not as a whole count as a Modified Version
-of the Document, provided no compilation copyright is claimed for the
-compilation. Such a compilation is called an ``aggregate'', and this
-License does not apply to the other self-contained works thus compiled
-with the Document, on account of their being thus compiled, if they
-are not themselves derivative works of the Document.
+distribution medium, is called an ``aggregate'' if the copyright
+resulting from the compilation is not used to limit the legal rights
+of the compilation's users beyond what the individual works permit.
+When the Document is included in an aggregate, this License does not
+apply to the other works in the aggregate which are not themselves
+derivative works of the Document.
If the Cover Text requirement of section 3 is applicable to these
-copies of the Document, then if the Document is less than one quarter
-of the entire aggregate, the Document's Cover Texts may be placed on
-covers that surround only the Document within the aggregate.
-Otherwise they must appear on covers around the whole aggregate.
+copies of the Document, then if the Document is less than one half of
+the entire aggregate, the Document's Cover Texts may be placed on
+covers that bracket the Document within the aggregate, or the
+electronic equivalent of covers if the Document is in electronic form.
+Otherwise they must appear on printed covers that bracket the whole
+aggregate.
@item
TRANSLATION
@@ -332,10 +365,17 @@ Replacing Invariant Sections with translations requires special
permission from their copyright holders, but you may include
translations of some or all Invariant Sections in addition to the
original versions of these Invariant Sections. You may include a
-translation of this License provided that you also include the
-original English version of this License. In case of a disagreement
-between the translation and the original English version of this
-License, the original English version will prevail.
+translation of this License, and all the license notices in the
+Document, and any Warranty Disclaimers, provided that you also include
+the original English version of this License and the original versions
+of those notices and disclaimers. In case of a disagreement between
+the translation and the original version of this License or a notice
+or disclaimer, the original version will prevail.
+
+If a section in the Document is Entitled ``Acknowledgements'',
+``Dedications'', or ``History'', the requirement (section 4) to Preserve
+its Title (section 1) will typically require changing the actual
+title.
@item
TERMINATION
@@ -378,19 +418,28 @@ license notices just after the title page:
@group
Copyright (C) @var{year} @var{your name}.
Permission is granted to copy, distribute and/or modify this document
- under the terms of the GNU Free Documentation License, Version 1.1
+ under the terms of the GNU Free Documentation License, Version 1.2
or any later version published by the Free Software Foundation;
- with the Invariant Sections being @var{list their titles}, with the
- Front-Cover Texts being @var{list}, and with the Back-Cover Texts being @var{list}.
- A copy of the license is included in the section entitled ``GNU
+ with no Invariant Sections, no Front-Cover Texts, and no Back-Cover
+ Texts. A copy of the license is included in the section entitled ``GNU
Free Documentation License''.
@end group
@end smallexample
-If you have no Invariant Sections, write ``with no Invariant Sections''
-instead of saying which ones are invariant. If you have no
-Front-Cover Texts, write ``no Front-Cover Texts'' instead of
-``Front-Cover Texts being @var{list}''; likewise for Back-Cover Texts.
+If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
+replace the ``with...Texts.'' line with this:
+
+@smallexample
+@group
+ with the Invariant Sections being @var{list their titles}, with
+ the Front-Cover Texts being @var{list}, and with the Back-Cover Texts
+ being @var{list}.
+@end group
+@end smallexample
+
+If you have Invariant Sections without Cover Texts, or some other
+combination of the three, merge those two alternatives to suit the
+situation.
If your document contains nontrivial examples of program code, we
recommend releasing these examples in parallel under your choice of
diff --git a/gnu/usr.bin/texinfo/doc/info.1 b/gnu/usr.bin/texinfo/doc/info.1
index 4f7808ae7c5..39ca1d32ac3 100644
--- a/gnu/usr.bin/texinfo/doc/info.1
+++ b/gnu/usr.bin/texinfo/doc/info.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24.
-.TH INFO "1" "April 2002" "GNU texinfo 4.2" FSF
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.34.
+.TH INFO "1" "December 2004" "info 4.8" "User Commands"
.SH NAME
info \- read Info documents
.SH SYNOPSIS
@@ -34,24 +34,30 @@ specify nodes in first visited Info file.
output selected nodes to FILENAME.
.TP
\fB\-R\fR, \fB\-\-raw\-escapes\fR
-don't remove ANSI escapes from man pages.
+output "raw" ANSI escapes (default).
+.TP
+\fB\-\-no\-raw\-escapes\fR
+output escapes as literal text.
.TP
\fB\-\-restore\fR=\fIFILENAME\fR
read initial keystrokes from FILENAME.
.TP
\fB\-O\fR, \fB\-\-show\-options\fR, \fB\-\-usage\fR
-go to command-line options node.
+go to command\-line options node.
.TP
\fB\-\-subnodes\fR
recursively output menu items.
.TP
+\fB\-w\fR, \fB\-\-where\fR, \fB\-\-location\fR
+print physical location of Info file.
+.TP
\fB\-\-vi\-keys\fR
-use vi-like and less-like key bindings.
+use vi\-like and less\-like key bindings.
.TP
\fB\-\-version\fR
display version information and exit.
.PP
-The first non-option argument, if present, is the menu entry to start from;
+The first non\-option argument, if present, is the menu entry to start from;
it is searched for in all `dir' files along INFOPATH.
If it is not present, info merges all `dir' files and shows the result.
Any remaining arguments are treated as the names of menu
@@ -59,10 +65,10 @@ items relative to the initial node visited.
.SH EXAMPLES
.TP
info
-show top-level dir menu
+show top\-level dir menu
.TP
info emacs
-start at emacs node from top-level dir
+start at emacs node from top\-level dir
.TP
info emacs buffers
start at buffers node within emacs manual
@@ -73,11 +79,11 @@ start at node with emacs' command line options
info \fB\-f\fR ./foo.info
show file ./foo.info, not searching dir
.SH "REPORTING BUGS"
-Email bug reports to bug-texinfo@gnu.org,
-general questions and discussion to help-texinfo@gnu.org.
+Email bug reports to bug\-texinfo@gnu.org,
+general questions and discussion to help\-texinfo@gnu.org.
Texinfo home page: http://www.gnu.org/software/texinfo/
.SH COPYRIGHT
-Copyright \(co 2002 Free Software Foundation, Inc.
+Copyright \(co 2004 Free Software Foundation, Inc.
There is NO warranty. You may redistribute this software
under the terms of the GNU General Public License.
For more information about these matters, see the files named COPYING.
diff --git a/gnu/usr.bin/texinfo/doc/info.5 b/gnu/usr.bin/texinfo/doc/info.5
index 0e7eb1dc9cc..8380c536611 100644
--- a/gnu/usr.bin/texinfo/doc/info.5
+++ b/gnu/usr.bin/texinfo/doc/info.5
@@ -1,5 +1,5 @@
.\" info(5)
-.\" $Id: info.5,v 1.1.1.1 2000/02/09 01:27:23 espie Exp $
+.\" $Id: info.5,v 1.1.1.2 2006/07/17 16:03:58 espie Exp $
.\"
.\" Copyright (C) 1998 Free Software Foundation, Inc.
.\"
diff --git a/gnu/usr.bin/texinfo/doc/install-info.1 b/gnu/usr.bin/texinfo/doc/install-info.1
index a6fb8bf7f14..004d5d0f97d 100644
--- a/gnu/usr.bin/texinfo/doc/install-info.1
+++ b/gnu/usr.bin/texinfo/doc/install-info.1
@@ -1,22 +1,22 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24.
-.TH INSTALL-INFO "1" "April 2002" "GNU texinfo 4.2" FSF
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.34.
+.TH INSTALL-INFO "1" "December 2004" "install-info 4.8" "User Commands"
.SH NAME
install-info \- update info/dir entries
.SH SYNOPSIS
.B install-info
[\fIOPTION\fR]... [\fIINFO-FILE \fR[\fIDIR-FILE\fR]]
.SH DESCRIPTION
-Install or delete dir entries from INFO-FILE in the Info directory file
-DIR-FILE.
+Install or delete dir entries from INFO\-FILE in the Info directory file
+DIR\-FILE.
.SH OPTIONS
.TP
\fB\-\-delete\fR
-delete existing entries for INFO-FILE from DIR-FILE;
+delete existing entries for INFO\-FILE from DIR\-FILE;
don't insert any new entries.
.TP
\fB\-\-dir\-file\fR=\fINAME\fR
specify file name of Info directory file.
-This is equivalent to using the DIR-FILE argument.
+This is equivalent to using the DIR\-FILE argument.
.TP
\fB\-\-entry\fR=\fITEXT\fR
insert TEXT as an Info directory entry.
@@ -31,7 +31,7 @@ display this help and exit.
.TP
\fB\-\-info\-file\fR=\fIFILE\fR
specify Info file to install in the directory.
-This is equivalent to using the INFO-FILE argument.
+This is equivalent to using the INFO\-FILE argument.
.TP
\fB\-\-info\-dir\fR=\fIDIR\fR
same as \fB\-\-dir\-file\fR=\fIDIR\fR/dir.
@@ -56,11 +56,11 @@ from information in the Info file itself.
\fB\-\-version\fR
display version information and exit.
.SH "REPORTING BUGS"
-Email bug reports to bug-texinfo@gnu.org,
-general questions and discussion to help-texinfo@gnu.org.
+Email bug reports to bug\-texinfo@gnu.org,
+general questions and discussion to help\-texinfo@gnu.org.
Texinfo home page: http://www.gnu.org/software/texinfo/
.SH COPYRIGHT
-Copyright \(co 2002 Free Software Foundation, Inc.
+Copyright \(co 2004 Free Software Foundation, Inc.
There is NO warranty. You may redistribute this software
under the terms of the GNU General Public License.
For more information about these matters, see the files named COPYING.
diff --git a/gnu/usr.bin/texinfo/doc/makeinfo.1 b/gnu/usr.bin/texinfo/doc/makeinfo.1
index 3500b6817c7..7b46491e0a6 100644
--- a/gnu/usr.bin/texinfo/doc/makeinfo.1
+++ b/gnu/usr.bin/texinfo/doc/makeinfo.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24.
-.TH MAKEINFO "1" "April 2002" "GNU texinfo 4.2" FSF
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.34.
+.TH MAKEINFO "1" "December 2004" "makeinfo 4.8" "User Commands"
.SH NAME
makeinfo \- translate Texinfo documents
.SH SYNOPSIS
@@ -20,7 +20,7 @@ preserve output even if errors.
display this help and exit.
.TP
\fB\-\-no\-validate\fR
-suppress node cross-reference validation.
+suppress node cross\-reference validation.
.TP
\fB\-\-no\-warn\fR
suppress warnings (but not errors).
@@ -36,17 +36,20 @@ display version information and exit.
.SS "Output format selection (default is to produce Info):"
.TP
\fB\-\-docbook\fR
-output DocBook rather than Info.
+output Docbook XML rather than Info.
.TP
\fB\-\-html\fR
output HTML rather than Info.
.TP
\fB\-\-xml\fR
-output XML (TexinfoML) rather than Info.
+output Texinfo XML rather than Info.
+.TP
+\fB\-\-plaintext\fR
+output plain text rather than Info.
.SS "General output options:"
.TP
\fB\-E\fR, \fB\-\-macro\-expand\fR FILE
-output macro-expanded source to FILE.
+output macro\-expanded source to FILE.
ignoring any @setfilename.
.TP
\fB\-\-no\-headers\fR
@@ -86,7 +89,17 @@ If VAL is `none', do not indent; if VAL is
`asis', preserve existing indentation.
.TP
\fB\-\-split\-size\fR=\fINUM\fR
-split Info files at size NUM (default 50000).
+split Info files at size NUM (default 300000).
+.SS "Options for HTML:"
+.TP
+\fB\-\-css\-include\fR=\fIFILE\fR
+include FILE in HTML <style> output;
+read stdin if FILE is \-.
+.SS "Options for XML and Docbook:"
+.TP
+\fB\-\-output\-indent\fR=\fIVAL\fR
+indent XML elements by VAL spaces (default 2).
+If VAL is 0, ignorable whitespace is dropped.
.SS "Input file options:"
.TP
\fB\-\-commands\-in\-node\-names\fR
@@ -105,6 +118,10 @@ prepend DIR to the @include search path.
undefine the variable VAR, as with @clear.
.SS "Conditional processing in input:"
.TP
+\fB\-\-ifdocbook\fR
+process @ifdocbook and @docbook even if
+not generating Docbook.
+.TP
\fB\-\-ifhtml\fR
process @ifhtml and @html even if not generating HTML.
.TP
@@ -117,6 +134,12 @@ process @ifplaintext even if not generating plain text.
\fB\-\-iftex\fR
process @iftex and @tex; implies \fB\-\-no\-split\fR.
.TP
+\fB\-\-ifxml\fR
+process @ifxml and @xml.
+.TP
+\fB\-\-no\-ifdocbook\fR
+do not process @ifdocbook and @docbook text.
+.TP
\fB\-\-no\-ifhtml\fR
do not process @ifhtml and @html text.
.TP
@@ -128,11 +151,17 @@ do not process @ifplaintext text.
.TP
\fB\-\-no\-iftex\fR
do not process @iftex and @tex text.
+.TP
+\fB\-\-no\-ifxml\fR
+do not process @ifxml and @xml text.
+.IP
+Also, for the \fB\-\-no\-ifFORMAT\fR options, do process @ifnotFORMAT text.
.IP
The defaults for the @if... conditionals depend on the output format:
if generating HTML, \fB\-\-ifhtml\fR is on and the others are off;
if generating Info, \fB\-\-ifinfo\fR is on and the others are off;
if generating plain text, \fB\-\-ifplaintext\fR is on and the others are off;
+if generating XML, \fB\-\-ifxml\fR is on and the others are off.
.SH EXAMPLES
.TP
makeinfo foo.texi
@@ -142,7 +171,7 @@ makeinfo \fB\-\-html\fR foo.texi
write HTML to @setfilename
.TP
makeinfo \fB\-\-xml\fR foo.texi
-write XML to @setfilename
+write Texinfo XML to @setfilename
.TP
makeinfo \fB\-\-docbook\fR foo.texi
write DocBook XML to @setfilename
@@ -154,11 +183,11 @@ makeinfo \fB\-\-html\fR \fB\-\-no\-headers\fR foo.texi write html without node l
makeinfo \fB\-\-number\-sections\fR foo.texi write Info with numbered sections
makeinfo \fB\-\-no\-split\fR foo.texi write one Info file however big
.SH "REPORTING BUGS"
-Email bug reports to bug-texinfo@gnu.org,
-general questions and discussion to help-texinfo@gnu.org.
+Email bug reports to bug\-texinfo@gnu.org,
+general questions and discussion to help\-texinfo@gnu.org.
Texinfo home page: http://www.gnu.org/software/texinfo/
.SH COPYRIGHT
-Copyright \(co 2002 Free Software Foundation, Inc.
+Copyright \(co 2004 Free Software Foundation, Inc.
There is NO warranty. You may redistribute this software
under the terms of the GNU General Public License.
For more information about these matters, see the files named COPYING.
diff --git a/gnu/usr.bin/texinfo/doc/mdate-sh b/gnu/usr.bin/texinfo/doc/mdate-sh
index c079aed3e22..881782eb55e 100644
--- a/gnu/usr.bin/texinfo/doc/mdate-sh
+++ b/gnu/usr.bin/texinfo/doc/mdate-sh
@@ -1,6 +1,9 @@
#!/bin/sh
# Get modification time of a file or directory and pretty-print it.
-# Copyright 1995, 1996, 1997 Free Software Foundation, Inc.
+
+scriptversion=2004-12-08.12
+
+# Copyright (C) 1995, 1996, 1997, 2003, 2004 Free Software Foundation, Inc.
# written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, June 1995
#
# This program is free software; you can redistribute it and/or modify
@@ -22,6 +25,31 @@
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+case $1 in
+ '')
+ echo "$0: No file. Try \`$0 --help' for more information." 1>&2
+ exit 1;
+ ;;
+ -h | --h*)
+ cat <<\EOF
+Usage: mdate-sh [--help] [--version] FILE
+
+Pretty-print the modification time of FILE.
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+ exit 0
+ ;;
+ -v | --v*)
+ echo "mdate-sh $scriptversion"
+ exit 0
+ ;;
+esac
+
# Prevent date giving response in another language.
LANG=C
export LANG
@@ -30,24 +58,38 @@ export LC_ALL
LC_TIME=C
export LC_TIME
-# Get the extended ls output of the file or directory.
-# On HPUX /bin/sh, "set" interprets "-rw-r--r--" as options, so the "x" below.
+save_arg1="$1"
+
+# Find out how to get the extended ls output of a file or directory.
if ls -L /dev/null 1>/dev/null 2>&1; then
- set - x`ls -L -l -d $1`
+ ls_command='ls -L -l -d'
else
- set - x`ls -l -d $1`
+ ls_command='ls -l -d'
fi
-# The month is at least the fourth argument
-# (3 shifts here, the next inside the loop).
-shift
-shift
-shift
-# Find the month. Next argument is day, followed by the year or time.
+# A `ls -l' line looks as follows on OS/2.
+# drwxrwx--- 0 Aug 11 2001 foo
+# This differs from Unix, which adds ownership information.
+# drwxrwx--- 2 root root 4096 Aug 11 2001 foo
+#
+# To find the date, we split the line on spaces and iterate on words
+# until we find a month. This cannot work with files whose owner is a
+# user named `Jan', or `Feb', etc. However, it's unlikely that `/'
+# will be owned by a user whose name is a month. So we first look at
+# the extended ls output of the root directory to decide how many
+# words should be skipped to get the date.
+
+# On HPUX /bin/sh, "set" interprets "-rw-r--r--" as options, so the "x" below.
+set x`ls -l -d /`
+
+# Find which argument is the month.
month=
+command=
until test $month
do
shift
+ # Add another shift to the command.
+ command="$command shift;"
case $1 in
Jan) month=January; nummonth=1;;
Feb) month=February; nummonth=2;;
@@ -64,6 +106,28 @@ do
esac
done
+# Get the extended ls output of the file or directory.
+set x`eval "$ls_command \"\$save_arg1\""`
+
+# Remove all preceding arguments
+eval $command
+
+# Get the month. Next argument is day, followed by the year or time.
+case $1 in
+ Jan) month=January; nummonth=1;;
+ Feb) month=February; nummonth=2;;
+ Mar) month=March; nummonth=3;;
+ Apr) month=April; nummonth=4;;
+ May) month=May; nummonth=5;;
+ Jun) month=June; nummonth=6;;
+ Jul) month=July; nummonth=7;;
+ Aug) month=August; nummonth=8;;
+ Sep) month=September; nummonth=9;;
+ Oct) month=October; nummonth=10;;
+ Nov) month=November; nummonth=11;;
+ Dec) month=December; nummonth=12;;
+esac
+
day=$2
# Here we have to deal with the problem that the ls output gives either
@@ -95,3 +159,12 @@ esac
# The result.
echo $day $month $year
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
diff --git a/gnu/usr.bin/texinfo/doc/stamp-1 b/gnu/usr.bin/texinfo/doc/stamp-1
index cbc67f41b53..32973a788b2 100644
--- a/gnu/usr.bin/texinfo/doc/stamp-1
+++ b/gnu/usr.bin/texinfo/doc/stamp-1
@@ -1,4 +1,4 @@
-@set UPDATED 23 March 2002
-@set UPDATED-MONTH March 2002
-@set EDITION 4.2
-@set VERSION 4.2
+@set UPDATED 14 December 2004
+@set UPDATED-MONTH December 2004
+@set EDITION 4.8
+@set VERSION 4.8
diff --git a/gnu/usr.bin/texinfo/doc/stamp-vti b/gnu/usr.bin/texinfo/doc/stamp-vti
index c21b39a2cb5..ae55f879d47 100644
--- a/gnu/usr.bin/texinfo/doc/stamp-vti
+++ b/gnu/usr.bin/texinfo/doc/stamp-vti
@@ -1,4 +1,4 @@
-@set UPDATED 28 March 2002
-@set UPDATED-MONTH March 2002
-@set EDITION 4.2
-@set VERSION 4.2
+@set UPDATED 29 December 2004
+@set UPDATED-MONTH December 2004
+@set EDITION 4.8
+@set VERSION 4.8
diff --git a/gnu/usr.bin/texinfo/doc/texi2dvi.1 b/gnu/usr.bin/texinfo/doc/texi2dvi.1
index f815bb5c061..fe06b4ae188 100644
--- a/gnu/usr.bin/texinfo/doc/texi2dvi.1
+++ b/gnu/usr.bin/texinfo/doc/texi2dvi.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24.
-.TH TEXI2DVI "1" "April 2002" "GNU Texinfo 4.2 0.51" FSF
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.34.
+.TH TEXI2DVI "1" "December 2004" "texi2dvi 1.34" "User Commands"
.SH NAME
texi2dvi \- print Texinfo documents
.SH SYNOPSIS
@@ -7,7 +7,7 @@ texi2dvi \- print Texinfo documents
[\fIOPTION\fR]... \fIFILE\fR...
.SH DESCRIPTION
Run each Texinfo or LaTeX FILE through TeX in turn until all
-cross-references are resolved, building all indices. The directory
+cross\-references are resolved, building all indices. The directory
containing each FILE is searched for included files. The suffix of FILE
is used to determine its language (LaTeX or Texinfo).
.PP
@@ -44,10 +44,10 @@ display version information and exit successfully
report on what is done
.SS "TeX tuning:"
.TP
--@
+\-@
use @input instead of \einput; for preloaded Texinfo
.TP
-\fB\-e\fR, \fB\-\-expand\fR
+\fB\-e\fR, \fB\-E\fR, \fB\-\-expand\fR
force macro expansion using makeinfo
.TP
\fB\-I\fR DIR
@@ -59,19 +59,25 @@ specify the LANG of FILE (LaTeX or Texinfo)
\fB\-p\fR, \fB\-\-pdf\fR
use pdftex or pdflatex for processing
.TP
-\fB\-t\fR, \fB\-\-texinfo\fR=\fICMD\fR
-insert CMD after @setfilename in copy of input file
+\fB\-r\fR, \fB\-\-recode\fR
+call recode before TeX to translate input characters
+.TP
+\fB\-t\fR, \fB\-\-command\fR=\fICMD\fR
+insert CMD in copy of input file
+.TP
+or \fB\-\-texinfo\fR=\fICMD\fR
multiple values accumulate
.PP
The values of the BIBTEX, LATEX (or PDFLATEX), MAKEINDEX, MAKEINFO,
-TEX (or PDFTEX), and TEXINDEX environment variables are used to run
-those commands, if they are set.
+TEX (or PDFTEX), TEXINDEX, and THUMBPDF environment variables are used
+to run those commands, if they are set. Any CMD strings are added
+after @setfilename for Texinfo input, in the first line for LaTeX input.
.SH "REPORTING BUGS"
-Email bug reports to <bug-texinfo@gnu.org>,
-general questions and discussion to <help-texinfo@gnu.org>.
+Email bug reports to <bug\-texinfo@gnu.org>,
+general questions and discussion to <help\-texinfo@gnu.org>.
Texinfo home page: http://www.gnu.org/software/texinfo/
.SH COPYRIGHT
-Copyright \(co 2002 Free Software Foundation, Inc.
+Copyright \(co 2004 Free Software Foundation, Inc.
There is NO warranty. You may redistribute this software
under the terms of the GNU General Public License.
For more information about these matters, see the files named COPYING.
diff --git a/gnu/usr.bin/texinfo/doc/texindex.1 b/gnu/usr.bin/texinfo/doc/texindex.1
index 854fed8c30e..732e12b8874 100644
--- a/gnu/usr.bin/texinfo/doc/texindex.1
+++ b/gnu/usr.bin/texinfo/doc/texindex.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24.
-.TH TEXINDEX "1" "April 2002" "GNU texinfo 4.2" FSF
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.34.
+.TH TEXINDEX "1" "December 2004" "texindex 4.8" "User Commands"
.SH NAME
texindex \- sort Texinfo index files
.SH SYNOPSIS
@@ -25,11 +25,11 @@ send output to FILE
\fB\-\-version\fR
display version information and exit
.SH "REPORTING BUGS"
-Email bug reports to bug-texinfo@gnu.org,
-general questions and discussion to help-texinfo@gnu.org.
+Email bug reports to bug\-texinfo@gnu.org,
+general questions and discussion to help\-texinfo@gnu.org.
Texinfo home page: http://www.gnu.org/software/texinfo/
.SH COPYRIGHT
-Copyright \(co 2002 Free Software Foundation, Inc.
+Copyright \(co 2004 Free Software Foundation, Inc.
There is NO warranty. You may redistribute this software
under the terms of the GNU General Public License.
For more information about these matters, see the files named COPYING.
diff --git a/gnu/usr.bin/texinfo/doc/texinfo.5 b/gnu/usr.bin/texinfo/doc/texinfo.5
index 68504e38035..83387c5705b 100644
--- a/gnu/usr.bin/texinfo/doc/texinfo.5
+++ b/gnu/usr.bin/texinfo/doc/texinfo.5
@@ -1,7 +1,7 @@
.\" texinfo(5)
-.\" $Id: texinfo.5,v 1.1.1.1 2000/02/09 01:27:23 espie Exp $
+.\" $Id: texinfo.5,v 1.1.1.2 2006/07/17 16:03:58 espie Exp $
.\"
-.\" Copyright (C) 1998, 99 Free Software Foundation, Inc.
+.\" Copyright (C) 1998, 1999, 2002 Free Software Foundation, Inc.
.\"
.\" Permission is granted to make and distribute verbatim copies of this
.\" manual provided the copyright notice and this permission notice are
@@ -19,7 +19,7 @@
.\"
.TH TEXINFO 5 "GNU Texinfo" "FSF"
.SH NAME
-Texinfo \- software documentation system
+texinfo \- software documentation system
.SH DESCRIPTION
Texinfo is a documentation system that uses a single source file to
produce both online information and printed output. It is primarily
diff --git a/gnu/usr.bin/texinfo/doc/txi-cs.tex b/gnu/usr.bin/texinfo/doc/txi-cs.tex
index 9fa05b4afa1..5c9395cfd5d 100644
--- a/gnu/usr.bin/texinfo/doc/txi-cs.tex
+++ b/gnu/usr.bin/texinfo/doc/txi-cs.tex
@@ -1,11 +1,11 @@
-% $Id: txi-cs.tex,v 1.1.1.2 2002/06/10 13:21:49 espie Exp $
+% $Id: txi-cs.tex,v 1.1.1.3 2006/07/17 16:03:58 espie Exp $
% Czech translation for texinfo.tex.
%
% Copyright (C) 1999, 2000 Free Software Foundation.
%
% Authors:
% Vladimir Michl <Vladimir.Michl@mujweb.cz>
-% Stepan Kasal <kasal@suse.cz>
+% Stepan Kasal <kasal@ucw.cz>
%
% This program is free software; you can redistribute it and/or modify
% it under the terms of the GNU General Public License as published by
@@ -58,9 +58,7 @@
\gdef\putwordDefspec{Speciální forma}
\gdef\putwordDefvar{Proměnná}
\gdef\putwordDefopt{Volby}
-\global\let\putwordDeftypevar\putwordDefvar
\gdef\putwordDeffunc{Funkce}
-\global\let\putwordDeftypefun\putwordDeffunc
%
% Redefine \today to produce Czech
% preferred dates such as 28. januar 1999.
diff --git a/gnu/usr.bin/texinfo/doc/txi-de.tex b/gnu/usr.bin/texinfo/doc/txi-de.tex
index 4d5b1c63b5f..2b17a24c8f8 100644
--- a/gnu/usr.bin/texinfo/doc/txi-de.tex
+++ b/gnu/usr.bin/texinfo/doc/txi-de.tex
@@ -1,5 +1,5 @@
% txi-de.tex -- adaptation to German for texinfo.tex.
-% $Id: txi-de.tex,v 1.1.1.1 2000/02/09 01:27:22 espie Exp $
+% $Id: txi-de.tex,v 1.1.1.2 2006/07/17 16:03:58 espie Exp $
%
% Copyright (C) 1999 Free Software Foundation, Inc.
%
@@ -75,9 +75,5 @@
\gdef\putwordDefvar{Variable}
%% \defopt
\gdef\putwordDefopt{Benutzer Option}
-%% \deftypevar
-\gdef\putwordDeftypevar{Variable}
%% \deffun
\gdef\putwordDeffunc{Funktion}
-%% \deftypefun
-\gdef\putwordDeftypefun{Funktion}
diff --git a/gnu/usr.bin/texinfo/doc/txi-en.tex b/gnu/usr.bin/texinfo/doc/txi-en.tex
index f972a745317..d788eb9633e 100644
--- a/gnu/usr.bin/texinfo/doc/txi-en.tex
+++ b/gnu/usr.bin/texinfo/doc/txi-en.tex
@@ -1,7 +1,7 @@
% English non-translation for texinfo.tex. This is read when a source
% document says @documentlanguage en (which might happen after another
% @documentlanguage). The actual values are the same as defaults.
-% $Id: txi-en.tex,v 1.1.1.1 2000/02/09 01:27:22 espie Exp $
+% $Id: txi-en.tex,v 1.1.1.2 2006/07/17 16:03:58 espie Exp $
%
% Copyright (C) 1999 Free Software Foundation.
%
@@ -56,9 +56,7 @@
\gdef\putwordDefspec{Special Form}
\gdef\putwordDefvar{Variable}
\gdef\putwordDefopt{User Option}
-\gdef\putwordDeftypevar{Variable}
\gdef\putwordDeffunc{Function}
-\gdef\putwordDeftypefun{Function}
% Produces Day Month Year style of output.
\def\today{%
diff --git a/gnu/usr.bin/texinfo/doc/txi-es.tex b/gnu/usr.bin/texinfo/doc/txi-es.tex
index 496bd2586ea..334e2d1e109 100644
--- a/gnu/usr.bin/texinfo/doc/txi-es.tex
+++ b/gnu/usr.bin/texinfo/doc/txi-es.tex
@@ -53,8 +53,6 @@
\gdef\putwordDefivar{Variable de Instancia}
\gdef\putwordDefvar{Variable}
\gdef\putwordDefopt{Opci\'on de Usuario}
-\gdef\putwordDeftypevar{Variable}
\gdef\putwordDeffunc{Funci\'on}
-\gdef\putwordDeftypefun{Funci\'on}
\endinput
diff --git a/gnu/usr.bin/texinfo/doc/txi-fr.tex b/gnu/usr.bin/texinfo/doc/txi-fr.tex
index 2210ac9ce51..da62e1ab9e4 100644
--- a/gnu/usr.bin/texinfo/doc/txi-fr.tex
+++ b/gnu/usr.bin/texinfo/doc/txi-fr.tex
@@ -1,5 +1,5 @@
% txi-fr.tex -- TeX macros to handle French language for texinfo.tex documents.
-% $Id: txi-fr.tex,v 1.1.1.1 2002/06/10 13:21:49 espie Exp $
+% $Id: txi-fr.tex,v 1.1.1.2 2006/07/17 16:03:58 espie Exp $
%
% Copyright (C) 1999 Free Software Foundation.
%
@@ -59,9 +59,7 @@
\gdef\putwordDefspec{Forme Sp\'eciale}
\gdef\putwordDefvar{Variable}
\gdef\putwordDefopt{Option de l'usager}
-\gdef\putwordDeftypevar{Variable}
\gdef\putwordDeffunc{Fonction}
-\gdef\putwordDeftypefun{Fonction}
% Produces Day Month Year style of output.
% French datation - for instance: 10 janvier 2000.
diff --git a/gnu/usr.bin/texinfo/doc/txi-it.tex b/gnu/usr.bin/texinfo/doc/txi-it.tex
new file mode 100644
index 00000000000..19fb396647e
--- /dev/null
+++ b/gnu/usr.bin/texinfo/doc/txi-it.tex
@@ -0,0 +1,69 @@
+% English non-translation for texinfo.tex. This is read when a source
+% document says @documentlanguage en (which might happen after another
+% @documentlanguage). The actual values are the same as defaults.
+% $Id: txi-it.tex,v 1.1.1.1 2006/07/17 16:03:58 espie Exp $
+%
+% Copyright (C) 1999 Free Software Foundation.
+%
+% This program is free software; you can redistribute it and/or modify
+% it under the terms of the GNU General Public License as published by
+% the Free Software Foundation; either version 2 of the License, or
+% (at your option) any later version.
+%
+% This program is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+% GNU General Public License for more details.
+%
+% You should have received a copy of the GNU General Public License
+% along with this program; if not, write to the Free Software
+% Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+\gdef\putwordAppendix{Appendice}
+\gdef\putwordChapter{Capitolo}
+\gdef\putwordfile{file}
+\gdef\putwordin{in}
+\gdef\putwordIndexIsEmpty{(L'indice \'e vuoto)}
+\gdef\putwordIndexNonexistent{(L'indice non esiste)}
+\gdef\putwordInfo{Info}
+\gdef\putwordInstanceVariableof{Variabile di istanza di}
+\gdef\putwordMethodon{Metodo di}
+\gdef\putwordNoTitle{Nessun titolo}
+\gdef\putwordof{di}
+\gdef\putwordon{su}
+\gdef\putwordpage{pagina}
+\gdef\putwordsection{sezione}
+\gdef\putwordSection{Sezione}
+\gdef\putwordsee{vedi}
+\gdef\putwordSee{Vedi}
+\gdef\putwordShortTOC{Sommario abbreviato}
+\gdef\putwordTOC{Sommario}
+%
+\gdef\putwordMJan{Gennaio}
+\gdef\putwordMFeb{Febbraio}
+\gdef\putwordMMar{Marzo}
+\gdef\putwordMApr{Aprile}
+\gdef\putwordMMay{Maggio}
+\gdef\putwordMJun{Giugno}
+\gdef\putwordMJul{Luglio}
+\gdef\putwordMAug{Agosto}
+\gdef\putwordMSep{Settembre}
+\gdef\putwordMOct{Ottobre}
+\gdef\putwordMNov{Novembre}
+\gdef\putwordMDec{Dicembre}
+%
+\gdef\putwordDefmac{Macro}
+\gdef\putwordDefspec{Forma speciale}
+\gdef\putwordDefvar{Variabile}
+\gdef\putwordDefopt{Opzione}
+\gdef\putwordDeffunc{Funzione}
+
+% Produces Day Month Year style of output.
+\def\today{%
+ \number\day\space
+ \ifcase\month
+ \or\putwordMJan\or\putwordMFeb\or\putwordMMar\or\putwordMApr
+ \or\putwordMMay\or\putwordMJun\or\putwordMJul\or\putwordMAug
+ \or\putwordMSep\or\putwordMOct\or\putwordMNov\or\putwordMDec
+ \fi
+ \space\number\year}
diff --git a/gnu/usr.bin/texinfo/doc/txi-nl.tex b/gnu/usr.bin/texinfo/doc/txi-nl.tex
index 65b9d05ff73..075d47d2c6f 100644
--- a/gnu/usr.bin/texinfo/doc/txi-nl.tex
+++ b/gnu/usr.bin/texinfo/doc/txi-nl.tex
@@ -1,5 +1,5 @@
% Dutch translation for texinfo.tex.
-% $Id: txi-nl.tex,v 1.1.1.1 2000/02/09 01:27:22 espie Exp $
+% $Id: txi-nl.tex,v 1.1.1.2 2006/07/17 16:03:58 espie Exp $
%
% Copyright (C) 1999 Free Software Foundation.
%
@@ -55,9 +55,7 @@
\gdef\putwordDefspec{Speciale Vorm}
\gdef\putwordDefvar{Variabele}
\gdef\putwordDefopt{Gebruikers optie}
-\gdef\putwordDeftypevar{Variabele}
\gdef\putwordDeffunc{Functie}
-\gdef\putwordDeftypefun{Functie}
% Produces Day Month Year style of output.
\def\today{%
diff --git a/gnu/usr.bin/texinfo/doc/txi-no.tex b/gnu/usr.bin/texinfo/doc/txi-no.tex
index aa538d6b551..a4e589382ed 100644
--- a/gnu/usr.bin/texinfo/doc/txi-no.tex
+++ b/gnu/usr.bin/texinfo/doc/txi-no.tex
@@ -54,9 +54,7 @@
\gdef\putwordDefivar{Forekomstvariabel}
\gdef\putwordDefvar{Variabel}
\gdef\putwordDefopt{Brukervalg}
-\gdef\putwordDeftypevar{Variabel}
\gdef\putwordDeffunc{Funksjon}
-\gdef\putwordDeftypefun{Funksjon}
%
% Redefine \today to produce Norwegian
% preferred dates such as 28. januar 1999.
diff --git a/gnu/usr.bin/texinfo/doc/txi-pl.tex b/gnu/usr.bin/texinfo/doc/txi-pl.tex
new file mode 100644
index 00000000000..2df91d0e795
--- /dev/null
+++ b/gnu/usr.bin/texinfo/doc/txi-pl.tex
@@ -0,0 +1,73 @@
+% txi-pl.tex -- adaptation to Polish for texinfo.tex.
+% $Id: txi-pl.tex,v 1.1.1.1 2006/07/17 16:03:58 espie Exp $
+%
+% Copyright (C) 2003 Free Software Foundation.
+%
+% This program is free software; you can redistribute it and/or modify
+% it under the terms of the GNU General Public License as published by
+% the Free Software Foundation; either version 2 of the License, or
+% (at your option) any later version.
+%
+% This program is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+% GNU General Public License for more details.
+%
+% You should have received a copy of the GNU General Public License
+% along with this program; if not, write to the Free Software
+% Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+%
+% Written by Wojciech Polak <polak@gnu.org> on 29-03-2003.
+% Modified by Staszek Wawrykiewicz <staw@gust.org.pl> on 01-04-2003.
+%
+\prefixing
+\gdef\putwordAppendix{Suplement}
+\gdef\putwordChapter{Rozdzia/l}
+\gdef\putwordfile{plik}
+\gdef\putwordin{w}
+\gdef\putwordIndexIsEmpty{(Skorowidz jest pusty)}
+\gdef\putwordIndexNonexistent{(Brak skorowidza)}
+\gdef\putwordInfo{Info}
+\gdef\putwordInstanceVariableof{Przyk/ladowa zmienna}
+\gdef\putwordMethodon{Metoda}
+\gdef\putwordNoTitle{Brak tytu/lu}
+\gdef\putwordof{z}
+\gdef\putwordon{na}
+\gdef\putwordpage{strona}
+\gdef\putwordsection{cz/e/s/c}
+\gdef\putwordSection{Cz/e/s/c}
+\gdef\putwordsee{zobacz}
+\gdef\putwordSee{Zobacz}
+\gdef\putwordShortTOC{Kr/otka zawarto/s/c}
+\gdef\putwordTOC{Spis tre/sci}
+%
+\gdef\putwordMJan{stycznia}
+\gdef\putwordMFeb{lutego}
+\gdef\putwordMMar{marca}
+\gdef\putwordMApr{kwietnia}
+\gdef\putwordMMay{maja}
+\gdef\putwordMJun{czerwca}
+\gdef\putwordMJul{lipca}
+\gdef\putwordMAug{sierpnia}
+\gdef\putwordMSep{wrze/snia}
+\gdef\putwordMOct{pa/xdziernika}
+\gdef\putwordMNov{listopada}
+\gdef\putwordMDec{grudnia}
+%
+\gdef\putwordDefmac{Makro}
+\gdef\putwordDefspec{Specjalna forma}
+\gdef\putwordDefvar{Zmienna}
+\gdef\putwordDefopt{Opcja u/zytkownika}
+\gdef\putwordDeffunc{Funkcja}
+\nonprefixing
+%
+% Produces Day Month Year style of output.
+%
+\def\today{%
+ \number\day\space
+ \ifcase\month
+ \or\putwordMJan\or\putwordMFeb\or\putwordMMar\or\putwordMApr
+ \or\putwordMMay\or\putwordMJun\or\putwordMJul\or\putwordMAug
+ \or\putwordMSep\or\putwordMOct\or\putwordMNov\or\putwordMDec
+ \fi
+ \space\number\year}
diff --git a/gnu/usr.bin/texinfo/doc/txi-pt.tex b/gnu/usr.bin/texinfo/doc/txi-pt.tex
index 4f4530b3df5..c65bc5e1d5a 100644
--- a/gnu/usr.bin/texinfo/doc/txi-pt.tex
+++ b/gnu/usr.bin/texinfo/doc/txi-pt.tex
@@ -65,9 +65,5 @@
\gdef\putwordDefvar{Vari\'avel}
%% \defopt
\gdef\putwordDefopt{Op\,c\~ao de Usu\'ario}
-%% \deftypevar
-\gdef\putwordDeftypevar{Vari\'avel}
%% \deffun
\gdef\putwordDeffunc{Fun\,c\~ao}
-%% \deftypefun
-\gdef\putwordDeftypefun{Fun\,c\~ao}
diff --git a/gnu/usr.bin/texinfo/doc/txi-tr.tex b/gnu/usr.bin/texinfo/doc/txi-tr.tex
new file mode 100644
index 00000000000..e106cd098b5
--- /dev/null
+++ b/gnu/usr.bin/texinfo/doc/txi-tr.tex
@@ -0,0 +1,82 @@
+% txi-en.tex -- adaptation to Turkish for texinfo.tex.
+% $Id: txi-tr.tex,v 1.1.1.1 2006/07/17 16:03:58 espie Exp $
+%
+% Copyright (C) 2003 Free Software Foundation, Inc.
+%
+% This program is free software; you can redistribute it and/or modify
+% it under the terms of the GNU General Public License as published by
+% the Free Software Foundation; either version 2, or (at your option)
+% any later version.
+%
+% This program is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+% GNU General Public License for more details.
+%
+% You should have received a copy of the GNU General Public License
+% along with this program; if not, write to the Free Software
+% Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+%
+% Written by Alper Ersoy, 5 January 2003, <aersoy@tfz.net>
+%
+%%
+%% Turkish translations of the used words.
+%%
+%%
+\gdef\putwordAppendix{Ek}
+\gdef\putwordChapter{Kesim}
+\gdef\putwordfile{dosya}
+\gdef\putwordInfo{Bilgi}
+\gdef\putwordpage{Sayfa}
+\gdef\putwordsection{b\"ol\"um}
+\gdef\putwordSection{B\"ol\"um}
+\gdef\putwordsee{bkz.}
+\gdef\putwordSee{Bkz.}
+\gdef\putwordShortTOC{\dotaccent{I}\,cindekiler (K\dotless{i}saca)}
+\gdef\putwordTOC{\dotaccent{I}\,cindekiler}
+%%
+%% This one really sucks :\
+\gdef\putwordMethodon{S\dotless{i}n\dotless{i}f:}
+%%
+%% I could not translate these ones, need examples :\
+%% If anybody out there is using these in turkish, please
+%% don't hesitate to send me patches ;)
+\gdef\putwordin{in}
+\gdef\putwordon{on}
+\gdef\putwordof{of}
+%%
+%%
+\gdef\putwordNoTitle{Ba\,sl\dotless{i}s\dotless{i}z}
+\gdef\putwordIndexNonexistent{(Dizin bulunmamakta)}
+\gdef\putwordIndexIsEmpty{(Dizin bo\,s)}
+%%
+%% Months
+\gdef\putwordMJan{Ocak}
+\gdef\putwordMFeb{\,Subat}
+\gdef\putwordMMar{Mart}
+\gdef\putwordMApr{Nisan}
+\gdef\putwordMMai{May\dotless{i}s}
+\gdef\putwordMJun{Haziran}
+\gdef\putwordMJul{Temmuz}
+\gdef\putwordMAug{A\u{g}ustos}
+\gdef\putwordMSep{Eyl\"ul}
+\gdef\putwordMOct{Ekim}
+\gdef\putwordMNov{Kas\dotless{i}m}
+\gdef\putwordMDec{Aral\dotless{i}k}
+%%
+%% Definitions
+\gdef\putwordDefmac{Makro}
+\gdef\putwordDefspec{\"Ozel Yap\dotless{i}}
+\gdef\putwordDefopt{Se\,cenek}
+\gdef\putwordDefvar{De\u{g}i\,sken}
+\gdef\putwordDeffunc{Fonksiyon}
+%%
+% Produces Day Month Year style of output.
+\def\today{%
+ \number\day\space
+ \ifcase\month
+ \or\putwordMJan\or\putwordMFeb\or\putwordMMar\or\putwordMApr
+ \or\putwordMMay\or\putwordMJun\or\putwordMJul\or\putwordMAug
+ \or\putwordMSep\or\putwordMOct\or\putwordMNov\or\putwordMDec
+ \fi
+ \space\number\year}
diff --git a/gnu/usr.bin/texinfo/doc/version-stnd.texi b/gnu/usr.bin/texinfo/doc/version-stnd.texi
index cbc67f41b53..32973a788b2 100644
--- a/gnu/usr.bin/texinfo/doc/version-stnd.texi
+++ b/gnu/usr.bin/texinfo/doc/version-stnd.texi
@@ -1,4 +1,4 @@
-@set UPDATED 23 March 2002
-@set UPDATED-MONTH March 2002
-@set EDITION 4.2
-@set VERSION 4.2
+@set UPDATED 14 December 2004
+@set UPDATED-MONTH December 2004
+@set EDITION 4.8
+@set VERSION 4.8
diff --git a/gnu/usr.bin/texinfo/doc/version.texi b/gnu/usr.bin/texinfo/doc/version.texi
index c21b39a2cb5..ae55f879d47 100644
--- a/gnu/usr.bin/texinfo/doc/version.texi
+++ b/gnu/usr.bin/texinfo/doc/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 28 March 2002
-@set UPDATED-MONTH March 2002
-@set EDITION 4.2
-@set VERSION 4.2
+@set UPDATED 29 December 2004
+@set UPDATED-MONTH December 2004
+@set EDITION 4.8
+@set VERSION 4.8