From 04c0d1d7dd1ce7d599fab311045de3da6b4891c3 Mon Sep 17 00:00:00 2001
From: Andrew Solovay <asolovay@google.com>
Date: Wed, 28 Oct 2015 13:32:36 -0700
Subject: [PATCH] docs: Fixed name of uses-permission-sdk-23

Docs had incorrectly said the element was named
<uses-permission-sdk23> (missing a hyphen in sdk-23). Fixing all
references to that element, and renaming the reference page
accordingly. A separate CL sets up a redirect from the old page
name to the new one.

See first comment for doc stage location.

Change-Id: I6e675e03f87851d36465a8fdf3de730de524c4a8
bug: 25346975
---
 docs/html/guide/guide_toc.cs                              | 2 +-
 docs/html/guide/topics/manifest/manifest-element.jd       | 2 +-
 .../html/guide/topics/manifest/uses-permission-element.jd | 4 ++--
 ...sdk23-element.jd => uses-permission-sdk-23-element.jd} | 8 ++++----
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename docs/html/guide/topics/manifest/{uses-permission-sdk23-element.jd => uses-permission-sdk-23-element.jd} (92%)

diff --git a/docs/html/guide/guide_toc.cs b/docs/html/guide/guide_toc.cs
index fa80dd5e8de48..780f7c4c9fbfb 100644
--- a/docs/html/guide/guide_toc.cs
+++ b/docs/html/guide/guide_toc.cs
@@ -183,7 +183,7 @@
       <li><a href="<?cs var:toroot ?>guide/topics/manifest/uses-feature-element.html">&lt;uses-feature&gt;</a></li> <!-- ##api level 4## -->
       <li><a href="<?cs var:toroot ?>guide/topics/manifest/uses-library-element.html">&lt;uses-library&gt;</a></li>
       <li><a href="<?cs var:toroot ?>guide/topics/manifest/uses-permission-element.html">&lt;uses-permission&gt;</a></li>
-      <li><a href="<?cs var:toroot ?>guide/topics/manifest/uses-permission-sdk23-element.html">&lt;uses-permission-sdk23&gt;</a></li>
+      <li><a href="<?cs var:toroot ?>guide/topics/manifest/uses-permission-sdk-23-element.html">&lt;uses-permission-sdk-23&gt;</a></li>
       <li><a href="<?cs var:toroot ?>guide/topics/manifest/uses-sdk-element.html">&lt;uses-sdk&gt;</a></li>
     </ul>
   </li><!-- end of the manifest file -->
diff --git a/docs/html/guide/topics/manifest/manifest-element.jd b/docs/html/guide/topics/manifest/manifest-element.jd
index 4eb32cb0616c8..5968548a5d3eb 100644
--- a/docs/html/guide/topics/manifest/manifest-element.jd
+++ b/docs/html/guide/topics/manifest/manifest-element.jd
@@ -35,7 +35,7 @@ parent.link=manifest-intro.html
 <br/><code><a href="{@docRoot}guide/topics/manifest/uses-configuration-element.html">&lt;uses-configuration&gt;</a></code>  <!-- ##api level 3## -->
 <br/><code><a href="{@docRoot}guide/topics/manifest/uses-feature-element.html">&lt;uses-feature&gt;</a></code>
 <br/><code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html">&lt;uses-permission&gt;</a></code>
-<br/><code><a href="{@docRoot}guide/topics/manifest/uses-permission-sdk23-element.html">&lt;uses-permission-sdk23&gt;</a></code>
+<br/><code><a href="{@docRoot}guide/topics/manifest/uses-permission-sdk-23-element.html">&lt;uses-permission-sdk-23&gt;</a></code>
 <br/><code><a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html">&lt;uses-sdk&gt;</a></code></dd>
 
 <p>
diff --git a/docs/html/guide/topics/manifest/uses-permission-element.jd b/docs/html/guide/topics/manifest/uses-permission-element.jd
index 38432bf71251e..32fe21eb89ea7 100644
--- a/docs/html/guide/topics/manifest/uses-permission-element.jd
+++ b/docs/html/guide/topics/manifest/uses-permission-element.jd
@@ -97,8 +97,8 @@ permission is needed only up to API level 18 with a declaration such as this:
 <dd>
 <ul>
   <li><code><a href="{@docRoot}guide/topics/manifest/permission-element.html">&lt;permission&gt;</a></code></li>
-  <li><a href="uses-permission-sdk23-element.html"
-      ><code>&lt;uses-permission-sdk23&gt;</code></a></li>
+  <li><a href="uses-permission-sdk-23-element.html"
+      ><code>&lt;uses-permission-sdk-23&gt;</code></a></li>
   <li><code><a href="{@docRoot}guide/topics/manifest/uses-feature-element.html">&lt;uses-feature&gt;</a></code></li>
 </ul>
 </dd>
diff --git a/docs/html/guide/topics/manifest/uses-permission-sdk23-element.jd b/docs/html/guide/topics/manifest/uses-permission-sdk-23-element.jd
similarity index 92%
rename from docs/html/guide/topics/manifest/uses-permission-sdk23-element.jd
rename to docs/html/guide/topics/manifest/uses-permission-sdk-23-element.jd
index 0b71ed6a1fcb2..ff45499850052 100644
--- a/docs/html/guide/topics/manifest/uses-permission-sdk23-element.jd
+++ b/docs/html/guide/topics/manifest/uses-permission-sdk-23-element.jd
@@ -1,5 +1,5 @@
-page.title=&lt;uses-permission-sdk23&gt;
-page.tags="uses-permission-sdk23","permissions"
+page.title=&lt;uses-permission-sdk-23&gt;
+page.tags="uses-permission-sdk-23","permissions","uses-permission-sdk23"
 parent.title=The AndroidManifest.xml File
 parent.link=manifest-intro.html
 @jd:body
@@ -7,7 +7,7 @@ parent.link=manifest-intro.html
 <dl class="xml">
 
 <dt>syntax:</dt>
-<dd><pre class="stx">&lt;uses-permission-sdk23 android:<a href="#nm">name</a>="<i>string</i>"
+<dd><pre class="stx">&lt;uses-permission-sdk-23 android:<a href="#nm">name</a>="<i>string</i>"
         android:<a href="#maxSdk">maxSdkVersion</a>="<i>integer</i>" /&gt;</pre></dd>
 
 <dt>Contained in:</dt>
@@ -31,7 +31,7 @@ parent.link=manifest-intro.html
   update. If a new feature is minor enough, you may prefer to disable
   the feature altogether on those devices, so the user does not have to grant
   additional permissions to update the app. By using the
-  <code>&lt;uses-permission-sdk23&gt;</code> element instead of <a href=
+  <code>&lt;uses-permission-sdk-23&gt;</code> element instead of <a href=
   "uses-permission-element.html"><code>&lt;uses-permission&gt;</code></a>,
   you can request the permission <em>only</em> if the app is running on
   platforms that support the runtime permissions model, in which the user