From cedbf100750365c7650db98142a88b7b065d843f Mon Sep 17 00:00:00 2001
From: Gavin Atkinson <gavin@FreeBSD.org>
Date: Mon, 29 Sep 2014 18:04:35 +0000
Subject: [PATCH] Pad out the section on tethering, and clarify which device is
 likely to be needed for iPhones/iPads, Android devices, and older devices.

Change the "kldload" examples to use "if_foo" rather than "foo" as only
the former works on 9.x.
---
 .../handbook/advanced-networking/chapter.xml  | 20 ++++++++++++++++---
 en_US.ISO8859-1/books/handbook/book.xml       |  1 +
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml b/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml
index adeea62553..3f64f3707a 100644
--- a/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml
@@ -2248,15 +2248,29 @@ freebsdap       00:11:95:c3:0d:ac    1   54M 22:1   100 EPS</screen>
     <para>Many cellphones provide the option to share their data
       connection over USB (often called "tethering").  This feature
       uses either the <acronym>RNDIS</acronym>, <acronym>CDC</acronym>
-      or a custom <trademark class="registered">iPhone</trademark>
+      or a custom &apple; &iphone;/&ipad;
       protocol.</para>
 
+    <itemizedlist>
+      <listitem>
+	<para>&android; devices generally use the &man.urndis.4; driver.</para>
+      </listitem>
+
+      <listitem>
+	<para>&apple; devices use the &man.ipheth.4; driver.</para>
+      </listitem>
+
+      <listitem>
+	<para>Older devices will often use the &man.cdce.4; driver.</para>
+      </listitem>
+    </itemizedlist>
+
     <para>Before attaching a device, load the appropriate driver
       into the kernel:</para>
 
     <screen>&prompt.root; <userinput>kldload if_urndis
-&prompt.root; kldload cdce
-&prompt.root; kldload ipheth</userinput></screen>
+&prompt.root; kldload if_cdce
+&prompt.root; kldload if_ipheth</userinput></screen>
 
     <para>Once the device is attached
       <literal>ue</literal><replaceable>0</replaceable> will be
diff --git a/en_US.ISO8859-1/books/handbook/book.xml b/en_US.ISO8859-1/books/handbook/book.xml
index 1b26ce9a86..f8bb63e6c4 100644
--- a/en_US.ISO8859-1/books/handbook/book.xml
+++ b/en_US.ISO8859-1/books/handbook/book.xml
@@ -63,6 +63,7 @@
       &tm-attrib.adobe;
       &tm-attrib.apple;
       &tm-attrib.creative;
+      &tm-attrib.google;
       &tm-attrib.heidelberger;
       &tm-attrib.ibm;
       &tm-attrib.ieee;