Made all references to mk.conf consistent by defining and using a macro

for it. Suggested by joerg.

14 files changed, 70 insertions, 69 deletions

diff --git a/doc/guide/files/binary.xml b/doc/guide/files/binary.xml
index 9a59d683fc5..88a349b9595 100644
--- a/doc/guide/files/binary.xml
+++ b/doc/guide/files/binary.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: binary.xml,v 1.32 2007/06/01 11:07:24 rillig Exp $ -->
+<!-- $NetBSD: binary.xml,v 1.33 2007/08/15 06:33:43 rillig Exp $ -->
 
 <chapter id="binary">
   <title>Creating binary packages</title>
@@ -75,15 +75,14 @@
       </sect3>
 
       <sect3 id="binary.mk.conf">
-	<title>/etc/mk.conf</title>
+	<title>&mk.conf;</title>
 
-	<para>You may want to set variables in
-	<filename>/etc/mk.conf</filename>.
+	<para>You may want to set variables in &mk.conf;.
 	Look at <filename>pkgsrc/mk/defaults/mk.conf</filename> for
 	details of the default settings. You will want to ensure that
 	<varname>ACCEPTABLE_LICENSES</varname> meet your local policy.
 	As used in this example, <varname>_ACCEPTABLE=yes</varname>
-	accepts <emphasis>all</emphasis> licenses.</para>
+	completely bypasses the license check.</para>
 
 <programlisting>
 PACKAGES?=      ${_PKGSRCDIR}/packages/${MACHINE_ARCH}
@@ -425,7 +424,7 @@ fi
 	</step>
 
 	<step>
-	  <para>Edit <filename>/etc/mk.conf</filename>, see <xref linkend="binary.mk.conf"/>.</para>
+	  <para>Edit &mk.conf;, see <xref linkend="binary.mk.conf"/>.</para>
 	</step>
 
 	<step>
@@ -455,7 +454,7 @@ fi
       pkgsrc, the <filename>pkgsrc/mk/bulk/build</filename> script
       may be used to build a subset of the packages contained in
       pkgsrc.  By setting <varname>SPECIFIC_PKGS</varname>
-      in <filename>/etc/mk.conf</filename>, the variables</para>
+      in &mk.conf;, the variables</para>
 
       <itemizedlist>
 	<listitem><para>SITE_SPECIFIC_PKGS</para></listitem>
diff --git a/doc/guide/files/build.xml b/doc/guide/files/build.xml
index 269bbe26ca5..f89d00572aa 100644
--- a/doc/guide/files/build.xml
+++ b/doc/guide/files/build.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: build.xml,v 1.46 2007/06/01 11:07:24 rillig Exp $ -->
+<!-- $NetBSD: build.xml,v 1.47 2007/08/15 06:33:44 rillig Exp $ -->
 
 <chapter id="build">
   <title>The build process</title>
@@ -909,7 +909,7 @@ ${FETCH_CMD} ${FETCH_BEFORE_ARGS} ${site}${file} ${FETCH_AFTER_ARGS}
 	  fail!</para>
 
 	  <para>The following variables can be used either on the
-	  command line or in <filename>/etc/mk.conf</filename> to
+	  command line or in &mk.conf; to
 	  alter the behaviour of <command>make
 	  update</command>:</para>
 
@@ -1012,9 +1012,8 @@ ${FETCH_CMD} ${FETCH_BEFORE_ARGS} ${site}${file} ${FETCH_AFTER_ARGS}
 	  </screen>
 
 	  <para>The following variables can be used either on the
-	  command line or in <filename>/etc/mk.conf</filename> to
-	  alter the behaviour of <command>make
-	  clean-update</command>:</para>
+	  command line or in &mk.conf; to alter the behaviour of
+	  <command>make clean-update</command>:</para>
 
 	  <variablelist>
 	    <varlistentry>
@@ -1213,8 +1212,7 @@ ${FETCH_CMD} ${FETCH_BEFORE_ARGS} ${site}${file} ${FETCH_AFTER_ARGS}
 	  <para>After a package is installed, check all its
 	  binaries and (on ELF platforms) shared libraries to see
 	  if they find the shared libs they need.  Run by default
-	  if <varname>PKG_DEVELOPER</varname> is set in
-	  <filename>/etc/mk.conf</filename>.</para>
+	  if <varname>PKG_DEVELOPER</varname> is set in &mk.conf;.</para>
 	</listitem>
       </varlistentry>
 
diff --git a/doc/guide/files/components.xml b/doc/guide/files/components.xml
index 7e37e54dcf9..3d0b9b98c62 100644
--- a/doc/guide/files/components.xml
+++ b/doc/guide/files/components.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: components.xml,v 1.36 2007/06/15 10:26:53 rillig Exp $ -->
+<!-- $NetBSD: components.xml,v 1.37 2007/08/15 06:33:44 rillig Exp $ -->
 
 <chapter id="components"> <?dbhtml filename="components.html"?>
 <title>Package components - files, directories and contents</title>
@@ -145,7 +145,7 @@ converters    games         mbone         print         x11
       other variables handle common cases of setting
       <varname>WRKDIR_BASENAME</varname> individually. If
       <varname>OBJHOSTNAME</varname> is defined in
-      <filename>/etc/mk.conf</filename>, the first component of
+      &mk.conf;, the first component of
       the host's name is attached to the directory name. If
       <varname>OBJMACHINE</varname> is defined, the platform name
       is attached, which might look like
diff --git a/doc/guide/files/configuring.xml b/doc/guide/files/configuring.xml
index b4ebf9fa9d9..a17fae2cc4e 100644
--- a/doc/guide/files/configuring.xml
+++ b/doc/guide/files/configuring.xml
@@ -1,8 +1,10 @@
-<!-- $NetBSD: configuring.xml,v 1.28 2007/08/10 00:51:51 wiz Exp $ -->
+<!-- $NetBSD: configuring.xml,v 1.29 2007/08/15 06:33:44 rillig Exp $ -->
 
 <chapter id="configuring">
   <title>Configuring pkgsrc</title>
 
+<anchor id="mk.conf" />
+
 <para>The whole pkgsrc system is configured in a single file, usually
 called <filename>mk.conf</filename>. In which directory pkgsrc looks for
 that file depends on the installation. On NetBSD, when you use
@@ -111,7 +113,7 @@ works.</para>
 	    information.</para>
 	</listitem>
 	<listitem><para><varname>PKGMAKECONF</varname>: Location of
-	    the <filename>mk.conf</filename> file used by a package's
+	    the &mk.conf; file used by a package's
 	    BSD-style Makefile. If this is not set,
 	    <varname>MAKECONF</varname> is set to
 	    <filename>/dev/null</filename> to avoid picking up
@@ -343,7 +345,7 @@ LDFLAGS+=        -your -linkerflags
 </programlisting>
 
     <para>The following variables can be defined in
-    <filename>/etc/mk.conf</filename> to select which options to
+    &mk.conf; to select which options to
     enable for a package: <varname>PKG_DEFAULT_OPTIONS</varname>,
     which can be used to select or disable options for all packages
     that support them, and
@@ -354,7 +356,7 @@ LDFLAGS+=        -your -linkerflags
     are disabled. A few examples:</para>
 
     <screen>
-&uprompt; <command>grep "PKG.*OPTION" /etc/mk.conf</command>
+&uprompt; <command>grep "PKG.*OPTION" &mk.conf;</command>
 PKG_DEFAULT_OPTIONS=    -arts -dvdread -esound
 PKG_OPTIONS.kdebase=    debug -sasl
 PKG_OPTIONS.apache=     suexec </screen>
@@ -385,12 +387,12 @@ PKG_OPTIONS.apache=     suexec </screen>
     <para>Before the options framework was introduced, build options
     were selected by setting a variable (often named
     <varname>USE_<replaceable>FOO</replaceable></varname>) in
-    <filename>/etc/mk.conf</filename> for each option.  To ease
+    &mk.conf; for each option.  To ease
     transition to the options framework for the user, these legacy
     variables are converted to the appropriate options setting
     (<varname>PKG_OPTIONS.<replaceable>pkgbase</replaceable></varname>)
     automatically.  A warning is issued to prompt the user to update
-    <filename>/etc/mk.conf</filename> to use the options framework
+    &mk.conf; to use the options framework
     directly.  Support for the legacy variables will be removed
     eventually.</para>
   </sect1>
diff --git a/doc/guide/files/debug.xml b/doc/guide/files/debug.xml
index cb1685cf4c0..2e0611f7682 100644
--- a/doc/guide/files/debug.xml
+++ b/doc/guide/files/debug.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: debug.xml,v 1.6 2006/12/03 01:03:38 kano Exp $ -->
+<!-- $NetBSD: debug.xml,v 1.7 2007/08/15 06:33:44 rillig Exp $ -->
 
 <chapter id="debug">
   <title>Debugging</title>
@@ -10,8 +10,7 @@
 
   <itemizedlist>
     <listitem>
-      <para>Be sure to set <varname>PKG_DEVELOPER=1</varname> in
-      <filename>/etc/mk.conf</filename></para>
+      <para>Be sure to set <varname>PKG_DEVELOPER=yes</varname> in &mk.conf;.</para>
     </listitem>
 
     <listitem>
diff --git a/doc/guide/files/faq.xml b/doc/guide/files/faq.xml
index f436d44fb63..ba36a66e2ab 100644
--- a/doc/guide/files/faq.xml
+++ b/doc/guide/files/faq.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: faq.xml,v 1.36 2007/07/30 21:13:00 kano Exp $ -->
+<!-- $NetBSD: faq.xml,v 1.37 2007/08/15 06:33:44 rillig Exp $ -->
 
 <chapter id="faq"> <?dbhtml filename="faq.html"?>
 <title>Frequently Asked Questions</title>
@@ -264,7 +264,7 @@ that allow finer tuning of the tree layout.</para>
 <para>By default, resuming transfers in pkgsrc is disabled, but you can
 enable this feature by adding the option
 <varname>PKG_RESUME_TRANSFERS=YES</varname> into
-<filename>/etc/mk.conf</filename>.  If, during a fetch step, an incomplete
+&mk.conf;.  If, during a fetch step, an incomplete
 distfile is found, pkgsrc will try to resume it.</para>
 
 <para>You can also
@@ -295,7 +295,7 @@ FETCH_OUTPUT_ARGS=     -O
 <para>If you want to use modular X.org from pkgsrc instead of your system's own X11
 (<filename>/usr/X11R6</filename>, <filename>/usr/openwin</filename>, ...)
 you will have to add the following line into
-<filename>/etc/mk.conf</filename>:</para>
+&mk.conf;:</para>
 
 <programlisting>
 X11_TYPE=modular
@@ -348,7 +348,7 @@ the first available command from the following list:</para>
 <filename>/usr/bin/ftp</filename>, which automatically tries passive
 connections first, and falls back to active connections if the server
 refuses to do passive.  For the other tools, add the following to your
-<filename>/etc/mk.conf</filename> file:
+&mk.conf; file:
 <varname>PASSIVE_FETCH=1</varname>.</para>
 
 <para>Having that option present will prevent
@@ -420,7 +420,7 @@ that to format man pages.</para>
 <para>In the case of the <filename
   role="pkg">pkgtools/pkg_install</filename> package, you
 can get away with setting <varname>NOMAN=YES</varname> either in the
-environment or in <filename>/etc/mk.conf</filename>.</para>
+environment or in &mk.conf;.</para>
 
 </sect1>
 
@@ -453,7 +453,7 @@ password for each required package installed.  To avoid this, the sudo
 package can be used, which does password caching over a limited time.  To
 use it, install sudo (either as binary package or from
 <filename role="pkg">security/sudo</filename>) and then put the
-following into your <filename>/etc/mk.conf</filename>, somewhere
+following into your &mk.conf;, somewhere
 <emphasis>after</emphasis> the definition of the
 <varname>LOCALBASE</varname> variable:</para>
 
@@ -479,7 +479,7 @@ configuration of the provided packages).</para>
 
 <para>In order to change the defaults, you can modify the
 <varname>PKG_SYSCONFBASE</varname> variable (in
-<filename>/etc/mk.conf</filename>) to point to your preferred configuration
+&mk.conf;) to point to your preferred configuration
 directory; some common examples include <filename>/etc</filename> or
 <filename>/etc/pkg</filename>.</para>
 
@@ -549,7 +549,7 @@ check.</para>
 
 	<para>When you add your own preferences to the
 	<varname>CFLAGS</varname> variable in your
-	<filename>mk.conf</filename>, these flags are passed in
+	&mk.conf;, these flags are passed in
 	environment variables to the <filename>./configure</filename>
 	scripts and to &man.make.1;. Some package authors ignore the
 	<varname>CFLAGS</varname> from the environment variable by
diff --git a/doc/guide/files/files.xml b/doc/guide/files/files.xml
index 623fb6424ae..8902ba97488 100644
--- a/doc/guide/files/files.xml
+++ b/doc/guide/files/files.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: files.xml,v 1.5 2007/06/01 11:07:25 rillig Exp $ -->
+<!-- $NetBSD: files.xml,v 1.6 2007/08/15 06:33:45 rillig Exp $ -->
 
 <chapter id="files">
 <title>Directory layout of the installed files</title>
@@ -53,7 +53,7 @@ operation.</para></listitem>
 
 <listitem><para><varname>PKG_SYSCONFDIR</varname> corresponds to
 <filename>/etc</filename> in the base system. It contains configuration
-files of the packages, as well as pkgsrc's <filename>mk.conf</filename>
+files of the packages, as well as pkgsrc's &mk.conf;
 itself.</para></listitem>
 
 </itemizedlist>
diff --git a/doc/guide/files/fixes.xml b/doc/guide/files/fixes.xml
index cfc08860d03..3d9e99b42b9 100644
--- a/doc/guide/files/fixes.xml
+++ b/doc/guide/files/fixes.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: fixes.xml,v 1.88 2007/08/10 00:51:51 wiz Exp $ -->
+<!-- $NetBSD: fixes.xml,v 1.89 2007/08/15 06:33:45 rillig Exp $ -->
 
 <chapter id="fixes"> <?dbhtml filename="fixes.html"?>
 <title>Making your package work</title>
@@ -17,11 +17,11 @@
   </sect2>
 
   <sect2 id="pulling-vars-from-etc-mk.conf">
-    <title>How to pull in user-settable variables from <filename>mk.conf</filename></title>
+    <title>How to pull in user-settable variables from &mk.conf;</title>
 
     <para>The pkgsrc user can configure pkgsrc by overriding several
     variables in the file pointed to by <varname>MAKECONF</varname>,
-    which is <filename>/etc/mk.conf</filename> by default. When you
+    which is &mk.conf; by default. When you
     want to use those variables in the preprocessor directives of
     &man.make.1; (for example <literal>.if</literal> or
     <literal>.for</literal>), you need to include the file
@@ -165,7 +165,7 @@ LICENSE=        xv-license
 
     <para>The license can be viewed with <command>make
     show-license</command>, and if the user so chooses, the line
-    printed above can be added to <filename>/etc/mk.conf</filename> to
+    printed above can be added to &mk.conf; to
     convey to pkgsrc that it should not in the future fail because of
     that license:</para>
 
@@ -1762,7 +1762,7 @@ PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Pg/.packlist
     <para>If a package contains a rc.d script, it won't be copied into
     the startup directory by default, but you can enable it, by adding
     the option <varname>PKG_RCD_SCRIPTS=YES</varname> in
-    <filename>/etc/mk.conf</filename>. This option will copy the scripts
+    &mk.conf;. This option will copy the scripts
     into <filename>/etc/rc.d</filename> when a package is installed, and
     it will automatically remove the scripts when the package is
     deinstalled.</para>
diff --git a/doc/guide/files/infr.design.xml b/doc/guide/files/infr.design.xml
index 1191cbc5709..cff50ad466f 100644
--- a/doc/guide/files/infr.design.xml
+++ b/doc/guide/files/infr.design.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: infr.design.xml,v 1.7 2007/06/01 11:07:25 rillig Exp $ -->
+<!-- $NetBSD: infr.design.xml,v 1.8 2007/08/15 06:33:45 rillig Exp $ -->
 
 <chapter id="infr.design"> <?dbhtml filename="infr.design.html"?>
 <title>Design of the pkgsrc infrastructure</title>
@@ -242,11 +242,8 @@ CFLAGS+=                -Wall
 	<varname>MACHINE_ARCH</varname>.</para>
 
 	<para>Then, the user settings are loaded from the file specified
-	in <varname>MAKECONF</varname>. If the bmake command from pkgsrc
-	is used, <varname>MAKECONF</varname> defaults to
-	<filename><replaceable>${prefix}</replaceable>/etc/mk.conf</filename>.
-	With the native &man.make.1; command on NetBSD, it defaults to
-	<filename>/etc/mk.conf</filename>. After that, those variables
+	in <varname>MAKECONF</varname>, which is usually &mk.conf;.
+	After that, those variables
 	that have not been overridden by the user are loaded from
 	<filename>mk/defaults/mk.conf</filename>.</para>
 
diff --git a/doc/guide/files/options.xml b/doc/guide/files/options.xml
index 66b7da7dd44..156adc392c8 100644
--- a/doc/guide/files/options.xml
+++ b/doc/guide/files/options.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: options.xml,v 1.21 2007/06/01 11:07:25 rillig Exp $ -->
+<!-- $NetBSD: options.xml,v 1.22 2007/08/15 06:33:45 rillig Exp $ -->
 
 <!-- based on: pkgsrc/mk/bsd.options.mk 1.56 -->
 
@@ -20,7 +20,7 @@ apply.</para>
 <para>Global default options are listed in
 <varname>PKG_DEFAULT_OPTIONS</varname>, which is a list of the options
 that should be built into every package if that option is supported.
-This variable should be set in <filename>/etc/mk.conf</filename>.</para>
+This variable should be set in &mk.conf;.</para>
 
 </sect1>
 
@@ -127,7 +127,7 @@ build options which are enabled by default.</para></listitem>
 <listitem><para><varname>PKG_OPTIONS_LEGACY_VARS</varname> is a list
 of
 <quote><replaceable>USE_VARIABLE</replaceable>:<replaceable>option</replaceable></quote>
-pairs that map legacy <filename>/etc/mk.conf</filename> variables to
+pairs that map legacy &mk.conf; variables to
 their option counterparts.  Pairs should be added with
 <quote>+=</quote> to keep the listing of global legacy variables.  A
 warning will be issued if the user uses a legacy
diff --git a/doc/guide/files/pkgsrc.ent b/doc/guide/files/pkgsrc.ent
new file mode 100644
index 00000000000..9ea9ec97dd9
--- /dev/null
+++ b/doc/guide/files/pkgsrc.ent
@@ -0,0 +1,7 @@
+<!-- $NetBSD: pkgsrc.ent,v 1.1 2007/08/15 06:33:46 rillig Exp $ -->
+
+<!--
+	Entities that can (and should) be used in the pkgsrc guide.
+-->
+
+<!ENTITY mk.conf "<link linkend='mk.conf'><filename>mk.conf</filename></link>">
diff --git a/doc/guide/files/platforms.xml b/doc/guide/files/platforms.xml
index 9fc07c4ade9..dcb8a6dcde3 100644
--- a/doc/guide/files/platforms.xml
+++ b/doc/guide/files/platforms.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: platforms.xml,v 1.55 2007/06/01 11:07:25 rillig Exp $ -->
+<!-- $NetBSD: platforms.xml,v 1.56 2007/08/15 06:33:46 rillig Exp $ -->
 
 <chapter id="platforms">
   <title>Using pkgsrc on systems other than &os;</title>
@@ -378,7 +378,7 @@ file and inspect the contents before extracting it.
 	</listitem>
 
 	<listitem>
-	  <para>An example <filename>/etc/mk.conf</filename> file will be placed in
+	  <para>An example &mk.conf; file will be placed in
 	  <filename>/etc/mk.conf.example</filename> file
 	  when you use the bootstrap script.</para>
 	</listitem>
@@ -606,7 +606,7 @@ interix:kP=\E[S:kN=\E[T:kH=\E[U:dc@:DC@:tc=pcansi:
 
       <para>Therefore, please make sure that you have no conflicting
       <varname>CFLAGS</varname> in your environment or the
-      <filename>/etc/mk.conf</filename>.  Particularly, make sure that you do not
+      &mk.conf;.  Particularly, make sure that you do not
       try to link n32 object files with lib64 or vice versa.  Check your
       <filename>/etc/compiler.defaults</filename>!</para>
 
@@ -626,7 +626,7 @@ interix:kP=\E[S:kN=\E[T:kH=\E[U:dc@:DC@:tc=pcansi:
 PKGSRC_COMPILER=        mipspro
       </programlisting>
 
-      in <filename>/etc/mk.conf</filename>.  Otherwise, pkgsrc will assume you
+      in &mk.conf;.  Otherwise, pkgsrc will assume you
       are using gcc and may end up passing invalid flags to the compiler.  Note that
       bootstrap should create an appropriate <filename>mk.conf.example</filename> by
       default.</para>
@@ -670,7 +670,7 @@ ac_cv___attribute__=yes ./bootstrap
       compiler.</para>
 
       <para>After bootstrapping, you should set <varname>PKGSRC_COMPILER</varname>
-      in <filename>/etc/mk.conf</filename>:</para>
+      in &mk.conf;:</para>
 
       <programlisting>
 PKGSRC_COMPILER=        icc
@@ -680,7 +680,7 @@ PKGSRC_COMPILER=        icc
       <filename>/opt/intel_cc_80</filename>, which
       is also the pkgsrc default. If you have installed it into a different
       directory, set <varname>ICCBASE</varname> in
-      <filename>/etc/mk.conf</filename>:</para>
+      &mk.conf;:</para>
 
       <programlisting>
 ICCBASE=                /opt/icc
@@ -731,10 +731,10 @@ ICCBASE=                /opt/icc
 	</listitem>
 
 	<listitem>
-	  <para>An example <filename>/etc/mk.conf</filename> file will be placed in
+	  <para>An example &mk.conf; file will be placed in
 	  <filename>/etc/mk.conf.example</filename> file
 	  when you use the bootstrap script. OpenBSD's make program uses
-	  <filename>/etc/mk.conf</filename>
+	  &mk.conf;
 	  as well. You can work around this by enclosing all the pkgsrc-specific parts
 	  of the file with:</para>
 
@@ -808,7 +808,7 @@ ICCBASE=                /opt/icc
 	</itemizedlist>
 
 	<para>You should set the following variables in your
-	<filename>mk.conf</filename> file:</para>
+	&mk.conf; file:</para>
 
 <programlisting>
 CC=     cc
@@ -826,8 +826,7 @@ CXXCPP= CC -E
 	<title>Building 64-bit binaries with SunPro</title>
 
 	<para>To build 64-bit packages, you just need to have the
-	following lines in your <filename>mk.conf</filename>
-	file:</para>
+	following lines in your &mk.conf; file:</para>
 
 <programlisting>
 PKGSRC_COMPILER=        sunpro
@@ -846,7 +845,7 @@ ABI=                    64
       The workaround is to use another shell for the configure
       scripts, for example by installing <filename
       role="pkg">shells/bash</filename> and adding the following lines
-      to your <filename>mk.conf</filename>:</para>
+      to your &mk.conf;:</para>
 
       <programlisting>
 CONFIG_SHELL=   ${LOCALBASE}/bin/bash
diff --git a/doc/guide/files/submit.xml b/doc/guide/files/submit.xml
index 3a0ccb6f9ad..f7649cd0aa1 100644
--- a/doc/guide/files/submit.xml
+++ b/doc/guide/files/submit.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: submit.xml,v 1.18 2007/07/30 21:13:01 kano Exp $ -->
+<!-- $NetBSD: submit.xml,v 1.19 2007/08/15 06:33:46 rillig Exp $ -->
 
 <chapter id="submit"> <?dbhtml filename="submit.html"?>
 <title>Submitting and Committing</title>
@@ -80,7 +80,7 @@
   For new packages, or package moves or removals, set the
   <varname>CTYPE</varname> variable on the command line to "Added",
   "Moved", or "Removed".  You can set <varname>NETBSD_LOGIN_NAME</varname>
-  in <filename>/etc/mk.conf</filename> if your local login name is
+  in &mk.conf; if your local login name is
   not the same as your NetBSD login name. Don't forget to commit
   the changes to <filename>pkgsrc/doc/CHANGES-<replaceable>YYYY</replaceable></filename>!</para>
 </sect1>
diff --git a/doc/guide/files/using.xml b/doc/guide/files/using.xml
index 0101e1f75a5..2e02d45df4e 100644
--- a/doc/guide/files/using.xml
+++ b/doc/guide/files/using.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: using.xml,v 1.29 2006/12/15 13:22:14 martti Exp $ -->
+<!-- $NetBSD: using.xml,v 1.30 2007/08/15 06:33:46 rillig Exp $ -->
 
 <chapter id="using"> <?dbhtml filename="using.html"?>
 <title>Using pkgsrc</title>
@@ -250,7 +250,7 @@ Version mismatch: 'tcsh' 6.09.00 vs 6.10.00
   <para>The default <emphasis>prefix</emphasis> for installed packages
   is <filename>/usr/pkg</filename>. If you wish to change this, you
   should do so by setting <varname>LOCALBASE</varname> in
-  <filename>mk.conf</filename>. You should not try to use multiple
+  &mk.conf;. You should not try to use multiple
   different <varname>LOCALBASE</varname> definitions on the same
   system (inside a chroot is an exception). </para>
 
@@ -283,7 +283,7 @@ Version mismatch: 'tcsh' 6.09.00 vs 6.10.00
     you don't need to connect. If the distfiles are on CD-ROM, you can
     mount the CD-ROM on <filename>/cdrom</filename> and add:
     <screen>DISTDIR=/cdrom/pkgsrc/distfiles</screen>
-    to your <filename>mk.conf</filename>.</para>
+    to your &mk.conf;.</para>
 
     <para>By default a list of distribution sites will be randomly
     intermixed to prevent huge load on servers which holding popular
@@ -307,7 +307,7 @@ Version mismatch: 'tcsh' 6.09.00 vs 6.10.00
 
     <para>You can change these settings either in your shell's environment, or,
     if you want to keep the settings, by editing the
-    <filename>/etc/mk.conf</filename> file,
+    &mk.conf; file,
     and adding the definitions there.</para>
 
     <para>
@@ -400,12 +400,12 @@ Version mismatch: 'tcsh' 6.09.00 vs 6.10.00
     package system and whatever else may have been installed
     there.</para>
 
-    <para>Some packages look in <filename>/etc/mk.conf</filename> to
+    <para>Some packages look in &mk.conf; to
     alter some configuration options at build time.  Have a look at
     <filename>pkgsrc/mk/defaults/mk.conf</filename> to get an overview
     of what will be set there by default.  Environment variables such
     as <varname>LOCALBASE</varname> can be set in
-    <filename>/etc/mk.conf</filename> to save having to remember to
+    &mk.conf; to save having to remember to
     set them each time you want to use pkgsrc.</para>
 
     <para>Occasionally, people want to <quote>look under the