From nobody@FreeBSD.org  Thu Aug 18 00:13:20 2011
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B0873106566C
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 18 Aug 2011 00:13:19 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id A18708FC13
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 18 Aug 2011 00:13:19 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p7I0DJxv084163
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 18 Aug 2011 00:13:19 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id p7I0DJgD084157;
	Thu, 18 Aug 2011 00:13:19 GMT
	(envelope-from nobody)
Message-Id: <201108180013.p7I0DJgD084157@red.freebsd.org>
Date: Thu, 18 Aug 2011 00:13:19 GMT
From: Ben Kaduk <kaduk@mit.edu>
To: freebsd-gnats-submit@FreeBSD.org
Subject: grammar updates for carp.4
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         159854
>Category:       docs
>Synopsis:       [patch] grammar updates for carp.4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    bjk
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          doc-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Aug 18 00:20:07 UTC 2011
>Closed-Date:    Thu May 03 13:09:04 UTC 2012
>Last-Modified:  Thu May  3 13:10:10 UTC 2012
>Originator:     Ben Kaduk
>Release:        9-current
>Organization:
MIT SIPB
>Environment:
n/a
>Description:
Some grammar fixups for carp.4 (also a piece of markup).
There was also a long line and trailing whitespace in one spot, so I have a separate whitespace.diff.txt to be applied prior to the main diff.  I only get one attachment in the webform, so the second diff will come in as a reply to the ticket.
>How-To-Repeat:
man 4 carp
>Fix:


Patch attached with submission follows:

--- carp.4.orig	2011-08-17 14:12:08.000000000 -0400
+++ carp.4.whitespace	2011-08-17 14:13:19.000000000 -0400
@@ -38,7 +38,8 @@
 .Nm
 interface is a pseudo-device that implements and controls the
 CARP protocol.
-CARP allows multiple hosts on the same local network to share a set of IP addresses.
+CARP allows multiple hosts on the same local
+network to share a set of IP addresses.
 Its primary purpose is to ensure that these
 addresses are always available, but in some configurations
 .Nm
@@ -184,7 +185,7 @@
 event.
 Please see
 .Xr devd.conf 5
-and 
+and
 .Sx EXAMPLES
 section for more information.
 .Sh EXAMPLES


>Release-Note:
>Audit-Trail:

From: Benjamin Kaduk <kaduk@MIT.EDU>
To: FreeBSD-gnats-submit@freebsd.org
Cc:  
Subject: Re: docs/159854: grammar updates for carp.4
Date: Wed, 17 Aug 2011 20:21:01 -0400 (EDT)

   This message is in MIME format.  The first part should be readable text,
   while the remaining parts are likely unreadable without MIME-aware tools.
 
 ---559023410-1428168044-1313626861=:7526
 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
 
 And the main diff.
 
 -Ben
 ---559023410-1428168044-1313626861=:7526
 Content-Type: TEXT/PLAIN; charset=US-ASCII; name=carp.4.diff.txt
 Content-Transfer-Encoding: BASE64
 Content-ID: <alpine.GSO.1.10.1108172021010.7526@multics.mit.edu>
 Content-Description: 
 Content-Disposition: attachment; filename=carp.4.diff.txt
 
 LS0tIGNhcnAuNC53aGl0ZXNwYWNlCTIwMTEtMDgtMTcgMTQ6MTM6MTkuMDAw
 MDAwMDAwIC0wNDAwDQorKysgY2FycC40CTIwMTEtMDgtMTcgMjA6MTE6NTQu
 MDAwMDAwMDAwIC0wNDAwDQpAQCAtNTAsOSArNTAsOSBAQA0KIGludGVyZmFj
 ZSBjYW4gYmUgY3JlYXRlZCBhdCBydW50aW1lIHVzaW5nIHRoZQ0KIC5ObSBp
 ZmNvbmZpZyBMaSBjYXJwIE5zIEFyIE4gQ20gY3JlYXRlDQogY29tbWFuZCBv
 ciBieSBjb25maWd1cmluZw0KLWl0IHZpYQ0KK29uZSB2aWEgdGhlDQogLlZh
 IGNsb25lZF9pbnRlcmZhY2VzDQotaW4gdGhlDQordmFyaWFibGUgaW4gdGhl
 DQogLlBhIC9ldGMvcmMuY29uZg0KIGZpbGUuDQogLlBwDQpAQCAtODgsNyAr
 ODgsNyBAQA0KIGFuZA0KIC5DbSBhZHZza2V3DQogYXJlIHB1dCBpbnNpZGUg
 Q0FSUCBhZHZlcnRpc2VtZW50cy4NCi1UaGVzZSBjb25maWd1cmF0aW9ucyBj
 YW4gYmUgZG9uZSB1c2luZw0KK1RoZXNlIHZhbHVlcyBjYW4gYmUgY29uZmln
 dXJlZCB1c2luZw0KIC5YciBpZmNvbmZpZyA4ICwNCiBvciB0aHJvdWdoIHRo
 ZQ0KIC5EdiBTSU9DU1ZIDQpAQCAtOTYsNyArOTYsNyBAQA0KIC5QcA0KIEFk
 ZGl0aW9uYWxseSwgdGhlcmUgYXJlIGEgbnVtYmVyIG9mIGdsb2JhbCBwYXJh
 bWV0ZXJzIHdoaWNoIGNhbiBiZSBzZXQgdXNpbmcNCiAuWHIgc3lzY3RsIDgg
 Og0KLS5CbCAtdGFnIC13aWR0aCAiLlZhIG5ldC5pbmV0LmNhcnAuYXJwYmFs
 YW5jZSINCisuQmwgLXRhZyAtd2lkdGggIi5WYSBuZXQuaW5ldC5jYXJwLnN1
 cHByZXNzX3ByZWVtcHQiDQogLkl0IFZhIG5ldC5pbmV0LmNhcnAuYWxsb3cN
 CiBBY2NlcHQgaW5jb21pbmcNCiAuTm0NCkBAIC0xMTgsNDQgKzExOCw1MiBA
 QA0KIFNlZSBhbHNvIHRoZSBmaXJzdCBleGFtcGxlLg0KIERpc2FibGVkIGJ5
 IGRlZmF1bHQuDQogLkl0IFZhIG5ldC5pbmV0LmNhcnAubG9nDQotVmFsdWUg
 b2YgMCBkaXNhYmxlcyBhbnkgbG9nZ2luZy4NCi1WYWx1ZSBvZiAxIGVuYWJs
 ZXMgbG9nZ2luZyBzdGF0ZSBjaGFuZ2VzIG9mDQorRGV0ZXJtaW5lIHdoYXQg
 ZXZlbnRzIHJlbGF0aW5nIHRvDQorLk5tDQoraW50ZXJmYWNlcyBhcmUgbG9n
 Z2VkLg0KK0EgdmFsdWUgb2YgMCBkaXNhYmxlcyBhbnkgbG9nZ2luZy4NCitB
 IHZhbHVlIG9mIDEgZW5hYmxlcyBsb2dnaW5nIHN0YXRlIGNoYW5nZXMgb2YN
 CiAuTm0NCiBpbnRlcmZhY2VzLg0KIFZhbHVlcyBhYm92ZSAxIGVuYWJsZSBs
 b2dnaW5nIG9mIGJhZA0KIC5ObQ0KIHBhY2tldHMuDQotRGVmYXVsdCB2YWx1
 ZSBpcyAxLg0KK1RoZSBkZWZhdWx0IHZhbHVlIGlzIDEuDQogLkl0IFZhIG5l
 dC5pbmV0LmNhcnAuYXJwYmFsYW5jZQ0KIEJhbGFuY2UgbG9jYWwgdHJhZmZp
 YyB1c2luZyBBUlAgKHNlZSBiZWxvdykuDQogRGlzYWJsZWQgYnkgZGVmYXVs
 dC4NCiAuSXQgVmEgbmV0LmluZXQuY2FycC5zdXBwcmVzc19wcmVlbXB0DQot
 QSByZWFkIG9ubHkgdmFsdWUgc2hvd2luZyB0aGUgc3RhdHVzIG9mIHByZWVt
 cHRpb24gc3VwcHJlc3Npb24uDQorQSByZWFkLW9ubHkgdmFsdWUgc2hvd2lu
 ZyB0aGUgc3RhdHVzIG9mIHByZWVtcHRpb24gc3VwcHJlc3Npb24uDQogUHJl
 ZW1wdGlvbiBjYW4gYmUgc3VwcHJlc3NlZCBpZiBsaW5rIG9uIGFuIGludGVy
 ZmFjZSBpcyBkb3duDQotb3Igd2hlbg0KK29yIHdoZW4gdGhlDQogLlhyIHBm
 c3luYyA0DQogaW50ZXJmYWNlIGlzIG5vdCBzeW5jaHJvbml6ZWQuDQotVmFs
 dWUgb2YgMCBtZWFucyB0aGF0IHByZWVtcHRpb24gaXMgbm90IHN1cHByZXNz
 ZWQsIHNpbmNlIG5vDQorQSB2YWx1ZSBvZiAwIG1lYW5zIHRoYXQgcHJlZW1w
 dGlvbiBpcyBub3Qgc3VwcHJlc3NlZCwgc2luY2Ugbm8NCiBwcm9ibGVtcyBh
 cmUgZGV0ZWN0ZWQuDQotRXZlcnkgcHJvYmxlbSBpbmNyZW1lbnRzIHN1cHBy
 ZXNzaW9uIGNvdW50ZXIuDQorVGhlIHZhbHVlIGlzIGluY3JlbWVudGVkIHdo
 ZW4gYSBwcm9ibGVtIGlzIGRldGVjdGVkLg0KIC5FbA0KIC5TaCBBUlAgbGV2
 ZWwgbG9hZCBiYWxhbmNpbmcNCi1UaGUNCitBDQogLk5tDQotaGFzIGxpbWl0
 ZWQgYWJpbGl0aWVzIGZvciBsb2FkIGJhbGFuY2luZyB0aGUgaW5jb21pbmcg
 Y29ubmVjdGlvbnMNCi1iZXR3ZWVuIGhvc3RzIGluIEV0aGVybmV0IG5ldHdv
 cmsuDQotRm9yIGxvYWQgYmFsYW5jaW5nIG9wZXJhdGlvbiwgb25lIG5lZWRz
 IHNldmVyYWwgQ0FSUCBpbnRlcmZhY2VzIHRoYXQNCitpbnRlcmZhY2UNCito
 YXMgbGltaXRlZCBhYmlsaXRpZXMgZm9yIGxvYWQtYmFsYW5jaW5nIGluY29t
 aW5nIGNvbm5lY3Rpb25zDQorYmV0d2VlbiBob3N0cyBpbiBhbiBFdGhlcm5l
 dCBuZXR3b3JrLg0KK0ZvciBsb2FkLWJhbGFuY2luZyBvcGVyYXRpb24sIG9u
 ZSBuZWVkcyBzZXZlcmFsIENBUlAgaW50ZXJmYWNlcyB0aGF0DQogYXJlIGNv
 bmZpZ3VyZWQgdG8gdGhlIHNhbWUgSVAgYWRkcmVzcywgYnV0IHRvIGEgZGlm
 ZmVyZW50IFZISURzLg0KIE9uY2UgYW4gQVJQIHJlcXVlc3QgaXMgcmVjZWl2
 ZWQsIHRoZSBDQVJQIHByb3RvY29sIHdpbGwgdXNlIGEgaGFzaGluZw0KIGZ1
 bmN0aW9uIGFnYWluc3QgdGhlIHNvdXJjZSBJUCBhZGRyZXNzIGluIHRoZSBB
 UlAgcmVxdWVzdCB0byBkZXRlcm1pbmUNCi13aGljaCBWSElEIHNob3VsZCB0
 aGlzIHJlcXVlc3QgYmVsb25nIHRvLg0KLUlmIHRoZSBjb3JyZXNwb25kaW5n
 IENBUlAgaW50ZXJmYWNlIGlzIGluIG1hc3RlciBzdGF0ZSwgdGhlIEFSUCBy
 ZXF1ZXN0DQotd2lsbCBiZSByZXBsaWVkLCBvdGhlcndpc2UgaXQgd2lsbCBi
 ZSBpZ25vcmVkLg0KK3doaWNoIFZISUQgdGhlIHJlcXVlc3Qgd2lsbCBiZSBh
 c3NpZ25lZCB0by4NCitJZiB0aGUgY29ycmVzcG9uZGluZyBDQVJQIGludGVy
 ZmFjZSBpcyB0aGUgY3VycmVudA0KK21hc3RlciBpbnRlcmZhY2UsIGEgcmVw
 bHkgd2lsbA0KK2JlIHNlbnQgdG8gdGhlIEFSUCByZXF1ZXN0Ow0KK290aGVy
 d2lzZSBpdCB3aWxsIGJlIGlnbm9yZWQuDQogU2VlIHRoZQ0KIC5TeCBFWEFN
 UExFUw0KIHNlY3Rpb24gZm9yIGEgcHJhY3RpY2FsIGV4YW1wbGUgb2YgbG9h
 ZCBiYWxhbmNpbmcuDQogLlBwDQotVGhlIEFSUCBsb2FkIGJhbGFuY2luZyBo
 YXMgc29tZSBsaW1pdGF0aW9ucy4NCitUaGUgQVJQIGxvYWQgYmFsYW5jaW5n
 IGltcGxlbWVudGVkIGluDQorLk5tDQoraGFzIHNvbWUgbGltaXRhdGlvbnMu
 DQogRmlyc3QsIEFSUCBiYWxhbmNpbmcgb25seSB3b3JrcyBvbiB0aGUgbG9j
 YWwgbmV0d29yayBzZWdtZW50Lg0KIEl0IGNhbm5vdCBiYWxhbmNlIHRyYWZm
 aWMgdGhhdCBjcm9zc2VzIGEgcm91dGVyLCBiZWNhdXNlIHRoZQ0KIHJvdXRl
 ciBpdHNlbGYgd2lsbCBhbHdheXMgYmUgYmFsYW5jZWQgdG8gdGhlIHNhbWUg
 dmlydHVhbCBob3N0Lg0KQEAgLTE2NSwxMCArMTczLDExIEBADQogaXMgZGFu
 Z2Vyb3VzLCBiZWNhdXNlIHRoaXMgY3JlYXRlcyBhIHJhY2UgY29uZGl0aW9u
 IGJldHdlZW4NCiBiYWxhbmNlZCByb3V0ZXJzIGFuZCBhIGhvc3QgdGhleSBh
 cmUgc2VydmluZy4NCiBJbWFnaW5lIGFuIGluY29taW5nIHBhY2tldCBjcmVh
 dGluZyBzdGF0ZSBvbiB0aGUgZmlyc3Qgcm91dGVyLCBiZWluZw0KLWZvcndh
 cmRlZCB0byBpdHMgZGVzdGluYXRpb24sIGFuZCBkZXN0aW5hdGlvbiByZXBs
 eWluZyBmYXN0ZXINCitmb3J3YXJkZWQgdG8gaXRzIGRlc3RpbmF0aW9uLCBh
 bmQgdGhlIGRlc3RpbmF0aW9uIHJlcGx5aW5nIGZhc3Rlcg0KIHRoYW4gdGhl
 IHN0YXRlIGluZm9ybWF0aW9uIGlzIHBhY2tlZCBhbmQgc3luY2VkIHdpdGgg
 dGhlIHNlY29uZCByb3V0ZXIuDQogSWYgdGhlIHJlcGx5IHdvdWxkIGJlIGxv
 YWQgYmFsYW5jZWQgdG8gc2Vjb25kIHJvdXRlciwgaXQgd2lsbCBiZQ0KLWRy
 b3BwZWQgZHVlIHRvIG5vIHN0YXRlLg0KK2Ryb3BwZWQgc2luY2UgdGhlIHNl
 Y29uZCByb3V0ZXIgaGFzIG5vdCB5ZXQgcmVjZWl2ZWQgaW5mb3JtYXRpb24g
 YWJvdXQNCit0aGUgY29ubmVjdGlvbiBzdGF0ZS4NCiAuU2ggU1RBVEUgQ0hB
 TkdFIE5PVElGSUNBVElPTlMNCiBTb21ldGltZXMgaXQgaXMgdXNlZnVsIHRv
 IGdldCBub3RpZmllZCBhYm91dA0KIC5ObQ0KQEAgLTE4MiwxMCArMTkxLDEw
 IEBADQogLkR2IExJTktfVVANCiBvcg0KIC5EdiBMSU5LX0RPV04NCi1ldmVu
 dC4NCitldmVudHMuDQogUGxlYXNlIHNlZQ0KIC5YciBkZXZkLmNvbmYgNQ0K
 LWFuZA0KK2FuZCB0aGUNCiAuU3ggRVhBTVBMRVMNCiBzZWN0aW9uIGZvciBt
 b3JlIGluZm9ybWF0aW9uLg0KIC5TaCBFWEFNUExFUw0KQEAgLTE5Myw4ICsy
 MDIsOCBAQA0KIGZhaWxvdmVyIGFsbCBvZiB0aGUNCiAuTm0NCiBpbnRlcmZh
 Y2VzIHRvZ2V0aGVyLCB3aGVuIG9uZSBvZiB0aGUgcGh5c2ljYWwgaW50ZXJm
 YWNlcyBnb2VzIGRvd24uDQotVGhpcyBpcyBhY2hpZXZlZCBieSB0aGUgcHJl
 ZW1wdCBvcHRpb24uDQotRW5hYmxlIGl0IG9uIGJvdGggaG9zdCBBIGFuZCBC
 Og0KK1RoaXMgaXMgYWNoaWV2ZWQgYnkgdGhlIHVzZSBvZiB0aGUgcHJlZW1w
 dCBvcHRpb24uDQorRW5hYmxlIGl0IG9uIGJvdGggaG9zdHMgQSBhbmQgQjoN
 CiAuUHANCiAuRGwgc3lzY3RsIG5ldC5pbmV0LmNhcnAucHJlZW1wdD0xDQog
 LlBwDQo=
 
 ---559023410-1428168044-1313626861=:7526--

From: Benedict Reuschling <bcr@FreeBSD.org>
To: bug-followup@FreeBSD.org, kaduk@mit.edu
Cc:  
Subject: Re: docs/159854: [patch] grammar updates for carp.4
Date: Sat, 22 Oct 2011 16:02:21 +0200

 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
 The "problem" with contributed man pages (from other projects, in this
 case OpenBSD's CARP) is that we don't fix them in our tree, as this
 would result in merge conflict when importing the next version their
 tree into ours.
 
 Hence, it is better to contact the vendor and see whether the
 corrections can be done in their tree first and when that is done,
 contact our maintainer for that piece of software to import these fixes.
 
 However, as we are currently a few versions behind the vendor version,
 the man page has changed significantly as far as your patch is
 concerned. You might want to check their current version and see whether
 your fixes still apply:
 
 http://www.openbsd.org/cgi-bin/cvsweb/src/share/man/man4/carp.4
 
 Cheers
 
 Benedict Reuschling
 FreeBSD Documentation Committer
 
 The FreeBSD Documentation Project
 FreeBSD German Documentation Project - https://doc.bsdgroup.de
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.8 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
 
 iEYEARECAAYFAk6izO0ACgkQTSZQLkqBk0jDhACdEHauNwccMC3ZrWd8WQ0RTLyH
 N0kAnAwRwoVLhuyNzmw4t4gyzxpOLvgm
 =tm30
 -----END PGP SIGNATURE-----
Responsible-Changed-From-To: freebsd-doc->eadler 
Responsible-Changed-By: eadler 
Responsible-Changed-When: Sun Mar 4 04:31:29 UTC 2012 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=159854 
Responsible-Changed-From-To: eadler->bjk 
Responsible-Changed-By: eadler 
Responsible-Changed-When: Thu Apr 26 00:49:15 UTC 2012 
Responsible-Changed-Why:  
Punt to you 

http://www.freebsd.org/cgi/query-pr.cgi?pr=159854 
State-Changed-From-To: open->closed 
State-Changed-By: bjk 
State-Changed-When: Thu May 3 13:08:31 UTC 2012 
State-Changed-Why:  
Committed (with modifications) in r234953. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=159854 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: docs/159854: commit references a PR
Date: Thu,  3 May 2012 13:08:21 +0000 (UTC)

 Author: bjk (doc committer)
 Date: Thu May  3 13:08:11 2012
 New Revision: 234953
 URL: http://svn.freebsd.org/changeset/base/234953
 
 Log:
   Grammar and markup fixes.
   
   PR:		docs/159854
   Approved by:	hrs (mentor)
 
 Modified:
   head/share/man/man4/carp.4
 
 Modified: head/share/man/man4/carp.4
 ==============================================================================
 --- head/share/man/man4/carp.4	Thu May  3 10:38:02 2012	(r234952)
 +++ head/share/man/man4/carp.4	Thu May  3 13:08:11 2012	(r234953)
 @@ -42,8 +42,8 @@ addresses are always available.
  .Pp
  To use
  .Nm ,
 -the administrator needs to configure at minimum a common virtual host ID
 -(vhid) and attach at least one IP address to this vhid on each machine which
 +the administrator needs to configure at a minimum a common virtual host ID
 +(vhid), and attach at least one IP address to this vhid on each machine which
  is to take part in the virtual group.
  Additional parameters can also be set on a per-vhid basis:
  .Cm advbase
 @@ -72,13 +72,13 @@ Both
  and
  .Cm advskew
  are put inside CARP advertisements.
 -These configurations can be done using
 +These values can be configured using
  .Xr ifconfig 8 ,
  or through the
  .Dv SIOCSVH
  .Xr ioctl 2 .
  .Pp
 -CARP virtual hosts can be configured on multicast capable interfaces: Ethernet,
 +CARP virtual hosts can be configured on multicast-capable interfaces: Ethernet,
  layer 2 VLAN, FDDI and Token Ring.
  An arbitrary number of virtual host IDs can be configured on an interface.
  An arbitrary number of IPv4 or IPv6 addresses can be attached to a particular
 @@ -91,7 +91,7 @@ elections independently.
  .Pp
  Additionally, there are a number of global parameters which can be set using
  .Xr sysctl 8 :
 -.Bl -tag -width ".Va net.inet.carp.preempt"
 +.Bl -tag -width ".Va net.inet.carp.ifdown_demotion_factor"
  .It Va net.inet.carp.allow
  Accept incoming
  .Nm
 @@ -103,14 +103,17 @@ When enabled, a vhid in a backup state w
  is announcing itself with a lower advskew.
  Disabled by default.
  .It Va net.inet.carp.log
 -Value of 0 disables any logging.
 -Value of 1 enables logging state changes of
 +Determines what events relating to
 +.Nm
 +interfaces are logged.
 +A value of 0 disables any logging.
 +A value of 1 enables logging state changes of
  .Nm
  vhids.
  Values above 1 enable logging of bad
  .Nm
  packets.
 -Default value is 1.
 +The default value is 1.
  .It Va net.inet.carp.demotion
  This value shows current level of CARP demotion.
  The value is added to the actual advskew sent in announcements for
 @@ -123,44 +126,48 @@ running a vhid goes down, or while the
  .Xr pfsync 4
  interface is not synchronized.
  The demotion value is writable, so that user may alter it
 -depending on some external conditions, for example on status of some
 +depending on some external conditions, for example on the status of some
  daemon utility.
 -However, altering the value should be performed with care, do
 +However, altering the value should be performed with care, so as to
  not conflict with subsystems that adjust demotion factor
  automatically:
  .Nm
  and
  .Xr pfsync 4 .
  .It Va net.inet.carp.ifdown_demotion_factor
 -Value added to
 +This value is added to
  .Va net.inet.carp.demotion
 -when interface running a vhid goes down.
 -Default value is 240 (maximum advskew value).
 +when an interface running a vhid goes down.
 +The default value is 240 (the maximum advskew value).
  .It Va net.inet.carp.senderr_demotion_factor
 -Value added to
 +This value is added to
  .Va net.inet.carp.demotion
  when
  .Nm
  experiences errors sending its announcements.
 -Default value is 240 (maximum advskew value).
 +The default value is 240 (the maximum advskew value).
  .El
  .\".Sh ARP level load balancing
 -.\"The
 +.\"A
  .\".Nm
 -.\"has limited abilities for load balancing the incoming connections
 -.\"between hosts in Ethernet network.
 -.\"For load balancing operation, one needs several CARP interfaces that
 +.\"interface has limited abilities for load balancing incoming connections
 +.\"between hosts in an Ethernet network.
 +.\"For load-balancing operation, one needs several CARP interfaces that
  .\"are configured to the same IP address, but to a different vhids.
  .\"Once an ARP request is received, the CARP protocol will use a hashing
  .\"function against the source IP address in the ARP request to determine
 -.\"which vhid should this request belong to.
 -.\"If the corresponding CARP interface is in master state, the ARP request
 -.\"will be replied, otherwise it will be ignored.
 +.\"which vhid the request will be assigned to.
 +.\"If the corresponding CARP interface is the current
 +.\"master interface, a reply will
 +.\"be sent to the ARP request;
 +.\"otherwise it will be ignored.
  .\"See the
  .\".Sx EXAMPLES
  .\"section for a practical example of load balancing.
  .\".Pp
 -.\"The ARP load balancing has some limitations.
 +.\"The ARP load balancing implemented in
 +.\".Nm
 +.\"has some limitations.
  .\"First, ARP balancing only works on the local network segment.
  .\"It cannot balance traffic that crosses a router, because the
  .\"router itself will always be balanced to the same virtual host.
 @@ -170,10 +177,11 @@ Default value is 240 (maximum advskew va
  .\"is dangerous, because this creates a race condition between
  .\"balanced routers and a host they are serving.
  .\"Imagine an incoming packet creating state on the first router, being
 -.\"forwarded to its destination, and destination replying faster
 +.\"forwarded to its destination, and the destination replying faster
  .\"than the state information is packed and synced with the second router.
  .\"If the reply would be load balanced to second router, it will be
 -.\"dropped due to no state.
 +.\"dropped since the second router has not yet received information about
 +.\"the connection state.
  .Sh STATE CHANGE NOTIFICATIONS
  Sometimes it is useful to get notified about
  .Nm
 @@ -183,11 +191,12 @@ This can be accomplished by using
  hooks.
  Master/slave events are signalled under system
  .Dv CARP .
 -Subsystem specifies vhid and name of interface, where event occurred.
 -Type of the message displays new state of vhid.
 +The subsystem specifies the vhid and name of the interface where
 +the master/slave event occurred.
 +The type of the message displays the new state of the vhid.
  Please see
  .Xr devd.conf 5
 -and
 +and the
  .Sx EXAMPLES
  section for more information.
  .Sh EXAMPLES
 @@ -195,8 +204,8 @@ For firewalls and routers with multiple 
  failover all of the addresses running
  .Nm
  together, when one of the physical interfaces goes down.
 -This is achieved by the preempt option.
 -Enable it on both host A and B:
 +This is achieved by the use of the preempt option.
 +Enable it on both hosts A and B:
  .Pp
  .Dl sysctl net.inet.carp.preempt=1
  .Pp
 @@ -295,7 +304,6 @@ The
  device was imported into
  .Fx 5.4 .
  In
 -.Fx 10.0
 -the
 +.Fx 10.0 ,
  .Nm
  was significantly rewritten, and is no longer a pseudo-interface.
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
>Unformatted:
