summaryrefslogtreecommitdiffstats
path: root/docs/html/guide/topics
diff options
context:
space:
mode:
authorCraig Mautner <cmautner@google.com>2015-03-13 00:37:32 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-13 00:37:32 +0000
commit7151b1ef4213207103a669602d6bb9502bc22a13 (patch)
treefa9c42c051f93f9de690b461b8de5d8de82bed85 /docs/html/guide/topics
parent11b6e2358aac68691f016fca07ee82be3e815f2b (diff)
parent98560bdf87ad5f97054b13d3c92954132584c7f7 (diff)
downloadframeworks_base-7151b1ef4213207103a669602d6bb9502bc22a13.zip
frameworks_base-7151b1ef4213207103a669602d6bb9502bc22a13.tar.gz
frameworks_base-7151b1ef4213207103a669602d6bb9502bc22a13.tar.bz2
am 98560bdf: am bfcc60a3: am 2825a9c6: am 470ad0fa: Merge "Correct docs to specify leading slash in paths." into lmp-docs
* commit '98560bdf87ad5f97054b13d3c92954132584c7f7': Correct docs to specify leading slash in paths.
Diffstat (limited to 'docs/html/guide/topics')
-rw-r--r--docs/html/guide/topics/manifest/data-element.jd5
1 files changed, 3 insertions, 2 deletions
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 @@ just a URI, or both a data type and a URI. A URI is specified by separate
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 @@ the filter.</dd>
<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}