From 83e6146660b0a41916814f2616551199c9b37329 Mon Sep 17 00:00:00 2001 From: lstewart Date: Fri, 23 Sep 2011 05:28:09 +0000 Subject: [PATCH] MFC r225583: Rename the cc.4 and cc.9 modular congestion control related man pages to mod_cc.4 and mod_cc.9 respectively to avoid any possible confusion with the cc.1 gcc man page. Update references to these man pages where required. Requested by: Grenville Armitage git-svn-id: svn://svn.freebsd.org/base/stable/8@225738 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- ObsoleteFiles.inc | 3 +++ share/man/man4/Makefile | 3 ++- share/man/man4/cc_chd.4 | 8 ++++---- share/man/man4/cc_cubic.4 | 6 +++--- share/man/man4/cc_hd.4 | 8 ++++---- share/man/man4/cc_htcp.4 | 6 +++--- share/man/man4/cc_newreno.4 | 6 +++--- share/man/man4/cc_vegas.4 | 8 ++++---- share/man/man4/h_ertt.4 | 2 +- share/man/man4/{cc.4 => mod_cc.4} | 8 ++++---- share/man/man4/tcp.4 | 8 ++++---- share/man/man9/Makefile | 2 +- share/man/man9/{cc.9 => mod_cc.9} | 10 +++++----- 13 files changed, 41 insertions(+), 37 deletions(-) rename share/man/man4/{cc.4 => mod_cc.4} (98%) rename share/man/man9/{cc.9 => mod_cc.9} (99%) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index d253e64a2..311f0a80c 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -14,6 +14,9 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20110915: rename congestion control manpages +OLD_FILES+=usr/share/man/man4/cc.4.gz +OLD_FILES+=usr/share/man/man9/cc.9.gz # 20101123: removed subblock.h from liblzma OLD_FILES+=usr/include/lzma/subblock.h # 20101114: Remove long-obsolete MAKEDEV.8 diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index b40ebd72a..c6bf447de 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -67,7 +67,6 @@ MAN= aac.4 \ cardbus.4 \ carp.4 \ cas.4 \ - cc.4 \ cc_chd.4 \ cc_cubic.4 \ cc_hd.4 \ @@ -225,6 +224,8 @@ MAN= aac.4 \ mmc.4 \ mmcsd.4 \ mn.4 \ + mod_cc.4 \ + mos.4 \ mouse.4 \ mps.4 \ mpt.4 \ diff --git a/share/man/man4/cc_chd.4 b/share/man/man4/cc_chd.4 index 9a1f76280..39cdef3b6 100644 --- a/share/man/man4/cc_chd.4 +++ b/share/man/man4/cc_chd.4 @@ -29,7 +29,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 15, 2011 +.Dd September 15, 2011 .Dt CC_CHD 4 .Os .Sh NAME @@ -86,16 +86,16 @@ is used. Default is 1. .El .Sh SEE ALSO -.Xr cc 4 , .Xr cc_cubic 4 , .Xr cc_hd 4 , .Xr cc_htcp 4 , .Xr cc_newreno 4 , .Xr cc_vegas 4 , .Xr h_ertt 4 , +.Xr mod_cc 4 , .Xr tcp 4 , -.Xr cc 9 , -.Xr khelp 9 +.Xr khelp 9 , +.Xr mod_cc 9 .Rs .%A "D. A. Hayes" .%A "G. Armitage" diff --git a/share/man/man4/cc_cubic.4 b/share/man/man4/cc_cubic.4 index be5684cf8..771f2643b 100644 --- a/share/man/man4/cc_cubic.4 +++ b/share/man/man4/cc_cubic.4 @@ -30,7 +30,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 15, 2011 +.Dd September 15, 2011 .Dt CC_CUBIC 4 .Os .Sh NAME @@ -62,14 +62,14 @@ section below. .Sh MIB Variables There are currently no tunable MIB variables. .Sh SEE ALSO -.Xr cc 4 , .Xr cc_chd 4 , .Xr cc_hd 4 , .Xr cc_htcp 4 , .Xr cc_newreno 4 , .Xr cc_vegas 4 , +.Xr mod_cc 4 , .Xr tcp 4 , -.Xr cc 9 +.Xr mod_cc 9 .Rs .%A "Sangtae Ha" .%A "Injong Rhee" diff --git a/share/man/man4/cc_hd.4 b/share/man/man4/cc_hd.4 index d761539d1..ca887f83a 100644 --- a/share/man/man4/cc_hd.4 +++ b/share/man/man4/cc_hd.4 @@ -29,7 +29,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 15, 2011 +.Dd September 15, 2011 .Dt CC_HD 4 .Os .Sh NAME @@ -69,16 +69,16 @@ Minimum queuing delay threshold (qmin) in ticks. Default is 5. .El .Sh SEE ALSO -.Xr cc 4 , .Xr cc_chd 4 , .Xr cc_cubic 4 , .Xr cc_htcp 4 , .Xr cc_newreno 4 , .Xr cc_vegas 4 , .Xr h_ertt 4 , +.Xr mod_cc 4 , .Xr tcp 4 , -.Xr cc 9 , -.Xr khelp 9 +.Xr khelp 9 , +.Xr mod_cc 9 .Rs .%A "L. Budzisz" .%A "R. Stanojevic" diff --git a/share/man/man4/cc_htcp.4 b/share/man/man4/cc_htcp.4 index 6e916b950..45d00186c 100644 --- a/share/man/man4/cc_htcp.4 +++ b/share/man/man4/cc_htcp.4 @@ -30,7 +30,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 15, 2011 +.Dd September 15, 2011 .Dt CC_HTCP 4 .Os .Sh NAME @@ -69,14 +69,14 @@ window increase during congestion avoidance mode invariant with respect to RTT. Default is 0 (disabled). .El .Sh SEE ALSO -.Xr cc 4 , .Xr cc_chd 4 , .Xr cc_cubic 4 , .Xr cc_hd 4 , .Xr cc_newreno 4 , .Xr cc_vegas 4 , +.Xr mod_cc 4 , .Xr tcp 4 , -.Xr cc 9 +.Xr mod_cc 9 .Rs .%A "D. Leith" .%A "R. Shorten" diff --git a/share/man/man4/cc_newreno.4 b/share/man/man4/cc_newreno.4 index c09b36221..fe4c3db30 100644 --- a/share/man/man4/cc_newreno.4 +++ b/share/man/man4/cc_newreno.4 @@ -30,7 +30,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 15, 2011 +.Dd September 15, 2011 .Dt CC_NEWRENO 4 .Os .Sh NAME @@ -42,14 +42,14 @@ Details about the algorithm can be found in RFC5681. .Sh MIB Variables There are currently no tunable MIB variables. .Sh SEE ALSO -.Xr cc 4 , .Xr cc_chd 4 , .Xr cc_cubic 4 , .Xr cc_hd 4 , .Xr cc_htcp 4 , .Xr cc_vegas 4 , +.Xr mod_cc 4 , .Xr tcp 4 , -.Xr cc 9 +.Xr mod_cc 9 .Sh ACKNOWLEDGEMENTS Development and testing of this software were made possible in part by grants from the FreeBSD Foundation and Cisco University Research Program Fund at diff --git a/share/man/man4/cc_vegas.4 b/share/man/man4/cc_vegas.4 index ce55723c5..13a3fe06e 100644 --- a/share/man/man4/cc_vegas.4 +++ b/share/man/man4/cc_vegas.4 @@ -29,7 +29,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 15, 2011 +.Dd September 15, 2011 .Dt CC_VEGAS 4 .Os .Sh NAME @@ -94,16 +94,16 @@ When setting beta, the value must satisfy: 0 < alpha < beta. Default is 3. .El .Sh SEE ALSO -.Xr cc 4 , .Xr cc_chd 4 , .Xr cc_cubic 4 , .Xr cc_hd 4 , .Xr cc_htcp 4 , .Xr cc_newreno 4 , .Xr h_ertt 4 , +.Xr mod_cc 4 , .Xr tcp 4 , -.Xr cc 9 , -.Xr khelp 9 +.Xr khelp 9 , +.Xr mod_cc 9 .Rs .%A "L. S. Brakmo" .%A "L. L. Peterson" diff --git a/share/man/man4/h_ertt.4 b/share/man/man4/h_ertt.4 index ed7461ef9..90a9f31c1 100644 --- a/share/man/man4/h_ertt.4 +++ b/share/man/man4/h_ertt.4 @@ -108,10 +108,10 @@ consumers to unset the flag if they wish to use it as a notification method for new measurements. .El .Sh SEE ALSO -.Xr cc 4 , .Xr cc_chd 4 , .Xr cc_hd 4 , .Xr cc_vegas 4 , +.Xr mod_cc 4 , .Xr hhook 9 , .Xr khelp 9 .Sh ACKNOWLEDGEMENTS diff --git a/share/man/man4/cc.4 b/share/man/man4/mod_cc.4 similarity index 98% rename from share/man/man4/cc.4 rename to share/man/man4/mod_cc.4 index 32da74179..204537faa 100644 --- a/share/man/man4/cc.4 +++ b/share/man/man4/mod_cc.4 @@ -30,11 +30,11 @@ .\" .\" $FreeBSD$ .\" -.Dd February 15, 2011 -.Dt cc 4 +.Dd September 15, 2011 +.Dt MOD_CC 4 .Os .Sh NAME -.Nm cc +.Nm mod_cc .Nd Modular congestion control .Sh DESCRIPTION The modular congestion control framework allows the TCP implementation to @@ -82,7 +82,7 @@ MIB variable. .Xr cc_newreno 4 , .Xr cc_vegas 4 , .Xr tcp 4 , -.Xr cc 9 +.Xr mod_cc 9 .Sh ACKNOWLEDGEMENTS Development and testing of this software were made possible in part by grants from the FreeBSD Foundation and Cisco University Research Program Fund at diff --git a/share/man/man4/tcp.4 b/share/man/man4/tcp.4 index 663d43821..e5d56c727 100644 --- a/share/man/man4/tcp.4 +++ b/share/man/man4/tcp.4 @@ -38,7 +38,7 @@ .\" From: @(#)tcp.4 8.1 (Berkeley) 6/5/93 .\" $FreeBSD$ .\" -.Dd February 15, 2011 +.Dd September 15, 2011 .Dt TCP 4 .Os .Sh NAME @@ -144,7 +144,7 @@ bandwidth-controlled window space. Select or query the congestion control algorithm that TCP will use for the connection. See -.Xr cc 4 +.Xr mod_cc 4 for details. .It Dv TCP_NODELAY Under most circumstances, @@ -249,7 +249,7 @@ The default congestion control algorithm for is .Xr cc_newreno 4 . Other congestion control algorithms can be made available using the -.Xr cc 4 +.Xr mod_cc 4 framework. .Ss MIB Variables The @@ -576,10 +576,10 @@ address. .Xr socket 2 , .Xr sysctl 3 , .Xr blackhole 4 , -.Xr cc 4 , .Xr inet 4 , .Xr intro 4 , .Xr ip 4 , +.Xr mod_cc 4 , .Xr syncache 4 , .Xr setkey 8 .Rs diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index 682773c28..a0e08f559 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -44,7 +44,6 @@ MAN= accept_filter.9 \ BUS_SETUP_INTR.9 \ bus_space.9 \ byteorder.9 \ - cc.9 \ cd.9 \ condvar.9 \ config_intrhook.9 \ @@ -170,6 +169,7 @@ MAN= accept_filter.9 \ microtime.9 \ microuptime.9 \ mi_switch.9 \ + mod_cc.9 \ module.9 \ MODULE_DEPEND.9 \ MODULE_VERSION.9 \ diff --git a/share/man/man9/cc.9 b/share/man/man9/mod_cc.9 similarity index 99% rename from share/man/man9/cc.9 rename to share/man/man9/mod_cc.9 index 6a3798445..75e2db039 100644 --- a/share/man/man9/cc.9 +++ b/share/man/man9/mod_cc.9 @@ -31,11 +31,11 @@ .\" .\" $FreeBSD$ .\" -.Dd February 15, 2011 -.Dt CC 9 +.Dd September 15, 2011 +.Dt MOD_CC 9 .Os .Sh NAME -.Nm cc , +.Nm mod_cc , .Nm DECLARE_CC_MODULE , .Nm CC_VAR .Nd Modular Congestion Control @@ -53,7 +53,7 @@ loadable kernel modules via the facility. Transport protocols can select from the list of available algorithms on a connection-by-connection basis, or use the system default (see -.Xr cc 4 +.Xr mod_cc 4 for more details). .Pp .Nm @@ -290,13 +290,13 @@ by the value of the congestion window. Algorithms should use the abscence of this flag being set to avoid accumulating a large difference between the congestion window and send window. .Sh SEE ALSO -.Xr cc 4 , .Xr cc_chd 4 , .Xr cc_cubic 4 , .Xr cc_hd 4 , .Xr cc_htcp 4 , .Xr cc_newreno 4 , .Xr cc_vegas 4 , +.Xr mod_cc 4 , .Xr tcp 4 .Sh ACKNOWLEDGEMENTS Development and testing of this software were made possible in part by grants -- 2.45.0