am 479a49f7: am 7585586c: Merge change Ib1eb2e9e into eclair

Merge commit '479a49f74f77855825ba69b105c065422c24246a'

* commit '479a49f74f77855825ba69b105c065422c24246a':
  sdk doc change for esr: Add "resources" tab content. Fix links pointing to the old locations. Change Android.mk to output samples files to resources/samples. Misc other fixes.

21 files changed, 40 insertions, 118 deletions

diff --git a/docs/html/guide/basics/what-is-android.jd b/docs/html/guide/basics/what-is-android.jd
index 668e62e..9393fab 100644
--- a/docs/html/guide/basics/what-is-android.jd
+++ b/docs/html/guide/basics/what-is-android.jd
@@ -64,7 +64,7 @@ to be replaced by the user.</p>
 <p>Underlying all applications is a set of services and systems, including:
 <ul>
     <li>A rich and extensible set of <a
-    href="{@docRoot}guide/tutorials/views/index.html">Views</a> that can be used to
+    href="{@docRoot}resources/tutorials/views/index.html">Views</a> that can be used to
     build an application, including lists, grids, text boxes, buttons, and even
     an embeddable web browser</li>
     <li><a href="{@docRoot}guide/topics/providers/content-providers.html">Content
@@ -80,7 +80,7 @@ to be replaced by the user.</p>
 </ul>
 
 <p>For more details and a walkthrough of an application, see the <a
-href="{@docRoot}guide/tutorials/notepad/index.html">Notepad Tutorial</a>.</p>
+href="{@docRoot}resources/tutorials/notepad/index.html">Notepad Tutorial</a>.</p>
     
 <a name="libraries" id="libraries"></a>
 <h2>Libraries</h2>
diff --git a/docs/html/guide/developing/debug-tasks.jd b/docs/html/guide/developing/debug-tasks.jd
index 6b7c27a..3279741 100644
--- a/docs/html/guide/developing/debug-tasks.jd
+++ b/docs/html/guide/developing/debug-tasks.jd
@@ -60,7 +60,7 @@ D/ActivityManager( 763): Stopping: HistoryRecord{409dbb20 com.android.home.AllAp
         that expose useful information such as CPU usage and frame rate. See <a href="#additionaldebugging">Debug
         and Test Settings on the Emulator</a> below. </li>
 </ul>
-<p>Also, see the <a href="{@docRoot}guide/appendix/faq/troubleshooting.html">Troubleshooting</a> section
+<p>Also, see the <a href="{@docRoot}resources/faq/troubleshooting.html">Troubleshooting</a> section
     of the doc to figure out why your application isn't appearing on the emulator,
     or why it's not starting. </p>
 
diff --git a/docs/html/guide/developing/tools/adt.jd b/docs/html/guide/developing/tools/adt.jd
index 219be67..eb7ad4f 100644
--- a/docs/html/guide/developing/tools/adt.jd
+++ b/docs/html/guide/developing/tools/adt.jd
@@ -105,7 +105,7 @@ Eclipse components (for example, WST). If you encounter an error when
 installing ADT, your Eclipse installation might not include those components. 
 For information about how to quickly add the necessary components to your 
 Eclipse installation, see the troubleshooting topic 
-<a href="{@docRoot}guide/appendix/faq/troubleshooting.html#installeclipsecomponents">ADT Installation Error: "requires plug-in org.eclipse.wst.sse.ui"</a>.</p>
+<a href="{@docRoot}resources/faq/troubleshooting.html#installeclipsecomponents">ADT Installation Error: "requires plug-in org.eclipse.wst.sse.ui"</a>.</p>
 
 <h4>For Linux users</h4>
 <p>If you encounter this error when installing the ADT Plugin for Eclipse: 
diff --git a/docs/html/guide/developing/tools/emulator.jd b/docs/html/guide/developing/tools/emulator.jd
index 43f9271..507353e 100644
--- a/docs/html/guide/developing/tools/emulator.jd
+++ b/docs/html/guide/developing/tools/emulator.jd
@@ -1754,7 +1754,7 @@ to the current working directory): </p>
 <p>For emulators running on Mac OS X, if you see an error &quot;Warning: No DNS servers found&quot; when starting the emulator, check to see whether you have an <code>/etc/resolv.conf</code> file. If not, please run the following line in a command window:</p>
     <pre>ln -s /private/var/run/resolv.conf /etc/resolv.conf</pre>
 
-<p>See <a href="{@docRoot}guide/appendix/faq/index.html">Frequently Asked Questions</a> for more troubleshooting information. </p>
+<p>See <a href="{@docRoot}resources/faq/index.html">Frequently Asked Questions</a> for more troubleshooting information. </p>
 
 <a name="limitations"></a>
     <h2>Emulator Limitations</h2>
diff --git a/docs/html/guide/guide_toc.cs b/docs/html/guide/guide_toc.cs
index c99d61c..13d752a 100644
--- a/docs/html/guide/guide_toc.cs
+++ b/docs/html/guide/guide_toc.cs
@@ -363,81 +363,6 @@
           </a></li>
     </ul>
   </li>
-  
-  <li>
-    <h2><span class="en">Tutorials and Sample Code</span>
-               <span class="de" style="display:none">Lernprogramme und Beispielcode</span>
-               <span class="es" style="display:none">Tutoriales y código de ejemplo</span>
-               <span class="fr" style="display:none">Didacticiels et exemple de code</span>
-               <span class="it" style="display:none">Esercitazioni e codice di esempio</span>
-               <span class="ja" style="display:none">チュートリアルとサンプル コード</span>
-               <span class="zh-CN" style="display:none">辅导手册和示例代码</span>
-               <span class="zh-TW" style="display:none">教學課程與程式碼範例</span>
-    </h2>
-    <ul>
-      <li><a href="<?cs var:toroot ?>guide/tutorials/hello-world.html">
-            <span class="en">Hello World</span>
-          </a></li>
-      <li><a href="<?cs var:toroot ?>guide/tutorials/views/index.html">
-            <span class="en">Hello Views</span>
-          </a></li>
-      <li><a href="<?cs var:toroot ?>guide/tutorials/localization/index.html">
-            <span class="en">Hello Localization</span>
-          </a></li>
-      <li><a href="<?cs var:toroot ?>guide/tutorials/notepad/index.html">
-            <span class="en">Notepad Tutorial</span>
-          </a></li>
-    </ul>
-    <ul>
-      <li class="toggle-list">
-        <div><a href="<?cs var:toroot ?>guide/samples/index.html">
-               <span class="en">Sample Code</span>
-             </a></div>
-        <ul>
-          <li><a href="<?cs var:toroot ?>guide/samples/ApiDemos/index.html">
-                <span class="en">API Demos</span>
-              </a></li>
-          <li><a href="<?cs var:toroot ?>guide/samples/BluetoothChat/index.html">
-                <span class="en">Bluetooth Chat</span>
-              </a></li>
-          <li><a href="<?cs var:toroot ?>guide/samples/ContactManager/index.html">
-                <span class="en">Contact Manager</span>
-              </a></li>
-          <li><a href="<?cs var:toroot ?>guide/samples/Home/index.html">
-                <span class="en">Home</span>
-              </a></li>
-          <li><a href="<?cs var:toroot ?>guide/samples/JetBoy/index.html">
-                <span class="en">JetBoy</span>
-              </a></li>
-          <li><a href="<?cs var:toroot ?>guide/samples/LunarLander/index.html">
-                <span class="en">Lunar Lander</span>
-              </a></li>
-          <li><a href="<?cs var:toroot ?>guide/samples/MultiResolution/index.html">
-                <span class="en">Multiple Resolutions</span>
-              </a></li>
-          <li><a href="<?cs var:toroot ?>guide/samples/NotePad/index.html">
-                <span class="en">Note Pad</span>
-              </a></li>
-          <li><a href="<?cs var:toroot ?>guide/samples/SearchableDictionary/index.html">
-                <span class="en">Searchable Dictionary</span>
-              </a></li>
-          <li><a href="<?cs var:toroot ?>guide/samples/Snake/index.html">
-                <span class="en">Snake</span>
-              </a></li>
-          <li><a href="<?cs var:toroot ?>guide/samples/SoftKeyboard/index.html">
-                <span class="en">Soft Keyboard</span>
-              </a></li>
-          <li><a href="<?cs var:toroot ?>guide/samples/Wiktionary/index.html">
-                <span class="en">Wiktionary</span>
-              </a></li>
-          <li><a href="<?cs var:toroot ?>guide/samples/WiktionarySimple/index.html">
-                <span class="en">Wiktionary (Simplified)</span>
-              </a></li>
-        </ul>
-      </li>
-    </ul>
-  </li>
-  
 
   <li>
     <h2><span class="en">Appendix</span>
@@ -462,9 +387,6 @@
       <li><a href="<?cs var:toroot ?>guide/appendix/glossary.html">
             <span class="en">Glossary</span>
           </a></li>
-      <li><a href="<?cs var:toroot ?>guide/appendix/faq/index.html">
-            <span class="en">FAQ</span>
-          </a></li>
     </ul>
   </li>
 
diff --git a/docs/html/guide/index.jd b/docs/html/guide/index.jd
index ecbf97b..1674bc8 100644
--- a/docs/html/guide/index.jd
+++ b/docs/html/guide/index.jd
@@ -77,7 +77,7 @@ understanding of the application framework.
 <p>
 For additional help, consider joining one or more of the Android 
 discussion groups.  Go to the 
-<a href="{@docRoot}community/index.html">Community</a> tab above 
+<a href="{@docRoot}resources/community-groups.html">Community</a> pages 
 for more information.
 </p>
 
diff --git a/docs/html/guide/publishing/app-signing.jd b/docs/html/guide/publishing/app-signing.jd
index f0febc0..86dd155 100644
--- a/docs/html/guide/publishing/app-signing.jd
+++ b/docs/html/guide/publishing/app-signing.jd
@@ -268,7 +268,7 @@ in <code>C:\Documents and Settings\<user>\.android\</code> on Windows XP, and in
 <p>Note that, if your development machine is using a non-Gregorian locale, the build 
 tools may erroneously generate an already-expired debug certificate, so that you get an 
 error when trying to compile your application. For workaround information, see the 
-troubleshooting topic <a href="{@docRoot}guide/appendix/faq/troubleshooting.html#signingcalendar">
+troubleshooting topic <a href="{@docRoot}resources/faq/troubleshooting.html#signingcalendar">
 I&nbsp;can't&nbsp;compile my app because the build tools generated an expired debug 
 certificate</a>. </p>
 
diff --git a/docs/html/guide/publishing/versioning.jd b/docs/html/guide/publishing/versioning.jd
index 81e5ce0..1d55f8a 100644
--- a/docs/html/guide/publishing/versioning.jd
+++ b/docs/html/guide/publishing/versioning.jd
@@ -170,6 +170,6 @@ maximum API Level. </p>
 <code>android:minSdkVersion</code> as an attribute. </p>
 
 <p>For more information, see the <a
-href="{@docRoot}guide/developing/manifest/uses-sdk-element.html"><code>&lt;uses-
-sdk&gt;</code></a> manifest element documentation and the <a
+href="{@docRoot}guide/topics/manifest/uses-sdk-element.html"><code>&lt;uses-sdk&gt;</code></a>
+manifest element documentation and the <a
 href="{@docRoot}guide/appendix/api-levels.html">API Levels</a> document.</p>
diff --git a/docs/html/guide/topics/appwidgets/index.jd b/docs/html/guide/topics/appwidgets/index.jd
index 0ba05ac..f36b684 100644
--- a/docs/html/guide/topics/appwidgets/index.jd
+++ b/docs/html/guide/topics/appwidgets/index.jd
@@ -339,7 +339,7 @@ without worrying about the AppWidgetProvider closing down due to an
 sample's AppWidgetProvider</a> for an example of an App Widget running a {@link android.app.Service}.</p>
 
 <p>Also see the <a 
-href="{@docRoot}guide/samples/ApiDemos/src/com/example/android/apis/appwidget/ExampleAppWidgetProvider.html">
+href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/appwidget/ExampleAppWidgetProvider.html">
 ExampleAppWidgetProvider.java</a> sample class.</p>
 
 
@@ -468,7 +468,7 @@ reaching the end, the App Widget host is notified that the configuration was can
 App Widget will not be added.</p>
 
 <p>See the <a 
-href="{@docRoot}guide/samples/ApiDemos/src/com/example/android/apis/appwidget/ExampleAppWidgetConfigure.html">
+href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/appwidget/ExampleAppWidgetConfigure.html">
 ExampleAppWidgetConfigure.java</a> sample class in ApiDemos for an example.</p>
 
 
diff --git a/docs/html/guide/topics/graphics/opengl.jd b/docs/html/guide/topics/graphics/opengl.jd
index 901980d..4d0b223 100644
--- a/docs/html/guide/topics/graphics/opengl.jd
+++ b/docs/html/guide/topics/graphics/opengl.jd
@@ -28,7 +28,7 @@ ES API. However, it may not be identical, so watch out for deviations.</p>
 
 <p>For an example of this usage model (based on the classic GL ColorCube), showing how to use
 it with threads can be found in 
-<a href="{@docRoot}guide/samples/ApiDemos/src/com/example/android/apis/graphics/GLSurfaceViewActivity.html">com.android.samples.graphics.GLSurfaceViewActivity.java</a>.
+<a href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/graphics/GLSurfaceViewActivity.html">com.android.samples.graphics.GLSurfaceViewActivity.java</a>.
 </p>
 
 <p>Writing a summary of how to actually write 3D applications using OpenGL is
diff --git a/docs/html/guide/topics/intents/intents-filters.jd b/docs/html/guide/topics/intents/intents-filters.jd
index 962a001..7a7eb70 100644
--- a/docs/html/guide/topics/intents/intents-filters.jd
+++ b/docs/html/guide/topics/intents/intents-filters.jd
@@ -702,8 +702,8 @@ declared in its manifest file.  (If you're working offline in the SDK, you
 can find all the source files for this sample application, including its 
 manifest file, at {@code &lt;sdk&gt;/samples/NotePad/index.html}.  
 If you're viewing the documentation online, the source files are in the 
-<a href="{@docRoot}guide/samples/index.html">Tutorials and Sample Code</a> 
-section <a href="{@docRoot}guide/samples/NotePad/index.html">here</a>.)
+<a href="{@docRoot}resources/samples/index.html">Tutorials and Sample Code</a> 
+section <a href="{@docRoot}resources/samples/NotePad/index.html">here</a>.)
 </p>
 
 <p>
diff --git a/docs/html/guide/topics/manifest/supports-screens-element.jd b/docs/html/guide/topics/manifest/supports-screens-element.jd
index 5494320..620d3b2 100644
--- a/docs/html/guide/topics/manifest/supports-screens-element.jd
+++ b/docs/html/guide/topics/manifest/supports-screens-element.jd
@@ -31,7 +31,7 @@ or scale them up by a factor of 1.5 (high dpi screens).
 The screen density is expressed as dots-per-inch (dpi).</p>
 
 <p>For more information, see 
-<a href="{@docRoot}guide/practices/screens_suppport.html">Multiple Screens Support</a>.</p>
+<a href="{@docRoot}guide/practices/screens_support.html">Multiple Screens Support</a>.</p>
 
 
 <dt>attributes:</dt>
diff --git a/docs/html/guide/topics/resources/localization.jd b/docs/html/guide/topics/resources/localization.jd
index f32f1ac..192695b 100755
--- a/docs/html/guide/topics/resources/localization.jd
+++ b/docs/html/guide/topics/resources/localization.jd
@@ -51,7 +51,7 @@ defaults.</li>
 <h2>See also</h2>

   <ol>

   <li><a

-href="{@docRoot}guide/tutorials/localization/index.html">Hello, L10N Tutorial</a></li>

+href="{@docRoot}resources/tutorials/localization/index.html">Hello, L10N Tutorial</a></li>

     <li><a href="resources-i18n.html">Resources</a></li>

     <li><a href="{@docRoot}guide/topics/ui/declaring-layout.html">Declaring Layout</a></li>

     <li><a href="{@docRoot}reference/android/app/Activity.html#ActivityLifecycle">Activity Lifecycle</a></li>

@@ -90,7 +90,7 @@ programmatically. This document does not cover how to  localize your Java code.
 </ul>

 

 <p>The <a

-href="{@docRoot}guide/tutorials/localization/index.html">Hello, L10N

+href="{@docRoot}resources/tutorials/localization/index.html">Hello, L10N

 </a> tutorial takes you through the steps of creating a simple localized

 application that uses  locale-specific resources in the way described in this

 document. </p>

diff --git a/docs/html/guide/topics/ui/binding.jd b/docs/html/guide/topics/ui/binding.jd
index 4725321..6ac0bb0 100644
--- a/docs/html/guide/topics/ui/binding.jd
+++ b/docs/html/guide/topics/ui/binding.jd
@@ -13,9 +13,9 @@ parent.link=index.html
   
   <h2>See also</h2>
   <ol>
-    <li><a href="{@docRoot}guide/tutorials/views/hello-spinner.html">Hello Spinner tutorial</a></li>
-    <li><a href="{@docRoot}guide/tutorials/views/hello-listview.html">Hello ListView tutorial</a></li>
-    <li><a href="{@docRoot}guide/tutorials/views/hello-gridview.html">Hello GridView tutorial</a></li>
+    <li><a href="{@docRoot}resources/tutorials/views/hello-spinner.html">Hello Spinner tutorial</a></li>
+    <li><a href="{@docRoot}resources/tutorials/views/hello-listview.html">Hello ListView tutorial</a></li>
+    <li><a href="{@docRoot}resources/tutorials/views/hello-gridview.html">Hello GridView tutorial</a></li>
   </ol>
 </div>
 </div>
@@ -107,7 +107,7 @@ mHistoryView.setOnItemClickListener(mMessageClickedHandler);
 
 <div class="special">
 <p>For more discussion on how to create different AdapterViews, read the following tutorials:
-<a href="{@docRoot}guide/tutorials/views/hello-spinner.html">Hello Spinner</a>,
-<a href="{@docRoot}guide/tutorials/views/hello-listview.html">Hello ListView</a>, and
-<a href="{@docRoot}guide/tutorials/views/hello-gridview.html">Hello GridView</a>.
+<a href="{@docRoot}resources/tutorials/views/hello-spinner.html">Hello Spinner</a>,
+<a href="{@docRoot}resources/tutorials/views/hello-listview.html">Hello ListView</a>, and
+<a href="{@docRoot}resources/tutorials/views/hello-gridview.html">Hello GridView</a>.
 </div>
diff --git a/docs/html/guide/topics/ui/custom-components.jd b/docs/html/guide/topics/ui/custom-components.jd
index 6027a82..900e08b 100644
--- a/docs/html/guide/topics/ui/custom-components.jd
+++ b/docs/html/guide/topics/ui/custom-components.jd
@@ -61,7 +61,7 @@ examples of what you could do with them:</p>
   </li>
   <li>
     You could override the way that an EditText component is rendered on the screen
-    (the <a href="{@docRoot}guide/samples/NotePad/index.html">Notepad Tutorial</a> uses this to good effect, 
+    (the <a href="{@docRoot}resources/samples/NotePad/index.html">Notepad Tutorial</a> uses this to good effect, 
     to create a lined-notepad page).
   </li>
   <li>
@@ -318,9 +318,9 @@ Here's a summary of some of the other standard methods that the framework calls
 
 <h3 id="customexample">A Custom View Example</h3>
 <p>The CustomView sample in the 
-<a href="{@docRoot}guide/samples/ApiDemos/index.html">API Demos</a> provides an example
+<a href="{@docRoot}resources/samples/ApiDemos/index.html">API Demos</a> provides an example
 of a customized View. The custom View is defined in the
-<a href="{@docRoot}guide/samples/ApiDemos/src/com/example/android/apis/view/LabelView.html">LabelView</a>
+<a href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/view/LabelView.html">LabelView</a>
 class.</p>
 <p>The LabelView sample demonstrates a number of different aspects of custom components:</p>
 <ul>
@@ -339,7 +339,7 @@ class.</p>
   provided canvas.</li>
 </ul>
 <p>You can see some sample usages of the LabelView custom View in
-<a href="{@docRoot}guide/samples/ApiDemos/res/layout/custom_view_1.html">custom_view_1.xml</a>
+<a href="{@docRoot}resources/samples/ApiDemos/res/layout/custom_view_1.html">custom_view_1.xml</a>
 from the samples. In particular, you can see a mix of both <code>android:</code>
 namespace parameters and custom <code>app:</code> namespace parameters. These
 <code>app:</code> parameters are the custom ones that the LabelView recognizes
@@ -446,7 +446,7 @@ you would do with a fully customized component, but by starting with a more
 specialized class in the View hierarchy, you can also get a lot of behavior for
 free that probably does exactly what you want.</p>
 <p>For example, the SDK includes a <a
-href="{@docRoot}guide/samples/NotePad/index.html">NotePad application</a> in the
+href="{@docRoot}resources/samples/NotePad/index.html">NotePad application</a> in the
 samples. This demonstrates many aspects of using the Android platform, among
 them is extending an EditText View to make a lined notepad. This is not a
 perfect example, and the APIs for doing this might change from this early
@@ -455,7 +455,7 @@ preview, but it does demonstrate the principles.</p>
 NotePad sample into Eclipse (or
 just look at the source using the link provided). In particular look at the definition of
 <code>MyEditText</code> in the <a
-href="{@docRoot}guide/samples/NotePad/src/com/example/android/notepad/NoteEditor.html">NoteEditor.java</a>
+href="{@docRoot}resources/samples/NotePad/src/com/example/android/notepad/NoteEditor.html">NoteEditor.java</a>
 file.</p>
 <p>Some points to note here</p>
 <ol>
diff --git a/docs/html/guide/topics/ui/declaring-layout.jd b/docs/html/guide/topics/ui/declaring-layout.jd
index fdd5ddd..662efbf 100644
--- a/docs/html/guide/topics/ui/declaring-layout.jd
+++ b/docs/html/guide/topics/ui/declaring-layout.jd
@@ -65,7 +65,7 @@ example, the EditText element has a <code>text</code> attribute that corresponds
 
 <p class="note"><strong>Tip:</strong> Learn more about different layout types in <a href="{@docRoot}guide/topics/ui/layout-objects.html">Common
 Layout Objects</a>. There are also a collection of tutorials on building various layouts in the
-<a href="{@docRoot}guide/tutorials/views/index.html">Hello Views</a> tutorial guide.</p>
+<a href="{@docRoot}resources/tutorials/views/index.html">Hello Views</a> tutorial guide.</p>
 
 <h2 id="write">Write the XML</h2>
 
diff --git a/docs/html/guide/topics/ui/dialogs.jd b/docs/html/guide/topics/ui/dialogs.jd
index c476b0d..74b544b 100644
--- a/docs/html/guide/topics/ui/dialogs.jd
+++ b/docs/html/guide/topics/ui/dialogs.jd
@@ -47,10 +47,10 @@ for notifications and short activities that directly relate to the application i
     See <a href="#ProgressDialog">Creating a ProgressDialog</a> below.</dd>
   <dt>{@link android.app.DatePickerDialog}</dt>
   <dd>A dialog that allows the user to select a date. See the 
-    <a href="{@docRoot}guide/tutorials/views/hello-datepicker.html">Hello DatePicker</a> tutorial.</dd>
+    <a href="{@docRoot}resources/tutorials/views/hello-datepicker.html">Hello DatePicker</a> tutorial.</dd>
   <dt>{@link android.app.TimePickerDialog}</dt>
   <dd>A dialog that allows the user to select a time. See the 
-    <a href="{@docRoot}guide/tutorials/views/hello-timepicker.html">Hello TimePicker</a> tutorial.</dd>
+    <a href="{@docRoot}resources/tutorials/views/hello-timepicker.html">Hello TimePicker</a> tutorial.</dd>
 </dl>
 
 <p>If you would like to customize your own dialog, you can extend the
diff --git a/docs/html/guide/topics/ui/layout-objects.jd b/docs/html/guide/topics/ui/layout-objects.jd
index bb13a18..345e9b3 100644
--- a/docs/html/guide/topics/ui/layout-objects.jd
+++ b/docs/html/guide/topics/ui/layout-objects.jd
@@ -19,7 +19,7 @@ parent.link=index.html
 <p>This section describes some of the more common types of layout objects
 to use in your applications. Like all layouts, they are subclasses of {@link android.view.ViewGroup ViewGroup}.</p>
 
-<p>Also see the <a href="{@docRoot}guide/tutorials/views/index.html">Hello Views</a> tutorials for
+<p>Also see the <a href="{@docRoot}resources/tutorials/views/index.html">Hello Views</a> tutorials for
 some guidance on using more Android View layouts.</p>
 
 <h2 id="framelayout">FrameLayout</h2>
@@ -83,7 +83,7 @@ neighboring elements. This can be turned off by setting
 <code>android:baselineAligned=&quot;false&quot;</code> in the layout XML. </p>
 
 <p>To view other sample code, see the 
-<a href="{@docRoot}guide/tutorials/views/hello-linearlayout.html">Hello LinearLayout</a> tutorial.</p>
+<a href="{@docRoot}resources/tutorials/views/hello-linearlayout.html">Hello LinearLayout</a> tutorial.</p>
 
 
 <h2 id="tablelayout">TableLayout</h2>
@@ -138,7 +138,7 @@ result, with cell borders displayed as dotted lines (added for visual effect). <
     fits the screen. See the {@link android.widget.TableLayout TableLayout reference} 
 documentation for more details. </p>
 
-<p>To view sample code, see the <a href="{@docRoot}guide/tutorials/views/hello-tablelayout.html">Hello
+<p>To view sample code, see the <a href="{@docRoot}resources/tutorials/views/hello-tablelayout.html">Hello
 TableLayout</a> tutorial.</p>
 
 
@@ -208,7 +208,7 @@ refer to the ID using the syntax of a relative resource
     For example, assigning the parameter <code>toLeft="my_button"</code> to a TextView would place the TextView to 
     the left of the View with the ID <var>my_button</var> (which must be written in the XML <em>before</em> the TextView). </p>
 
-<p>To view this sample code, see the <a href="{@docRoot}guide/tutorials/views/hello-relativelayout.html">Hello
+<p>To view this sample code, see the <a href="{@docRoot}resources/tutorials/views/hello-relativelayout.html">Hello
 RelativeLayout</a> tutorial.</p>
 
 
diff --git a/docs/html/guide/topics/ui/menus.jd b/docs/html/guide/topics/ui/menus.jd
index 0129e8f..cf3c7de 100644
--- a/docs/html/guide/topics/ui/menus.jd
+++ b/docs/html/guide/topics/ui/menus.jd
@@ -180,7 +180,7 @@ Then, register a {@link android.view.ContextMenu} for the View, with
 <code>{@link android.app.Activity#registerForContextMenu(View) registerForContextMenu()}</code>.</p>
 
 <p>For example, here is some code that can be used with the 
-<a href="{@docRoot}guide/tutorials/notepad/index.html">Notepad application</a>
+<a href="{@docRoot}resources/tutorials/notepad/index.html">Notepad application</a>
 to add a context menu for each note in the list:</p>
 <pre>
 public void onCreateContextMenu(ContextMenu menu, View v,
@@ -518,5 +518,5 @@ a <code>&lt;category></code> element in the intent filter. For example:</p>
 <a href="/guide/topics/intents/intents-filters.html">Intents and Intent Filters</a> document.</p>
 
 <p>For a sample application using this technique, see the 
-<a href="{@docRoot}guide/samples/NotePad/index.html">Note Pad</a>
+<a href="{@docRoot}resources/samples/NotePad/index.html">Note Pad</a>
 sample code.</p>
diff --git a/docs/html/guide/topics/ui/ui-events.jd b/docs/html/guide/topics/ui/ui-events.jd
index 6b30e44..ccef64f 100644
--- a/docs/html/guide/topics/ui/ui-events.jd
+++ b/docs/html/guide/topics/ui/ui-events.jd
@@ -15,7 +15,7 @@ parent.link=index.html
 
   <h2>See also</h2>
   <ol>
-    <li><a href="{@docRoot}guide/tutorials/views/hello-formstuff.html">Hello Form Stuff tutorial</a></li>
+    <li><a href="{@docRoot}resources/tutorials/views/hello-formstuff.html">Hello Form Stuff tutorial</a></li>
   </ol>
 </div>
 </div>
diff --git a/docs/html/guide/topics/views/custom-views.jd b/docs/html/guide/topics/views/custom-views.jd
index 4e0e164..8589b1a 100644
--- a/docs/html/guide/topics/views/custom-views.jd
+++ b/docs/html/guide/topics/views/custom-views.jd
@@ -40,7 +40,7 @@ parent.link=index.html
   </li>
   <li>
     You could override the way that an EditText component is rendered on the screen
-    (the <a href="{@docRoot}guide/samples/NotePad/">Notepad sample</a> uses this to good effect, 
+    (the <a href="{@docRoot}resources/samples/NotePad/">Notepad sample</a> uses this to good effect, 
     to create a lined-notepad page).
   </li>
   <li>