summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/guide/files/pkginstall.xml4
-rw-r--r--doc/pkgsrc.html2
-rw-r--r--doc/pkgsrc.txt2
3 files changed, 4 insertions, 4 deletions
diff --git a/doc/guide/files/pkginstall.xml b/doc/guide/files/pkginstall.xml
index afef1c6cfb6..1b95263161d 100644
--- a/doc/guide/files/pkginstall.xml
+++ b/doc/guide/files/pkginstall.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: pkginstall.xml,v 1.18 2014/06/01 16:42:45 wiz Exp $ -->
+<!-- $NetBSD: pkginstall.xml,v 1.19 2014/06/10 15:09:42 joerg Exp $ -->
<chapter id="pkginstall"> <?dbhtml filename="pkginstall.html"?>
<title>The pkginstall framework</title>
@@ -219,7 +219,7 @@ set based upon the following variables:</para>
<filename>Makefile</filename> (i.e., it is not user-customizable).</para>
<para>As an example, consider the Apache package,
- <filename role="pkg">www/apache2</filename>, which places its
+ <filename role="pkg">www/apache24</filename>, which places its
configuration files under the
<filename>httpd/</filename> subdirectory of
<varname>PKG_SYSCONFBASE</varname>. This should be set in the package
diff --git a/doc/pkgsrc.html b/doc/pkgsrc.html
index ad73d8d9e27..b66b624b3a2 100644
--- a/doc/pkgsrc.html
+++ b/doc/pkgsrc.html
@@ -5744,7 +5744,7 @@ set based upon the following variables:</p>
variable only makes sense in the package's
<code class="filename">Makefile</code> (i.e., it is not user-customizable).</p>
<p>As an example, consider the Apache package,
- <a href="ftp://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/www/apache2/README.html" target="_top"><code class="filename">www/apache2</code></a>, which places its
+ <a href="ftp://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/www/apache2/README.html" target="_top"><code class="filename">www/apache24</code></a>, which places its
configuration files under the
<code class="filename">httpd/</code> subdirectory of
<code class="varname">PKG_SYSCONFBASE</code>. This should be set in the package
diff --git a/doc/pkgsrc.txt b/doc/pkgsrc.txt
index a0e8b85b3eb..1a7a18a21ce 100644
--- a/doc/pkgsrc.txt
+++ b/doc/pkgsrc.txt
@@ -4852,7 +4852,7 @@ shall be installed. Its contents are set based upon the following variables:
definition of this variable only makes sense in the package's Makefile
(i.e., it is not user-customizable).
- As an example, consider the Apache package, www/apache2, which places its
+ As an example, consider the Apache package, www/apache24, which places its
configuration files under the httpd/ subdirectory of PKG_SYSCONFBASE. This
should be set in the package Makefile.