summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--release/doc/en_US.ISO8859-1/relnotes/article.sgml3
-rw-r--r--release/doc/en_US.ISO8859-1/relnotes/common/new.sgml3
2 files changed, 4 insertions, 2 deletions
diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
index 3ffe9ff..1c03887 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
@@ -1554,7 +1554,8 @@
<para>&man.ipfw.8; will now avoid the display of dynamic
firewall rules unless the <option>-d</option> flag is passed to
- it. The <option>-e</option> lists expired dynamic rules.</para>
+ it. The <option>-e</option> option lists expired dynamic
+ rules. &merged;</para>
<para>&man.ipfw.8; has a new feature (<literal>me</literal>) that
allows for packet matching on interfaces with dynamically-changing
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 3ffe9ff..1c03887 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
@@ -1554,7 +1554,8 @@
<para>&man.ipfw.8; will now avoid the display of dynamic
firewall rules unless the <option>-d</option> flag is passed to
- it. The <option>-e</option> lists expired dynamic rules.</para>
+ it. The <option>-e</option> option lists expired dynamic
+ rules. &merged;</para>
<para>&man.ipfw.8; has a new feature (<literal>me</literal>) that
allows for packet matching on interfaces with dynamically-changing
OpenPOWER on IntegriCloud