Copy head@r302406 to stable/11 as part of the 11.0-RELEASE cycle.
Prune svn:mergeinfo from the new branch, as nothing has been merged
here.

Additional commits post-branch will follow.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

use .Mt to mark up email addresses consistently (final part)

PR: 191174
Submitted by: Franco Fichtner <franco at lastsummer.de>

mdoc: Avoid playing tricks with Ns: If Nm is present in the SYNOPSIS section,
it will be output on its own line. Ns cancels this effect however. This change
is also consistent with the rest of our manual pages.

- move steps describing how to gain ipdivert support to SYNOPSIS and
follow the style of other section 4 manual pages
- add ipfw(4) to SEE ALSO section

Reviewed by: ru
Approved by: trhodes (mentor), keramida (mentor)

Expand contractions.

Expand *n't contractions.

Sort sections.

Scheduled mdoc(7) sweep.

Bump .Dd

Reminded by: ru

Note that send(2) is no longer applicable to divert(4) sockets.

Noticed by: Dmitry Dvoinikov
Wording by: cperciva
MFC after: 3 days

Refuse to unload the ipdivert module unless the 'force' flag is given to kldunload.

Reflect the fact that IPDIVERT is a loadable module in the divert(4) and ipfw(8)
man pages.

Be explicit that packets passed from a 'ipfw tee' action will not be reassembled.

Prodded by: ru

Mechanically kill hard sentence breaks and double whitespaces.

Correct to match reality regarding interface names.

PR: 51006
Submitted by: "Dmitry Pryanishnikov" <dmitry@atlantis.dp.ua>
mdoc clue by: "Simon L. Nielsen" <simon@nitro.dk>
MFC after: 10 days

Hiten's patchset for section four manpages, slightly edited by me.

Fix syntax error.

mdoc(7) police: Use the new .In macro for #include statements.

mdoc(7) police: join split punctuation to macro calls.

mdoc(7) police:

Avoid using parenthesis enclosure macros (.Pq and .Po/.Pc) with plain text.
Not only this slows down the mdoc(7) processing significantly, but it also
has an undesired (in this case) effect of disabling hyphenation within the
entire enclosed block.

mdoc(7) police: removed HISTORY info from the .Os call.

mdoc(7) police: remove extraneous .Pp before and/or after .Sh.

Note that packets read as outgoing have invalid IP header checksums.

Use Fx macro wherever possible.

Update @freebsd.org email addresses to @FreeBSD.org as is the
precedent.

Change archie's and my email addresses from Whistle.com to FreeBSD.org

Simple -mdoc fixes.

Remove single-space hard sentence breaks. These degrade the quality
of the typeset output, tend to make diffs harder to read and provide
bad examples for new-comers to mdoc.

Minor display fix.

$Id$ -> $FreeBSD$

Make the Man page reflect teh new reality.

Hide the interface name in the sin_zero section of the sockaddr_in
passed to the user process for incoming packets. When the sockaddr_in
is passed back to the divert socket later, use thi sas the primary
interface lookup and only revert to the IP address when the name fails.
This solves a long standing bug with divert sockets:
When two interfaces had the same address (P2P for example) the interface
"assigned" to the reinjected packet was sometimes incorect.
Probably we should define a "sockaddr_div" to officially hold this
extended information in teh same manner as sockaddr_dl.

.Sh AUTHOR -> .Sh AUTHORS according to mdoc specs.
Use .An/.Aq.

Update the LOOP AVOIDANCE section to reflect reality.
Requested by: Archie Cobbs <archie@whistle.com>

Fixed missing #include(s) (mostly of <sys/types.h> in synopsis).

Reviewed by: wollman

Revert $FreeBSD$ back to $Id$

Incoming packets no longer have their ip_sum zero'd

Make the long-awaited change from $Id$ to $FreeBSD$

This will make a number of things easier in the future, as well as (finally!)
avoiding the Id-smashing problem which has plagued developers for so long.

Boy, I'm glad we're not using sup anymore. This update would have been
insane otherwise.

Sort cross references.

Minor formatting/style fixes.

Submitted by: Sandro Sigala <sandro@cat.local.net> as part of PR # 2134

Fix some spelling errors.

Adding changes to ipfw and the kernel to support ip packet diversion..
This stuff should not be too destructive if the IPDIVERT is not compiled in..
be aware that this changes the size of the ip_fw struct
so ipfw needs to be recompiled to use it.. more changes coming to clean this up.