summaryrefslogtreecommitdiffstats
path: root/release
diff options
context:
space:
mode:
authorgshapiro <gshapiro@FreeBSD.org>2000-10-19 21:54:37 +0000
committergshapiro <gshapiro@FreeBSD.org>2000-10-19 21:54:37 +0000
commit995f1c4b5d54c7c925f750cd5a8dae546d825adc (patch)
tree929724e6cd719e76ea61d19b612ffce67b7fec71 /release
parent1763356b8331c5c743fd21627ed985a57c2b0b99 (diff)
downloadFreeBSD-src-995f1c4b5d54c7c925f750cd5a8dae546d825adc.zip
FreeBSD-src-995f1c4b5d54c7c925f750cd5a8dae546d825adc.tar.gz
Make note of merged changes.
Diffstat (limited to 'release')
-rw-r--r--release/texts/alpha/RELNOTES.TXT10
-rw-r--r--release/texts/i386/RELNOTES.TXT10
2 files changed, 12 insertions, 8 deletions
diff --git a/release/texts/alpha/RELNOTES.TXT b/release/texts/alpha/RELNOTES.TXT
index fb8b284..c0def73 100644
--- a/release/texts/alpha/RELNOTES.TXT
+++ b/release/texts/alpha/RELNOTES.TXT
@@ -234,14 +234,16 @@ the F=S flag is set on the Mlocal line. Those with .mc files who need to
add the flag can do so by adding the following line to their your .mc file
and regenerating the sendmail.cf file:
MODIFY_MAILER_FLAGS(`LOCAL', `+S')dnl
-Note that FEATURE(`local_lmtp') already does this.
+Note that FEATURE(`local_lmtp') already does this. [MERGED]
-The default /etc/mail/sendmail.cf disables the SMTP EXPN and VRFY commands.
+The default /etc/mail/sendmail.cf disables the SMTP EXPN and VRFY
+commands. [MERGED]
-vacation(1) has been updated to use the version included with sendmail.
+vacation(1) has been updated to use the version included with
+sendmail. [MERGED]
The sendmail(8) configuration building tools are installed in
-/usr/share/sendmail/cf/.
+/usr/share/sendmail/cf/. [MERGED]
awk has been upgraded from gawk-3.0.4 to gawk-3.0.6. This fixes a number
of non-critical bugs and includes a few performance tweaks.
diff --git a/release/texts/i386/RELNOTES.TXT b/release/texts/i386/RELNOTES.TXT
index eee473a..baf6c6e 100644
--- a/release/texts/i386/RELNOTES.TXT
+++ b/release/texts/i386/RELNOTES.TXT
@@ -275,14 +275,16 @@ the F=S flag is set on the Mlocal line. Those with .mc files who need to
add the flag can do so by adding the following line to their your .mc file
and regenerating the sendmail.cf file:
MODIFY_MAILER_FLAGS(`LOCAL', `+S')dnl
-Note that FEATURE(`local_lmtp') already does this.
+Note that FEATURE(`local_lmtp') already does this. [MERGED]
-The default /etc/mail/sendmail.cf disables the SMTP EXPN and VRFY commands.
+The default /etc/mail/sendmail.cf disables the SMTP EXPN and VRFY
+commands. [MERGED]
-vacation(1) has been updated to use the version included with sendmail.
+vacation(1) has been updated to use the version included with
+sendmail. [MERGED]
The sendmail(8) configuration building tools are installed in
-/usr/share/sendmail/cf/.
+/usr/share/sendmail/cf/. [MERGED]
awk has been upgraded from gawk-3.0.4 to gawk-3.0.6. This fixes a number
of non-critical bugs and includes a few performance tweaks.
OpenPOWER on IntegriCloud