From owner-svn-src-all@FreeBSD.ORG Thu Sep 15 12:15:37 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 355E21065672; Thu, 15 Sep 2011 12:15:37 +0000 (UTC) (envelope-from lstewart@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 1ACB58FC1A; Thu, 15 Sep 2011 12:15:37 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p8FCFaL5073088; Thu, 15 Sep 2011 12:15:36 GMT (envelope-from lstewart@svn.freebsd.org) Received: (from lstewart@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p8FCFafh073073; Thu, 15 Sep 2011 12:15:36 GMT (envelope-from lstewart@svn.freebsd.org) Message-Id: <201109151215.p8FCFafh073073@svn.freebsd.org> From: Lawrence Stewart Date: Thu, 15 Sep 2011 12:15:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225583 - in head: . share/man/man4 share/man/man9 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Sep 2011 12:15:37 -0000 Author: lstewart Date: Thu Sep 15 12:15:36 2011 New Revision: 225583 URL: http://svn.freebsd.org/changeset/base/225583 Log: 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 Approved by: re (kib) MFC after: 3 days Added: head/share/man/man4/mod_cc.4 - copied, changed from r225576, head/share/man/man4/cc.4 head/share/man/man9/mod_cc.9 - copied, changed from r225576, head/share/man/man9/cc.9 Deleted: head/share/man/man4/cc.4 head/share/man/man9/cc.9 Modified: head/ObsoleteFiles.inc head/share/man/man4/Makefile head/share/man/man4/cc_chd.4 head/share/man/man4/cc_cubic.4 head/share/man/man4/cc_hd.4 head/share/man/man4/cc_htcp.4 head/share/man/man4/cc_newreno.4 head/share/man/man4/cc_vegas.4 head/share/man/man4/h_ertt.4 head/share/man/man4/tcp.4 head/share/man/man9/Makefile Modified: head/ObsoleteFiles.inc ============================================================================== --- head/ObsoleteFiles.inc Thu Sep 15 11:50:09 2011 (r225582) +++ head/ObsoleteFiles.inc Thu Sep 15 12:15:36 2011 (r225583) @@ -38,6 +38,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20110915: rename congestion control manpages +OLD_FILES+=usr/share/man/man4/cc.4.gz +OLD_FILES+=usr/share/man/man9/cc.9.gz # 20110831: atomic page flags operations OLD_FILES+=usr/share/man/man9/vm_page_flag.9.gz OLD_FILES+=usr/share/man/man9/vm_page_flag_clear.9.gz Modified: head/share/man/man4/Makefile ============================================================================== --- head/share/man/man4/Makefile Thu Sep 15 11:50:09 2011 (r225582) +++ head/share/man/man4/Makefile Thu Sep 15 12:15:36 2011 (r225583) @@ -71,7 +71,6 @@ MAN= aac.4 \ cardbus.4 \ carp.4 \ cas.4 \ - cc.4 \ cc_chd.4 \ cc_cubic.4 \ cc_hd.4 \ @@ -233,6 +232,7 @@ MAN= aac.4 \ mmc.4 \ mmcsd.4 \ mn.4 \ + mod_cc.4 \ mos.4 \ mouse.4 \ mps.4 \ Modified: head/share/man/man4/cc_chd.4 ============================================================================== --- head/share/man/man4/cc_chd.4 Thu Sep 15 11:50:09 2011 (r225582) +++ head/share/man/man4/cc_chd.4 Thu Sep 15 12:15:36 2011 (r225583) @@ -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" Modified: head/share/man/man4/cc_cubic.4 ============================================================================== --- head/share/man/man4/cc_cubic.4 Thu Sep 15 11:50:09 2011 (r225582) +++ head/share/man/man4/cc_cubic.4 Thu Sep 15 12:15:36 2011 (r225583) @@ -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" Modified: head/share/man/man4/cc_hd.4 ============================================================================== --- head/share/man/man4/cc_hd.4 Thu Sep 15 11:50:09 2011 (r225582) +++ head/share/man/man4/cc_hd.4 Thu Sep 15 12:15:36 2011 (r225583) @@ -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) i 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" Modified: head/share/man/man4/cc_htcp.4 ============================================================================== --- head/share/man/man4/cc_htcp.4 Thu Sep 15 11:50:09 2011 (r225582) +++ head/share/man/man4/cc_htcp.4 Thu Sep 15 12:15:36 2011 (r225583) @@ -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 avoida 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" Modified: head/share/man/man4/cc_newreno.4 ============================================================================== --- head/share/man/man4/cc_newreno.4 Thu Sep 15 11:50:09 2011 (r225582) +++ head/share/man/man4/cc_newreno.4 Thu Sep 15 12:15:36 2011 (r225583) @@ -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 .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 Modified: head/share/man/man4/cc_vegas.4 ============================================================================== --- head/share/man/man4/cc_vegas.4 Thu Sep 15 11:50:09 2011 (r225582) +++ head/share/man/man4/cc_vegas.4 Thu Sep 15 12:15:36 2011 (r225583) @@ -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 satisf 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" Modified: head/share/man/man4/h_ertt.4 ============================================================================== --- head/share/man/man4/h_ertt.4 Thu Sep 15 11:50:09 2011 (r225582) +++ head/share/man/man4/h_ertt.4 Thu Sep 15 12:15:36 2011 (r225583) @@ -108,10 +108,10 @@ consumers to unset the flag if they wish 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 Copied and modified: head/share/man/man4/mod_cc.4 (from r225576, head/share/man/man4/cc.4) ============================================================================== --- head/share/man/man4/cc.4 Thu Sep 15 09:54:07 2011 (r225576, copy source) +++ head/share/man/man4/mod_cc.4 Thu Sep 15 12:15:36 2011 (r225583) @@ -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 Modified: head/share/man/man4/tcp.4 ============================================================================== --- head/share/man/man4/tcp.4 Thu Sep 15 11:50:09 2011 (r225582) +++ head/share/man/man4/tcp.4 Thu Sep 15 12:15:36 2011 (r225583) @@ -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 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 @@ -510,10 +510,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 Modified: head/share/man/man9/Makefile ============================================================================== --- head/share/man/man9/Makefile Thu Sep 15 11:50:09 2011 (r225582) +++ head/share/man/man9/Makefile Thu Sep 15 12:15:36 2011 (r225583) @@ -43,7 +43,6 @@ MAN= accept_filter.9 \ BUS_SETUP_INTR.9 \ bus_space.9 \ byteorder.9 \ - cc.9 \ cd.9 \ condvar.9 \ config_intrhook.9 \ @@ -169,6 +168,7 @@ MAN= accept_filter.9 \ microtime.9 \ microuptime.9 \ mi_switch.9 \ + mod_cc.9 \ module.9 \ MODULE_DEPEND.9 \ MODULE_VERSION.9 \ Copied and modified: head/share/man/man9/mod_cc.9 (from r225576, head/share/man/man9/cc.9) ============================================================================== --- head/share/man/man9/cc.9 Thu Sep 15 09:54:07 2011 (r225576, copy source) +++ head/share/man/man9/mod_cc.9 Thu Sep 15 12:15:36 2011 (r225583) @@ -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