diff options
author | Craig Mautner <cmautner@google.com> | 2015-03-13 00:17:36 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-13 00:17:36 +0000 |
commit | 2825a9c618840c1cf3d59806a794674f12a7c7c6 (patch) | |
tree | 32b6a047a6a358f97d60d0cdef889579d6e0b600 | |
parent | 7256fb4fdd088cd0a827452cbdd8bd243da00881 (diff) | |
parent | 470ad0fa1c0a4047c0a4c3d132a9ec3106e447ba (diff) | |
download | frameworks_base-2825a9c618840c1cf3d59806a794674f12a7c7c6.zip frameworks_base-2825a9c618840c1cf3d59806a794674f12a7c7c6.tar.gz frameworks_base-2825a9c618840c1cf3d59806a794674f12a7c7c6.tar.bz2 |
am 470ad0fa: Merge "Correct docs to specify leading slash in paths." into lmp-docs
* commit '470ad0fa1c0a4047c0a4c3d132a9ec3106e447ba':
Correct docs to specify leading slash in paths.
-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} |