diff options
| author | Craig Mautner <cmautner@google.com> | 2015-03-13 00:29:21 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-13 00:29:21 +0000 |
| commit | 98560bdf87ad5f97054b13d3c92954132584c7f7 (patch) | |
| tree | 0a55020329bb0a2a205839a8c8f6dc256ff05358 /docs/html/guide/topics | |
| parent | db56b5a681b097f7649937e8ad4d73c1e560fb3b (diff) | |
| parent | bfcc60a3f03ff25dccb5277626da213b1e254ccd (diff) | |
| download | frameworks_base-98560bdf87ad5f97054b13d3c92954132584c7f7.zip frameworks_base-98560bdf87ad5f97054b13d3c92954132584c7f7.tar.gz frameworks_base-98560bdf87ad5f97054b13d3c92954132584c7f7.tar.bz2 | |
am bfcc60a3: am 2825a9c6: am 470ad0fa: Merge "Correct docs to specify leading slash in paths." into lmp-docs
* commit 'bfcc60a3f03ff25dccb5277626da213b1e254ccd':
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.jd | 5 |
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 <scheme>://<host>:<port>/[<path>|<pathPrefix>|<pathPattern>]}</p> +{@code <scheme>://<host>:<port>[<path>|<pathPrefix>|<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} |