New release notes found while trying to catch-up RELENG_4 to reality:

whois(1) -c, pkg_delete -r, rc.conf(5) support for IPFilter state tables.

3 files changed, 35 insertions, 16 deletions

diff --git a/release/Makefile b/release/Makefile
index 228d71f..6e83fce 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -191,6 +191,7 @@ FIXCRYPTO+=	usr.sbin/sendmail
 MTREEFILES=		${.CURDIR}/../etc/mtree
 _R?=			/R
 RD=			${_R}/stage
+RND=			${RD}/release.doc
 FD=			${_R}/ftp
 CD=			${_R}/cdrom
 CD_DISC1=		${CD}/disc1
@@ -617,10 +618,10 @@ release.8:
 	gzip -9c ${.CURDIR}/../COPYRIGHT > ${RD}/mfsfd/stand/help/COPYRIGHT.hlp.gz
 .if !defined(NODOC)
 	@for i in ${DIST_DOCS_ARCH_INDEP}; do \
-	  gzip -9c ${.CURDIR}/doc/${RELNOTES_LANG}/$$i/article.txt > ${RD}/mfsfd/stand/help/`echo $${i} | tr 'a-z' 'A-Z'`.TXT.gz; \
+	  gzip -9c ${RND}/${RELNOTES_LANG}/$$i/article.txt > ${RD}/mfsfd/stand/help/`echo $${i} | tr 'a-z' 'A-Z'`.TXT.gz; \
 	done
 	@for i in ${DIST_DOCS_ARCH_DEP}; do \
-	  gzip -9c ${.CURDIR}/doc/${RELNOTES_LANG}/$$i/${MACHINE_ARCH}/article.txt > ${RD}/mfsfd/stand/help/`echo $${i} | tr 'a-z' 'A-Z'`.TXT.gz; \
+	  gzip -9c ${RND}/${RELNOTES_LANG}/$$i/${MACHINE_ARCH}/article.txt > ${RD}/mfsfd/stand/help/`echo $${i} | tr 'a-z' 'A-Z'`.TXT.gz; \
 	done
 	@mv ${RD}/mfsfd/stand/help/INSTALLATION.TXT.gz ${RD}/mfsfd/stand/help/INSTALL.TXT.gz
 .endif
@@ -693,7 +694,7 @@ release.9:
 		${MNT} ${FIXITSIZE} ${RD}/fixitfd ${FIXITINODE} ${FIXITLABEL}
 # Do our last minute floppies directory setup in a convenient place.
 .if !defined(NODOC)
-	@cp ${.CURDIR}/doc/${RELNOTES_LANG}/installation/${MACHINE_ARCH}/article.txt \
+	@cp ${RND}/${RELNOTES_LANG}/installation/${MACHINE_ARCH}/article.txt \
 		${RD}/floppies/README.TXT
 	@(cd ${RD}/floppies; md5 README.TXT *.flp > CHECKSUM.MD5)
 .else
@@ -712,14 +713,14 @@ ftp.1:
 	@cd ${RD}/dists && find . -print | cpio -dumpl ${FD}
 .if !defined(NODOC)
 	@for i in ${DIST_DOCS_ARCH_INDEP}; do \
-	  cp ${.CURDIR}/doc/${RELNOTES_LANG}/$$i/article.txt ${FD}/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \
-	  cp ${.CURDIR}/doc/${RELNOTES_LANG}/$$i/article.html ${FD}/`echo $${i} | tr 'a-z' 'A-Z'`.HTM; \
+	  cp ${RND}/${RELNOTES_LANG}/$$i/article.txt ${FD}/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \
+	  cp ${RND}/${RELNOTES_LANG}/$$i/article.html ${FD}/`echo $${i} | tr 'a-z' 'A-Z'`.HTM; \
 	done
 	@for i in ${DIST_DOCS_ARCH_DEP}; do \
-	  cp ${.CURDIR}/doc/${RELNOTES_LANG}/$$i/${MACHINE_ARCH}/article.txt ${FD}/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \
-	  cp ${.CURDIR}/doc/${RELNOTES_LANG}/$$i/${MACHINE_ARCH}/article.html ${FD}/`echo $${i} | tr 'a-z' 'A-Z'`.HTM; \
+	  cp ${RND}/${RELNOTES_LANG}/$$i/${MACHINE_ARCH}/article.txt ${FD}/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \
+	  cp ${RND}/${RELNOTES_LANG}/$$i/${MACHINE_ARCH}/article.html ${FD}/`echo $${i} | tr 'a-z' 'A-Z'`.HTM; \
 	done
-	@cp ${.CURDIR}/doc/${RELNOTES_LANG}/readme/docbook.css ${FD}
+	@cp ${RND}/${RELNOTES_LANG}/readme/docbook.css ${FD}
 	@mv ${FD}/INSTALLATION.TXT ${FD}/INSTALL.TXT
 	@mv ${FD}/INSTALLATION.HTM ${FD}/INSTALL.HTM
 .endif
@@ -751,14 +752,14 @@ cdrom.1:
 	@echo "CD_VERSION = ${BUILDNAME}" > ${CD_DISC2}/cdrom.inf
 .if !defined(NODOC)
 	@for i in ${DIST_DOCS_ARCH_INDEP}; do \
-	  cp ${.CURDIR}/doc/${RELNOTES_LANG}/$$i/article.txt ${CD_DISC1}/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \
-	  cp ${.CURDIR}/doc/${RELNOTES_LANG}/$$i/article.html ${CD_DISC1}/`echo $${i} | tr 'a-z' 'A-Z'`.HTM; \
+	  cp ${RND}/${RELNOTES_LANG}/$$i/article.txt ${CD_DISC1}/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \
+	  cp ${RND}/${RELNOTES_LANG}/$$i/article.html ${CD_DISC1}/`echo $${i} | tr 'a-z' 'A-Z'`.HTM; \
 	done
 	@for i in ${DIST_DOCS_ARCH_DEP}; do \
-	  cp ${.CURDIR}/doc/${RELNOTES_LANG}/$$i/${MACHINE_ARCH}/article.txt ${CD_DISC1}/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \
-	  cp ${.CURDIR}/doc/${RELNOTES_LANG}/$$i/${MACHINE_ARCH}/article.html ${CD_DISC1}/`echo $${i} | tr 'a-z' 'A-Z'`.HTM; \
+	  cp ${RND}/${RELNOTES_LANG}/$$i/${MACHINE_ARCH}/article.txt ${CD_DISC1}/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \
+	  cp ${RND}/${RELNOTES_LANG}/$$i/${MACHINE_ARCH}/article.html ${CD_DISC1}/`echo $${i} | tr 'a-z' 'A-Z'`.HTM; \
 	done
-	@cp ${.CURDIR}/doc/${RELNOTES_LANG}/readme/docbook.css ${CD_DISC1}
+	@cp ${RND}/${RELNOTES_LANG}/readme/docbook.css ${CD_DISC1}
 	@mv ${CD_DISC1}/INSTALLATION.TXT ${CD_DISC1}/INSTALL.TXT
 	@mv ${CD_DISC1}/INSTALLATION.HTM ${CD_DISC1}/INSTALL.HTM
 .endif
@@ -818,7 +819,7 @@ doc.1:
 #
 doc.2:
 	@echo "Making release documentation..."
-	@cd ${.CURDIR}/doc && make all 'FORMATS=html txt'
+	@cd ${.CURDIR}/doc && make all install clean 'FORMATS=html txt' INSTALL_COMPRESSED='' DOCDIR=${RND}
 	touch doc.2
 
 # Various "subroutine" and other supporting targets.
diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
index 5d26f74..3b423812 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
@@ -2257,6 +2257,10 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
     appropriate server will also be queried, provided that the
     <option>-Q</option> option is not specified. &merged;</para>
 
+    <para>&man.whois.1; supports a <option>-c</option> option to
+    specify a country code to help direct queries towards a particular
+    whois server. &merged;</para>
+
     <para>&man.xargs.1; now supports a <option>-J</option>
     <replaceable>replstr</replaceable> option that allows the user to
     tell &man.xargs.1; to insert the data read from standard input at
@@ -2359,7 +2363,9 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
       <para>The version of <application>IPFilter</application>
       provided with &os; now includes the &man.ipfs.8; program, which
       allows state information created for NAT entries and stateful
-      rules to be saved to disk and restored after a reboot. &merged;</para>
+      rules to be saved to disk and restored after a reboot. 
+      Boot-time configuration of these features is supported by
+      &man.rc.conf.5;. &merged;</para>
 
       <para>The <application>ISC DHCP</application> client has been
       updated to 2.0pl5. &merged;</para>
@@ -2659,6 +2665,9 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
       option for removing all packages and a <option>-i</option> option
       for &man.rm.1;-style interactive confirmation. &merged;</para>
 
+      <para>&man.pkg.delete.1; now supports a <option>-r</option>
+      option for recursive package removal. &merged;</para>
+
       <para>&man.pkg.info.1; now supports globbing against names of
       installed packages.  The <option>-G</option> option disables this
       behavior, and the <option>-x</option> option causes regular
diff --git a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
index 5d26f74..3b423812 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
@@ -2257,6 +2257,10 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
     appropriate server will also be queried, provided that the
     <option>-Q</option> option is not specified. &merged;</para>
 
+    <para>&man.whois.1; supports a <option>-c</option> option to
+    specify a country code to help direct queries towards a particular
+    whois server. &merged;</para>
+
     <para>&man.xargs.1; now supports a <option>-J</option>
     <replaceable>replstr</replaceable> option that allows the user to
     tell &man.xargs.1; to insert the data read from standard input at
@@ -2359,7 +2363,9 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
       <para>The version of <application>IPFilter</application>
       provided with &os; now includes the &man.ipfs.8; program, which
       allows state information created for NAT entries and stateful
-      rules to be saved to disk and restored after a reboot. &merged;</para>
+      rules to be saved to disk and restored after a reboot. 
+      Boot-time configuration of these features is supported by
+      &man.rc.conf.5;. &merged;</para>
 
       <para>The <application>ISC DHCP</application> client has been
       updated to 2.0pl5. &merged;</para>
@@ -2659,6 +2665,9 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
       option for removing all packages and a <option>-i</option> option
       for &man.rm.1;-style interactive confirmation. &merged;</para>
 
+      <para>&man.pkg.delete.1; now supports a <option>-r</option>
+      option for recursive package removal. &merged;</para>
+
       <para>&man.pkg.info.1; now supports globbing against names of
       installed packages.  The <option>-G</option> option disables this
       behavior, and the <option>-x</option> option causes regular