From owner-svn-src-stable-10@FreeBSD.ORG  Mon Feb 10 22:24:49 2014
Return-Path: <owner-svn-src-stable-10@FreeBSD.ORG>
Delivered-To: svn-src-stable-10@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E3933757;
 Mon, 10 Feb 2014 22:24:49 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id CC5CC10A9;
 Mon, 10 Feb 2014 22:24:49 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1AMOnEf047132;
 Mon, 10 Feb 2014 22:24:49 GMT
 (envelope-from brueffer@svn.freebsd.org)
Received: (from brueffer@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1AMOnis047131;
 Mon, 10 Feb 2014 22:24:49 GMT
 (envelope-from brueffer@svn.freebsd.org)
Message-Id: <201402102224.s1AMOnis047131@svn.freebsd.org>
From: Christian Brueffer <brueffer@FreeBSD.org>
Date: Mon, 10 Feb 2014 22:24:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r261731 - stable/10/share/man/man4
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Feb 2014 22:24:50 -0000

Author: brueffer
Date: Mon Feb 10 22:24:49 2014
New Revision: 261731
URL: http://svnweb.freebsd.org/changeset/base/261731

Log:
  MFC: r261339
  
  MLINK ixgbe.4 to {if_ix.4, ix.4}.  An update for ixgbe.4
  which deals with the "ix prefix being shared by two drivers"
  situation is forthcoming.

Modified:
  stable/10/share/man/man4/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/share/man/man4/Makefile
==============================================================================
--- stable/10/share/man/man4/Makefile	Mon Feb 10 22:21:22 2014	(r261730)
+++ stable/10/share/man/man4/Makefile	Mon Feb 10 22:24:49 2014	(r261731)
@@ -635,6 +635,8 @@ MLINKS+=ipw.4 if_ipw.4
 MLINKS+=iwi.4 if_iwi.4
 MLINKS+=iwn.4 if_iwn.4
 MLINKS+=ixgb.4 if_ixgb.4
+MLINKS+=ixgbe.4 ix.4
+MLINKS+=ixgbe.4 if_ix.4
 MLINKS+=ixgbe.4 if_ixgbe.4
 MLINKS+=jme.4 if_jme.4
 MLINKS+=kue.4 if_kue.4