not in 3.11

9 files changed, 0 insertions, 1277 deletions

diff --git a/gnu/usr.bin/texinfo/makeinfo/macro.texi b/gnu/usr.bin/texinfo/makeinfo/macro.texi
deleted file mode 100644
index 8a3fe802392..00000000000
--- a/gnu/usr.bin/texinfo/makeinfo/macro.texi
+++ /dev/null
@@ -1,177 +0,0 @@
-@c This file is included in makeinfo.texi.
-@c
-@ifinfo
-@comment Here are some useful examples of the macro facility.
-
-@c Simply insert the right version of the texinfo name.
-@macro texinfo{}
-TeXinfo
-@end macro
-
-@macro dfn{text}
-@dfn{\text\}
-@cpindex \text\
-@end macro
-
-@c Define a macro which expands to a pretty version of the name of the
-@c Makeinfo program.
-@macro makeinfo{}
-@code{Makeinfo}
-@end macro
-
-@c Define a macro which is used to define other macros.  This one makes
-@c a macro which creates a node and gives it a sectioning command.  Note
-@c that the created macro uses the original definition within the
-@c expansion text.  This takes advantage of the non-recursion feature of
-@c macro execution.
-@macro node_define{orig-name}
-@macro \orig-name\{title}
-@node \title\
-@\orig-name\ \title\
-@end macro
-@end macro
-
-@c Now actually define a new set of sectioning commands.
-@node_define {chapter}
-@node_define {section}
-@node_define {subsection}
-@end ifinfo
-
-@chapter The Macro Facility
-
-This chapter describes the new macro facility.
-
-A @dfn{macro} is a command that you define in terms of other commands.
-It doesn't exist as a @texinfo{} command until you define it as part of
-the input file to @makeinfo{}.  Once the command exists, it behaves much
-as any other @texinfo{} command.  Macros are a useful way to ease the
-details and tedium of writing a `correct' info file.  The following
-sections explain how to write and invoke macros.
-
-@menu
-* How to Use Macros in @texinfo{}::
-                        How to use the macro facility.
-
-* Using Macros Recursively::
-                        How to write a macro which does (or doesn't) recurse.
-
-* Using @texinfo{} Macros As Arguments::
-                        Passing a macro as an argument.
-@end menu
-
-@section How to Use Macros in @texinfo{}
-
-Using macros in @texinfo{} is easy.  First you define the macro.  After
-that, the macro command is available as a normal @texinfo{} command.
-Here is what a definition looks like:
-
-@example
-@@macro @var{name}@{@var{arg1}, @var{@dots{}} @var{argn}@}
-@var{@texinfo{} commands@dots{}}
-@@end macro
-@end example
-
-The arguments that you specify that the macro takes are expanded with
-the actual parameters used when calling the macro if they are seen
-surrounded by backslashes.  For example, here is a definition of
-@code{@@codeitem}, a macro which can be used wherever @code{@@item} can
-be used, but which surrounds its argument with @code{@@code@{@dots{}@}}.
-
-@example
-@@macro codeitem@{item@}
-@@item @@code@{\item\@}
-@@end macro
-@end example
-
-When the macro is expanded, all of the text between the @code{@@macro}
-and @code{@@end macro} is inserted into the document at the expansion
-point, with the actual parameters substituted for the named parameters.
-So, a call to the above macro might look like:
-
-@example
-@@codeitem@{Foo@}
-@end example
-
-and @makeinfo{} would execute the following code:
-
-@example
-@@item @@code@{Foo@}
-@end example
-
-A special case is made for macros which only take a single argument, and
-which are invoked without any brace characters (i.e.,
-@samp{@{}@dots{}@samp{@}}) surrounding an argument; the rest of the line
-is supplied as is as the sole argument to the macro.  This special case
-allows one to redefine some standard @texinfo{} commands without
-modifying the input file.  Along with the non-recursive action of macro
-invocation, one can easily redefine the sectioning commands to also
-provide index entries:
-
-@example
-@@macro chapter@{name@}
-@@chapter \name\
-@@findex \name\
-@@end macro
-@end example
-
-Thus, the text:
-
-@example
-@@chapter strlen
-@end example
-
-will expand to:
-
-@example
-@@chapter strlen
-@@findex strlen
-@end example
-
-@section Using Macros Recursively
-
-Normally, while a particular macro is executing, any call to that macro
-will be seen as a call to a builtin @texinfo{} command.  This allows one
-to redefine a builtin @texinfo{} command as a macro, and then use that
-command within the definition of the macro itself.  For example, one
-might wish to make sure that whereever a term was defined with
-@code{@@dfn@{@dots{}@}}, the location of the definition would appear
-in the concept index for the manual.  Here is a macro which redefines
-@code{@@dfn} to do just that:
-
-@example
-@@macro dfn@{text@}
-@@dfn@{\text\@}
-@@cpindex \text\
-@@end macro
-@end example
-
-Note that we used the builtin @texinfo{} command @code{@@dfn} within our
-overriding macro definition.
-
-This behaviour itself can be overridden for macro execution by writing a
-special @dfn{macro control command} in the definition of the macro.  The
-command is considered special because it doesn't affect the output text
-directly, rather, it affects the way in which the macro is defined.  One
-such special command is @code{@@allow-recursion}.
-
-@example
-@@macro silly@{arg@}
-@@allow-recursion
-\arg\
-@@end macro
-@end example
-
-Now @code{@@silly} is a macro that can be used within a call to itself:
-
-@example
-This text @@silly@{@@silly@{some text@}@} is ``some text''.
-@end example
-
-@section Using @texinfo{} Macros As Arguments
-
-@printindex cp
-How to use @texinfo{} macros as arguments to other @texinfo{} macros.
-
-@bye
-
-
diff --git a/gnu/usr.bin/texinfo/makeinfo/macros/example.texi b/gnu/usr.bin/texinfo/makeinfo/macros/example.texi
deleted file mode 100644
index d3554ff3ddc..00000000000
--- a/gnu/usr.bin/texinfo/makeinfo/macros/example.texi
+++ /dev/null
@@ -1,224 +0,0 @@
-\input texinfo    @c -*-texinfo-*-
-@comment %**start of header
-@setfilename example.info
-@set VERSION 1.58
-@paragraphindent none
-@comment %**end of header
-
-@include simpledoc.texi
-
-@document {@makeinfo{}, Brian J. Fox,
-This file is an extract from the @cite{@texinfo{}} manual.@*
-It documents @makeinfo{}\, a program that converts @texinfo{} files into
-Info files.
-}
-
-@menu
-* What is @makeinfo{}?::
-* Controlling Paragraph Formats::
-* Command Line Options::
-* Pointer Validation::
-@end menu
-
-@section What is @makeinfo{}?
-
-@iftex
-This file documents the use of the @code{makeinfo} program, versions
-@value{VERSION} and later.  It is an extract from the @cite{TeXinfo} manual.
-@end iftex
-
-@makeinfo{} is a program for converting @dfn{@texinfo{}} files into
-@dfn{@Info{}} files.  @texinfo{} is a documentation system that uses a
-single source file to produce both on-line information and printed output.
-
-You can read the on-line information using @Info{}; type @code{info} to
-learn about @Info{}.
-@ifinfo
-@xref{Top, Texinfo, Overview of Texinfo, texinfo, Texinfo},
-@end ifinfo
-@iftex
-See the @cite{TeXinfo} manual,
-@end iftex
-to learn about the TeXinfo documentation system.
-
-@section Controlling Paragraph Formats
-
-In general, @makeinfo{} @dfn{fills} the paragraphs that it outputs
-to an @Info{} file.  Filling is the process of breaking and connecting
-lines so that lines are the same length as or shorter than the number
-specified as the fill column.  Lines are broken between words.  With
-@makeinfo{}, you can control:
-
-@itemize @bullet
-@item
-The width of each paragraph (the @dfn{fill-column}).
-@item
-The amount of indentation that the first line of 
-each paragraph receives (the @dfn{paragraph-indentation}).
-@end itemize
-
-@section Command Line Options
-
-The following command line options are available for @makeinfo{}.
-
-@need 100
-@table @code
-@item -D @var{var}
-Cause @var{var} to be defined.  This is equivalent to 
-@code{@@set @var{var}} in the Texinfo file.
-
-@need 150
-@item --error-limit @var{limit}
-Set the maximum number of errors that @makeinfo{} will report
-before exiting (on the assumption that continuing would be useless).
-The default number of errors that can be reported before
-@makeinfo{} gives up is 100.@refill
-
-@need 150
-@item --fill-column @var{width}
-Specify the maximum number of columns in a line; this is the right-hand
-edge of a line.  Paragraphs that are filled will be filled to this
-width.  The default value for @code{fill-column} is 72.
-
-@item --footnote-style @var{style}
-Set the footnote style to @var{style}, either @samp{end} for the end
-node style or @samp{separate} for the separate node style.  The value
-set by this option overrides the value set in a Texinfo file by an
-@code{@@footnotestyle} command.  When the footnote style is
-@samp{separate}, @makeinfo{} makes a new node containing the
-footnotes found in the current node.  When the footnote style is
-@samp{end}, @makeinfo{} places the footnote references at the end
-of the current node.
-
-@need 150
-@item -I @var{dir}
-Add @code{dir} to the directory search list for finding files that are
-included using the @code{@@include} command.  By default,
-@makeinfo{} searches only the current directory.
-
-@need 150
-@item --no-headers
-Do not include menus or node lines in the output.  This results in an
-@sc{ascii} file that you cannot read in Info since it does not contain
-the requisite nodes or menus; but you can print such a file in a
-single, typewriter-like font and produce acceptable output.
-
-@need 150
-@item --no-split
-Suppress the splitting stage of @makeinfo{}.  Normally, large
-output files (where the size is greater than 70k bytes) are split into
-smaller subfiles, each one approximately 50k bytes.  If you specify
-@samp{--no-split}, @makeinfo{} will not split up the output
-file.
-
-@need 100
-@item --no-pointer-validate
-@item --no-validate
-Suppress the pointer-validation phase of @makeinfo{}.  Normally,
-after a Texinfo file is processed, some consistency checks are made to
-ensure that cross references can be resolved, etc.
-@xref{Pointer Validation}.
-
-@need 150
-@item --no-warn
-Suppress the output of warning messages.  This does @emph{not}
-suppress the output of error messages, only warnings.  You might
-want this if the file you are creating has examples of Texinfo cross
-references within it, and the nodes that are referenced do not actually
-exist.
-
-@item --no-number-footnotes
-Supress automatic footnote numbering.  By default, @makeinfo{}
-numbers each footnote sequentially in a single node, resetting the
-current footnote number to 1 at the start of each node.
-
-@need 150
-@item --output @var{file}
-@itemx -o @var{file}
-Specify that the output should be directed to @var{file} and not to the
-file name specified in the @code{@@setfilename} command found in the Texinfo
-source.  @var{file} can be the special token @samp{-}, which specifies
-standard output.
-
-@need 150
-@item --paragraph-indent @var{indent}
-Set the paragraph indentation style to @var{indent}.  The value set by
-this option overrides the value set in a Texinfo file by an
-@code{@@paragraphindent} command.  The value of @var{indent} is
-interpreted as follows:
-
-@itemize @bullet
-@item
-If the value of @var{indent} is @samp{asis}, do not change the
-existing indentation at the starts of paragraphs.
-
-@item
-If the value of @var{indent} is zero, delete any existing
-indentation.
-
-@item
-If the value of @var{indent} is greater than zero, indent each
-paragraph by that number of spaces.
-@end itemize
-
-@need 100
-@item --reference-limit @var{limit}
-Set the value of the number of references to a node that
-@makeinfo{} will make without reporting a warning.  If a node has more
-than this number of references in it, @makeinfo{} will make the
-references but also report a warning.
-
-@need 150
-@item -U @var{var}
-Cause @var{var} to be undefined.  This is equivalent to 
-@code{@@clear @var{var}} in the Texinfo file.
-
-@need 100
-@item --verbose
-Cause @makeinfo{} to display messages saying what it is doing.
-Normally, @makeinfo{} only outputs messages if there are errors or
-warnings.
-
-@need 100
-@item --version
-Report the version number of this copy of @makeinfo{}.
-@end table
-
-@section Pointer Validation
-@cindex Pointer validation with @makeinfo{}
-@cindex Validation of pointers
-
-If you do not suppress pointer-validation (by using the
-@samp{--no-pointer-validation} option), @makeinfo{}
-will check the validity of the final Info file.  Mostly,
-this means ensuring that nodes you have referenced
-really exist.  Here is a complete list of what is
-checked:
-
-@enumerate
-@item
-If a `Next', `Previous', or `Up' node reference is a reference to a
-node in the current file and is not an external reference such as to
-@file{(dir)}, then the referenced node must exist.
-
-@item
-In every node, if the `Previous' node is different from the `Up' node, 
-then the `Previous' node must also be pointed to by a `Next' node.
-
-@item
-Every node except the `Top' node must have an `Up' pointer.
-
-@item
-The node referenced by an `Up' pointer must contain a reference to the
-current node in some manner other than through a `Next' reference.
-This includes menu entries and cross references.
-
-@item
-If the `Next' reference of a node is not the same as the `Next' reference
-of the `Up' reference, then the node referenced by the `Next' pointer
-must have a `Previous' pointer that points back to the current node.
-This rule allows the last node in a section to point to the first node
-of the next chapter.
-@end enumerate
-
-@bye
diff --git a/gnu/usr.bin/texinfo/makeinfo/macros/html.texi b/gnu/usr.bin/texinfo/makeinfo/macros/html.texi
deleted file mode 100644
index 60760825c68..00000000000
--- a/gnu/usr.bin/texinfo/makeinfo/macros/html.texi
+++ /dev/null
@@ -1,269 +0,0 @@
-@c  html.texi: -*- Texinfo -*- Macros which support HTML output.
-
-@c  Copyright (c) 1995 Brian Fox (bfox@ai.mit.edu)
-@c  Author: Brian J. Fox (bfox@ai.mit.edu) Sat Apr  1 20:30:54 1995.
-@c
-@c I didn't want to write this myself, because I wanted some HTML wizard
-@c to get everything exactly right.  However, rms continues to believe
-@c that the macro system is not a good idea.  I couldn't disagree more,
-@c so I am writing this as an example of how useful such macros can be.
-
-@macro html
-@set html
-<html>
-@end macro
-
-@c
-@c The first step is to define the macros which really only have meaning
-@c when producing output for HTML.
-
-@c
-@c @anchor{Brian Fox, http://www.ua.com/users/bfox/}
-@c
-@macro anchor{text, link}
-@ifset html
-<a href="\link\">\text\</a>
-@end ifset
-@ifclear html
-\text\
-@end ifclear
-@end macro
-
-@macro pre{}
-@ifset html
-<pre>
-@end ifset
-@end macro
-
-@macro endpre{}
-@ifset html
-</pre>
-@end ifset
-@end macro
-
-@macro TeX
-@ifset html
-<i>T</i>e<i>X</i>
-@end ifset
-@ifclear html
-@TeX{}
-@end ifclear
-@end macro
-
-@macro paragraph{}
-@ifset html
-<p>
-@end ifset
-@end macro
-
-@c
-@c @email{bfox@@ai.mit.edu}
-@c
-@macro email{address}
-@anchor{mailto:\address\, \address\}
-@end macro
-
-@c
-@c Redefine the TeXinfo commands which have direct HTML counterparts.
-@c 
-
-@macro html-define-0arg{command, html-insertion}
-@macro \command\
-@ifset html
-\html-insertion\
-@end ifset
-@ifclear html
-@\command\
-@end ifclear
-@end macro
-@end macro
-
-@macro html-define-1arg{command, html-insertion}
-@macro \command\{arg}
-@ifset html
-\html-insertion\
-@end ifset
-@ifclear html
-@\command\{\arg\}
-@end ifclear
-@end macro
-@end macro
-
-@macro html-define-line{command, html-insertion}
-@macro \command\{line}
-@ifset html
-\html-insertion\
-@end ifset
-@ifclear html
-@\command\ \line\
-@end ifclear
-@end macro
-@end macro
-
-@html-define-0arg{*, <br>}
-@html-define-1arg{b, <b>\\arg\\</b>}
-@html-define-1arg{code, <tt><b>\\arg\\</b></tt>}
-@html-define-line{itemize, <ul>}
-@html-define-line{item,<p><li>}
-@html-define-line{heading,<h1>\\line\\</h1>}
-@html-define-0arg{bye, </html>}
-
-@c 
-@c Define into nothing the macros which do nothing in html.
-@c 
-@html-define-line{group,}
-
-@c
-@c Define a macro which is used to define other macros.  This one makes
-@c a macro which creates an HTML header line.  No sectioning commands
-@c are used.  This takes advantage of the non-recursion feature of
-@c macro execution.
-@macro node_define{orig-name, header-style}
-@macro \orig-name\{title}
-@ifset html
-@node \title\
-<a name="\title\"><\header-style\>\title\</\header-style\></a>
-@end ifset
-@ifclear html
-@\orig-name\ \title\
-@end ifclear
-@end macro
-@end macro
-
-@c
-@c The same as NODE_DEFINE, but italicized.
-@macro inode_define{orig-name, header-style}
-@macro \orig-name\{title}
-@ifset html
-@node \title\
-<a name="\title\"><\header-style\><i>\title\</i></\header-style\></a>
-@end ifset
-@ifclear html
-@\orig-name\ \title\
-@end ifclear
-@end macro
-@end macro
-
-@c Ignore @node commands.
-@html-define-line{node,}
-
-@c Here is a special one for "@top".
-@macro top{title}
-@end macro
-
-@c Now actually define a new set of sectioning commands.
-@node_define {appendix, h1}
-@node_define {appendixsec, h2}
-@node_define {appendixsubsec, h3}
-@node_define {appendixsubsubsec, h4}
-@node_define {chapter, h1}
-@node_define {section, h2}
-@node_define {subsection, h3}
-@node_define {subsubsec, h4}
-@node_define {unnumbered, h1}
-@node_define {unnumberedsec, h2}
-@node_define {unnumberedsubsec, h3}
-@node_define {unnumberedsubsubsec, h4}
-
-@c The italicized analogues.
-@inode_define {iappendix, h1}
-@inode_define {iappendixsec, h2}
-@inode_define {iappendixsubsec, h3}
-@inode_define {iappendixsubsubsec, h4}
-@inode_define {ichapter, h1}
-@inode_define {isection, h2}
-@inode_define {isubsection, h3}
-@inode_define {isubsubsec, h4}
-@inode_define {iunnumbered, h1}
-@inode_define {iunnumberedsec, h2}
-@inode_define {iunnumberedsubsec, h3}
-@inode_define {iunnumberedsubsubsec, h4}
-
-@c Manual starter:
-@c 
-@c Pass arguments of TITLE, AUTHOR, and a short DESCRIPTION.
-@c Immediately following, insert the Top node's menu.
-@c 
-@c Typical usage:
-@c 
-@c @document{Makeinfo, Brian J. Fox, This file documents the use of the
-@c @code{makeinfo} program\, versions 1.61 and later.}
-@c 
-@c @menu
-@c * What is @makeinfo{}?::
-@c @end menu
-@macro document{title, author, description}
-@ifinfo
-\description\
-
-Copyright @copyright{} 1995 \author\
-Copyright @copyright{} 1995 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 preserved on all copies.
-
-Permission is granted to process this file through TeX and print the
-results, provided the printed document carries copying permission
-notice identical to this one except for the removal of this paragraph
-(this paragraph not being relevant to the printed manual).
-
-Permission is granted to copy and distribute modified versions of this
-manual under the conditions for verbatim copying, provided that the entire
-resulting derived work is distributed under the terms of a permission
-notice identical to this one.
-
-Permission is granted to copy and distribute translations of this manual
-into another language, under the above conditions for modified versions,
-except that this permission notice may be stated in a translation approved
-by the copyright holders.
-@end ifinfo
-
-@titlepage
-@title \title\
-@author \author\
-
-@page
-@vskip 0pt plus 1filll
-Copyright @copyright{} 1995 \author\
-Copyright @copyright{} 1995 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 preserved on all copies.
-
-Permission is granted to copy and distribute modified versions of this
-manual under the conditions for verbatim copying, provided that the entire
-resulting derived work is distributed under the terms of a permission
-notice identical to this one.
-
-Permission is granted to copy and distribute translations of this manual
-into another language, under the above conditions for modified versions,
-except that this permission notice may be stated in a translation approved
-by the copyright holders.
-@end titlepage
-
-@top{\title\}
-
-\description\
-@end macro
-
-@html-define-line{end,
-@ifeq{"\\line\\"\, "ifinfo"\, @end ifinfo}
-@ifeq{"\\line\\"\, "ifset"\, @end ifset}
-@ifeq{"\\line\\"\, "ifclear"\, @end ifclear}
-@ifeq{"\\line\\"\, "cartouche"\, @end cartouche}
-@ifeq{"\\line\\"\, "menu"\, @end menu}
-@ifeq{"\\line\\"\, "itemize"\, </ul>}
-@ifeq{"\\line\\"\, "enumerate"\, </ul>}
-@ifeq{"\\line\\"\, "table"\, </ul>}
-@ifeq{"\\line\\"\, "ftable"\, </ul>}
-@ifeq{"\\line\\"\, "vtable"\, </ul>}
-@ifeq{"\\line\\"\, "menu"\, xxx}
-@ifeq{"\\line\\"\, "quotation"\, </pre>}
-@ifeq{"\\line\\"\, "example"\, </tt></pre>}
-@ifeq{"\\line\\"\, "smallexample"\, </tt></pre>}
-@ifeq{"\\line\\"\, "lisp"\, </tt></pre>}
-@ifeq{"\\line\\"\, "format"\, </tt></pre>}
-@ifeq{"\\line\\"\, "display"\, </tt></pre>}
-@ifeq{"\\line\\"\, "group"}}
diff --git a/gnu/usr.bin/texinfo/makeinfo/macros/multifmt.texi b/gnu/usr.bin/texinfo/makeinfo/macros/multifmt.texi
deleted file mode 100644
index 0f2eb32a585..00000000000
--- a/gnu/usr.bin/texinfo/makeinfo/macros/multifmt.texi
+++ /dev/null
@@ -1,41 +0,0 @@
-@c  multiformat.texi: -*- Texinfo -*- \input texinfo.tex
-
-@c  Copyright (c) 1995 Universal Access, Inc
-@c  Author: Brian J. Fox (bfox@ua.com) Sun Apr  2 07:56:23 1995.
-@setfilename multiformat.info
-
-@include html.texi
-
-@ifset html
-@html
-@end ifset
-
-@node First Node, First Section, (dir), (dir)
-@chapter First Chapter
-Here is some text that belongs in the first chapter.  Nothing very
-exciting happens here, but this is enough text to span a couple of
-lines, and we feel that is important.
-@paragraph
-
-This is the second paragraph of the first chapter.  Note that the
-formatting commands in @code{HTML} seem to do the right thing, as do the
-commands when invoked in @code{Texinfo} mode and in @TeX{}.
-
-@node First Section, , First Node, First Node
-@isection First Section
-
-Here is some text in the first section of the first chapter.  We are
-trying very hard to examine the output here to see exactly how proper it
-is.  If I wasn't so tired, we could probably see it already.
-@paragraph
-
-Here is a list of items:
-@paragraph
-
-@itemize @bullet
-@item Here is the first item.
-@item Here is the second item.
-@end itemize
-
-@bye
-
diff --git a/gnu/usr.bin/texinfo/makeinfo/macros/res-samp.texi b/gnu/usr.bin/texinfo/makeinfo/macros/res-samp.texi
deleted file mode 100644
index 5b4e869e0c3..00000000000
--- a/gnu/usr.bin/texinfo/makeinfo/macros/res-samp.texi
+++ /dev/null
@@ -1,32 +0,0 @@
-\input texinfo.tex
-@setfilename resume-example.info
-
-@include resume.texi
-
-@name Brian J. Fox
-@email bfox@@ai.mit.edu
-@street 116 Barranca Ave, Ste. B
-@city Santa Barbara
-@state CA
-@zip 93109
-@phone (805) 564-2192
-
-@resume
-
-@block{EDUCATION}
-@entry{
-12/11/59,
-12/11/63,
-My Mom's House,
-Learning at home with my mother., 
-This was the most learning I ever did.}
-
-@entry{12/11/63, 12/11/77, Brookline\, MA, Learning in the public school system.}
-@entry{12/11/78, 12/11/81, Santa Barbara\, CA, Learning in life
-experience\, and three months at Santa Barbara City College.}
-
-@block{WORK EXPERIENCE}
-@entry{12/11/59, 12/11/75, Mom's house, Various and sundry tasks\,
-including washing dishes and clothes\, and toilet training.}
-@entry{3 months ago, present, Terrapin\, Inc., hacking up Unix systems\, breaking @code{LOGO} worlds\, terrorizing surrounding neighborhood.}
-@bye
diff --git a/gnu/usr.bin/texinfo/makeinfo/macros/resume.texi b/gnu/usr.bin/texinfo/makeinfo/macros/resume.texi
deleted file mode 100644
index a4dc5d04be9..00000000000
--- a/gnu/usr.bin/texinfo/makeinfo/macros/resume.texi
+++ /dev/null
@@ -1,64 +0,0 @@
-@c 
-@c Reusme writing macros.  Produce a very specific format.
-@c 
-
-@c A macro which creates a macro.  The resultant macro can be called to
-@c set a variable which has the same name as the macro.  Use
-@c @value{name} to get the value set in @name{}.
-@macro make-var-macro{macro-name}
-@macro \macro-name\{value}
-@quote-arg
-@set \macro-name\ \value\
-@end macro
-@end macro
-
-@make-var-macro{name}
-@make-var-macro{street}
-@make-var-macro{city}
-@make-var-macro{state}
-@make-var-macro{zip}
-@make-var-macro{phone}
-@make-var-macro{email}
-
-@c Give all of the above variable/macros a null value to start.
-@name
-@street
-@city
-@state
-@zip
-@phone
-@email
-
-@c A typical heading for a resume block is a non-indented line.
-@macro block{title}
-@paragraphindent none
-@comment @noindent
-@heading \title\
-@end macro
-
-@c A typical entry in a resume has a from-date, a to-date, a location,
-@c a job title, and a longer descrition body.
-
-@macro entry{from-date, to-date, where, what, body}
-@paragraphindent 8
-@b{\where\: \what\ (\from-date\ --- \to-date\)}
-@paragraphindent 3
-
-\body\
-@paragraphindent none
-@end macro
-
-@macro address{}
-@value{name}@*
-@value{street}@*
-@value{city}, @value{state}@*
-@value{zip}@*
-@value{phone}
-@end macro
-
-@macro resume{}
-@center @value{name}@*
-@center @value{street}@*
-@center @value{city}, @value{state} @value{zip}@*
-@center @value{email}
-@end macro
diff --git a/gnu/usr.bin/texinfo/makeinfo/macros/simpledoc.texi b/gnu/usr.bin/texinfo/makeinfo/macros/simpledoc.texi
deleted file mode 100644
index 576cb9b8e41..00000000000
--- a/gnu/usr.bin/texinfo/makeinfo/macros/simpledoc.texi
+++ /dev/null
@@ -1,135 +0,0 @@
-
-@comment Here are some useful examples of the macro facility.
-
-@c Simply insert the right version of the texinfo name.
-@macro texinfo{}
-TeXinfo
-@end macro
-
-@c Define a macro which expands to a pretty version of the name of the
-@c Makeinfo program.
-@macro makeinfo{}
-@code{Makeinfo}
-@end macro
-
-@c Simple insert the right version of the Info name.
-@macro Info{}
-@code{Info}
-@end macro
-
-@c Define a macro which is used to define other macros.  This one makes
-@c a macro which creates a node and gives it a sectioning command.  Note
-@c that the created macro uses the original definition within the
-@c expansion text.  This takes advantage of the non-recursion feature of
-@c macro execution.
-@macro node_define{orig-name}
-@macro \orig-name\{title}
-@node \title\
-@\orig-name\ \title\
-@end macro
-@end macro
-
-@c Here is a special one for "@top", causing the node name to be "Top",
-@c but leaving the section name as the specified title.
-@macro top{title}
-@node Top
-@top \title\
-@end macro
-
-@c Now actually define a new set of sectioning commands.
-@node_define {appendix}
-@node_define {appendixsec}
-@node_define {appendixsubsec}
-@node_define {appendixsubsubsec}
-@node_define {chapter}
-@node_define {section}
-@node_define {subsection}
-@node_define {subsubsec}
-@node_define {unnumbered}
-@node_define {unnumberedsec}
-@node_define {unnumberedsubsec}
-@node_define {unnumberedsubsubsec}
-
-@c The italicized analogues.
-@node_define {iappendix}
-@node_define {iappendixsec}
-@node_define {iappendixsubsec}
-@node_define {iappendixsubsubsec}
-@node_define {ichapter}
-@node_define {isection}
-@node_define {isubsection}
-@node_define {isubsubsec}
-@node_define {iunnumbered}
-@node_define {iunnumberedsec}
-@node_define {iunnumberedsubsec}
-@node_define {iunnumberedsubsubsec}
-
-@c Manual starter:
-@c 
-@c Pass arguments of TITLE, AUTHOR, and a short DESCRIPTION.
-@c Immediately following, insert the Top node's menu.
-@c 
-@c Typical usage:
-@c 
-@c @document{Makeinfo, Brian J. Fox, This file documents the use of the
-@c @code{makeinfo} program\, versions 1.58 and later.}
-@c 
-@c @menu
-@c * What is @makeinfo{}?::
-@c @end menu
-
-@macro document{title, author, description}
-@ifinfo
-\description\
-
-Copyright @copyright{} 1994 \author\
-Copyright @copyright{} 1994 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 preserved on all copies.
-
-Permission is granted to process this file through TeX and print the
-results, provided the printed document carries copying permission
-notice identical to this one except for the removal of this paragraph
-(this paragraph not being relevant to the printed manual).
-
-Permission is granted to copy and distribute modified versions of this
-manual under the conditions for verbatim copying, provided that the entire
-resulting derived work is distributed under the terms of a permission
-notice identical to this one.
-
-Permission is granted to copy and distribute translations of this manual
-into another language, under the above conditions for modified versions,
-except that this permission notice may be stated in a translation approved
-by the copyright holders.
-@end ifinfo
-
-@titlepage
-@title \title\
-@author \author\
-
-@page
-@vskip 0pt plus 1filll
-Copyright @copyright{} 1994 \author\
-Copyright @copyright{} 1994 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 preserved on all copies.
-
-Permission is granted to copy and distribute modified versions of this
-manual under the conditions for verbatim copying, provided that the entire
-resulting derived work is distributed under the terms of a permission
-notice identical to this one.
-
-Permission is granted to copy and distribute translations of this manual
-into another language, under the above conditions for modified versions,
-except that this permission notice may be stated in a translation approved
-by the copyright holders.
-@end titlepage
-
-@top{\title\}
-
-\description\
-@end macro
diff --git a/gnu/usr.bin/texinfo/makeinfo/makeinfo.texi b/gnu/usr.bin/texinfo/makeinfo/makeinfo.texi
deleted file mode 100644
index 0299fea7398..00000000000
--- a/gnu/usr.bin/texinfo/makeinfo/makeinfo.texi
+++ /dev/null
@@ -1,295 +0,0 @@
-\input texinfo    @c -*-texinfo-*-
-@comment %**start of header
-@setfilename makeinfo.info
-@set VERSION 1.61
-@paragraphindent none
-@comment %**start of header
-
-@ifinfo
-This file is an extract from the @cite{Texinfo} manual.@*
-It documents @code{makeinfo}, a program that converts Texinfo
-files into Info files.  
-
-Copyright (C) 1992, 1993, 1994, 1995 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 preserved on all copies.
-
-@ignore
-Permission is granted to process this file through TeX and print the
-results, provided the printed document carries copying permission
-notice identical to this one except for the removal of this paragraph
-(this paragraph not being relevant to the printed manual).
-
-@end ignore
-Permission is granted to copy and distribute modified versions of this
-manual under the conditions for verbatim copying, provided that the entire
-resulting derived work is distributed under the terms of a permission
-notice identical to this one.
-
-Permission is granted to copy and distribute translations of this manual
-into another language, under the above conditions for modified versions,
-except that this permission notice may be stated in a translation approved
-by the Free Software Foundation.
-@end ifinfo
-
-@titlepage
-@title GNU Makeinfo
-@author Brian J. Fox and Robert J. Chassell
-
-@page
-@vskip 0pt plus 1filll
-Copyright @copyright{} 1992, 1993, 1994, 1995 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 preserved on all copies.
-
-Permission is granted to copy and distribute modified versions of this
-manual under the conditions for verbatim copying, provided that the entire
-resulting derived work is distributed under the terms of a permission
-notice identical to this one.
-
-Permission is granted to copy and distribute translations of this manual
-into another language, under the above conditions for modified versions,
-except that this permission notice may be stated in a translation approved
-by the Free Software Foundation.
-@end titlepage
-
-@node Top, ,(dir), (dir)
-@chapter What is @code{makeinfo}?
-
-@iftex
-This file documents the use of the @code{makeinfo} program, versions
-@value{VERSION} and later.  It is an extract from the @cite{TeXinfo} manual.
-@end iftex
-
-@code{makeinfo} is a program for converting @dfn{TeXinfo} files into @dfn{Info}
-files.  TeXinfo is a documentation system that uses a single source file to
-produce both on-line information and printed output.
-
-You can read the on-line information using Info; type @code{info} to
-learn about Info.
-@ifinfo
-@xref{Top, Texinfo, Overview of Texinfo, texinfo, Texinfo},
-@end ifinfo
-@iftex
-See the @cite{TeXinfo} manual,
-@end iftex
-to learn about the TeXinfo documentation system.
-
-@menu
-* Formatting Control::          Controlling the width of lines, paragraph
-                                indentation, and other similar formatting.
-
-* Options::                     Command line options which control the
-                                behaviour of Makeinfo.
-
-* Pointer Validation::          How Makeinfo can help you to track node
-                                references through complex Texinfo files.
-
-* The Macro Facility::          Makeinfo allows the use of @dfn{macros}.
-
-* Index::                       Index of Concepts.
-@end menu
-
-@node Formatting Control
-@section Controlling Paragraph Formats
-
-Without any special options, @code{makeinfo} @dfn{fills} the paragraphs that
-it outputs to an Info file.  Filling is the process of breaking and connecting
-lines so that lines are the same length as or shorter than the number
-specified as the fill column.  Lines are broken between words.  With
-@code{makeinfo}, you can control:
-
-@itemize @bullet
-@item
-The width of each paragraph (the @dfn{fill-column}).
-@item
-The amount of indentation that the first line of 
-each paragraph receives (the @dfn{paragraph-indentation}).
-@end itemize
-
-@node Options
-@section Command Line Options
-
-The following command line options are available for @code{makeinfo}.
-
-@need 100
-@table @code
-@item -D @var{var}
-Cause @var{var} to be defined.  This is equivalent to 
-@code{@@set @var{var}} in the Texinfo file.
-
-@need 150
-@item --error-limit @var{limit}
-Set the maximum number of errors that @code{makeinfo} will report
-before exiting (on the assumption that continuing would be useless).
-The default number of errors that can be reported before
-@code{makeinfo} gives up is 100.@refill
-
-@need 150
-@item --fill-column @var{width}
-Specify the maximum number of columns in a line; this is the right-hand
-edge of a line.  Paragraphs that are filled will be filled to this
-width.  The default value for @code{fill-column} is 72.
-@refill
-
-@item --footnote-style @var{style}
-Set the footnote style to @var{style}, either @samp{end} for the end
-node style or @samp{separate} for the separate node style.  The value
-set by this option overrides the value set in a Texinfo file by an
-@code{@@footnotestyle} command.  When the footnote style is
-@samp{separate}, @code{makeinfo} makes a new node containing the
-footnotes found in the current node.  When the footnote style is
-@samp{end}, @code{makeinfo} places the footnote references at the end
-of the current node.@refill
-
-@need 150
-@item -I @var{dir}
-Add @code{dir} to the directory search list for finding files that are
-included using the @code{@@include} command.  By default,
-@code{makeinfo} searches only the current directory.
-
-@need 150
-@item --no-headers
-Do not include menus or node lines in the output.  This results in an
-@sc{ascii} file that you cannot read in Info since it does not contain
-the requisite nodes or menus; but you can print such a file in a
-single, typewriter-like font and produce acceptable output.
-
-@need 150
-@item --no-split
-Suppress the splitting stage of @code{makeinfo}.  Normally, large
-output files (where the size is greater than 70k bytes) are split into
-smaller subfiles, each one approximately 50k bytes.  If you specify
-@samp{--no-split}, @code{makeinfo} will not split up the output
-file.@refill
-
-@need 100
-@item --no-pointer-validate
-@item --no-validate
-Suppress the pointer-validation phase of @code{makeinfo}.  Normally,
-after a Texinfo file is processed, some consistency checks are made to
-ensure that cross references can be resolved, etc.
-@xref{Pointer Validation}.@refill
-
-@need 150
-@item --no-warn
-Suppress the output of warning messages.  This does @emph{not}
-suppress the output of error messages, only warnings.  You might
-want this if the file you are creating has examples of Texinfo cross
-references within it, and the nodes that are referenced do not actually
-exist.@refill
-
-@item --no-number-footnotes
-Supress automatic footnote numbering.  By default, @code{makeinfo}
-numbers each footnote sequentially in a single node, resetting the
-current footnote number to 1 at the start of each node.
-
-@need 150
-@item --output @var{file}
-@itemx -o @var{file}
-Specify that the output should be directed to @var{file} and not to the
-file name specified in the @code{@@setfilename} command found in the Texinfo
-source.  @var{file} can be the special token @samp{-}, which specifies
-standard output.
-
-@need 150
-@item --paragraph-indent @var{indent}
-Set the paragraph indentation style to @var{indent}.  The value set by
-this option overrides the value set in a Texinfo file by an
-@code{@@paragraphindent} command.  The value of @var{indent} is
-interpreted as follows:@refill
-
-@itemize @bullet
-@item
-If the value of @var{indent} is @samp{asis}, do not change the
-existing indentation at the starts of paragraphs.@refill
-
-@item
-If the value of @var{indent} is zero, delete any existing
-indentation.@refill
-
-@item
-If the value of @var{indent} is greater than zero, indent each
-paragraph by that number of spaces.@refill
-@end itemize
-
-@need 100
-@item --reference-limit @var{limit}
-Set the value of the number of references to a node that
-@code{makeinfo} will make without reporting a warning.  If a node has more
-than this number of references in it, @code{makeinfo} will make the
-references but also report a warning.@refill
-
-@need 150
-@item -U @var{var}
-Cause @var{var} to be undefined.  This is equivalent to 
-@code{@@clear @var{var}} in the Texinfo file.
-
-@need 100
-@item --verbose
-Cause @code{makeinfo} to display messages saying what it is doing.
-Normally, @code{makeinfo} only outputs messages if there are errors or
-warnings.@refill
-
-@need 100
-@item --version
-Report the version number of this copy of @code{makeinfo}.@refill
-
-@item --help
-Show a summary of the commend line arguments to @code{makeinfo}.
-@end table
-
-@node Pointer Validation
-@section Pointer Validation
-@cindex Pointer validation with @code{makeinfo}
-@cindex Validation of pointers
-
-If you do not suppress pointer-validation (by using the
-@samp{--no-pointer-validation} option), @code{makeinfo}
-will check the validity of the final Info file.  Mostly,
-this means ensuring that nodes you have referenced
-really exist.  Here is a complete list of what is
-checked:@refill
-
-@enumerate
-@item
-If a `Next', `Previous', or `Up' node reference is a reference to a
-node in the current file and is not an external reference such as to
-@file{(dir)}, then the referenced node must exist.@refill
-
-@item
-In every node, if the `Previous' node is different from the `Up' node, 
-then the `Previous' node must also be pointed to by a `Next' node.@refill
-
-@item
-Every node except the `Top' node must have an `Up' pointer.@refill
-
-@item
-The node referenced by an `Up' pointer must contain a reference to the
-current node in some manner other than through a `Next' reference.
-This includes menu entries and cross references.@refill
-
-@item
-If the `Next' reference of a node is not the same as the `Next' reference
-of the `Up' reference, then the node referenced by the `Next' pointer
-must have a `Previous' pointer that points back to the current node.
-This rule allows the last node in a section to point to the first node
-of the next chapter.@refill
-@end enumerate
-
-@lowersections
-@include macro.texi
-@raisesections
-
-@lowersections
-@node Index
-@appendix Index
-@printindex cp
-@raisesections
-
-@contents
-@bye
diff --git a/gnu/usr.bin/texinfo/makeinfo/multiformat.texi b/gnu/usr.bin/texinfo/makeinfo/multiformat.texi
deleted file mode 100644
index 0c6c467dc0d..00000000000
--- a/gnu/usr.bin/texinfo/makeinfo/multiformat.texi
+++ /dev/null
@@ -1,40 +0,0 @@
-@c  multiformat.texi: -*- Texinfo -*- \input texinfo.tex
-
-@c  Copyright (c) 1995 Universal Access, Inc
-@c  Author: Brian J. Fox (bfox@ua.com) Sun Apr  2 07:56:23 1995.
-@setfilename multiformat.info
-
-@include html.texi
-
-@ifset html
-@html
-@end ifset
-
-@node First Node, First Section, (dir), (dir)
-@chapter First Chapter
-Here is some text that belongs in the first chapter.  Nothing very
-exciting happens here, but this is enough text to span a couple of
-lines, and we feel that is important.
-@paragraph
-
-This is the second paragraph of the first chapter.  Note that the
-formatting commands in @code{HTML} seem to do the right thing, as do the
-commands when invoked in @code{Texinfo} mode and in @TeX{}.
-
-@node First Section, , First Node, First Node
-@isection First Section
-
-Here is some text in the first section of the first chapter.  We are
-trying very hard to examine the output here to see exactly how proper it
-is.  If I wasn't so tired, we could probably see it already.
-@paragraph
-
-Here is a list of items:
-@paragraph
-
-@itemize @bullet
-@item Here is the first item.
-@item Here is the second item.
-@end itemize
-
-@bye