Merge "docs: update auth doc to mention multiple scopes bug 7644251" into jb-mr1-dev
diff --git a/docs/html/google/play-services/auth.jd b/docs/html/google/play-services/auth.jd
index 3f46c3f..8e11131 100644
--- a/docs/html/google/play-services/auth.jd
+++ b/docs/html/google/play-services/auth.jd
@@ -57,7 +57,12 @@
</pre>
<h2 id="obtain">Obtaining an Access Token</h2>
<p>
- With an email address, you can now obtain an access token. There are two general
+ With an email address and the service scope you can now obtain an access token.
+</p>
+<p class="note"><strong>Note:</strong> Specify <code>"oauth2:<em>scope</em>"</code> for a single scope or
+ <code>"oauth2:<em>scope1</em> <em>scope2</em> <em>scope3</em>"</code> for multiple scopes.</p>
+
+There are two general
ways to get a token:</p>
<ul>
@@ -73,6 +78,7 @@
<h3>Using getToken()</h3>
The following code snippet obtains an access token with an email address, the scope that you want to use for the service, and a {@link android.content.Context}:
+
<pre>
HelloActivity mActivity;
String mEmail;