commit 67756964129004061346ae029c792cc0213b7e70
author Scott Main <smain@google.com> Fri Jun 29 16:22:42 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Jun 29 16:22:42 2012 -0700
tree 7d03153254f46414c7d33e419a3f25ab3df234bd
parent a9c3846194b69f1bfa73066be670c9d77f6dd0d7
parent f0d68a975fc4cf0e43c94f1678a311b2ed201c92

am f0d68a97: Merge "docs: Google IO bug fixes - http://b.corp.google.com/issue?id=6756248 - http://code.google.com/p/android/issues/detail?id=33877" into jb-dev

* commit 'f0d68a975fc4cf0e43c94f1678a311b2ed201c92':
  docs: Google IO bug fixes - http://b.corp.google.com/issue?id=6756248 - http://code.google.com/p/android/issues/detail?id=33877

docs/html/tools/adk/adk2.jd

diff --git a/docs/html/tools/adk/adk2.jd b/docs/html/tools/adk/adk2.jd
index d0d8831..ee9c0d8 100644
--- a/docs/html/tools/adk/adk2.jd
+++ b/docs/html/tools/adk/adk2.jd
@@ -237,7 +237,7 @@
 <pre>
 $> mkdir android-accessories
 $> cd android-accessories
-$> repo -init -u https://android.googlesource.com/platform/manifest -b android-accessories
+$> repo init -u https://android.googlesource.com/accessories/manifest
 $> repo sync
 </pre>
   </li>

docs/html/tools/sdk/eclipse-adt.jd

diff --git a/docs/html/tools/sdk/eclipse-adt.jd b/docs/html/tools/sdk/eclipse-adt.jd
index ae3eb05..aa21423 100644
--- a/docs/html/tools/sdk/eclipse-adt.jd
+++ b/docs/html/tools/sdk/eclipse-adt.jd
@@ -130,7 +130,7 @@
       <li>Tracer for GLES
         <ul>
           <li>Added new perspective view and tools for tracing OpenGL calls for an application and
-track the visual results of each call. (<a href="{@docRoot}tools/gltracer.html">more info</a>)</li>
+track the visual results of each call. (<a href="{@docRoot}tools/help/gltracer.html">more info</a>)</li>
         </ul>
       </li>
       <li>Lint

docs/html/tools/sdk/tools-notes.jd

diff --git a/docs/html/tools/sdk/tools-notes.jd b/docs/html/tools/sdk/tools-notes.jd
index 5d9bb49..14d1aa4 100644
--- a/docs/html/tools/sdk/tools-notes.jd
+++ b/docs/html/tools/sdk/tools-notes.jd
@@ -86,11 +86,11 @@
       <ul>
         <li>Added new Device Monitor application, grouping Android debugging tools into a
 single application, including ddms, traceview, hierarchyviewer and Tracer for GLES. (<a
-href="{@docRoot}tools/gltracer.html">more info</a>)</li>
+href="{@docRoot}tools/help/gltracer.html">more info</a>)</li>
         <li>Added new System Trace new tool for tracing Android system activity. This tool allow you
 to capture a slice of system activity, plus additional information tagged from the <strong>Settings
 &gt; Developer Options &gt; Monitoring: Enable traces</strong> or with specific calls added to your
-application code. (<a href="{@docRoot}tools/systrace.html">more info</a>)</li>
+application code.</li>
         </li>
         <li>Build System
           <ul>