commit 5be1afedd8f2289ba047473b242cd0535a4493fe
author Craig Mautner <cmautner@google.com> Fri Mar 13 00:46:51 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Mar 13 00:46:51 2015 +0000
tree ae96c8b60970d42a5649d50c0436c9d2357afbb8
parent 07e01e07bbfffa9e247a54dd96b3013de46d59e7
parent 7151b1ef4213207103a669602d6bb9502bc22a13

am 7151b1ef: am 98560bdf: am bfcc60a3: am 2825a9c6: am 470ad0fa: Merge "Correct docs to specify leading slash in paths." into lmp-docs

* commit '7151b1ef4213207103a669602d6bb9502bc22a13':
  Correct docs to specify leading slash in paths.

docs/html/guide/topics/manifest/data-element.jd

diff --git a/docs/html/guide/topics/manifest/data-element.jd b/docs/html/guide/topics/manifest/data-element.jd
index ecba508..77f16dd 100644
--- a/docs/html/guide/topics/manifest/data-element.jd
+++ b/docs/html/guide/topics/manifest/data-element.jd
@@ -24,7 +24,7 @@
 attributes for each of its parts:
 
 <p style="margin-left: 2em">
-{@code &lt;scheme>://&lt;host>:&lt;port>/[&lt;path>|&lt;pathPrefix>|&lt;pathPattern>]}</p>
+{@code &lt;scheme>://&lt;host>:&lt;port>[&lt;path>|&lt;pathPrefix>|&lt;pathPattern>]}</p>
 
 <p>
 These attributes that specify the URL format are optional, but also mutually dependent:
@@ -115,7 +115,8 @@
 <dt><a name="path"></a>{@code android:path}
 <br/>{@code android:pathPrefix}
 <br/>{@code android:pathPattern}</dt>
-<dd>The path part of a URI.  The {@code path} attribute specifies a complete
+<dd>The path part of a URI which must begin with a /.
+The {@code path} attribute specifies a complete
 path that is matched against the complete path in an Intent object.  The
 {@code pathPrefix} attribute specifies a partial path that is matched against
 only the initial part of the path in the Intent object.  The {@code pathPattern}