From 3b33cdcbf803687ea2d80931f30e8cdc958dad41 Mon Sep 17 00:00:00 2001
From: Dirk Dougherty <ddougherty@google.com>
Date: Thu, 15 Dec 2011 15:34:41 -0800
Subject: Doc merge from master:Training class on Identifying and
 Authenticating Users.

Conflicts:

	docs/html/training/id-auth/authenticate.jd
	docs/html/training/id-auth/custom_auth.jd
	docs/html/training/id-auth/identify.jd
	docs/html/training/id-auth/index.jd

Change-Id: I73174b2cb923ec5d28b551f27d0512d427616c69
---
 docs/html/training/id-auth/index.jd | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'docs/html/training/id-auth/index.jd')

diff --git a/docs/html/training/id-auth/index.jd b/docs/html/training/id-auth/index.jd
index 39ca397..00474ea 100644
--- a/docs/html/training/id-auth/index.jd
+++ b/docs/html/training/id-auth/index.jd
@@ -1,8 +1,8 @@
-page.title=Identifying Users
+page.title=Remembering Users
 
 trainingnavtop=true
 startpage=true
-next.title=Identifying Your User
+next.title=Remembering Your User
 next.link=identify.html
 
 @jd:body
@@ -39,7 +39,7 @@ make your application a richer, more personal experience.</p>
 user's identity, enabling you to:</p>
 
 <ul>
-<li>Identify the user by detecting and selecting an account
+<li>Personalize your app by remembering users by their account name(s)
 <li>Authenticate the user to make sure they are who they say they are
 <li>Gain permission to access the user's online data via services like
 the Google APIs
@@ -51,7 +51,7 @@ back-end services
 <h2>Lessons</h2>
 
 <dl>
-  <dt><b><a href="identify.html">Identifying Your User</a></b></dt>
+  <dt><b><a href="identify.html">Remembering Your User</a></b></dt>
     <dd>Use {@link android.accounts.AccountManager} to learn the user's account name(s).</dd>
 
   <dt><b><a href="authenticate.html">Authenticating to OAuth2 Services</a></b></dt>
-- 
cgit v1.1