diff options
| author | Scott Main <smain@google.com> | 2013-09-16 13:11:07 -0700 |
|---|---|---|
| committer | Scott Main <smain@google.com> | 2013-09-16 14:25:18 -0700 |
| commit | 2d006d2fb2d053392324769971c3a10d8ad93ac4 (patch) | |
| tree | 77f70444300a3c1b480d5ddc14f3500ab3955ac7 /docs/html/training | |
| parent | 1294a8f9a2ccc4e19d218dbe8645ddac533706d8 (diff) | |
| download | frameworks_base-2d006d2fb2d053392324769971c3a10d8ad93ac4.zip frameworks_base-2d006d2fb2d053392324769971c3a10d8ad93ac4.tar.gz frameworks_base-2d006d2fb2d053392324769971c3a10d8ad93ac4.tar.bz2 | |
more string changes for wi-fi trademark compliance
Change-Id: Iee87c7d627e724f212d4a378815a77ff056d0dec
Diffstat (limited to 'docs/html/training')
4 files changed, 5 insertions, 10 deletions
diff --git a/docs/html/training/connect-devices-wirelessly/nsd-wifi-direct.jd b/docs/html/training/connect-devices-wirelessly/nsd-wifi-direct.jd index 8dc5fd9..5c1321e 100644 --- a/docs/html/training/connect-devices-wirelessly/nsd-wifi-direct.jd +++ b/docs/html/training/connect-devices-wirelessly/nsd-wifi-direct.jd @@ -1,7 +1,4 @@ page.title=Using Wi-Fi P2P for Service Discovery -parent.title=Connecting Devices Wirelessly -parent.link=index.html - trainingnavtop=true @jd:body diff --git a/docs/html/training/connect-devices-wirelessly/nsd.jd b/docs/html/training/connect-devices-wirelessly/nsd.jd index 30f5c49..e07e2af 100644 --- a/docs/html/training/connect-devices-wirelessly/nsd.jd +++ b/docs/html/training/connect-devices-wirelessly/nsd.jd @@ -1,10 +1,6 @@ page.title=Using Network Service Discovery -parent.title=Connecting Devices Wirelessly -parent.link=index.html trainingnavtop=true -next.title=Connecting with Wi-Fi Direct -next.link=wifi-direct.html @jd:body diff --git a/docs/html/training/connect-devices-wirelessly/wifi-direct.jd b/docs/html/training/connect-devices-wirelessly/wifi-direct.jd index 98435c6..d67ed23 100644 --- a/docs/html/training/connect-devices-wirelessly/wifi-direct.jd +++ b/docs/html/training/connect-devices-wirelessly/wifi-direct.jd @@ -23,8 +23,10 @@ trainingnavtop=true </div> <p>The Wi-Fi peer-to-peer (P2P) APIs allow applications to connect to nearby devices without -needing to connect to a network or hotspot (Android's Wi-Fi P2P framework complies with the Wi-Fi -Alliance's Wi-Fi Direct™ certification program). Wi-Fi P2P allows your application to quickly +needing to connect to a network or hotspot (Android's Wi-Fi P2P framework complies with the +<a href="http://www.wi-fi.org/discover-and-learn/wi-fi-direct" + class="external-link">Wi-Fi Direct™</a> certification program). + Wi-Fi P2P allows your application to quickly find and interact with nearby devices, at a range beyond the capabilities of Bluetooth. </p> <p> diff --git a/docs/html/training/training_toc.cs b/docs/html/training/training_toc.cs index 0c4f9df..8c2752e 100644 --- a/docs/html/training/training_toc.cs +++ b/docs/html/training/training_toc.cs @@ -418,7 +418,7 @@ include the action bar on devices running Android 2.1 or higher." </a> </li> <li><a href="<?cs var:toroot ?>training/connect-devices-wirelessly/nsd-wifi-direct.html"> - Using Wi-Fi Direct for Service Discovery + Using Wi-Fi P2P for Service Discovery </a> </li> </ul> |