Commits

Aidan Kehoe  committed a7da359

Backed out changeset e82f5b7010fe, incompatible with extant makeinfo.

  • Participants
  • Parent commits e82f5b7

Comments (0)

Files changed (10)

File man/ChangeLog

-2010-02-19  Ben Wing  <ben@xemacs.org>
-
-	* widget.texi:
-	* widget.texi (Top):
-	* widget.texi (Introduction):
-	* widget.texi (User Interface):
-	* widget.texi (Programming Example):
-	* widget.texi (Setting Up the Buffer):
-	* widget.texi (Basic Types):
-	* widget.texi (link):
-	* widget.texi (url-link):
-	* widget.texi (info-link):
-	* widget.texi (push-button):
-	* widget.texi (editable-field):
-	* widget.texi (text):
-	* widget.texi (menu-choice):
-	* widget.texi (radio-button-choice):
-	* widget.texi (item):
-	* widget.texi (choice-item):
-	* widget.texi (toggle):
-	* widget.texi (checkbox):
-	* widget.texi (checklist):
-	* widget.texi (editable-list):
-	* widget.texi (group):
-	* widget.texi (Sexp Types):
-	* widget.texi (constants):
-	* widget.texi (generic):
-	* widget.texi (atoms):
-	* widget.texi (composite):
-	* widget.texi (Widget Properties):
-	* widget.texi (Defining New Widgets):
-	* widget.texi (Widget Browser):
-	* widget.texi (Widget Minor Mode):
-	* widget.texi (Utilities):
-	* widget.texi (Widget Wishlist):
-	* widget.texi (Widget Internals):
-	* widget.texi (GNU Free Documentation License):
-	* widget.texi (Index):
-	Sync with FSF 23.1.92.
-
-2010-02-19  Ben Wing  <ben@xemacs.org>
-
-	* texinfo/fdl.texi: New file.
-	* texinfo/texinfo.texi:
-	* texinfo/texinfo.texi (Top):
-	* texinfo/texinfo.texi (Copying Conditions):
-	* texinfo/texinfo.texi (Overview):
-	* texinfo/texinfo.texi (Reporting Bugs):
-	* texinfo/texinfo.texi (Using Texinfo):
-	* texinfo/texinfo.texi (Output Formats):
-	* texinfo/texinfo.texi (Info Files):
-	* texinfo/texinfo.texi (Printed Books):
-	* texinfo/texinfo.texi (Formatting Commands):
-	* texinfo/texinfo.texi (Conventions):
-	* texinfo/texinfo.texi (Comments):
-	* texinfo/texinfo.texi (Minimum):
-	* texinfo/texinfo.texi (Six Parts):
-	* texinfo/texinfo.texi (Short Sample):
-	* texinfo/texinfo.texi (History):
-	* texinfo/texinfo.texi (Texinfo Mode):
-	* texinfo/texinfo.texi (Texinfo Mode Overview):
-	* texinfo/texinfo.texi (XEmacs Editing):
-	* texinfo/texinfo.texi (Inserting):
-	* texinfo/texinfo.texi (Showing the Structure):
-	* texinfo/texinfo.texi (Updating Nodes and Menus):
-	* texinfo/texinfo.texi (Updating Commands):
-	* texinfo/texinfo.texi (Updating Requirements):
-	* texinfo/texinfo.texi (Other Updating Commands):
-	* texinfo/texinfo.texi (Info Formatting):
-	* texinfo/texinfo.texi (Printing):
-	* texinfo/texinfo.texi (Texinfo Mode Summary):
-	* texinfo/texinfo.texi (Beginning a File):
-	* texinfo/texinfo.texi (Sample Beginning):
-	* texinfo/texinfo.texi (Texinfo File Header):
-	* texinfo/texinfo.texi (First Line):
-	* texinfo/texinfo.texi (Start of Header):
-	* texinfo/texinfo.texi (setfilename):
-	* texinfo/texinfo.texi (settitle):
-	* texinfo/texinfo.texi (End of Header):
-	* texinfo/texinfo.texi (Document Permissions):
-	* texinfo/texinfo.texi (copying):
-	* texinfo/texinfo.texi (insertcopying):
-	* texinfo/texinfo.texi (Titlepage & Copyright Page):
-	* texinfo/texinfo.texi (titlepage):
-	* texinfo/texinfo.texi (titlefont center sp):
-	* texinfo/texinfo.texi (title subtitle author):
-	* texinfo/texinfo.texi (Copyright):
-	* texinfo/texinfo.texi (end titlepage):
-	* texinfo/texinfo.texi (headings on off):
-	* texinfo/texinfo.texi (Contents):
-	* texinfo/texinfo.texi (The Top Node):
-	* texinfo/texinfo.texi (Top Node Example):
-	* texinfo/texinfo.texi (Master Menu Parts):
-	* texinfo/texinfo.texi (Global Document Commands):
-	* texinfo/texinfo.texi (documentdescription):
-	* texinfo/texinfo.texi (setchapternewpage):
-	* texinfo/texinfo.texi (paragraphindent):
-	* texinfo/texinfo.texi (firstparagraphindent):
-	* texinfo/texinfo.texi (exampleindent):
-	* texinfo/texinfo.texi (Software Copying Permissions):
-	* texinfo/texinfo.texi (Ending a File):
-	* texinfo/texinfo.texi (Printing Indices & Menus):
-	* texinfo/texinfo.texi (File End):
-	* texinfo/texinfo.texi (Structuring):
-	* texinfo/texinfo.texi (Tree Structuring):
-	* texinfo/texinfo.texi (Structuring Command Types):
-	* texinfo/texinfo.texi (makeinfo top):
-	* texinfo/texinfo.texi (chapter):
-	* texinfo/texinfo.texi (unnumbered & appendix):
-	* texinfo/texinfo.texi (majorheading & chapheading):
-	* texinfo/texinfo.texi (section):
-	* texinfo/texinfo.texi (unnumberedsec appendixsec heading):
-	* texinfo/texinfo.texi (subsection):
-	* texinfo/texinfo.texi (unnumberedsubsec appendixsubsec subheading):
-	* texinfo/texinfo.texi (subsubsection):
-	* texinfo/texinfo.texi (Raise/lower sections):
-	* texinfo/texinfo.texi (Nodes):
-	* texinfo/texinfo.texi (Two Paths):
-	* texinfo/texinfo.texi (Node Menu Illustration):
-	* texinfo/texinfo.texi (node):
-	* texinfo/texinfo.texi (Node Names):
-	* texinfo/texinfo.texi (Writing a Node):
-	* texinfo/texinfo.texi (Node Line Tips):
-	* texinfo/texinfo.texi (Node Line Requirements):
-	* texinfo/texinfo.texi (First Node):
-	* texinfo/texinfo.texi (makeinfo top command):
-	* texinfo/texinfo.texi (makeinfo Pointer Creation):
-	* texinfo/texinfo.texi (anchor):
-	* texinfo/texinfo.texi (Menus):
-	* texinfo/texinfo.texi (Menu Location):
-	* texinfo/texinfo.texi (Writing a Menu):
-	* texinfo/texinfo.texi (Menu Parts):
-	* texinfo/texinfo.texi (Less Cluttered Menu Entry):
-	* texinfo/texinfo.texi (Menu Example):
-	* texinfo/texinfo.texi (Other Info Files):
-	* texinfo/texinfo.texi (Cross References):
-	* texinfo/texinfo.texi (References):
-	* texinfo/texinfo.texi (Cross Reference Commands):
-	* texinfo/texinfo.texi (Cross Reference Parts):
-	* texinfo/texinfo.texi (xref):
-	* texinfo/texinfo.texi (Reference Syntax):
-	* texinfo/texinfo.texi (One Argument):
-	* texinfo/texinfo.texi (Two Arguments):
-	* texinfo/texinfo.texi (Three Arguments):
-	* texinfo/texinfo.texi (Four and Five Arguments):
-	* texinfo/texinfo.texi (Top Node Naming):
-	* texinfo/texinfo.texi (ref):
-	* texinfo/texinfo.texi (pxref):
-	* texinfo/texinfo.texi (inforef):
-	* texinfo/texinfo.texi (uref):
-	* texinfo/texinfo.texi (cite):
-	* texinfo/texinfo.texi (Marking Text):
-	* texinfo/texinfo.texi (Indicating):
-	* texinfo/texinfo.texi (Useful Highlighting):
-	* texinfo/texinfo.texi (code):
-	* texinfo/texinfo.texi (kbd):
-	* texinfo/texinfo.texi (key):
-	* texinfo/texinfo.texi (samp):
-	* texinfo/texinfo.texi (verb):
-	* texinfo/texinfo.texi (var):
-	* texinfo/texinfo.texi (env):
-	* texinfo/texinfo.texi (file):
-	* texinfo/texinfo.texi (command):
-	* texinfo/texinfo.texi (option):
-	* texinfo/texinfo.texi (dfn):
-	* texinfo/texinfo.texi (abbr):
-	* texinfo/texinfo.texi (acronym):
-	* texinfo/texinfo.texi (indicateurl):
-	* texinfo/texinfo.texi (email):
-	* texinfo/texinfo.texi (Emphasis):
-	* texinfo/texinfo.texi (emph & strong):
-	* texinfo/texinfo.texi (Smallcaps):
-	* texinfo/texinfo.texi (Fonts):
-	* texinfo/texinfo.texi (Quotations and Examples):
-	* texinfo/texinfo.texi (Block Enclosing Commands):
-	* texinfo/texinfo.texi (quotation):
-	* texinfo/texinfo.texi (example):
-	* texinfo/texinfo.texi (verbatim):
-	* texinfo/texinfo.texi (verbatiminclude):
-	* texinfo/texinfo.texi (lisp):
-	* texinfo/texinfo.texi (small):
-	* texinfo/texinfo.texi (display):
-	* texinfo/texinfo.texi (format):
-	* texinfo/texinfo.texi (exdent):
-	* texinfo/texinfo.texi (flushleft & flushright):
-	* texinfo/texinfo.texi (noindent):
-	* texinfo/texinfo.texi (indent):
-	* texinfo/texinfo.texi (cartouche):
-	* texinfo/texinfo.texi (Lists and Tables):
-	* texinfo/texinfo.texi (Introducing Lists):
-	* texinfo/texinfo.texi (itemize):
-	* texinfo/texinfo.texi (enumerate):
-	* texinfo/texinfo.texi (Two-column Tables):
-	* texinfo/texinfo.texi (table):
-	* texinfo/texinfo.texi (ftable vtable):
-	* texinfo/texinfo.texi (itemx):
-	* texinfo/texinfo.texi (Multi-column Tables):
-	* texinfo/texinfo.texi (Multitable Column Widths):
-	* texinfo/texinfo.texi (Multitable Rows):
-	* texinfo/texinfo.texi (Special Displays):
-	* texinfo/texinfo.texi (Floats):
-	* texinfo/texinfo.texi (float):
-	* texinfo/texinfo.texi (caption shortcaption):
-	* texinfo/texinfo.texi (listoffloats):
-	* texinfo/texinfo.texi (Images):
-	* texinfo/texinfo.texi (Image Syntax):
-	* texinfo/texinfo.texi (Image Scaling):
-	* texinfo/texinfo.texi (Footnotes):
-	* texinfo/texinfo.texi (Footnote Commands):
-	* texinfo/texinfo.texi (Footnote Styles):
-	* texinfo/texinfo.texi (Indices):
-	* texinfo/texinfo.texi (Index Entries):
-	* texinfo/texinfo.texi (Predefined Indices):
-	* texinfo/texinfo.texi (Indexing Commands):
-	* texinfo/texinfo.texi (Combining Indices):
-	* texinfo/texinfo.texi (syncodeindex):
-	* texinfo/texinfo.texi (synindex):
-	* texinfo/texinfo.texi (New Indices):
-	* texinfo/texinfo.texi (Insertions):
-	* texinfo/texinfo.texi (Atsign Braces Comma):
-	* texinfo/texinfo.texi (Inserting an Atsign):
-	* texinfo/texinfo.texi (Inserting Braces):
-	* texinfo/texinfo.texi (Inserting a Comma):
-	* texinfo/texinfo.texi (Inserting Quote Characters):
-	* texinfo/texinfo.texi (Inserting Space):
-	* texinfo/texinfo.texi (Not Ending a Sentence):
-	* texinfo/texinfo.texi (Ending a Sentence):
-	* texinfo/texinfo.texi (Multiple Spaces):
-	* texinfo/texinfo.texi (frenchspacing):
-	* texinfo/texinfo.texi (dmn):
-	* texinfo/texinfo.texi (Inserting Accents):
-	* texinfo/texinfo.texi (Inserting Quotation Marks):
-	* texinfo/texinfo.texi (Dots Bullets):
-	* texinfo/texinfo.texi (dots):
-	* texinfo/texinfo.texi (bullet):
-	* texinfo/texinfo.texi (TeX and copyright):
-	* texinfo/texinfo.texi (tex):
-	* texinfo/texinfo.texi (copyright symbol):
-	* texinfo/texinfo.texi (registered symbol):
-	* texinfo/texinfo.texi (euro):
-	* texinfo/texinfo.texi (pounds):
-	* texinfo/texinfo.texi (textdegree):
-	* texinfo/texinfo.texi (minus):
-	* texinfo/texinfo.texi (geq leq):
-	* texinfo/texinfo.texi (math):
-	* texinfo/texinfo.texi (Click Sequences):
-	* texinfo/texinfo.texi (Glyphs):
-	* texinfo/texinfo.texi (Glyphs Summary):
-	* texinfo/texinfo.texi (result):
-	* texinfo/texinfo.texi (expansion):
-	* texinfo/texinfo.texi (Print Glyph):
-	* texinfo/texinfo.texi (Error Glyph):
-	* texinfo/texinfo.texi (Equivalence):
-	* texinfo/texinfo.texi (Point Glyph):
-	* texinfo/texinfo.texi (Breaks):
-	* texinfo/texinfo.texi (Break Commands):
-	* texinfo/texinfo.texi (Line Breaks):
-	* texinfo/texinfo.texi (- and hyphenation):
-	* texinfo/texinfo.texi (allowcodebreaks):
-	* texinfo/texinfo.texi (w):
-	* texinfo/texinfo.texi (tie):
-	* texinfo/texinfo.texi (sp):
-	* texinfo/texinfo.texi (page):
-	* texinfo/texinfo.texi (group):
-	* texinfo/texinfo.texi (need):
-	* texinfo/texinfo.texi (Definition Commands):
-	* texinfo/texinfo.texi (Def Cmd Template):
-	* texinfo/texinfo.texi (Def Cmd Continuation Lines):
-	* texinfo/texinfo.texi (Optional Arguments):
-	* texinfo/texinfo.texi (deffnx):
-	* texinfo/texinfo.texi (Def Cmds in Detail):
-	* texinfo/texinfo.texi (Functions Commands):
-	* texinfo/texinfo.texi (Variables Commands):
-	* texinfo/texinfo.texi (Typed Functions):
-	* texinfo/texinfo.texi (Typed Variables):
-	* texinfo/texinfo.texi (Data Types):
-	* texinfo/texinfo.texi (Abstract Objects):
-	* texinfo/texinfo.texi (Object-Oriented Variables):
-	* texinfo/texinfo.texi (Object-Oriented Methods):
-	* texinfo/texinfo.texi (Defining Macros):
-	* texinfo/texinfo.texi (Invoking Macros):
-	* texinfo/texinfo.texi (Macro Details):
-	* texinfo/texinfo.texi (alias):
-	* texinfo/texinfo.texi (definfoenclose):
-	* texinfo/texinfo.texi (Hardcopy):
-	* texinfo/texinfo.texi (Use TeX):
-	* texinfo/texinfo.texi (Format with tex/texindex):
-	* texinfo/texinfo.texi (Format with texi2dvi):
-	* texinfo/texinfo.texi (Print with lpr):
-	* texinfo/texinfo.texi (Within XEmacs):
-	* texinfo/texinfo.texi (Texinfo Mode Printing):
-	* texinfo/texinfo.texi (Compile-Command):
-	* texinfo/texinfo.texi (Requirements Summary):
-	* texinfo/texinfo.texi (Preparing for TeX):
-	* texinfo/texinfo.texi (Overfull hboxes):
-	* texinfo/texinfo.texi (smallbook):
-	* texinfo/texinfo.texi (A4 Paper):
-	* texinfo/texinfo.texi (pagesizes):
-	* texinfo/texinfo.texi (Cropmarks and Magnification):
-	* texinfo/texinfo.texi (PDF Output):
-	* texinfo/texinfo.texi (Obtaining TeX):
-	* texinfo/texinfo.texi (Creating and Installing Info Files):
-	* texinfo/texinfo.texi (Creating an Info File):
-	* texinfo/texinfo.texi (makeinfo advantages):
-	* texinfo/texinfo.texi (Invoking makeinfo):
-	* texinfo/texinfo.texi (makeinfo options):
-	* texinfo/texinfo.texi (Pointer Validation):
-	* texinfo/texinfo.texi (makeinfo in XEmacs):
-	* texinfo/texinfo.texi (texinfo-format commands):
-	* texinfo/texinfo.texi (Batch Formatting):
-	* texinfo/texinfo.texi (Tag and Split Files):
-	* texinfo/texinfo.texi (Installing an Info File):
-	* texinfo/texinfo.texi (Directory File):
-	* texinfo/texinfo.texi (New Info File):
-	* texinfo/texinfo.texi (Other Info Directories):
-	* texinfo/texinfo.texi (Installing Dir Entries):
-	* texinfo/texinfo.texi (Invoking install-info):
-	* texinfo/texinfo.texi (Generating HTML):
-	* texinfo/texinfo.texi (HTML Translation):
-	* texinfo/texinfo.texi (HTML Splitting):
-	* texinfo/texinfo.texi (HTML CSS):
-	* texinfo/texinfo.texi (HTML Xref):
-	* texinfo/texinfo.texi (HTML Xref Link Basics):
-	* texinfo/texinfo.texi (HTML Xref Node Name Expansion):
-	* texinfo/texinfo.texi (HTML Xref Command Expansion):
-	* texinfo/texinfo.texi (HTML Xref 8-bit Character Expansion):
-	* texinfo/texinfo.texi (HTML Xref Mismatch):
-	* texinfo/texinfo.texi (Command List):
-	* texinfo/texinfo.texi (Command Syntax):
-	* texinfo/texinfo.texi (Tips):
-	* texinfo/texinfo.texi (Sample Texinfo Files):
-	* texinfo/texinfo.texi (Short Sample Texinfo File):
-	* texinfo/texinfo.texi (GNU Sample Texts):
-	* texinfo/texinfo.texi (Invoking sample):
-	* texinfo/texinfo.texi (GNU Free Documentation License):
-	* texinfo/texinfo.texi (Index):
-	* texinfo/texinfo.texi (Verbatim Copying License):
-	* texinfo/texinfo.texi (All-permissive Copying License):
-	* texinfo/texinfo.texi (Include Files):
-	* texinfo/texinfo.texi (Using Include Files):
-	* texinfo/texinfo.texi (texinfo-multiple-files-update):
-	* texinfo/texinfo.texi (Include Files Requirements):
-	* texinfo/texinfo.texi (Sample Include File):
-	* texinfo/texinfo.texi (Include Files Evolution):
-	* texinfo/texinfo.texi (Headings):
-	* texinfo/texinfo.texi (Headings Introduced):
-	* texinfo/texinfo.texi (Heading Format):
-	* texinfo/texinfo.texi (Heading Choice):
-	* texinfo/texinfo.texi (Custom Headings):
-	* texinfo/texinfo.texi (Catching Mistakes):
-	* texinfo/texinfo.texi (makeinfo Preferred):
-	* texinfo/texinfo.texi (Debugging with Info):
-	* texinfo/texinfo.texi (Debugging with TeX):
-	* texinfo/texinfo.texi (Using texinfo-show-structure):
-	* texinfo/texinfo.texi (Using occur):
-	* texinfo/texinfo.texi (Running Info-Validate):
-	* texinfo/texinfo.texi (Using Info-validate):
-	* texinfo/texinfo.texi (Unsplit):
-	* texinfo/texinfo.texi (Tagifying):
-	* texinfo/texinfo.texi (Splitting):
-	* texinfo/texinfo.texi (Refilling Paragraphs):
-	* texinfo/texinfo.texi (Command and Variable Index):
-	* texinfo/texinfo.texi (General Index):
-	* texinfo/version.texi: New file.
-	Sync with FSF 23.1.92.  Make new directory to hold the files needed
-	to generate texinfo.info, since there are three such files now.
-
-2010-02-19  Ben Wing  <ben@xemacs.org>
-
-	* Makefile:
-	* Makefile (src_files1):
-	* Makefile (DIR):
-	* Makefile (texinfo-srcs):
-	* Makefile ($(INFODIR)/widget.info):
-	* Makefile ($(INFODIR)/texinfo.info):
-	* Makefile (.PHONY):
-	* Makefile (texinfo.dvi):
-	* Makefile (texinfo.pdf):
-	* Makefile ($(HTMLDIR)/widget.html):
-	* Makefile ($(HTMLDIR)/texinfo.html):
-	Incorporate texinfo.texi moving to a subdirectory texinfo/.
-	Do some tricks to reduce the amount of duplication while still
-	maintaining compatible with non-GNU make (at least, with
-	Solaris make).
-		
-	* doclicense.texi: New file.
-	* info.texi:
-	* info.texi (Top):
-	* info.texi (Getting Started):
-	* info.texi (Help-Small-Screen):
-	* info.texi (Help):
-	* info.texi (Help-P):
-	* info.texi (Help-^L):
-	* info.texi (Help-Inv):
-	* info.texi (Help-]):
-	* info.texi (Help-M):
-	* info.texi (Help-FOO):
-	* info.texi (Help-Xref):
-	* info.texi (Help-Int):
-	* info.texi (Help-Q):
-	* info.texi (Advanced):
-	* info.texi (Search Text):
-	* info.texi (Search Index):
-	* info.texi (Go to node):
-	* info.texi (Choose menu subtopic):
-	* info.texi (Create Info buffer):
-	* info.texi (XEmacs Info Variables):
-	* info.texi (Expert Info):
-	* info.texi (Add):
-	* info.texi (Menus):
-	* info.texi (Cross-refs):
-	* info.texi (Help-Cross):
-	* info.texi (Tags):
-	* info.texi (Checking):
-	* info.texi (Index):
-	* texinfo.tex:
-	* texinfo.tex (paragraphindent{%):
-	* texinfo.tex (sectionheading will have):
-	* texinfo.tex (chapterzzz{#3}%):
-	* texinfo.tex (subsubsection = \numberedsubsubsec):
-	* texinfo.tex (subsubsection = \appendixsubsubsec):
-	* texinfo.tex (subsubsection = \unnumberedsubsubsec):
-	* texinfo.tex (sectionheading{#1}{sec}{Ynumbered}{\the\chapno.\the\secno}%):
-	* texinfo.tex (sectionheading{#1}{sec}{Yappendix}{\appendixletter.\the\secno}%):
-	* texinfo.tex (sectionheading{#1}{sec}{Ynothing}{\the\unnumberedno.\the\secno}%):
-	* texinfo.tex (sectionheading{#1}{subsec}{Ynumbered}{\the\chapno.\the\secno.\the\subsecno}%):
-	* texinfo.tex (sectionheading{#1}{subsec}{Yappendix}%):
-	* texinfo.tex (sectionheading{#1}{subsec}{Ynothing}%):
-	* texinfo.tex (sectionheading{#1}{subsubsec}{Ynumbered}%):
-	* texinfo.tex (sectionheading{#1}{subsubsec}{Yappendix}%):
-	* texinfo.tex (sectionheading{#1}{subsubsec}{Ynothing}%):
-	* texinfo.tex (sectionheading{#1}{subsubsec}{Yomitfromtoc}{}):
-	* texinfo.tex (sectionheading to do the printing.):
-	* texinfo.tex (sectionlevel}{#1}{#4}%):
-	* texinfo.tex (sectionheading, q.v.):
-	Sync with FSF 23.1.92.
-
 2010-02-10  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* xemacs-faq.texi (Top): Update menu.

File man/Makefile

 #  Makefile for man subdirectory in XEmacs
 #   Copyright (C) 1995 Board of Trustees, University of Illinois
 #   Copyright (C) 1994, 1995 Sun Microsystems.
-#   Copyright (C) 2005, 2010 Ben Wing.
+#   Copyright (C) 2005 Ben Wing.
 
 # This file is part of XEmacs.
 
 HTMLDIR = ../html
 PHOTODIR = ../etc/photos
 
-src_files1 = \
-	$(DIR)beta.texi \
-	$(DIR)cl.texi \
-	$(DIR)custom.texi \
-	$(DIR)emodules.texi \
-	$(DIR)external-widget.texi \
-	$(DIR)info.texi \
-	$(DIR)internals.texi \
-	$(DIR)lispref.texi \
-	$(DIR)new-users-guide.texi \
-	$(DIR)standards.texi \
-	$(DIR)term.texi \
-	$(DIR)termcap.texi \
-	$(DIR)texinfo.texi \
-	$(DIR)widget.texi \
-	$(DIR)xemacs.texi \
-	$(DIR)xemacs-faq.texi
+info_files = \
+	$(INFODIR)/beta.info \
+	$(INFODIR)/cl.info \
+	$(INFODIR)/custom.info \
+	$(INFODIR)/emodules.info \
+	$(INFODIR)/external-widget.info \
+	$(INFODIR)/info.info \
+	$(INFODIR)/internals.info \
+	$(INFODIR)/lispref.info \
+	$(INFODIR)/new-users-guide.info \
+	$(INFODIR)/standards.info \
+	$(INFODIR)/term.info \
+	$(INFODIR)/termcap.info \
+	$(INFODIR)/texinfo.info \
+	$(INFODIR)/widget.info \
+	$(INFODIR)/xemacs-faq.info \
+	$(INFODIR)/xemacs.info
 
-DIR:= 
-src_files := $(src_files1)
+html_files = \
+	$(HTMLDIR)/beta.html \
+	$(HTMLDIR)/cl.html \
+	$(HTMLDIR)/custom.html \
+	$(HTMLDIR)/emodules.html \
+	$(HTMLDIR)/external-widget.html \
+	$(HTMLDIR)/info.html \
+	$(HTMLDIR)/lispref.html \
+	$(HTMLDIR)/internals.html \
+	$(HTMLDIR)/new-users-guide.html \
+	$(HTMLDIR)/standards.html \
+	$(HTMLDIR)/term.html \
+	$(HTMLDIR)/termcap.html \
+	$(HTMLDIR)/texinfo.html \
+	$(HTMLDIR)/widget.html \
+	$(HTMLDIR)/xemacs.html \
+	$(HTMLDIR)/xemacs-faq.html
 
-DIR := $(INFODIR)/
-info_files := $(src_files1:.texi=.info)
+dvi_files = \
+	beta.dvi \
+	cl.dvi \
+	custom.dvi \
+	emodules.dvi \
+	external-widget.dvi \
+	info.dvi \
+	lispref.dvi \
+	internals.dvi \
+	new-users-guide.dvi \
+	standards.dvi \
+	term.dvi \
+	termcap.dvi \
+	texinfo.dvi \
+	widget.dvi \
+	xemacs.dvi \
+	xemacs-faq.dvi
 
-DIR := $(HTMLDIR)/
-html_files := $(src_files1:.texi=.html)
-
-dvi_files := $(src_files:.texi=.dvi)
-
-pdf_files := $(src_files:.texi=.pdf)
-
+pdf_files = \
+       beta.pdf \
+       cl.pdf \
+       custom.pdf \
+       emodules.pdf \
+       external-widget.pdf \
+       info.pdf \
+       lispref.pdf \
+       internals.pdf \
+       new-users-guide.pdf \
+       standards.pdf \
+       term.pdf \
+       termcap.pdf \
+       texinfo.pdf \
+       widget.pdf \
+       xemacs.pdf \
+       xemacs-faq.pdf
 
 xemacs-srcs = \
 	xemacs/abbrevs.texi \
 	new-users-guide/search.texi \
 	new-users-guide/xmenu.texi
 
-texinfo-srcs = \
-	texinfo/fdl.texi \
-	texinfo/texinfo.texi \
-	texinfo/version.texi
-
 $(INFODIR)/beta.info : beta.texi
 	$(MAKEINFO) -o $(INFODIR)/beta.info beta.texi
 
 $(INFODIR)/termcap.info : termcap.texi
 	$(MAKEINFO) -o $(INFODIR)/termcap.info termcap.texi
 
-$(INFODIR)/widget.info : widget.texi doclicense.texi
+$(INFODIR)/texinfo.info : texinfo.texi
+	$(MAKEINFO) -o $(INFODIR)/texinfo.info texinfo.texi
+
+$(INFODIR)/widget.info : widget.texi
 	$(MAKEINFO) -o $(INFODIR)/widget.info widget.texi
 
 $(INFODIR)/xemacs-faq.info : xemacs-faq.texi
 $(INFODIR)/new-users-guide.info : $(new-users-guide-srcs)
 	$(MAKEINFO) -P new-users-guide -o $(INFODIR)/new-users-guide.info new-users-guide/new-users-guide.texi
 
-$(INFODIR)/texinfo.info : $(texinfo-srcs)
-	$(MAKEINFO) -P texinfo -o $(INFODIR)/texinfo.info texinfo/texinfo.texi
-
 xemacs : $(INFODIR)/xemacs.info
 lispref : $(INFODIR)/lispref.info
 internals : $(INFODIR)/internals.info
 new-users-guide.info : $(INFODIR)/new-users-guide.info
-texinfo : $(INFODIR)/texinfo.info
 
-.PHONY : xemacs lispref internals new-users-guide texinfo info dvi pdf
+.PHONY : xemacs lispref internals new-users-guide info dvi pdf
 
 info : $(info_files)
 html : $(html_files)
 new-users-guide.dvi : $(new-users-guide-srcs)
 	$(TEXI2DVI) -I new-users-guide new-users-guide/new-users-guide.texi
 
-texinfo.dvi : $(texinfo-srcs)
-	$(TEXI2DVI) -I texinfo texinfo/texinfo.texi
-
 dvi : $(dvi_files)
 
 xemacs.pdf: $(xemacs-srcs)
 new-users-guide.pdf: $(new-users-guide-srcs)
 	$(TEXI2DVI) --pdf -I new-users-guide new-users-guide/new-users-guide.texi
 
-texinfo.pdf: $(texinfo-srcs)
-	$(TEXI2DVI) --pdf -I texinfo texinfo/texinfo.texi
-
 pdf: $(pdf_files)
 
 .PHONY: mostlyclean clean distclean realclean extraclean
 $(HTMLDIR)/termcap.html : termcap.texi
 	$(TEXI2HTML_SPLIT) termcap.texi
 
+$(HTMLDIR)/texinfo.html : texinfo.texi
+	$(TEXI2HTML_SPLIT) texinfo.texi
+
 $(HTMLDIR)/widget.html : widget.texi
 	$(TEXI2HTML_SPLIT) widget.texi
 
 $(HTMLDIR)/new-users-guide.html : $(new-users-guide-srcs)
 	$(TEXI2HTML_SPLIT) new-users-guide/new-users-guide.texi
 
-$(HTMLDIR)/texinfo.html : $(texinfo-srcs)
-	$(TEXI2HTML_SPLIT) texinfo/texinfo.texi
-
 xemacs : $(HTMLDIR)/xemacs.html
 lispref : $(HTMLDIR)/lispref.html
 internals : $(HTMLDIR)/internals.html
 new-users-guide.html : $(HTMLDIR)/new-users-guide.html
-texinfo : $(HTMLDIR)/texinfo.html
 
 html : $(html_files)

File man/doclicense.texi

-@c -*-texinfo-*-
-@c The GNU Free Documentation License.
-@center Version 1.3, 3 November 2008
-@c Synced up with: FSF 23.1.92.
-@c Synced by: Ben Wing, 2-17-10.
-
-@c This file is intended to be included within another document,
-@c hence no sectioning command or @node.
-
-@display
-Copyright @copyright{} 2000, 2001, 2002, 2007, 2008, 2009 Free Software Foundation, Inc.
-@uref{http://fsf.org/}
-
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.
-@end display
-
-@enumerate 0
-@item
-PREAMBLE
-
-The purpose of this License is to make a manual, textbook, or other
-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
-complements the GNU General Public License, which is a copyleft
-license designed for free software.
-
-We have designed this License in order to use it for manuals for free
-software, because free software needs free documentation: a free
-program should come with manuals providing the same freedoms that the
-software does.  But this License is not limited to software manuals;
-it can be used for any textual work, regardless of subject matter or
-whether it is published as a printed book.  We recommend this License
-principally for works whose purpose is instruction or reference.
-
-@item
-APPLICABILITY AND DEFINITIONS
-
-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.  (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.  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.  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, 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, 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},
-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
-this License requires to appear in the title page.  For works in
-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.
-
-The ``publisher'' means any person or entity that distributes copies
-of the Document to the public.
-
-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
-
-You may copy and distribute the Document in any medium, either
-commercially or noncommercially, provided that this License, the
-copyright notices, and the license notice saying this License applies
-to the Document are reproduced in all copies, and that you add no other
-conditions whatsoever to those of this License.  You may not use
-technical measures to obstruct or control the reading or further
-copying of the copies you make or distribute.  However, you may accept
-compensation in exchange for copies.  If you distribute a large enough
-number of copies you must also follow the conditions in section 3.
-
-You may also lend copies, under the same conditions stated above, and
-you may publicly display copies.
-
-@item
-COPYING IN QUANTITY
-
-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
-the full title with all words of the title equally prominent and
-visible.  You may add other material on the covers in addition.
-Copying with changes limited to the covers, as long as they preserve
-the title of the Document and satisfy these conditions, can be treated
-as verbatim copying in other respects.
-
-If the required texts for either cover are too voluminous to fit
-legibly, you should put the first ones listed (as many as fit
-reasonably) on the actual cover, and continue the rest onto adjacent
-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 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
-them a chance to provide you with an updated version of the Document.
-
-@item
-MODIFICATIONS
-
-You may copy and distribute a Modified Version of the Document under
-the conditions of sections 2 and 3 above, provided that you release
-the Modified Version under precisely this License, with the Modified
-Version filling the role of the Document, thus licensing distribution
-and modification of the Modified Version to whoever possesses a copy
-of it.  In addition, you must do these things in the Modified Version:
-
-@enumerate A
-@item
-Use in the Title Page (and on the covers, if any) a title distinct
-from that of the Document, and from those of previous versions
-(which should, if there were any, be listed in the History section
-of the Document).  You may use the same title as a previous version
-if the original publisher of that version gives permission.
-
-@item
-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 fewer than five),
-unless they release you from this requirement.
-
-@item
-State on the Title page the name of the publisher of the
-Modified Version, as the publisher.
-
-@item
-Preserve all the copyright notices of the Document.
-
-@item
-Add an appropriate copyright notice for your modifications
-adjacent to the other copyright notices.
-
-@item
-Include, immediately after the copyright notices, a license notice
-giving the public permission to use the Modified Version under the
-terms of this License, in the form shown in the Addendum below.
-
-@item
-Preserve in that license notice the full lists of Invariant Sections
-and required Cover Texts given in the Document's license notice.
-
-@item
-Include an unaltered copy of this License.
-
-@item
-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
-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.
-
-@item
-Preserve the network location, if any, given in the Document for
-public access to a Transparent copy of the Document, and likewise
-the network locations given in the Document for previous versions
-it was based on.  These may be placed in the ``History'' section.
-You may omit a network location for a work that was published at
-least four years before the Document itself, or if the original
-publisher of the version it refers to gives permission.
-
-@item
-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,
-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
-may not be included in the Modified Version.
-
-@item
-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
-appendices that qualify as Secondary Sections and contain no material
-copied from the Document, you may at your option designate some or all
-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
-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
-standard.
-
-You may add a passage of up to five words as a Front-Cover Text, and a
-passage of up to 25 words as a Back-Cover Text, to the end of the list
-of Cover Texts in the Modified Version.  Only one passage of
-Front-Cover Text and one of Back-Cover Text may be added by (or
-through arrangements made by) any one entity.  If the Document already
-includes a cover text for the same cover, previously added by you or
-by arrangement made by the same entity you are acting on behalf of,
-you may not add another; but you may replace the old one, on explicit
-permission from the previous publisher that added the old one.
-
-The author(s) and publisher(s) of the Document do not by this License
-give permission to use their names for publicity for or to assert or
-imply endorsement of any Modified Version.
-
-@item
-COMBINING DOCUMENTS
-
-You may combine the Document with other documents released under this
-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, 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
-copy.  If there are multiple Invariant Sections with the same name but
-different contents, make the title of each such section unique by
-adding at the end of it, in parentheses, the name of the original
-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 ``Acknowledgements'',
-and any sections Entitled ``Dedications''.  You must delete all
-sections Entitled ``Endorsements.''
-
-@item
-COLLECTIONS OF DOCUMENTS
-
-You may make a collection consisting of the Document and other documents
-released under this License, and replace the individual copies of this
-License in the various documents with a single copy that is included in
-the collection, provided that you follow the rules of this License for
-verbatim copying of each of the documents in all other respects.
-
-You may extract a single document from such a collection, and distribute
-it individually under this License, provided you insert a copy of this
-License into the extracted document, and follow this License in all
-other respects regarding verbatim copying of that document.
-
-@item
-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, 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 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
-
-Translation is considered a kind of modification, so you may
-distribute translations of the Document under the terms of section 4.
-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, 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
-
-You may not copy, modify, sublicense, or distribute the Document
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense, or distribute it is void, and
-will automatically terminate your rights under this License.
-
-However, if you cease all violation of this License, then your license
-from a particular copyright holder is reinstated (a) provisionally,
-unless and until the copyright holder explicitly and finally
-terminates your license, and (b) permanently, if the copyright holder
-fails to notify you of the violation by some reasonable means prior to
-60 days after the cessation.
-
-Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, receipt of a copy of some or all of the same material does
-not give you any rights to use it.
-
-@item
-FUTURE REVISIONS OF THIS LICENSE
-
-The Free Software Foundation may publish new, revised versions
-of the GNU Free Documentation License from time to time.  Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.  See
-@uref{http://www.gnu.org/copyleft/}.
-
-Each version of the License is given a distinguishing version number.
-If the Document specifies that a particular numbered version of this
-License ``or any later version'' applies to it, you have the option of
-following the terms and conditions either of that specified version or
-of any later version that has been published (not as a draft) by the
-Free Software Foundation.  If the Document does not specify a version
-number of this License, you may choose any version ever published (not
-as a draft) by the Free Software Foundation.  If the Document
-specifies that a proxy can decide which future versions of this
-License can be used, that proxy's public statement of acceptance of a
-version permanently authorizes you to choose that version for the
-Document.
-
-@item
-RELICENSING
-
-``Massive Multiauthor Collaboration Site'' (or ``MMC Site'') means any
-World Wide Web server that publishes copyrightable works and also
-provides prominent facilities for anybody to edit those works.  A
-public wiki that anybody can edit is an example of such a server.  A
-``Massive Multiauthor Collaboration'' (or ``MMC'') contained in the
-site means any set of copyrightable works thus published on the MMC
-site.
-
-``CC-BY-SA'' means the Creative Commons Attribution-Share Alike 3.0
-license published by Creative Commons Corporation, a not-for-profit
-corporation with a principal place of business in San Francisco,
-California, as well as future copyleft versions of that license
-published by that same organization.
-
-``Incorporate'' means to publish or republish a Document, in whole or
-in part, as part of another Document.
-
-An MMC is ``eligible for relicensing'' if it is licensed under this
-License, and if all works that were first published under this License
-somewhere other than this MMC, and subsequently incorporated in whole
-or in part into the MMC, (1) had no cover texts or invariant sections,
-and (2) were thus incorporated prior to November 1, 2008.
-
-The operator of an MMC Site may republish an MMC contained in the site
-under CC-BY-SA on the same site at any time before August 1, 2009,
-provided the MMC is eligible for relicensing.
-
-@end enumerate
-
-@page
-@heading ADDENDUM: How to use this License for your documents
-
-To use this License in a document you have written, include a copy of
-the License in the document and put the following copyright and
-license notices just after the title page:
-
-@smallexample
-@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.3
-  or any later version published by the Free Software Foundation;
-  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 Invariant Sections, Front-Cover Texts and Back-Cover Texts,
-replace the ``with@dots{}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
-free software license, such as the GNU General Public License,
-to permit their use in free software.
-
-
-@c Local Variables:
-@c ispell-local-pdict: "ispell-dict"
-@c End:
-
-@ignore
-   arch-tag: c1679162-1d8a-4f02-bc52-2e71765f0165
-@end ignore

File man/info.texi

-\input texinfo.tex    @c -*-texinfo-*-
-@c We must \input texinfo.tex instead of texinfo, otherwise make
-@c distcheck in the Texinfo distribution fails, because the texinfo Info
-@c file is made first, and texi2dvi must include . first in the path.
+\input texinfo    @c -*-texinfo-*-
 @comment %**start of header
-@setfilename info.info
+@setfilename ../info/info.info
 @settitle Info
-@syncodeindex fn cp
-@syncodeindex vr cp
-@syncodeindex ky cp
 @comment %**end of header
-@c Synced up with: Texinfo 4.13.
-@c Synced by: Ben Wing, 2-19-10.
+@comment $Id: info.texi,v 1.9 2001/04/13 09:11:28 michaels Exp $
 
-@copying
+@dircategory Texinfo documentation system
+@direntry
+* Info: (info).                 Documentation browsing system.
+@end direntry
+
+@ifinfo
 This file describes how to use Info, the on-line, menu-driven GNU
 documentation system.
 
-Copyright @copyright{} 1989, 1992, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1989, 92, 96, 97, 98, 99 Free Software Foundation, Inc.
 
-@quotation
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.2 or
-any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU
-Manual,'' and with the Back-Cover Texts as in (a) below.  A copy of the
-license is included in the section entitled ``GNU Free Documentation
-License'' in the XEmacs manual.
+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.
 
-(a) The FSF's Back-Cover Text is: ``You have freedom to copy and
-modify this GNU Manual, like GNU software.  Buying copies from GNU
-Press supports the FSF in developing GNU and promoting software
-freedom.''
+@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).
 
-This document is part of a collection distributed under the GNU Free
-Documentation License.  If you want to distribute this document
-separately from the collection, you can do so by adding a copy of the
-license to the document, as described in section 6 of the license.
-@end quotation
-@end copying
+@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.
 
-@dircategory Texinfo documentation system
-@direntry
-* Info: (info).         How to use the documentation browsing system.
-@end direntry
+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 Info
-@subtitle The online, hyper-text GNU documentation system
+@subtitle The online, menu-driven GNU documentation system
 @author Brian Fox
-@author and the GNU Texinfo community
 @page
 @vskip 0pt plus 1filll
-@insertcopying
+Copyright @copyright{} 1989, 92, 93, 96, 97, 98, 99 Free Software
+Foundation, Inc.
+@sp 2
+Published by the Free Software Foundation @*
+59 Temple Place - Suite 330 @*
+Boston, MA 02111-1307, USA.
+
+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
 
-@contents
-
-@ifnottex
 @node Top
 @top Info: An Introduction
 
-The GNU Project distributes most of its on-line manuals in the
-@dfn{Info format}, which you read using an @dfn{Info reader}.  You are
-probably using an Info reader to read this now.
+Info is a program for reading documentation, which you might be using
+now to read this.
 
-There are two primary Info readers: @code{info}, a stand-alone program
-designed just to read Info files (@pxref{Top,,Stand-alone Info,
-info-stnd, GNU Info}), and the @code{info} package in XEmacs, a
-general-purpose editor.  At present, only the XEmacs reader supports
-using a mouse.
-
-@ifinfo
-If you are new to the Info reader and want to learn how to use it,
-type the command @kbd{h} now.  It brings you to a programmed
-instruction sequence.
-
-To read about advanced Info commands, type @kbd{n} twice.  This
-brings you to @cite{Advanced Info Commands}, skipping over the `Getting
-Started' chapter.
-@end ifinfo
-@end ifnottex
+To learn how to use Info, type the command @kbd{h} while using the Info
+program.  It brings you to a programmed instruction sequence.
 
 @menu
 * Getting Started::             Getting started using an Info reader.
-* Advanced::                    Advanced Info commands.
-* Expert Info::                 Info commands for experts.
-* Index::                       An index of topics, commands, and variables.
+* Advanced Info::               Advanced commands within Info.
+* Creating an Info File::       How to make your own Info file.
 @end menu
 
-@node Getting Started, Advanced, Top, Top
+@node Getting Started, Advanced Info, Top, Top
 @comment  node-name,  next,  previous,  up
 @chapter Getting Started
 
-This first part of this Info manual describes how to get around inside
+This first part of the Info manual describes how to get around inside
 of Info.  The second part of the manual describes various advanced
-Info commands.  The third part briefly explains how to generate Info
-files from Texinfo files, and describes how to write an Info file
-by hand.
+Info commands, and how to write an Info as distinct from a Texinfo
+file.  The third part is about how to generate Info files from
+Texinfo files.
 
-@ifnotinfo
-This manual is primarily designed for browsing with an Info reader
-program on a computer, so that you can try Info commands while reading
-about them.  Reading it on paper or with an HTML browser is less
+@iftex
+This manual is primarily designed for use on a computer, so that you can
+try Info commands while reading about them.  Reading it on paper is less
 effective, since you must take it on faith that the commands described
-really do what the manual says.  By all means go through this manual
-now that you have it; but please try going through the on-line version
-as well.
+really do what the manual says.  By all means go through this manual now
+that you have it; but please try going through the on-line version as
+well.
 
-@cindex Info reader, how to invoke
-@cindex entering Info
 There are two ways of looking at the online version of this manual:
 
 @enumerate
 @item
 Type @code{info} at your shell's command line.  This approach uses a
-stand-alone program designed just to read Info files.
+small stand-alone program designed just to read Info files.
 
 @item
-Type @code{xemacs} at the command line; then type @kbd{C-h i}
-(@kbd{Control-h}, followed by @kbd{i}).  This approach uses the Info
-mode of the XEmacs editor.
+Type @code{emacs} at the command line; then type @kbd{C-h i} (Control
+@kbd{h}, followed by @kbd{i}).  This approach uses the Info mode of the
+Emacs program, an editor with many other capabilities.
 @end enumerate
 
 In either case, then type @kbd{mInfo} (just the letters), followed by
 the screen.
 @c FIXME! (pesch@cygnus.com, 14 dec 1992)
 @c Is it worth worrying about what-if the beginner goes to somebody
-@c else's XEmacs session, which already has an Info running in the middle
+@c else's Emacs session, which already has an Info running in the middle
 @c of something---in which case these simple instructions won't work?
-@end ifnotinfo
+@end iftex
 
 @menu
-* Help-Small-Screen::   Starting Info on a Small Screen.
-* Help::                How to use Info.
-* Help-P::              Returning to the Previous node.
-* Help-^L::             The Space, DEL, B and ^L commands.
-* Help-Inv::            Invisible text in XEmacs Info.
-* Help-M::              Menus.
-* Help-Xref::           Following cross-references.
-* Help-Int::            Some intermediate Info commands.
-* Help-Q::              Quitting Info.
+* Help-Small-Screen::   Starting Info on a Small Screen
+* Help::                How to use Info
+* Help-P::              Returning to the Previous node
+* Help-^L::             The Space, Rubout, B and ^L commands.
+* Help-M::              Menus
+* Help-Adv::            Some advanced Info commands
+* Help-Q::              Quitting Info
 @end menu
 
-@node Help-Small-Screen
+@node Help-Small-Screen, Help,  , Getting Started
+@comment  node-name,  next,  previous,  up
 @section Starting Info on a Small Screen
 
-@ifnotinfo
+@iftex
 (In Info, you only see this section if your terminal has a small
 number of lines; most readers pass by it without seeing it.)
-@end ifnotinfo
+@end iftex
 
-@cindex small screen, moving around
-Since your terminal has a relatively small number of lines on its
+Since your terminal has an unusually small number of lines on its
 screen, it is necessary to give you special advice at the beginning.
 
-If the entire text you are looking at fits on the screen, the text
-@samp{All} will be displayed at the bottom of the screen.  In the
-stand-alone Info reader, it is displayed at the bottom right corner of
-the screen; in XEmacs, it is displayed on the modeline.  If you see the
-text @samp{Top} instead, it means that there is more text below that
-does not fit.  To move forward through the text and see another screen
-full, press @key{SPC}, the Space bar.  To move back up, press the key
-labeled @samp{Backspace} or @samp{DEL} (on some keyboards, this key
-might be labeled @samp{Delete}).
+If you see the text @samp{--All----} at near the bottom right corner
+of the screen, it means the entire text you are looking at fits on the
+screen.  If you see @samp{--Top----} instead, it means that there is
+more text below that does not fit.  To move forward through the text
+and see another screen full, press the Space bar, @key{SPC}.  To move
+back up, press the key labeled @samp{Backspace} or @key{Delete}.
 
 @ifinfo
-Here are 40 lines of junk, so you can try @key{SPC} and @key{DEL} and
+Here are 40 lines of junk, so you can try Spaces and Deletes and
 see what they do.  At the end are instructions of what you should do
 next.
 
-@format
-This is line 20
-This is line 21
-This is line 22
-This is line 23
-This is line 24
-This is line 25
-This is line 26
-This is line 27
-This is line 28
-This is line 29
-This is line 30
-This is line 31
-This is line 32
-This is line 33
-This is line 34
-This is line 35
-This is line 36
-This is line 37
-This is line 38
-This is line 39
-This is line 40
-This is line 41
-This is line 42
-This is line 43
-This is line 44
-This is line 45
-This is line 46
-This is line 47
-This is line 48
-This is line 49
-This is line 50
-This is line 51
-This is line 52
-This is line 53
-This is line 54
-This is line 55
-This is line 56
-This is line 57
-This is line 58
-This is line 59
-@end format
+This is line 17 @*
+This is line 18 @*
+This is line 19 @*
+This is line 20 @*
+This is line 21 @*
+This is line 22 @*
+This is line 23 @*
+This is line 24 @*
+This is line 25 @*
+This is line 26 @*
+This is line 27 @*
+This is line 28 @*
+This is line 29 @*
+This is line 30 @*
+This is line 31 @*
+This is line 32 @*
+This is line 33 @*
+This is line 34 @*
+This is line 35 @*
+This is line 36 @*
+This is line 37 @*
+This is line 38 @*
+This is line 39 @*
+This is line 40 @*
+This is line 41 @*
+This is line 42 @*
+This is line 43 @*
+This is line 44 @*
+This is line 45 @*
+This is line 46 @*
+This is line 47 @*
+This is line 48 @*
+This is line 49 @*
+This is line 50 @*
+This is line 51 @*
+This is line 52 @*
+This is line 53 @*
+This is line 54 @*
+This is line 55 @*
+This is line 56 @*
 
 If you have managed to get here, go back to the beginning with
-@kbd{DEL} (or @key{BACKSPACE}), and come back here again, then you
-understand the about the @samp{Space} and @samp{Backspace} keys.  So
-now type an @kbd{n}---just one character; don't type the quotes and
-don't type the Return key afterward---to get to the normal start of
-the course.
+Delete, and come back here again, then you understand Space and
+Delete.  So now type an @kbd{n} ---just one character; don't type
+the quotes and don't type the Return key afterward--- to
+get to the normal start of the course.
 @end ifinfo
 
 @node Help, Help-P, Help-Small-Screen, Getting Started
 
 You are talking to the program Info, for reading documentation.
 
-  There are two ways to use Info: from within XEmacs or as a
-stand-alone reader that you can invoke from a shell using the command
-@command{info}.
-
-@cindex node, in Info documents
   Right now you are looking at one @dfn{Node} of Information.
 A node contains text describing a specific topic at a specific
-level of detail.  This node's topic is ``how to use Info''.  The mode
-line says that this is node @samp{Help} in the file @file{info}.
+level of detail.  This node's topic is ``how to use Info''.
 
-@cindex header of Info node
-  The top line of a node is its @dfn{header}.  This node's header
-(look at it now) says that the @samp{Next} node after this one is the
-node called @samp{Help-P}.  An advanced Info command lets you go to
-any node whose name you know.  In the stand-alone Info reader program,
-the header line shows the names of this node and the Info file as
-well.  In XEmacs, the header line is displayed with a special typeface,
-and remains at the top of the window all the time even if you scroll
-through the node.
+  The top line of a node is its @dfn{header}.  This node's header (look at
+it now) says that it is the node named @samp{Help} in the file
+@file{info}.  It says that the @samp{Next} node after this one is the node
+called @samp{Help-P}.  An advanced Info command lets you go to any node
+whose name you know.
 
-  Besides a @samp{Next}, a node can have a @samp{Previous} link, or an
-@samp{Up} link, or both.  As you can see, this node has all of these
-links.
+  Besides a @samp{Next}, a node can have a @samp{Previous} or an @samp{Up}.
+This node has a @samp{Previous} but no @samp{Up}, as you can see.
 
-@kindex n @r{(Info mode)}
   Now it is time to move on to the @samp{Next} node, named @samp{Help-P}.
 
-@format
->> Type @kbd{n} to move there.  Type just one character;
+>> Type @samp{n} to move there.  Type just one character;
    do not type the quotes and do not type a @key{RET} afterward.
-@end format
 
-@noindent
 @samp{>>} in the margin means it is really time to try a command.
 
-@format
->> If you are in XEmacs and have a mouse, and if you already practiced
-   typing @kbd{n} to get to the next node, click now with the left 
-   mouse button on the @samp{Next} link to do the same ``the mouse way''.
-@end format
-
 @node Help-P, Help-^L, Help, Getting Started
 @comment  node-name,  next,  previous,  up
 @section Returning to the Previous node
 
-@kindex p @r{(Info mode)}
 This node is called @samp{Help-P}.  The @samp{Previous} node, as you see,
 is @samp{Help}, which is the one you just came from using the @kbd{n}
 command.  Another @kbd{n} command now would take you to the next
 node, @samp{Help-^L}.
 
-@format
->> But do not type @kbd{n} yet.  First, try the @kbd{p} command, or
-   (in XEmacs) click on the @samp{Prev} link.  That takes you to
-   the @samp{Previous} node.  Then use @kbd{n} to return here.
-@end format
+>> But do not do that yet.  First, try the @kbd{p} command, which takes
+   you to the @samp{Previous} node.  When you get there, you can do an
+   @kbd{n} again to return here.
 
-  If you read this in XEmacs, you will see an @samp{Info} item in the
-menu bar, close to its right edge.  Clicking the mouse on the
-@samp{Info} menu-bar item opens a menu of commands which include
-@samp{Next} and @samp{Previous} (and also some others which you didn't yet
-learn about).
+  This all probably seems insultingly simple so far, but @emph{do not} be
+led into skimming.  Things will get more complicated soon.  Also,
+do not try a new command until you are told it is time to.  Otherwise,
+you may make Info skip past an important warning that was coming up.
 
-  This all probably seems insultingly simple so far, but @emph{please
-don't} start skimming.  Things will get complicated soon enough!
-Also, please do not try a new command until you are told it is time
-to.  You could make Info skip past an important warning that was
-coming up.
+>> Now do an @kbd{n} to get to the node @samp{Help-^L} and learn more.
 
-@format
->> Now do an @kbd{n}, or (in XEmacs) click the middle mouse button on
-   the @samp{Next} link, to get to the node @samp{Help-^L} and learn more.
-@end format
+@node Help-^L, Help-M, Help-P, Getting Started
+@comment  node-name,  next,  previous,  up
+@section The Space, Delete, B and ^L commands.
 
-@node Help-^L, Help-Inv, Help-P, Getting Started
-@comment  node-name,  next,  previous,  up
-@section The Space, DEL, B and ^L commands
-
-  This node's mode line tells you that you are now at node
-@samp{Help-^L}, and the header line tells you that @kbd{p} would get
-you back to @samp{Help-P}.  The node's title is highlighted and may be
-underlined as well; it says what the node is about.
+  This node's header tells you that you are now at node @samp{Help-^L}, and
+that @kbd{p} would get you back to @samp{Help-P}.  The node's title is
+underlined; it says what the node is about (most nodes have titles).
 
   This is a big node and it does not all fit on your display screen.
 You can tell that there is more that is not visible because you
-can see the text @samp{Top} rather than @samp{All} near the bottom of
-the screen.
+can see the string @samp{--Top-----} rather than @samp{--All----} near
+the bottom right corner of the screen.
 
-@kindex SPC @r{(Info mode)}
-@kindex DEL @r{(Info mode)}
-@kindex BACKSPACE @r{(Info mode)}
-@findex Info-scroll-up
-@findex Info-scroll-down
-  The @key{SPC}, @key{BACKSPACE} (or @key{DEL})@footnote{The key which
-we call ``Backspace or DEL'' in this manual is labeled differently on
-different keyboards.  Look for a key which is a little ways above the
-@key{ENTER} or @key{RET} key and which you normally use outside XEmacs
-to erase the character before the cursor, i.e.@: the character you
-typed last.  It might be labeled @samp{Backspace} or @samp{<-} or
-@samp{DEL}, or sometimes @samp{Delete}.} and @kbd{b} commands exist to
-allow you to ``move around'' in a node that does not all fit on the
-screen at once.  @key{SPC} moves forward, to show what was below the
-bottom of the screen.  @key{DEL} or @key{BACKSPACE} moves backward, to
-show what was above the top of the screen (there is not anything above
-the top until you have typed some spaces).
+  The Space, Delete and @kbd{B} commands exist to allow you to ``move
+around'' in a node that does not all fit on the screen at once.
+Space moves forward, to show what was below the bottom of the screen.
+Delete moves backward, to show what was above the top of the screen
+(there is not anything above the top until you have typed some spaces).
 
-@format
->> Now try typing a @key{SPC} (afterward, type a @key{BACKSPACE} to
-   return here).
-@end format
+>> Now try typing a Space (afterward, type a Delete to return here).
 
-  When you type the @key{SPC}, the two lines that were at the bottom of
-the screen appear at the top, followed by more lines.  @key{DEL} or
-@key{BACKSPACE} takes the two lines from the top and moves them to the
-bottom, @emph{usually}, but if there are not a full screen's worth of
-lines above them they may not make it all the way to the bottom.
+  When you type the space, the two lines that were at the bottom of
+the screen appear at the top, followed by more lines.  Delete takes
+the two lines from the top and moves them to the bottom,
+@emph{usually}, but if there are not a full screen's worth of lines
+above them they may not make it all the way to the bottom.
 
-  If you are reading this in XEmacs, note that the header line is
-always visible, never scrolling off the display.  That way, you can
-always see the @samp{Next}, @samp{Prev}, and @samp{Up} links, and you
-can conveniently go to one of these links at any time by
-clicking the middle mouse button on the link.
+  If you type Space when there is no more to see, it rings the
+bell and otherwise does nothing.  The same goes for Delete when
+the header of the node is visible.
 
-@cindex reading Info documents top to bottom
-@cindex Info documents as tutorials
-  @key{SPC} and @key{DEL} not only move forward and backward through
-the current node.  They also move between nodes.  @key{SPC} at the end
-of a node moves to the next node; @key{DEL} (or @key{BACKSPACE}) at
-the beginning of a node moves to the previous node.  In effect, these
-commands scroll through all the nodes in an Info file as a single
-logical sequence.  You can read an entire manual top to bottom by just
-typing @key{SPC}, and move backward through the entire manual from
-bottom to top by typing @key{DEL} (or @key{BACKSPACE}).
+  If your screen is ever garbaged, you can tell Info to print it out
+again by typing @kbd{C-l} (@kbd{Control-L}, that is---hold down ``Control'' and
+type an @key{L} or @kbd{l}).
 
-  In this sequence, a node's subnodes appear following their parent.
-If a node has a menu, @key{SPC} takes you into the subnodes listed in
-the menu, one by one.  Once you reach the end of a node, and have seen
-all of its subnodes, @key{SPC} takes you to the next node or to the
-parent's next node.
+>> Type @kbd{C-l} now.
 
-@kindex PAGEUP @r{(Info mode)}
-@kindex PAGEDOWN @r{(Info mode)}
-  Many keyboards nowadays have two scroll keys labeled @samp{PageUp}
-and @samp{PageDown} (or maybe @samp{Prior} and @samp{Next}).  If your
-keyboard has these keys, you can use them to move forward and backward
-through the text of one node, like @key{SPC} and @key{BACKSPACE} (or
-@key{DEL}).  However, @key{PAGEUP} and @key{PAGEDOWN} keys never
-scroll beyond the beginning or the end of the current node.
+  To move back to the beginning of the node you are on, you can type
+a lot of Deletes.  You can also type simply @kbd{b} for beginning.
+>> Try that now.  (We have put in enough verbiage to push this past
+the first screenful, but screens are so big nowadays that perhaps it
+isn't enough.  You may need to shrink your Emacs or Info window.)
+Then come back, with Spaces.
 
-@kindex C-l @r{(Info mode)}
-  If your screen is ever garbaged, you can tell Info to display it
-again by typing @kbd{C-l} (@kbd{Control-L}---that is, hold down
-@key{CTRL} and type @kbd{L} or @kbd{l}).
+  If your screen is very tall, all of this node might fit at once.
+In that case, "b" won't do anything.  Sorry; what can we do?
 
-@format
->> Type @kbd{C-l} now.
-@end format
-
-@kindex b @r{(Info mode)}
-  To move back to the beginning of the node you are on, you can type
-the @key{BACKSPACE} key (or @key{DEL}) many times.  You can also type
-@kbd{b} just once.  @kbd{b} stands for ``beginning.''
-
-@format
->> Try that now.  (We have put in enough verbiage to push this past
-   the first screenful, but screens are so big nowadays that perhaps it
-   isn't enough.  You may need to shrink your XEmacs or Info window.)
-   Then come back, by typing @key{SPC} one or more times.
-@end format
-
-@kindex ? @r{(Info mode)}
-@findex Info-summary
   You have just learned a considerable number of commands.  If you
 want to use one but have trouble remembering which, you should type
-@kbd{?}, which displays a brief list of commands.  When you are
-finished looking at the list, make it go away by typing @key{SPC}
+a @key{?} which prints out a brief list of commands.  When you are
+finished looking at the list, make it go away by pressing @key{SPC}
 repeatedly.
 
-@format
 >> Type a @key{?} now.  Press @key{SPC} to see consecutive screenfuls of
-   the list until finished.  Then type @key{SPC} several times.  If
-   you are using XEmacs, the help will then go away automatically.
-@end format
-
-  (If you are using the stand-alone Info reader, type @kbd{C-x 0} to
-return here, that is---press and hold @key{CTRL}, type an @kbd{x},
-then release @key{CTRL} and @kbd{x}, and press @kbd{0}; that's a zero,
-not the letter ``o''.)
+>> the list until finished.
 
   From now on, you will encounter large nodes without warning, and
-will be expected to know how to use @key{SPC} and @key{BACKSPACE} to
-move around in them without being told.  Since not all terminals have
+will be expected to know how to use Space and Delete to move
+around in them without being told.  Since not all terminals have
 the same size screen, it would be impossible to warn you anyway.
 
-@format
->> Now type @kbd{n}, or click the middle mouse button on the @samp{Next} link,
-   to visit the next node.
-@end format
+>> Now type @kbd{n} to see the description of the @kbd{m} command.
 
-@node Help-Inv, Help-M, Help-^L, Getting Started
+@node Help-M, Help-Adv, Help-^L, Getting Started
 @comment  node-name,  next,  previous,  up
-@section Invisible text in XEmacs Info
+@section Menus
 
-  Before discussing menus, we need to make some remarks that are only
-relevant to users reading Info using XEmacs.  Users of the stand-alone
-version can skip this node by typing @kbd{]} now.
+Menus and the @kbd{m} command
 
-@cindex invisible text in XEmacs
-  In XEmacs, certain text that appears in the stand-alone version is
-normally hidden, technically because it has the @samp{invisibility}
-property.  Invisible text is really a part of the text.  It becomes
-visible (by default) after killing and yanking, it appears in printed
-output, it gets saved to file just like any other text, and so on.
-Thus it is useful to know it is there.
-
-@findex visible-mode
-You can make invisible text visible by using the command @kbd{M-x
-visible-mode}.  Visible mode is a minor mode, so using the command a
-second time will make the text invisible again.  Watch the effects of
-the command on the ``menu'' below and the top line of this node.
-
-If you prefer to @emph{always} see the invisible text, you can set
-@code{Info-hide-note-references} to @code{nil}.  Enabling Visible mode
-permanently is not a real alternative, because XEmacs Info also uses
-(although less extensively) another text property that can change the
-text being displayed, the @samp{display} property.  Only the
-invisibility property is affected by Visible mode.  When, in this
-tutorial, we refer to the @samp{XEmacs} behavior, we mean the
-@emph{default} XEmacs behavior.
-
-Now type @kbd{]}, to learn about the @kbd{]} and @kbd{[} commands.
-
-@menu
-* ]:         Help-].               Node telling about ].
-* stuff:     Help-].               Same node.
-* Help-]::                         Yet again, same node.
-@end menu
-
-@node Help-], , , Help-Inv
-@subsection The @kbd{]} and @kbd{[} commands
-
-If you type @kbd{n} now, you get an error message saying that this
-node has no next node.  Similarly, if you type @kbd{p}, the error
-message tells you that there is no previous node.  (The exact message
-depends on the Info reader you use.)  This is because @kbd{n} and
-@kbd{p} carry you to the next and previous node @emph{at the same
-level}.  The present node is contained in a menu (see next) of the
-node you came from, and hence is considered to be at a lower level.
-It is the only node in the previous node's menu (even though it was
-listed three times). Hence it has no next or previous node that
-@kbd{n} or @kbd{p} could move to.
-
-If you systematically move through a manual by typing @kbd{n}, you run
-the risk of skipping many nodes.  You do not run this risk if you
-systematically use @kbd{@key{SPC}}, because, when you scroll to the
-bottom of a node and type another @kbd{@key{SPC}}, then this carries
-you to the following node in the manual @emph{regardless of level}.
-If you immediately want to go to that node, without having to scroll
-to the bottom of the screen first, you can type @kbd{]}.
-
-Similarly, @kbd{@key{BACKSPACE}} carries you to the preceding node
-regardless of level, after you scrolled to the beginning of the
-present node.  If you want to go to the preceding node immediately,
-you can type @kbd{[}.
-
-For instance, typing this sequence will come back here in three steps:
-@kbd{[ n [}.  To do the same backward, type @kbd{] p ]}.
-
-Now type @kbd{]} to go to the next node and learn about menus.
-
-@node Help-M, Help-Xref, Help-Inv, Getting Started
-@comment  node-name,  next,  previous,  up
-@section Menus and the @kbd{m} command
-
-@cindex menus in an Info document
-@cindex Info menus
-  With only the @kbd{n} (next), @kbd{p} (previous), @kbd{@key{SPC}},
-@kbd{@key{BACKSPACE}}, @kbd{]} and @kbd{[} commands for moving between
-nodes, nodes are restricted to a linear sequence.  Menus allow a
-branching structure.  A menu is a list of other nodes you can move to.
-It is actually just part of the text of the node formatted specially
-so that Info can interpret it.  The beginning of a menu is always
-identified by a line which starts with @w{@samp{* Menu:}}.  A node
-contains a menu if and only if it has a line in it which starts that
-way.  The only menu you can use at any moment is the one in the node
-you are in.  To use a menu in any other node, you must move to that
-node first.
+  With only the @kbd{n} and @kbd{p} commands for moving between nodes, nodes
+are restricted to a linear sequence.  Menus allow a branching
+structure.  A menu is a list of other nodes you can move to.  It is
+actually just part of the text of the node formatted specially so that
+Info can interpret it.  The beginning of a menu is always identified
+by a line which starts with @samp{* Menu:}.  A node contains a menu if and
+only if it has a line in it which starts that way.  The only menu you
+can use at any moment is the one in the node you are in.  To use a
+menu in any other node, you must move to that node first.
 
   After the start of the menu, each line that starts with a @samp{*}
-identifies one subtopic.  The line usually contains a brief name for
-the subtopic (followed by a @samp{:}, normally hidden in XEmacs), the
-name of the node that talks about that subtopic (again, normally
-hidden in XEmacs), and optionally some further description of the
+identifies one subtopic.  The line usually contains a brief name
+for the subtopic (followed by a @samp{:}), the name of the node that talks
+about that subtopic, and optionally some further description of the
 subtopic.  Lines in the menu that do not start with a @samp{*} have no
 special meaning---they are only for the human reader's benefit and do
 not define additional subtopics.  Here is an example:
 
 @example
-* Foo:  Node about FOO.      This tells about FOO.
+* Foo:  FOO's Node      This tells about FOO
 @end example
 
-The subtopic name is Foo, and the node describing it is @samp{Node
-about FOO}.  The rest of the line is just for the reader's
-Information.  [[ But this line is not a real menu item, simply because
-there is no line above it which starts with @w{@samp{* Menu:}}.  Also,
-in a real menu item, the @samp{*} would appear at the very start of
-the line.  This is why the ``normally hidden'' text in XEmacs, namely
-@samp{: Node about FOO.}, is actually visible in this example, even
-when Visible mode is off.]]
+The subtopic name is Foo, and the node describing it is @samp{FOO's Node}.
+The rest of the line is just for the reader's Information.
+[[ But this line is not a real menu item, simply because there is
+no line above it which starts with @samp{* Menu:}.]]
 
   When you use a menu to go to another node (in a way that will be
 described soon), what you specify is the subtopic name, the first
 abbreviation for this:
 
 @example
-* Foo::   This tells about FOO.
+* Foo::   This tells about FOO
 @end example
 
 @noindent
 This means that the subtopic name and node name are the same; they are
-both @samp{Foo}.  (The @samp{::} is normally hidden in XEmacs.)
+both @samp{Foo}.
 
-@format
->> Now use @key{SPC} to find the menu in this node, then come back to
-   the front with a @kbd{b} and some @key{SPC}s.  As you see, a menu is
+>> Now use Spaces to find the menu in this node, then come back to
+   the front with a @kbd{b} and some Spaces.  As you see, a menu is
    actually visible in its node.  If you cannot find a menu in a node
    by looking at it, then the node does not have a menu and the
    @kbd{m} command is not available.
-@end format
 
-If you keep typing @key{SPC} once the menu appears on the screen, it
-will move to another node (the first one in the menu).  If that
-happens, type @key{BACKSPACE} to come back.
+  The command to go to one of the subnodes is @kbd{m}---but @emph{do
+not do it yet!}  Before you use @kbd{m}, you must understand the
+difference between commands and arguments.  So far, you have learned
+several commands that do not need arguments.  When you type one, Info
+processes it and is instantly ready for another command.  The @kbd{m}
+command is different: it is incomplete without the @dfn{name of the
+subtopic}.  Once you have typed @kbd{m}, Info tries to read the
+subtopic name.
 
-@kindex m @r{(Info mode)}
-  The command to go to one of the subnodes is @kbd{m}.  This is very
-different from the commands you have used: it is a command that
-prompts you for more input.
+  Now look for the line containing many dashes near the bottom of the
+screen.  There is one more line beneath that one, but usually it is
+blank.  If it is empty, Info is ready for a command, such as @kbd{n}
+or @kbd{b} or Space or @kbd{m}.  If that line contains text ending
+in a colon, it means Info is trying to read the @dfn{argument} to a
+command.  At such times, commands do not work, because Info tries to
+use them as the argument.  You must either type the argument and
+finish the command you started, or type @kbd{Control-g} to cancel the
+command.  When you have done one of those things, the line becomes
+blank again.
 
-  The Info commands you know do not need additional input; when you
-type one of them, Info processes it instantly and then is ready for
-another command.  The @kbd{m} command is different: it needs to know
-the @dfn{name of the subtopic}.  Once you have typed @kbd{m}, Info
-tries to read the subtopic name.
-
-  Now, in the stand-alone Info, look for the line containing many
-dashes near the bottom of the screen.  (This is the stand-alone
-equivalent for the mode line in XEmacs.)  There is one more line
-beneath that one, but usually it is blank.  (In XEmacs, this is the
-echo area.)  When it is blank, Info is ready for a command, such as
-@kbd{n} or @kbd{b} or @key{SPC} or @kbd{m}.  If that line contains
-text ending in a colon, it means Info is reading more input for the
-last command.  You can't type an Info command then, because Info is
-trying to read input, not commands.  You must either give the input
-and finish the command you started, or type @kbd{Control-g} to cancel
-the command.  When you have done one of those things, the input entry
-line becomes blank again.  Then you can type Info commands again.
-
-@findex Info-menu
   The command to go to a subnode via a menu is @kbd{m}.  After you type
 the @kbd{m}, the line at the bottom of the screen says @samp{Menu item: }.
 You must then type the name of the subtopic you want, and end it with
 a @key{RET}.
 
-@cindex abbreviating Info subnodes
   You can abbreviate the subtopic name.  If the abbreviation is not
 unique, the first matching subtopic is chosen.  Some menus put
 the shortest possible abbreviation for each subtopic name in capital
 item name, except for one space where a space appears in the item in
 the menu.
 
-@cindex completion of Info node names
-  You can also use the @dfn{completion} feature to help enter the
-subtopic name.  If you type the @key{TAB} key after entering part of a
-name, it will fill in more of the name---as much as Info can deduce
-from the part you have entered.
+  You can also use the @dfn{completion} feature to help enter the subtopic
+name.  If you type the Tab key after entering part of a name, it will
+magically fill in more of the name---as much as follows uniquely from
+what you have entered.
 
   If you move the cursor to one of the menu subtopic lines, then you do
-not need to type the argument: you just type a @key{RET}, and it
-stands for the subtopic of the line you are on.  You can also click
-the middle mouse button directly on the subtopic line to go there.
+not need to type the argument: you just type a Return, and it stands for
+the subtopic of the line you are on.
 
 Here is a menu to give you a chance to practice.  This menu gives you
 three ways of going to one place, Help-FOO:
 
 @menu
 * Foo:  Help-FOO.       A node you can visit for fun.
-* Bar:  Help-FOO.       We have made two ways to get to the same place.
+* Bar:  Help-FOO.       Strange!  two ways to get to the same place.
 * Help-FOO::            And yet another!
 @end menu
 
-(Turn Visible mode on if you are using XEmacs.)
-
-@format
 >>  Now type just an @kbd{m} and see what happens:
-@end format
 
   Now you are ``inside'' an @kbd{m} command.  Commands cannot be used
 now; the next thing you will type must be the name of a subtopic.
 
-  You can change your mind about doing the @kbd{m} by typing
-@kbd{Control-g}.
+  You can change your mind about doing the @kbd{m} by typing Control-g.
 
-@format
 >> Try that now;  notice the bottom line clear.
-@end format
 
-@format
 >> Then type another @kbd{m}.
-@end format
 
-@format
->> Now type @kbd{BAR}, the item name.  Do not type @key{RET} yet.
-@end format
+>> Now type @samp{BAR} item name.  Do not type Return yet.
 
-  While you are typing the item name, you can use the @key{DEL} (or
-@key{BACKSPACE}) key to cancel one character at a time if you make a
-mistake.
+  While you are typing the item name, you can use the Delete key to
+cancel one character at a time if you make a mistake.
 
-@format
->> Press @key{DEL} to cancel the @samp{R}.  You could type another @kbd{R}
-   to replace it.  But you do not have to, since @samp{BA} is a valid
-   abbreviation.
-@end format
+>> Type one to cancel the @samp{R}.  You could type another @samp{R} to
+   replace it.  You do not have to, since @samp{BA} is a valid abbreviation.
 
-@format
 >> Now you are ready to go.  Type a @key{RET}.
-@end format
 
-  After visiting @samp{Help-FOO}, you should return here.
+  After visiting Help-FOO, you should return here.
 
-  Another way to move to the menu subtopic lines and between them is
-to type @key{TAB}.  Each time you type a @key{TAB}, you move to the
-next subtopic line.  To move to a previous subtopic line in the
-stand-alone reader, type @kbd{M-@key{TAB}}---that is, press and hold
-the @key{META} key and then press @key{TAB}.  (On some keyboards, the
-@key{META} key might be labeled @samp{Alt}.)  In XEmacs Info, type
-@kbd{S-@key{TAB}} to move to a previous subtopic line (press and hold
-the @key{Shift} key and then press @key{TAB}).
+>> Type @kbd{n} to see more commands.
 
-  Once you move cursor to a subtopic line, press @key{RET} to go to
-that subtopic's node.
+@c If a menu appears at the end of this node, remove it.
+@c It is an accident of the menu updating command.
 
-@cindex mouse support in Info mode
-@kindex Mouse-2 @r{(Info mode)}
-  If your terminal supports a mouse, you have yet another way of going
-to a subtopic.  Move your mouse pointer to the subtopic line,
-somewhere between the beginning @samp{*} and the colon @samp{:} which
-ends the subtopic's brief name.  You will see the subtopic's name
-change its appearance (usually, its background color will change), and
-the shape of the mouse pointer will change if your platform supports
-that.  After a while, if you leave the mouse on that spot, a small
-window will pop up, saying ``Mouse-2: go to that node,'' or the same
-message may appear at the bottom of the screen.
+Here is another way to get to  Help-FOO, a menu.  You can ignore this
+if you want, or else try it (but then please come back to here).
 
-  @kbd{Mouse-2} is the second button of your mouse counting from the
-left---the middle button on a 3-button mouse.  (On a 2-button mouse,
-you may have to press both buttons together to ``press the middle
-button''.)  The message tells you pressing @kbd{Mouse-2} with the
-current position of the mouse pointer (on subtopic in the menu) will
-go to that subtopic.
-
-@findex Info-mouse-follow-nearest-node
-  More generally, @kbd{Mouse-2} in an Info buffer finds the nearest
-link to another node and goes there.  For example, near a cross
-reference it acts like @kbd{f}, in a menu it acts like @kbd{m}, on the
-node's header line it acts like @kbd{n}, @kbd{p}, or @kbd{u}, etc.  At
-end of the node's text @kbd{Mouse-2} moves to the next node, or up if
-there's no next node.
-
-@format
->> Type @kbd{n} to see more commands.
-@end format
+@menu
+* Help-FOO::
+@end menu
 
 @node Help-FOO,  ,  , Help-M
+@comment  node-name,  next,  previous,  up
 @subsection The @kbd{u} command
 
-  Congratulations!  This is the node @samp{Help-FOO}.  It has an @samp{Up}
-pointer @samp{Help-M}, the node you just came from via the @kbd{m}
-command.  This is the usual convention---the nodes you reach from a menu
-have @samp{Up} nodes that lead back to the menu.  Menus move Down in the
-tree, and @samp{Up} moves Up.  @samp{Previous}, on the other hand, is
-usually used to ``stay on the same level but go backwards''.
+  Congratulations!  This is the node @samp{Help-FOO}.  Unlike the other
+nodes you have seen, this one has an @samp{Up}: @samp{Help-M}, the node you
+just came from via the @kbd{m} command.  This is the usual
+convention---the nodes you reach from a menu have @samp{Up} nodes that lead
+back to the menu.  Menus move Down in the tree, and @samp{Up} moves Up.
+@samp{Previous}, on the other hand, is usually used to ``stay on the same
+level but go backwards''
 
-@kindex u @r{(Info mode)}
-@findex Info-up
   You can go back to the node @samp{Help-M} by typing the command
-@kbd{u} for ``Up''.  This puts you at the menu subtopic line pointing
-to the subnode that the @kbd{u} command brought you from.  (Some Info
-readers may put you at the @emph{front} of the node instead---to get
-back to where you were reading, you have to type some @key{SPC}s.)
+@kbd{u} for ``Up''.  That puts you at the @emph{front} of the
+node---to get back to where you were reading you have to type
+some @key{SPC}s.
 
-  Another way to go Up is to click @kbd{Mouse-2} on the @samp{Up}
-pointer shown in the header line (provided that you have a mouse).
+>> Now type @kbd{u} to move back up to @samp{Help-M}.
 
-@format
->> Now type @kbd{u} to move back up to @samp{Help-M}.
-@end format
+@node Help-Adv, Help-Q, Help-M, Getting Started
+@comment  node-name,  next,  previous,  up
+@section Some advanced Info commands
 
-@node Help-Xref, Help-Int, Help-M, Getting Started
-@comment  node-name,  next,  previous,  up
-@section Following Cross-References
+  The course is almost over, so please stick with it to the end.
 
-@cindex cross references in Info documents
-  In Info doc