From 60a907e60c70d9d3807a4cea234ea87b324f03e8 Mon Sep 17 00:00:00 2001
From: Craig Mautner <cmautner@google.com>
Date: Thu, 5 Mar 2015 09:11:55 -0800
Subject: Correct docs to specify leading slash in paths.

The guide documentation for the manifest data element contains a
grammar that implies leading slashes are not required for the path
part of a URI string. Also the path documentation does not mention
the need for a leading slash.

Grammar from documentation:
<scheme>://<host>:<port>/[<path>|<pathPrefix>|<pathPattern>]
                        ^
                        |
Included "/" -----------+

All internal usages of path, pathPrefix, and pathPattern, have a /
starting out the string and these attributes don't work without that
/.

This change updates the grammar and the documentation for the path
attributes.

Fixes bug 19540035

Change-Id: I931a25fd1c10c01eaa32a7cfa82cca256b129efb
---
 docs/html/guide/topics/manifest/data-element.jd | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'docs/html/guide/topics')

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}
-- 
cgit v1.1