Avoid deprecation warnings with Texinfo 6.8

* doc/lispref/functions.texi (Function Safety):
* doc/misc/srecode.texi (Parts of SRecode):
* doc/misc/wisent.texi (Wisent Semantic, Wisent Lex):
* doc/misc/pcl-cvs.texi (Editing files):
* doc/misc/bovine.texi (top, Starting Rules)
(Bovine Grammar Rules, How Lexical Tokens Match)
(Optional Lambda Expression):
* doc/emacs/msdos.texi (Windows Keyboard):
* doc/emacs/buffers.texi (Several Buffers):
* doc/emacs/text.texi (Text): Avoid using @inforef, which is
deprecated.

8 files changed, 26 insertions, 34 deletions

diff --git a/doc/emacs/buffers.texi b/doc/emacs/buffers.texi
index bec7f37547c..c4e5bc32b7c 100644
--- a/doc/emacs/buffers.texi
+++ b/doc/emacs/buffers.texi
@@ -586,9 +586,6 @@ every @code{auto-revert-interval} seconds if you enable Auto Revert
 mode in this buffer, as long as it is not marked modified.  Global
 Auto Revert mode applies to the @file{*Buffer List*} buffer only if
 @code{global-auto-revert-non-file-buffers} is non-@code{nil}.
-@iftex
-@inforef{Auto Reverting the Buffer Menu,, emacs-xtra}, for details.
-@end iftex
 @ifnottex
 @xref{Auto Reverting the Buffer Menu, global-auto-revert-non-file-buffers}, for details.
 @end ifnottex
diff --git a/doc/emacs/msdos.texi b/doc/emacs/msdos.texi
index 4b58f6aa2f7..33d389acd50 100644
--- a/doc/emacs/msdos.texi
+++ b/doc/emacs/msdos.texi
@@ -549,10 +549,6 @@ meanings by enabling CUA Mode (@pxref{CUA Bindings}).  Another
 optional feature which will make Emacs behave like other Windows
 applications is Delete Selection mode (@pxref{Using Region}).
 
-@iftex
-@inforef{Windows Keyboard, , emacs}, for information about additional
-Windows-specific variables in this category.
-@end iftex
 @ifnottex
 @vindex w32-alt-is-meta
 @cindex @code{Alt} key (MS-Windows)
@@ -1176,11 +1172,6 @@ the default when such software is detected when running Emacs.
 When this variable is non-@code{nil}, other variables affecting the
 cursor display have no effect.
 
-@iftex
-@inforef{Windows Misc, , emacs}, for information about additional
-Windows-specific variables in this category.
-@end iftex
-
 @ifnottex
 @vindex w32-grab-focus-on-raise
 @cindex frame focus policy, MS-Windows
diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi
index f2fe2480154..c9c4be3c61d 100644
--- a/doc/emacs/text.texi
+++ b/doc/emacs/text.texi
@@ -61,7 +61,7 @@ use Picture mode, a special major mode for editing such pictures.
 @cindex autotyping
 @cindex automatic typing
   The automatic typing features may be useful when writing text.
-@inforef{Top,The Autotype Manual,autotype}.
+@xref{Top, Autotyping, The Autotype Manual, autotype}.
 @end ifinfo
 
 @menu
diff --git a/doc/lispref/functions.texi b/doc/lispref/functions.texi
index 64883bf0f63..77d1465c876 100644
--- a/doc/lispref/functions.texi
+++ b/doc/lispref/functions.texi
@@ -2421,11 +2421,12 @@ opposed to an unspecified one).
 @cindex safety of functions
 
 Some major modes, such as SES, call functions that are stored in user
-files.  (@inforef{Top, ,ses}, for more information on SES@.)  User
-files sometimes have poor pedigrees---you can get a spreadsheet from
-someone you've just met, or you can get one through email from someone
-you've never met.  So it is risky to call a function whose source code
-is stored in a user file until you have determined that it is safe.
+files.  (@xref{Top, Simple Emacs Spreadsheet,,ses}, for more
+information on SES@.)  User files sometimes have poor pedigrees---you
+can get a spreadsheet from someone you've just met, or you can get one
+through email from someone you've never met.  So it is risky to call a
+function whose source code is stored in a user file until you have
+determined that it is safe.
 
 @defun unsafep form &optional unsafep-vars
 Returns @code{nil} if @var{form} is a @dfn{safe} Lisp expression, or
diff --git a/doc/misc/bovine.texi b/doc/misc/bovine.texi
index 780f0addb59..9bfb117d1a5 100644
--- a/doc/misc/bovine.texi
+++ b/doc/misc/bovine.texi
@@ -78,13 +78,13 @@ The @dfn{bovine} parser is the original @semantic{} parser, and is an
 implementation of an @acronym{LL} parser.  It is good for simple
 languages.  It has many conveniences making grammar writing easy.  The
 conveniences make it less powerful than a Bison-like @acronym{LALR}
-parser.  For more information, @inforef{Top, The Wisent Parser Manual,
+parser.  For more information, @pxref{Top,, Wisent Parser Development,
 wisent}.
 
 Bovine @acronym{LL} grammars are stored in files with a @file{.by}
 extension.  When compiled, the contents is converted into a file of
 the form @file{NAME-by.el}.  This, in turn is byte compiled.
-@inforef{top, Grammar Framework Manual, grammar-fw}.
+@xref{top,, Grammar Framework Manual, grammar-fw}.
 
 @ifnottex
 @insertcopying
@@ -105,7 +105,8 @@ the form @file{NAME-by.el}.  This, in turn is byte compiled.
 In Bison, one and only one nonterminal is designated as the ``start''
 symbol.  In @semantic{}, one or more nonterminals can be designated as
 the ``start'' symbol.  They are declared following the @code{%start}
-keyword separated by spaces.  @inforef{start Decl, ,grammar-fw}.
+keyword separated by spaces.  @xref{start Decl,, Grammar Framework
+Manual, grammar-fw}.
 
 If no @code{%start} keyword is used in a grammar, then the very first
 is used.  Internally the first start nonterminal is targeted by the
@@ -115,7 +116,8 @@ parser harness.
 To find locally defined variables, the local context handler needs to
 parse the body of functional code.  The @code{scopestart} declaration
 specifies the name of a nonterminal used as the goal to parse a local
-context, @inforef{scopestart Decl, ,grammar-fw}.  Internally the
+context, @pxref{scopestart Decl,, Grammar Framework Manual,
+grammar-fw}.  Internally the
 scopestart nonterminal is targeted by the reserved symbol
 @code{bovine-inner-scope}, so it can be found by the parser harness.
 
@@ -124,7 +126,7 @@ scopestart nonterminal is targeted by the reserved symbol
 
 The rules are what allow the compiler to create tags from a language
 file.  Once the setup is done in the prologue, you can start writing
-rules.  @inforef{Grammar Rules, ,grammar-fw}.
+rules.  @xref{Grammar Rules,, Grammar Framework Manual, grammar-fw}.
 
 @example
 @var{result} : @var{components1} @var{optional-semantic-action1})
@@ -146,8 +148,8 @@ A particular @var{result} written into your grammar becomes
 the parser's goal.  It is designated by a @code{%start} statement
 (@pxref{Starting Rules}).  The value returned by the associated
 @var{optional-semantic-action} is the parser's result.  It should be
-a tree of @semantic{} @dfn{tags}, @inforef{Semantic Tags, ,
-semantic-appdev}.
+a tree of @semantic{} @dfn{tags}, @pxref{Semantic Tags,, Semantic
+Application Development, semantic-appdev}.
 
 @var{components} is made up of symbols.  A symbol such as @code{FOO}
 means that a syntactic token of class @code{FOO} must be matched.
@@ -170,8 +172,9 @@ For instance:
 @end example
 
 Means that @code{FOO} is a reserved language keyword, matched as such
-by looking up into a keyword table, @inforef{keyword Decl,
-,grammar-fw}.  This is because @code{"foo"} will be converted to
+by looking up into a keyword table, @pxref{keyword Decl,, Grammar
+Framework Manual, grammar-fw}.  This is because @code{"foo"} will be
+converted to
 @code{FOO} in the lexical analysis stage.  Thus the symbol @code{FOO}
 won't be available any other way.
 
@@ -383,8 +386,8 @@ Is an optional set of labeled values such as @code{:constant-flag t :parent
 Create a tag with @var{name} of respectively the class
 @code{variable}, @code{function}, @code{type}, @code{include},
 @code{package}, and @code{code}.
-See @inforef{Creating Tags, , semantic-appdev} for the lisp
-functions these translate into.
+See @ref{Creating Tags,, Semantic Application Development,
+semantic-appdev}, for the lisp functions these translate into.
 @end table
 
 If the symbol @code{%quotemode backquote} is specified, then use
diff --git a/doc/misc/pcl-cvs.texi b/doc/misc/pcl-cvs.texi
index 0d4f9769115..4ba067fd81f 100644
--- a/doc/misc/pcl-cvs.texi
+++ b/doc/misc/pcl-cvs.texi
@@ -839,7 +839,7 @@ files.
 @item f
 Find the file that the cursor points to (@code{cvs-mode-find-file}).  If
 the cursor points to a directory, run @code{dired} on that directory;
-@inforef{Dired, , emacs}.
+@pxref{Dired, Emacs Manual, , emacs}.
 
 @item o
 Like @kbd{f}, but use another window
diff --git a/doc/misc/srecode.texi b/doc/misc/srecode.texi
index a0e999b6812..1f7473c151a 100644
--- a/doc/misc/srecode.texi
+++ b/doc/misc/srecode.texi
@@ -259,7 +259,7 @@ contexts to have the same name.  Some standard contexts are
 @code{file}, @code{declaration}, and @code{classdecl}.
 
 A context can be automatically derived as well based on the parsing
-state from @i{Semantic}.  @inforef{Top, Semantic Manual, semantic}.
+state from @i{Semantic}.  @xref{Top, Semantic Manual,, semantic}.
 
 @section Applications
 Commands that do a particular user task which involves also writing
diff --git a/doc/misc/wisent.texi b/doc/misc/wisent.texi
index dc5b8e4d205..c0bb7b10a46 100644
--- a/doc/misc/wisent.texi
+++ b/doc/misc/wisent.texi
@@ -1575,7 +1575,7 @@ To use the Wisent parser with @semantic{} you have to define
 your grammar in @dfn{WY} form, a grammar format very close
 to the one used by Bison.
 
-Please @inforef{top, Semantic Grammar Framework Manual, grammar-fw}
+Please see @ref{top, Semantic Grammar Framework Manual,, grammar-fw},
 for more information on @semantic{} grammars.
 
 @menu
@@ -1962,8 +1962,8 @@ See implementation of the function @code{wisent-skip-token} in
 
 @findex semantic-lex
 The lexical analysis step of @semantic{} is performed by the general
-function @code{semantic-lex}.  For more information, @inforef{Writing
-Lexers, ,semantic-langdev}.
+function @code{semantic-lex}.  For more information, see @ref{Writing
+Lexers, Semantic Language Development,,semantic-langdev}.
 
 @code{semantic-lex} produces lexical tokens of the form: