Index: sbin/iked/iked.conf.5
===================================================================
RCS file: /cvs/src/sbin/iked/iked.conf.5,v
retrieving revision 1.25
diff -u -p -r1.25 iked.conf.5
--- sbin/iked/iked.conf.5 16 Jul 2013 09:45:28 -0000 1.25
+++ sbin/iked/iked.conf.5 19 Oct 2013 16:34:48 -0000
@@ -624,17 +624,16 @@ The following
fragment uses queues for all IPsec traffic with special
handling for developers and employees:
.Bd -literal -offset indent
-altq on ix0 cbq bandwidth 1000Mb \e
- queue { deflt, developers, employees, ipsec }
- queue deflt bandwidth 10% priority 0 cbq(default ecn)
- queue developers bandwidth 75% priority 7 cbq(borrow red)
- queue employees bandwidth 5% cbq(red)
- queue ipsec bandwidth 10% cbq(red)
+queue std on ix0 bandwidth 100M
+queue deflt parent std bandwidth 10M default
+queue developers parent std bandwidth 75M
+queue employees parent std bandwidth 5M
+queue ipsec parent std bandwidth 10M
-pass out on ix0 proto esp queue ipsec
+pass out on ix0 proto esp set queue ipsec
-pass out on ix0 tagged ipsec-developers.example.com queue developers
-pass out on ix0 tagged ipsec-employees.example.com queue employees
+pass out on ix0 tagged ipsec-developers.example.com set queue developers
+pass out on ix0 tagged ipsec-employees.example.com set queue employees
.Ed
.Pp
The following example assigns the tags in the
Index: sbin/ipsecctl/ipsec.conf.5
===================================================================
RCS file: /cvs/src/sbin/ipsecctl/ipsec.conf.5,v
retrieving revision 1.143
diff -u -p -r1.143 ipsec.conf.5
--- sbin/ipsecctl/ipsec.conf.5 29 Jun 2013 09:08:41 -0000 1.143
+++ sbin/ipsecctl/ipsec.conf.5 19 Oct 2013 16:34:48 -0000
@@ -544,17 +544,16 @@ The following
fragment uses queues for all IPsec traffic with special
handling for developers and employees:
.Bd -literal -offset indent
-altq on sk0 cbq bandwidth 1000Mb \e
- queue { deflt, developers, employees, ipsec }
- queue deflt bandwidth 10% priority 0 cbq(default ecn)
- queue developers bandwidth 75% priority 7 cbq(borrow red)
- queue employees bandwidth 5% cbq(red)
- queue ipsec bandwidth 10% cbq(red)
+queue std on sk0 bandwidth 100M
+queue deflt parent std bandwidth 10M default
+queue developers parent std bandwidth 75M
+queue employees parent std bandwidth 5M
+queue ipsec parent std bandwidth 10M
-pass out on sk0 proto esp queue ipsec
+pass out on sk0 proto esp set queue ipsec
-pass out on sk0 tagged ipsec-developers.bar.org queue developers
-pass out on sk0 tagged ipsec-employees.bar.org queue employees
+pass out on sk0 tagged ipsec-developers.bar.org set queue developers
+pass out on sk0 tagged ipsec-employees.bar.org set queue employees
.Ed
.Pp
The tags will be assigned by the following
Index: usr.bin/systat/systat.1
===================================================================
RCS file: /cvs/src/usr.bin/systat/systat.1,v
retrieving revision 1.96
diff -u -p -r1.96 systat.1
--- usr.bin/systat/systat.1 7 Sep 2013 11:43:50 -0000 1.96
+++ usr.bin/systat/systat.1 19 Oct 2013 16:34:56 -0000
@@ -376,9 +376,8 @@ Available orderings are:
and
.Ic number of pages .
.It Ic queues
-Display statistics about the active
-.Xr altq 9
-queues, similar to the output of
+Display statistics about the active queues,
+similar to the output of
.Cm pfctl Fl s Cm queue .
.It Ic rules
Display pf rules statistics, similar to the output of
