From owner-svn-doc-all@FreeBSD.ORG  Tue Jul 17 08:20:26 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 9B2681065670;
	Tue, 17 Jul 2012 08:20:26 +0000 (UTC)
	(envelope-from loader@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8621E8FC08;
	Tue, 17 Jul 2012 08:20:26 +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 q6H8KQlS032060;
	Tue, 17 Jul 2012 08:20:26 GMT (envelope-from loader@svn.freebsd.org)
Received: (from loader@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6H8KQ7p032058;
	Tue, 17 Jul 2012 08:20:26 GMT (envelope-from loader@svn.freebsd.org)
Message-Id: <201207170820.q6H8KQ7p032058@svn.freebsd.org>
From: Fukang Chen <loader@FreeBSD.org>
Date: Tue, 17 Jul 2012 08:20:26 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
	svn-doc-head@freebsd.org
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r39226 - head/zh_CN.GB2312/articles/linux-users
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
	user&quot; , &quot; projects&quot; , and &quot;
	translations&quot; \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Jul 2012 08:20:26 -0000

Author: loader
Date: Tue Jul 17 08:20:26 2012
New Revision: 39226
URL: http://svn.freebsd.org/changeset/doc/39226

Log:
  MFen: r38826 -> r39170

Modified:
  head/zh_CN.GB2312/articles/linux-users/article.sgml

Modified: head/zh_CN.GB2312/articles/linux-users/article.sgml
==============================================================================
--- head/zh_CN.GB2312/articles/linux-users/article.sgml	Tue Jul 17 05:06:36 2012	(r39225)
+++ head/zh_CN.GB2312/articles/linux-users/article.sgml	Tue Jul 17 08:20:26 2012	(r39226)
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Chinese (Simplified) Documentation Project
 
-     Original Revision: 1.10
+     Original Revision: r39170
 -->
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
 <!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
@@ -309,7 +309,7 @@ apache22_flags="-DSSL"</programlisting>
         <emphasis>ethX</emphasis> 格式的是，&os; 
         使用驱动名字后跟一个数字来标识。下面
         &man.ifconfig.8; 的输出显示了两个 &intel;&nbsp;Pro&nbsp;1000
-        的网络接口（em0 和 em1）：</para>
+        的网络接口（<devicename>em0</devicename> 和 <devicename>em1</devicename>）：</para>
 
       <screen>&prompt.user; <userinput>ifconfig</userinput>
 em0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 1500