From 5838bce60ee6c0c883873de506dc9f4d7a408ab4 Mon Sep 17 00:00:00 2001
From: sevan <sevan@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Sun, 25 Mar 2018 01:17:40 +0000
Subject: [PATCH] MFC r316721 r331274

Most wireless drivers don't support altq(4).

Extend the description of ALTQ to call it a system which is a framework in
altq(4) to match altq(9). This makes preserving the history section as the
author of ALTQ easier in the history section, rather than calling it a framework
in the description & a system in the history.
Add a history section to altq(4) and extend the history section in altq(9)


git-svn-id: svn://svn.freebsd.org/base/stable/10@331512 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 share/man/man4/altq.4 | 22 ++++++++++++----------
 share/man/man9/altq.9 |  8 ++++++--
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/share/man/man4/altq.4 b/share/man/man4/altq.4
index 771dc53d5..cbcb2f7fe 100644
--- a/share/man/man4/altq.4
+++ b/share/man/man4/altq.4
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 24, 2015
+.Dd March 20, 2018
 .Dt ALTQ 4
 .Os
 .Sh NAME
@@ -45,7 +45,8 @@
 .Sh DESCRIPTION
 The
 .Nm
-framework provides several disciplines for queuing outgoing network packets.
+system is a framework which provides several disciplines for queuing outgoing
+network packets.
 This is done by modifications to the interface packet queues.
 See
 .Xr altq 9
@@ -59,7 +60,7 @@ utility, so please refer to the
 .Xr pfctl 8
 and the
 .Xr pf.conf 5
-manpages for a complete description of the
+man pages for a complete description of the
 .Nm
 capabilities and how to use it.
 .Ss Kernel Options
@@ -130,7 +131,6 @@ They have been applied to the following hardware drivers:
 .Xr alc 4 ,
 .Xr ale 4 ,
 .Xr an 4 ,
-.Xr ath 4 ,
 .Xr aue 4 ,
 .Xr axe 4 ,
 .Xr bce 4 ,
@@ -150,8 +150,6 @@ They have been applied to the following hardware drivers:
 .Xr gem 4 ,
 .Xr hme 4 ,
 .Xr igb 4 ,
-.Xr ipw 4 ,
-.Xr iwi 4 ,
 .Xr ixgbe 4 ,
 .Xr jme 4 ,
 .Xr le 4 ,
@@ -163,10 +161,8 @@ They have been applied to the following hardware drivers:
 .Xr npe 4 ,
 .Xr nve 4 ,
 .Xr qlxgb 4 ,
-.Xr ral 4 ,
 .Xr re 4 ,
 .Xr rl 4 ,
-.Xr rum 4 ,
 .Xr sf 4 ,
 .Xr sge 4 ,
 .Xr sis 4 ,
@@ -176,11 +172,9 @@ They have been applied to the following hardware drivers:
 .Xr ti 4 ,
 .Xr txp 4 ,
 .Xr udav 4 ,
-.Xr ural 4 ,
 .Xr vge 4 ,
 .Xr vr 4 ,
 .Xr vte 4 ,
-.Xr wi 4 ,
 and
 .Xr xl 4 .
 .Pp
@@ -202,3 +196,11 @@ pseudo drivers also do support
 .Xr ipfw 8 ,
 .Xr pfctl 8 ,
 .Xr altq 9
+.Sh HISTORY
+The
+.Nm
+system first appeared in March 1997 and found home in the KAME project
+(http://www.kame.net).
+It was imported to
+.Fx
+in 5.3 .
diff --git a/share/man/man9/altq.9 b/share/man/man9/altq.9
index fd9440420..582428514 100644
--- a/share/man/man9/altq.9
+++ b/share/man/man9/altq.9
@@ -28,7 +28,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd August 25, 2004
+.Dd March 20, 2018
 .Dt ALTQ 9
 .Os
 .\"
@@ -596,4 +596,8 @@ is called immediately after
 .Sh HISTORY
 The
 .Nm
-system first appeared in March 1997.
+system first appeared in March 1997 and found home in the KAME project
+(http://www.kame.net).
+It was imported to
+.Fx
+in 5.3 .
-- 
2.42.0