Merge "Docs: Fixes broken links for N-Preview site." into mnc-mr-docs

3 files changed, 13 insertions, 11 deletions

diff --git a/docs/html/preview/behavior-changes.jd b/docs/html/preview/behavior-changes.jd
index 6873c92ce977..b64f3bbb17ae 100644
--- a/docs/html/preview/behavior-changes.jd
+++ b/docs/html/preview/behavior-changes.jd
@@ -107,7 +107,7 @@ page.image=images/cards/card-n-changes_2x.png
   removes these processing restrictions. The additional behavior does not
   affect recommendations and best practices in adapting your app to the prior
   version of Doze introduced in Android 6.0 (API level 23), as discussed in
-  <a href="{@docRoot}/training/monitoring-device-state/doze-standby.html">
+  <a href="{@docRoot}training/monitoring-device-state/doze-standby.html">
   Optimizing for Doze and App Standby</a>. You should still
   follow those recommendations, such as using Google Cloud Messaging (GCM) to
   send and receive messages, and start planning updates to accomodate the
diff --git a/docs/html/preview/features/security-config.jd b/docs/html/preview/features/security-config.jd
index 34860bf81a7e..92d98b4a1a9f 100644
--- a/docs/html/preview/features/security-config.jd
+++ b/docs/html/preview/features/security-config.jd
@@ -170,8 +170,9 @@ page.keywords=preview,security,network
 <p>
   Add the trusted CAs, in PEM or DER format, to {@code res/raw/trusted_roots}.
   Note that if using PEM format the file must contain <em>only</em> PEM data
-  and no extra text. You can also provide multiple <a href=
-  "certificates"><code>&lt;certificates&gt;</code></a> elements instead of one.
+  and no extra text. You can also provide multiple
+  <a href="#certificates"><code>&lt;certificates&gt;</code></a>
+elements instead of one.
 </p>
 
 
@@ -210,7 +211,8 @@ page.keywords=preview,security,network
   certificate for your production server. In order to support this without any
   modification to your app's code you can specify debug-only CAs that
   are <i>only</i> trusted when <a href=
-  "{@docRoot}guide/topics/manifest/app-element.html#debug">android:debuggable</a>
+  "{@docRoot}guide/topics/manifest/application-element.html#debug">
+android:debuggable</a>
   is {@code true} by using {@code debug-overrides}. Normally IDEs and build
   tools set this flag automatically for non-release builds.
 </p>
@@ -567,13 +569,13 @@ matching domain rule is used.</p></dd>
 
   <dd>
     Overrides to be applied when <a href=
-    "{@docRoot}guide/topics/manifest/app-element.html#debug">android:debuggable</a>
+    "{@docRoot}guide/topics/manifest/application-element.html#debug">android:debuggable</a>
     is {@code "true"} which is normally the case for non-release builds
     generated by IDEs and build tools. Trust anchors specified in {@code
     debug-overrides} are added to all other configurations and certificate
     pinning is not performed when the server's certificate chain uses one of
     these debug-only trust anchors. If <a href=
-    "{@docRoot}guide/topics/manifest/app-element.html#debug">android:debuggable</a>
+    "{@docRoot}guide/topics/manifest/application-element.html#debug">android:debuggable</a>
     is {@code "false"} then this section is completely ignored.
   </dd>
 </dl>
diff --git a/docs/html/preview/overview.jd b/docs/html/preview/overview.jd
index 39eb8e0ecf42..07e6be1aea48 100644
--- a/docs/html/preview/overview.jd
+++ b/docs/html/preview/overview.jd
@@ -203,7 +203,7 @@ page.tags="preview", "developer", "android"
 <p>
   We’ll notify you when preview updates are available via the <a href=
   "http://android-developers.blogspot.com/">Android Developers Blog</a>, as
-  well as this site and the <a href="https://developer.android.com/preview/dev-community">Android
+  well as this site and the <a href="{@docRoot}preview/dev-community">Android
   N Developer Community</a>.
 </p>
 
@@ -361,11 +361,11 @@ Android N</a> has
 <ul>
   <li> <a href="https://code.google.com/p/android-developer-preview/">N Developer Preview Issue
     Tracker</a> is your <strong>primary feedback channel.</strong> You can report bugs, performance
-    issues, and general feedback through the issue tracker. You can also check for <a
-    href="https://code.google.com/p/android-developer-preview/wiki/KnownIssues">known issues</a> and
+    issues, and general feedback through the issue tracker. You can also check for
+<a href="{@docRoot}preview/bug">known issues</a> and
     find workaround steps. We’ll keep you updated on your issue as it’s triaged and sent to
     the Android engineering team for review. </li>
-  <li> The <a href="https://developer.android.com/preview/dev-community">Android N Developer Community</a> is
+  <li> The <a href="{@docRoot}preview/dev-community">Android N Developer Community</a> is
     a Google+ community where you can <strong>connect with other developers</strong>working with
     Android N. You can share observations or ideas or find answers to
     questions about Android N. We’ll moderate the community and provide answers and
@@ -436,7 +436,7 @@ Android N</a> has
   <li> Review the <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API Reference</a>
   and <a href="{@docRoot}preview/samples.html">Android N samples</a> to gain more
   insight into new API features and how to use them in your app.
-  <li> Join the <a href="https://developer.android.com/preview/dev-community">Android N
+  <li> Join the <a href="{@docRoot}preview/dev-community">Android N
   Developer Community</a> to get the latest news and connect with other
   developers working with the new platform.</li>
 </ol>