--- a/man/ChangeLog	Fri Oct 10 11:51:05 2003 +0000
+++ b/man/ChangeLog	Fri Oct 10 12:39:45 2003 +0000
@@ -1,3 +1,47 @@
+2003-10-10  Ilya N. Golubev  <gin@mo.msk.ru>
+
+	* new-users-guide/custom2.texi (Init File):
+
+	Fix up erroneous uses of @var instead of @code for the names of
+	particular variables in programming languages.
+
+2003-10-10  Ilya N. Golubev  <gin@mo.msk.ru>
+
+	* custom.texi (The Init File):
+	* xemacs-faq.texi (Q2.1.3):
+	(Q2.1.5):
+
+	* internals/internals.texi (Modules for Internationalization):
+
+	* lispref/display.texi (Beeping):
+	* lispref/ldap.texi (Encoder/Decoder Functions):
+	* lispref/markers.texi (The Mark):
+	(The Region):
+	* lispref/menus.texi (Menu Accelerator Functions):
+	* lispref/numbers.texi (Math Functions):
+	* lispref/packaging.texi (package-info.in):
+	(Makefile):
+	(Local.rules File):
+	* lispref/postgresql.texi (libpq Lisp Symbols and DataTypes):
+	(libpq Lisp Variables):
+	(Synchronous Interface Functions):
+	(Other libpq Functions):
+
+	* new-users-guide/custom2.texi (Init File):
+	(Setting Variables):
+	* new-users-guide/files.texi (File Names):
+	(Saving Files):
+	* new-users-guide/search.texi (Search and Replace):
+
+	* xemacs/custom.texi (X Resources):
+
+	Fix up erroneous uses of @var instead of @code for the names of
+	particular variables in programming languages.
+
+2003-10-10  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* Makefile: Remove old package and redundant cruft.
+
 2003-10-10  Ilya N. Golubev  <gin@mo.msk.ru>
 
 	* lispref/mule.texi (Charset Property Functions): Charset registry

--- a/man/Makefile	Fri Oct 10 11:51:05 2003 +0000
+++ b/man/Makefile	Fri Oct 10 12:39:45 2003 +0000
@@ -280,19 +280,6 @@
 $(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)/w3.info : w3.texi
-#	$(MAKEINFO) -o $(INFODIR)/w3.info w3.texi
-
-# EMACS = ../src/xemacs
-# EMACSFLAGS = -batch -vanilla
-
-# $(INFODIR)/vm.info : vm.texi
-#	-$(EMACS) $(EMACSFLAGS) -insert vm.texi -l texinfmt \
-#		-f texinfo-format-buffer -f save-buffer
-#	-mv vm.info* $(INFODIR)/.
-
-# special = # $(INFODIR)/vm.info $(INFODIR)/texinfo.info
-
 xemacs : $(INFODIR)/xemacs.info
 lispref : $(INFODIR)/lispref.info
 internals : $(INFODIR)/internals.info
@@ -303,14 +290,6 @@
 info : $(info_files)
 html : $(html_files)
 
-# tm: FRC.tm
-#	cd ./tm && $(RECURSIVE_MAKE)
-# gnats: FRC.gnats
-#	cd ./gnats && $(RECURSIVE_MAKE)
-# FRC.xemacs FRC.lispref FRC.new-users-guide FRC.internals FRC.tm FRC.gnats:
-
-.PHONY: info dvi
-
 .texi.dvi:
 	-$(TEXI2DVI) $<
 
@@ -404,19 +383,6 @@
 $(HTMLDIR)/new-users-guide.html : $(new-users-guide-srcs)
 	$(TEXI2HTML) -subdir $(HTMLDIR) new-users-guide/new-users-guide.texi
 
-# $(HTMLDIR)/w3.html : w3.texi
-#	$(TEXI2HTML) -subdir $(HTMLDIR) w3.texi
-
-# EMACS = ../src/xemacs
-# EMACSFLAGS = -batch -vanilla
-
-# $(HTMLDIR)/vm.html : vm.texi
-#	-$(EMACS) $(EMACSFLAGS) -insert vm.texi -l texinfmt \
-#		-f texinfo-format-buffer -f save-buffer
-#	-mv vm.html* $(HTMLDIR)/.
-
-# special = # $(HTMLDIR)/vm.html $(HTMLDIR)/texinfo.html
-
 xemacs : $(HTMLDIR)/xemacs.html
 lispref : $(HTMLDIR)/lispref.html
 internals : $(HTMLDIR)/internals.html

--- a/man/custom.texi	Fri Oct 10 11:51:05 2003 +0000
+++ b/man/custom.texi	Fri Oct 10 12:39:45 2003 +0000
@@ -291,7 +291,7 @@
 @file{init.el} (in XEmacs 21.4 and later).  If you use another file, you
 must explicitly load it yourself.
 
-As of XEmacs 21.4.7, when @var{custom-file} is present, it is loaded
+As of XEmacs 21.4.7, when @code{custom-file} is present, it is loaded
 @emph{after} @file{init.el}.  This is likely to change in the future,
 because (1) actions in @file{init.el} often would like to depend on
 customizations for consistent appearance and (2) Custom is quite brutal

--- a/man/internals/internals.texi	Fri Oct 10 11:51:05 2003 +0000
+++ b/man/internals/internals.texi	Fri Oct 10 12:39:45 2003 +0000
@@ -5718,7 +5718,7 @@
 
 @file{mule-mcpath.c} provides some functions to allow for pathnames
 containing extended characters.  This code is fragmentary, obsolete, and
-completely non-working.  Instead, @var{pathname-coding-system} is used
+completely non-working.  Instead, @code{pathname-coding-system} is used
 to specify conversions of names of files and directories.  The standard
 C I/O functions like @samp{open()} are wrapped so that conversion occurs
 automatically.

--- a/man/lispref/display.texi	Fri Oct 10 11:51:05 2003 +0000
+++ b/man/lispref/display.texi	Fri Oct 10 12:39:45 2003 +0000
@@ -1284,7 +1284,7 @@
 The sound file must be in the Sun/NeXT U-LAW format.  @var{sound-name}
 should be a symbol, specifying the name of the sound.  If @var{volume}
 is specified, the sound will be played at that volume; otherwise, the
-value of @var{bell-volume} will be used.
+value of @code{bell-volume} will be used.
 @end deffn
 
 @defun play-sound sound &optional volume device

--- a/man/lispref/ldap.texi	Fri Oct 10 11:51:05 2003 +0000
+++ b/man/lispref/ldap.texi	Fri Oct 10 12:39:45 2003 +0000
@@ -431,21 +431,21 @@
 @end defun
 
 @defun ldap-decode-string str
-Decode a string @var{str} according to @var{ldap-coding-system}.
+Decode a string @var{str} according to @code{ldap-coding-system}.
 @end defun
 
 @defun ldap-encode-string str
-Encode a string @var{str} according to @var{ldap-coding-system}.
+Encode a string @var{str} according to @code{ldap-coding-system}.
 @end defun
 
 @defun ldap-decode-address str
-Decode an address @var{str} according to @var{ldap-coding-system} and
+Decode an address @var{str} according to @code{ldap-coding-system} and
 replacing $ signs with newlines as specified by LDAP encoding rules for
 addresses.
 @end defun
 
 @defun ldap-encode-address str
-Encode an address @var{str} according to @var{ldap-coding-system} and
+Encode an address @var{str} according to @code{ldap-coding-system} and
 replacing newlines with $ signs as specified by LDAP encoding rules for
 addresses.
 @end defun

--- a/man/lispref/markers.texi	Fri Oct 10 11:51:05 2003 +0000
+++ b/man/lispref/markers.texi	Fri Oct 10 12:39:45 2003 +0000
@@ -508,7 +508,7 @@
 mark position anyway---or @code{nil}, if the mark is not yet set for
 the buffer.
 
-(Remember that if @var{zmacs-regions} is @code{nil}, the mark is
+(Remember that if @code{zmacs-regions} is @code{nil}, the mark is
 always active as long as it exists, and the @var{force} argument
 will have no effect.)
 
@@ -687,8 +687,8 @@
 should normally use @code{interactive} with the @samp{r} specification
 to find the beginning and end of the region.  This lets other Lisp
 programs specify the bounds explicitly as arguments and automatically
-respects the user's setting for @var{zmacs-regions}.  (@xref{Interactive
-Codes}.)
+respects the user's setting for @code{zmacs-regions}.
+(@xref{Interactive Codes}.)
 
 @defun region-beginning &optional buffer
 This function returns the position of the beginning of @var{buffer}'s
@@ -730,7 +730,7 @@
 @defvar zmacs-region-stays
 If a command sets this variable to true, the currently active region
 will remain activated when the command finishes. (Normally the region is
-deactivated when each command terminates.) If @var{zmacs-regions} is
+deactivated when each command terminates.) If @code{zmacs-regions} is
 false, however, this has no effect.  Under normal circumstances, you do
 not need to set this; use the interactive specification @samp{_}
 instead, if you want the region to remain active.
@@ -740,15 +740,15 @@
 This function activates the region in the current buffer (this is
 equivalent to activating the current buffer's mark).  This will normally
 also highlight the text in the active region and set
-@var{zmacs-region-stays} to @code{t}. (If @var{zmacs-regions} is false,
-however, this function has no effect.)
+@code{zmacs-region-stays} to @code{t}. (If @code{zmacs-regions} is
+false, however, this function has no effect.)
 @end defun
 
 @defun zmacs-deactivate-region
 This function deactivates the region in the current buffer (this is
 equivalent to deactivating the current buffer's mark).  This will
 normally also unhighlight the text in the active region and set
-@var{zmacs-region-stays} to @code{nil}. (If @var{zmacs-regions} is
+@code{zmacs-region-stays} to @code{nil}. (If @code{zmacs-regions} is
 false, however, this function has no effect.)
 @end defun
 
@@ -768,21 +768,21 @@
 @code{set-mark-command}, @code{activate-region}, or
 @code{exchange-point-and-mark}.) Note that calling
 @file{zmacs-activate-region} will call this hook, even if the region is
-already active.  If @var{zmacs-regions} is false, however, this hook
+already active.  If @code{zmacs-regions} is false, however, this hook
 will never get called under any circumstances.
 @end defvar
 
 @defvar zmacs-deactivate-region-hook
 This normal hook is called when an active region becomes inactive.
 (Calling @file{zmacs-deactivate-region} when the region is inactive will
-@emph{not} cause this hook to be called.)  If @var{zmacs-regions} is
+@emph{not} cause this hook to be called.)  If @code{zmacs-regions} is
 false, this hook will never get called.
 @end defvar
 
 @defvar zmacs-update-region-hook
 This normal hook is called when an active region is "updated" by
 @code{zmacs-update-region}.  This normally gets called at the end
-of each command that sets @var{zmacs-region-stays} to @code{t},
+of each command that sets @code{zmacs-region-stays} to @code{t},
 indicating that the region should remain activated.  The motion
 commands do this.
 @end defvar

--- a/man/lispref/menus.texi	Fri Oct 10 11:51:05 2003 +0000
+++ b/man/lispref/menus.texi	Fri Oct 10 12:39:45 2003 +0000
@@ -677,14 +677,14 @@
 precedence over bindings in the current keymap(s).  @code{menu-fallback} means
 that bindings in the current keymap take precedence over menu accelerator keys.
 Thus a top level menu with an accelerator of "T" would be activated on a
-keypress of Meta-t if @var{menu-accelerator-enabled} is @code{menu-force}.
-However, if @var{menu-accelerator-enabled} is @code{menu-fallback}, then
+keypress of Meta-t if @code{menu-accelerator-enabled} is @code{menu-force}.
+However, if @code{menu-accelerator-enabled} is @code{menu-fallback}, then
 Meta-t will not activate the menubar and will instead run the function
 transpose-words, to which it is normally bound.
 
 The default value is @code{nil}.
 
-See also @var{menu-accelerator-modifiers} and @var{menu-accelerator-prefix}.
+See also @code{menu-accelerator-modifiers} and @code{menu-accelerator-prefix}.
 @end defvar
 
 @defvar menu-accelerator-map
@@ -698,12 +698,12 @@
 a keystroke.  The default value of @code{(meta)} mirrors the usage of the alt key
 as a menu accelerator in popular PC operating systems.
 
-The modifier keys in @var{menu-accelerator-modifiers} must match exactly the
+The modifier keys in @code{menu-accelerator-modifiers} must match exactly the
 modifiers present in the keypress.  The only exception is that the shift
-modifier is accepted in conjunction with alphabetic keys even if it is not
-a menu accelerator modifier.
+modifier is accepted in conjunction with alphabetic keys even if it is not a
+menu accelerator modifier.
 
-See also @var{menu-accelerator-enabled} and @var{menu-accelerator-prefix}.
+See also @code{menu-accelerator-enabled} and @code{menu-accelerator-prefix}.
 @end defvar
 
 @defvar menu-accelerator-prefix

--- a/man/lispref/numbers.texi	Fri Oct 10 11:51:05 2003 +0000
+++ b/man/lispref/numbers.texi	Fri Oct 10 12:39:45 2003 +0000
@@ -1028,7 +1028,7 @@
 
 @defun log number &optional base
 This function returns the logarithm of @var{number}, with base @var{base}.
-If you don't specify @var{base}, the base @var{e} is used.  If @var{number}
+If you don't specify @var{base}, the base @code{e} is used.  If @var{number}
 is negative, the result is a NaN.
 @end defun
 

--- a/man/lispref/packaging.texi	Fri Oct 10 11:51:05 2003 +0000
+++ b/man/lispref/packaging.texi	Fri Oct 10 12:39:45 2003 +0000
@@ -649,11 +649,11 @@
 @item XEMACS_INSTALLED_PACKAGES_ROOT
 Set this to the root of where you want the packages to be installed.
 Under this directory will hang @file{xemacs-packages} and
-@file{mule-packages}.  See @var{NONMULE_INSTALLED_PACKAGES_ROOT} and
-@var{MULE_INSTALLED_PACKAGES_ROOT}.  The default for this is
+@file{mule-packages}.  See @code{NONMULE_INSTALLED_PACKAGES_ROOT} and
+@code{MULE_INSTALLED_PACKAGES_ROOT}.  The default for this is
 @file{/usr/local/lib/xemacs}.  Which may not be what you want if you are
 developing XEmacs.  To quote the comments in
-@file{Local.rules.template}: 
+@file{Local.rules.template}:
 
 @quotation
 If you are developing XEmacs, you probably don't want to install the
@@ -677,7 +677,7 @@
 @item symlink
 The default is unset (blank).  If you set this to @samp{t} then
 @code{make install} will create a @dfn{symlink farm} of the installed
-packages under @var{XEMACS_INSTALLED_PACKAGES_ROOT}.  Obviously, for
+packages under @code{XEMACS_INSTALLED_PACKAGES_ROOT}.  Obviously, for
 this to work, your system has to support symbolic links.  This is as
 close as you can get to @dfn{running in place} for the packages.
 
@@ -794,8 +794,8 @@
 The path to your copy command (GNU cp).  The default is dependent on
 whether or not @var{symlink} is set (@samp{t}).
 
-If @var{symlink} is unset (blank), @var{RCOPY}'s default is 
-@code{cp -af}.  If @var{symlink} is set (@samp{t}), @var{RCOPY}'s
+If @var{symlink} is unset (blank), @code{RCOPY}'s default is 
+@code{cp -af}.  If @var{symlink} is set (@samp{t}), @code{RCOPY}'s
 default is @code{cp --force --recursive --symbolic-link}.
 @end table
 
@@ -803,11 +803,11 @@
 people will probably only need to alter:
 
 @itemize @bullet
-@item @var{XEMACS_INSTALLED_PACKAGES_ROOT}
-@item @var{NONMULE_INSTALLED_PACKAGES_ROOT}
-@item @var{MULE_INSTALLED_PACKAGES_ROOT}
-@item @var{NONMULE_PACKAGES}
-@item @var{MULE_PACKAGES}
+@item @code{XEMACS_INSTALLED_PACKAGES_ROOT}
+@item @code{NONMULE_INSTALLED_PACKAGES_ROOT}
+@item @code{MULE_INSTALLED_PACKAGES_ROOT}
+@item @code{NONMULE_PACKAGES}
+@item @code{MULE_PACKAGES}
 @end itemize
 
 @node Creating Packages, Documenting Packages, Local.rules File, Packaging
@@ -869,15 +869,15 @@
 
 @item version
 This is the XEmacs package version number of the package.  It is set
-from the @file{Makefile} variable @var{VERSION}.  This is something that
-the XEmacs Package Release Engineer deals with so there is no need for a
-package maintainer to touch it.  In @file{package-info.in} just put the
-place-marker, @samp{VERSION} here.
+from the @file{Makefile} variable @code{VERSION}.  This is something
+that the XEmacs Package Release Engineer deals with so there is no need
+for a package maintainer to touch it.  In @file{package-info.in} just
+put the place-marker, @samp{VERSION} here.
 
 @item author-version
 This is the package's internal, or @samp{upstream} version number if it
 has one.  It is set from the @file{Makefile} variable
-@var{AUTHOR_VERSION}. 
+@code{AUTHOR_VERSION}. 
 
 @item date
 This is the date of the last change made to the package.  It is
@@ -889,7 +889,7 @@
 
 @item maintainer
 This is the name and email address of the package's maintainer.  It is
-taken from the @file{Makefile} variable @var{MAINTAINER}.
+taken from the @file{Makefile} variable @code{MAINTAINER}.
 
 @item distribution
 An unused field, leave as @samp{xemacs}
@@ -900,7 +900,7 @@
 
 @item category
 The @samp{category} of the package.  It is taken from the
-@file{Makefile} variable @var{CATEGORY} and can be either
+@file{Makefile} variable @code{CATEGORY} and can be either
 @samp{standard} for non-Mule packages, or @samp{mule} for Mule
 packages.  The is also provision for @samp{unsupported} in this field
 which would be for packages that XEmacs.org do not distribute.
@@ -931,9 +931,9 @@
 provides.  Surround the list with parens.
 
 @item requires
-Taken from the @file{Makefile} variable @var{REQUIRES}.  It is a list of
-all the package's dependencies, including any macros and defstructs that
-need to be inlined.
+Taken from the @file{Makefile} variable @code{REQUIRES}.  It is a list
+of all the package's dependencies, including any macros and defstructs
+that need to be inlined.
 
 @samp{REQUIRES} cannot be correctly computed from the calls to
 @code{require} in the package's library sources.  @samp{REQUIRES} is
@@ -1133,19 +1133,19 @@
 @item ELCS_1
 A list of extra byte-compiled Lisp files used by the package to be
 installed in a subdirectory of the package's lisp directory.  The same
-care should be taken with this as with @var{ELCS} in regard to
+care should be taken with this as with @code{ELCS} in regard to
 @code{make clean}.
 
 @item ELCS_1_DEST
-The name of the subdirectory for the @var{ELCS_1} files to be installed
+The name of the subdirectory for the @code{ELCS_1} files to be installed
 to.  Be sure to include @samp{$(PACKAGE)/} as part of the name.
 
 @example
 ELCS_1_DEST = $(PACKAGE)/extra
 @end example
 
-Would put the @var{ELCS_1} files for the package, @samp{foo} into
-@file{xemacs-packages/lisp/foo/extra/}. 
+Would put the @code{ELCS_1} files for the package, @samp{foo} into
+@file{xemacs-packages/lisp/foo/extra/}.
 
 @item EARLY_GENERATED_LISP
 For additional @file{.el} files that will be generated before any
@@ -1169,8 +1169,8 @@
 @end example
 
 Preloads are loaded before @file{package-compile.el}, so the
-@var{load-path} is minimal.  Therefore @samp{PRELOADS} must specify a
-full path to packaged Lisp.  The base @var{load-path} does include the
+@code{load-path} is minimal.  Therefore @samp{PRELOADS} must specify a
+full path to packaged Lisp.  The base @code{load-path} does include the
 core Lisp directory, so core libraries are found.
 
 @item AUTOLOAD_PATH
@@ -1178,7 +1178,7 @@
 reside.  This is where the @file{auto-autoloads.el} file will be placed.
 
 @strong{N.B.} There is no need to use this variable if the @file{.el}
-files are in the package's toplevel directory.  @var{AUTOLOAD_PATH}
+files are in the package's toplevel directory.  @code{AUTOLOAD_PATH}
 defaults to @samp{.}.
 
 @item PACKAGE_SUPPRESS
@@ -1210,7 +1210,7 @@
 EXPLICIT_DOCS = texi/$(PACKAGE).texi
 @end example
 
-See @var{DOCS_TXI_EXTENSION} and @var{DOCS_TEXINFO_EXTENSION} if you
+See @code{DOCS_TXI_EXTENSION} and @code{DOCS_TEXINFO_EXTENSION} if you
 don't use the @file{.texi} file extension on your Texinfo sources.
 
 @item EXTRA_TEXI_FILES
@@ -1252,7 +1252,7 @@
 file ends up in @samp{$(DATA_DEST)}, not in a subdiredtory.
 
 @item DATA_DEST
-The directory where the files in @var{DATA_FILES} are installed to.  It
+The directory where the files in @code{DATA_FILES} are installed to.  It
 is a subdirectory of the installed @file{etc/} directory.  Be sure to
 prefix this value with @samp{$(PACKAGE)}, for example:
 
@@ -1264,12 +1264,12 @@
 
 @item DATA_1_FILES ... DATA_35_FILES
 For data files that need to go into a different directory from
-@var{DATA_DEST}. 
+@code{DATA_DEST}. 
 
 @item DATA_1_DEST ... DATA_35_DEST
-The name of the subdirectory for files specified in @var{DATA_n_FILES}.
-And like @var{DATA_DEST}, be sure to prefix @samp{$(PACKAGE)} to the
-value of these variables.
+The name of the subdirectory for files specified in
+@code{DATA_@var{n}_FILES}.  And like @code{DATA_DEST}, be sure to prefix
+@samp{$(PACKAGE)} to the value of these variables.
 
 @item EXTRA_DEPENDENCIES
 For additional files to build that aren't appropriate to place in any
@@ -1296,7 +1296,7 @@
 @item an entry in the @code{cond} in @code{package-name-to-directory}
 This is optional; it is necessary only if you keep your Lisp code
 somewhere other than the top-level directory of the package's source
-tree, eg, in @file{packages/xemacs-packages/@var{PACKAGE}/lisp}.
+tree, eg, in @file{packages/xemacs-packages/$(PACKAGE)/lisp}.
 @end table
 
 This only needs to be done once, when the package is first added to the

--- a/man/lispref/postgresql.texi	Fri Oct 10 11:51:05 2003 +0000
+++ b/man/lispref/postgresql.texi	Fri Oct 10 12:39:45 2003 +0000
@@ -104,27 +104,27 @@
 connection and when the @code{pq-setenv} call is made.
 
 @defvar pg:host
-Initialized from the @var{PGHOST} environment variable.  The default
+Initialized from the @code{PGHOST} environment variable.  The default
 host to connect to.
 @end defvar
 
 @defvar pg:user
-Initialized from the @var{PGUSER} environment variable.  The default
+Initialized from the @code{PGUSER} environment variable.  The default
 database user name.
 @end defvar
 
 @defvar pg:options
-Initialized from the @var{PGOPTIONS} environment variable.  Default
+Initialized from the @code{PGOPTIONS} environment variable.  Default
 additional server options.
 @end defvar
 
 @defvar pg:port
-Initialized from the @var{PGPORT} environment variable.  The default TCP
-port to connect to.
+Initialized from the @code{PGPORT} environment variable.  The default
+TCP port to connect to.
 @end defvar
 
 @defvar pg:tty
-Initialized from the @var{PGTTY} environment variable.  The default
+Initialized from the @code{PGTTY} environment variable.  The default
 debugging TTY.
 
 Compatibility note:  Debugging TTYs are turned off in the XEmacs Lisp
@@ -132,17 +132,17 @@
 @end defvar
 
 @defvar pg:database
-Initialized from the @var{PGDATABASE} environment variable.  The default
-database to connect to.
+Initialized from the @code{PGDATABASE} environment variable.  The
+default database to connect to.
 @end defvar
 
 @defvar pg:realm
-Initialized from the @var{PGREALM} environment variable.  The default
+Initialized from the @code{PGREALM} environment variable.  The default
 Kerberos realm.
 @end defvar
 
 @defvar pg:client-encoding
-Initialized from the @var{PGCLIENTENCODING} environment variable.  The
+Initialized from the @code{PGCLIENTENCODING} environment variable.  The
 default client encoding.
 
 Compatibility note:  This variable is not present in non-Mule XEmacsen.
@@ -153,35 +153,35 @@
 
 @c unused
 @defvar pg:authtype
-Initialized from the @var{PGAUTHTYPE} environment variable.  The default
-authentication scheme used.
+Initialized from the @code{PGAUTHTYPE} environment variable.  The
+default authentication scheme used.
 
 Compatibility note:  This variable is unused in versions of libpq after
 6.5.  It is not implemented at all in the XEmacs Lisp binding.
 @end defvar
 
 @defvar pg:geqo
-Initialized from the @var{PGGEQO} environment variable.  Genetic
+Initialized from the @code{PGGEQO} environment variable.  Genetic
 optimizer options.
 @end defvar
 
 @defvar pg:cost-index
-Initialized from the @var{PGCOSTINDEX} environment variable.  Cost index
-options.
+Initialized from the @code{PGCOSTINDEX} environment variable.  Cost
+index options.
 @end defvar
 
 @defvar pg:cost-heap
-Initialized from the @var{PGCOSTHEAP} environment variable.  Cost heap
+Initialized from the @code{PGCOSTHEAP} environment variable.  Cost heap
 options.
 @end defvar
 
 @defvar pg:tz
-Initialized from the @var{PGTZ} environment variable.  Default
+Initialized from the @code{PGTZ} environment variable.  Default
 timezone.
 @end defvar
 
 @defvar pg:date-style
-Initialized from the @var{PGDATESTYLE} environment variable.  Default
+Initialized from the @code{PGDATESTYLE} environment variable.  Default
 date style in returned date objects.
 @end defvar
 
@@ -338,7 +338,7 @@
 An unexpected response was received from the backend.
 @item pgres::nonfatal-error
 Undocumented.  This value is returned when the libpq function
-@code{PQresultStatus} is called with a @var{NULL} pointer.
+@code{PQresultStatus} is called with a @code{NULL} pointer.
 @item pgres::fatal-error
 Undocumented.  An error has occurred in processing the query and the
 operation was not completed.
@@ -510,7 +510,7 @@
 @end defun
 
 @defun pq-get-is-null result tup-num field-num
-Return t if the specific value is the SQL @var{NULL}.
+Return t if the specific value is the SQL @code{NULL}.
 @var{result} is a PGresult object.
 @var{tup-num} selects which tuple to fetch from.
 @var{field-num} selects which field to fetch from.
@@ -648,24 +648,24 @@
 The following options are available in the options string:
 @table @code
 @item authtype
-Authentication type.  Same as @var{PGAUTHTYPE}.  This is no longer used.
+Authentication type.  Same as @code{PGAUTHTYPE}.  This is no longer used.
 @item user
-Database user name.  Same as @var{PGUSER}.
+Database user name.  Same as @code{PGUSER}.
 @item password
 Database password.
 @item dbname
-Database name.  Same as @var{PGDATABASE}
+Database name.  Same as @code{PGDATABASE}
 @item host
-Symbolic hostname.  Same as @var{PGHOST}.
+Symbolic hostname.  Same as @code{PGHOST}.
 @item hostaddr
 Host address as four octets (eg. like 192.168.1.1).
 @item port
-TCP port to connect to.  Same as @var{PGPORT}.
+TCP port to connect to.  Same as @code{PGPORT}.
 @item tty
-Debugging TTY.  Same as @var{PGTTY}.  This value is suppressed in the
+Debugging TTY.  Same as @code{PGTTY}.  This value is suppressed in the
 XEmacs Lisp API.
 @item options
-Extra backend database options.  Same as @var{PGOPTIONS}.
+Extra backend database options.  Same as @code{PGOPTIONS}.
 @end table
 A database connection object is returned regardless of whether a
 connection was established or not.
@@ -897,7 +897,8 @@
 @end defun
 
 @defun pq-env-2-encoding
-Return the integer code representing the coding system in @var{PGCLIENTENCODING}.
+Return the integer code representing the coding system in
+@code{PGCLIENTENCODING}.
 
 @example
 (pq-env-2-encoding)

--- a/man/new-users-guide/custom2.texi	Fri Oct 10 11:51:05 2003 +0000
+++ b/man/new-users-guide/custom2.texi	Fri Oct 10 12:39:45 2003 +0000
@@ -93,7 +93,7 @@
 
 After you type any of the above commands, you will be prompted for a
 variable name in the @dfn{echo area}. Type in the name of the variable,
-for example, type  @var{case-fold-search} @key{RET}
+for example, type  @code{case-fold-search} @key{RET}
 Your window will split into two and you will see the following message
 in that window:
 
@@ -219,7 +219,7 @@
 @end example
 
 @noindent
-The value of the variable @var{c-tab-always-indent} is usually @samp{t}
+The value of the variable @code{c-tab-always-indent} is usually @samp{t}
 for @samp{true}. When this variable is true, then hitting the @key{TAB}
 key always indents the current line. 
 
@@ -233,7 +233,7 @@
 
 This mode will automatically break lines when you type a space so that
 the lines don't become too long. The length of the lines is controlled
-by the variable @var{fill-column}. You can set this variable to a value
+by the variable @code{fill-column}. You can set this variable to a value
 you wish. Look at the documentation for this variable to see its default
 value. To change the value to 75 for example, use:
 
@@ -383,7 +383,7 @@
 
 @item 
 To control the number of buffers listed when you select the @b{Buffers}
-menu, you need to set the variable @var{buffers-menu-max-size} to
+menu, you need to set the variable @code{buffers-menu-max-size} to
 whatever value you wish. For example, if you want 20 buffers to be listed
 when you select @b{Buffers} use:
 

--- a/man/new-users-guide/files.texi	Fri Oct 10 11:51:05 2003 +0000
+++ b/man/new-users-guide/files.texi	Fri Oct 10 12:39:45 2003 +0000
@@ -49,7 +49,7 @@
 a directory. You can see what the default directory of the current
 buffer is by using the @b{Describe Variable} option from the @b{Help}
 menu. When Emacs prompts you for the variable name to describe, type
-@var{default-directory}. If you wish to open a file in some other
+@code{default-directory}. If you wish to open a file in some other
 directory, use @key{DEL} or the @key{BackSpace} key to go back and type
 the path name of the new directory.
 
@@ -201,7 +201,7 @@
 
 @vindex make-backup-files
    When you save a file in Emacs, it destroys its old contents. However,
-if you set the variable @var{make-backup-files} to non-@code{nil}
+if you set the variable @code{make-backup-files} to non-@code{nil}
 i.e. @samp{t}, Emacs will create a @dfn{backup} file. Select the
 @b{Describe variable} option from the @b{Help} menu and look at the
 documentation for this variable. Its default value should be

--- a/man/new-users-guide/search.texi	Fri Oct 10 11:51:05 2003 +0000
+++ b/man/new-users-guide/search.texi	Fri Oct 10 12:39:45 2003 +0000
@@ -11,7 +11,7 @@
 of the text they are searching, i.e. if you are searching for "String",
 then "string" will also be one of the selections. If you want a case
 sensitive search select the @b{Case Sensitive Search} from the
-@b{Option} menu. You can also set the variable @var{case-fold-search} to
+@b{Option} menu. You can also set the variable @code{case-fold-search} to
 @code{nil} for making searches case-sensitive. For information on setting
 variables, @xref{Setting Variables}. The two commands for searching for
 strings in XEmacs are:

--- a/man/xemacs-faq.texi	Fri Oct 10 11:51:05 2003 +0000
+++ b/man/xemacs-faq.texi	Fri Oct 10 12:39:45 2003 +0000
@@ -7,7 +7,7 @@
 @finalout
 @titlepage
 @title XEmacs FAQ
-@subtitle Frequently asked questions about XEmacs @* Last Modified: $Date: 2003/08/27 18:06:58 $
+@subtitle Frequently asked questions about XEmacs @* Last Modified: $Date: 2003/10/10 12:39:27 $
 @sp 1
 @author Tony Rossini <rossini@@biostat.washington.edu>
 @author Ben Wing <ben@@xemacs.org>
@@ -1938,7 +1938,7 @@
 The binary cannot find the @file{XKeysymDB} file.  The location is
 hardcoded at compile time so if the system the binary was built on puts
 it a different place than your system does, you have problems.  To fix,
-set the environment variable @var{XKEYSYMDB} to the location of the
+set the environment variable @code{XKEYSYMDB} to the location of the
 @file{XKeysymDB} file on your system or to the location of the one
 included with XEmacs which should be at
 @iftex
@@ -1951,7 +1951,7 @@
 and does not contain the necessary lines.  Either ask your system
 administrator to replace it with the one which comes with XEmacs (which
 is the stock R6 version and is backwards compatible) or set your
-@var{XKEYSYMDB} variable to the location of XEmacs's described above.
+@code{XKEYSYMDB} variable to the location of XEmacs's described above.
 @end itemize
 
 @node Q2.1.4, Q2.1.5, Q2.1.3, Installation
@@ -1987,7 +1987,7 @@
 
 Help!  I can not get XEmacs to display on my Envizex X-terminal!
 
-Try setting the @var{DISPLAY} variable using the numeric IP address of
+Try setting the @code{DISPLAY} variable using the numeric IP address of
 the host you are running XEmacs from.
 
 @node Q2.1.6, Q2.1.7, Q2.1.5, Installation

--- a/man/xemacs/custom.texi	Fri Oct 10 11:51:05 2003 +0000
+++ b/man/xemacs/custom.texi	Fri Oct 10 12:39:45 2003 +0000
@@ -2154,7 +2154,7 @@
 Starting with XEmacs 21, XEmacs uses the class @samp{XEmacs} if it finds
 any XEmacs resources in the resource database when the X connection is
 initialized.  Otherwise, it will use the class @samp{Emacs} for
-backwards compatibility.  The variable @var{x-emacs-application-class}
+backwards compatibility.  The variable @code{x-emacs-application-class}
 may be consulted to determine the application class being used.
 
 The examples in this section assume the application class is @samp{Emacs}.