From owner-svn-src-all@FreeBSD.ORG  Mon Dec 14 11:15:47 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
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 C88501065670;
	Mon, 14 Dec 2009 11:15:47 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B75F18FC16;
	Mon, 14 Dec 2009 11:15:47 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nBEBFllN024691;
	Mon, 14 Dec 2009 11:15:47 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBEBFlMO024689;
	Mon, 14 Dec 2009 11:15:47 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <200912141115.nBEBFlMO024689@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Mon, 14 Dec 2009 11:15:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r200506 - stable/8/sys/netinet
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 &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 14 Dec 2009 11:15:47 -0000

Author: rwatson
Date: Mon Dec 14 11:15:47 2009
New Revision: 200506
URL: http://svn.freebsd.org/changeset/base/200506

Log:
  Merge r198393 from head to stable/8:
  
    Improve grammar in ip_input comment while attempting to maintain what
    might be its meaning.
  
  (Note, merge of the revision correcting a spelling error in this commit
  will follow as well!)

Modified:
  stable/8/sys/netinet/ip_input.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/netinet/ip_input.c
==============================================================================
--- stable/8/sys/netinet/ip_input.c	Mon Dec 14 11:08:21 2009	(r200505)
+++ stable/8/sys/netinet/ip_input.c	Mon Dec 14 11:15:47 2009	(r200506)
@@ -530,8 +530,8 @@ tooshort:
 	}
 	if ((dchg = (m_tag_find(m, PACKET_TAG_IPFORWARD, NULL) != NULL)) != 0) {
 		/*
-		 * Directly ship on the packet.  This allows to forward
-		 * packets that were destined for us to some other directly
+		 * Directly ship the packet on.  This allows forwarding
+		 * packets originally destined to us to ome other directly
 		 * connected host.
 		 */
 		ip_forward(m, dchg);