aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDima Dorfman <dd@FreeBSD.org>2001-08-01 20:04:19 +0000
committerDima Dorfman <dd@FreeBSD.org>2001-08-01 20:04:19 +0000
commitfdf72b194bb4e32a990b5ba3e219c0a9664a42af (patch)
treef9eedc99f32101c4b40863eccf7e0797345aa9df
parent48b3cebbee86fe6329b1cf121321e6a8d7706e79 (diff)
downloadsrc-fdf72b194bb4e32a990b5ba3e219c0a9664a42af.tar.gz
src-fdf72b194bb4e32a990b5ba3e219c0a9664a42af.zip
Note MFCs: WARNS, GCC_OPTIONS, and GNATS.
Notes
Notes: svn path=/head/; revision=80952
-rw-r--r--release/doc/en_US.ISO8859-1/relnotes/article.sgml6
-rw-r--r--release/doc/en_US.ISO8859-1/relnotes/common/new.sgml6
2 files changed, 6 insertions, 6 deletions
diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
index 0c8652282799..dab5c47c3120 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
@@ -1098,7 +1098,7 @@
supports the <varname>WARNS</varname> directive from NetBSD. This
directive controls the addition of compiler warning flags to
<varname>CFLAGS</varname> in a relatively compiler-neutral
- manner.</para>
+ manner. &merged;</para>
<para>&man.fsck.8; wrappers have been imported; this feature
provides infrastructure for &man.fsck.8; to work on different
@@ -1724,10 +1724,10 @@
<para>&man.gcc.1; now supports the environment variable
<varname>GCC_OPTIONS</varname>, which can hold a set of default
- options for <application>GCC</application>.</para>
+ options for <application>GCC</application>. &merged;</para>
<para><application>GNATS</application> has been updated to
- 3.113.</para>
+ 3.113. &merged;</para>
<para><application>gperf</application> has been updated to 2.7.2.</para>
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 0c8652282799..dab5c47c3120 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
@@ -1098,7 +1098,7 @@
supports the <varname>WARNS</varname> directive from NetBSD. This
directive controls the addition of compiler warning flags to
<varname>CFLAGS</varname> in a relatively compiler-neutral
- manner.</para>
+ manner. &merged;</para>
<para>&man.fsck.8; wrappers have been imported; this feature
provides infrastructure for &man.fsck.8; to work on different
@@ -1724,10 +1724,10 @@
<para>&man.gcc.1; now supports the environment variable
<varname>GCC_OPTIONS</varname>, which can hold a set of default
- options for <application>GCC</application>.</para>
+ options for <application>GCC</application>. &merged;</para>
<para><application>GNATS</application> has been updated to
- 3.113.</para>
+ 3.113. &merged;</para>
<para><application>gperf</application> has been updated to 2.7.2.</para>