Merge "docs: move FAQ and old notepad tutorial to other places where we can properly redirect. This way the docs are accessible from existing links and they at least appear with a sidenav Also resolve a bunch of links to the notepad docs." into jb-dev

19 files changed, 16 insertions, 16 deletions

diff --git a/docs/html/about/versions/index.jd b/docs/html/about/versions/index.jd
index 30826c0..518711f 100644
--- a/docs/html/about/versions/index.jd
+++ b/docs/html/about/versions/index.jd
@@ -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}resources/tutorials/notepad/index.html">Notepad Tutorial</a>.</p>
+href="{@docRoot}training/notepad/index.html">Notepad Tutorial</a>.</p>
     
 <a name="libraries" id="libraries"></a>
 <h2>Libraries</h2>
diff --git a/docs/html/resources/faq/commontasks.jd b/docs/html/guide/faq/commontasks.jd
index c72343a..7b90de2 100644
--- a/docs/html/resources/faq/commontasks.jd
+++ b/docs/html/guide/faq/commontasks.jd
@@ -62,7 +62,7 @@ folder in the SDK.</p>
 <p>Finally, a great way to started with Android development in Eclipse is to
 follow both the <a href="{@docRoot}resources/tutorials/hello-world.html">Hello,
 World</a> and <a
-href="{@docRoot}resources/tutorials/notepad/index.html">Notepad</a> code
+href="{@docRoot}training/notepad/index.html">Notepad</a> code
 tutorials. In particular, the start of the Hello Android tutorial is an
 excellent introduction to creating a new Android application in Eclipse.</p>
 
diff --git a/docs/html/resources/faq/framework.jd b/docs/html/guide/faq/framework.jd
index 4a7a3fc..4a7a3fc 100644
--- a/docs/html/resources/faq/framework.jd
+++ b/docs/html/guide/faq/framework.jd
diff --git a/docs/html/resources/faq/index.jd b/docs/html/guide/faq/index.jd
index 9a2614b..9a2614b 100644
--- a/docs/html/resources/faq/index.jd
+++ b/docs/html/guide/faq/index.jd
diff --git a/docs/html/resources/faq/licensingandoss.jd b/docs/html/guide/faq/licensingandoss.jd
index c267fe8..c267fe8 100644
--- a/docs/html/resources/faq/licensingandoss.jd
+++ b/docs/html/guide/faq/licensingandoss.jd
diff --git a/docs/html/resources/faq/security.jd b/docs/html/guide/faq/security.jd
index 52ee0d9..52ee0d9 100644
--- a/docs/html/resources/faq/security.jd
+++ b/docs/html/guide/faq/security.jd
diff --git a/docs/html/resources/faq/troubleshooting.jd b/docs/html/guide/faq/troubleshooting.jd
index f19f5ec..f19f5ec 100644
--- a/docs/html/resources/faq/troubleshooting.jd
+++ b/docs/html/guide/faq/troubleshooting.jd
diff --git a/docs/html/intl/ja/guide/basics/what-is-android.jd b/docs/html/intl/ja/guide/basics/what-is-android.jd
index fcf670d..f78b077 100644
--- a/docs/html/intl/ja/guide/basics/what-is-android.jd
+++ b/docs/html/intl/ja/guide/basics/what-is-android.jd
@@ -47,7 +47,7 @@ page.title=Android とは
 </ul>
 
 <p>アプリケーションの簡単な説明と詳細については、<a
-href="{@docRoot}resources/tutorials/notepad/index.html">Notepad チュートリアル</a>をご覧ください。</p>
+href="{@docRoot}training/notepad/index.html">Notepad チュートリアル</a>をご覧ください。</p>
     
 <a name="libraries" id="libraries"></a>
 <h2>ライブラリ</h2>
diff --git a/docs/html/intl/ja/sdk/1.5_r2/installing.jd b/docs/html/intl/ja/sdk/1.5_r2/installing.jd
index bd464c6..99807e1 100644
--- a/docs/html/intl/ja/sdk/1.5_r2/installing.jd
+++ b/docs/html/intl/ja/sdk/1.5_r2/installing.jd
@@ -167,7 +167,7 @@ JKS</pre>
 <p><strong>サンプル コードの参照</strong></p>
 <ul>
   <li><a href="{@docRoot}training/basics/firstapp/index.html">Hello World アプリケーション</a>を構築します（特に Eclipse ユーザーにおすすめです）。</li>
-  <li><a href="{@docRoot}resources/tutorials/notepad/index.html">Notepad チュートリアル</a>に沿って Android アプリケーションを完全に構築します。 </li>
+  <li><a href="{@docRoot}training/notepad/index.html">Notepad チュートリアル</a>に沿って Android アプリケーションを完全に構築します。 </li>
   <li><code><em>&lt;sdk&gt;</em>/platforms/<em>&lt;platfrom&gt;</em>/samples</code> に収められている他のサンプル アプリケーションのいずれかを新しいプロジェクトとして作成し、自分の開発環境でコンパイルし、実行します。</li>
 </ul>
 
diff --git a/docs/html/intl/ja/sdk/1.5_r3/installing.jd b/docs/html/intl/ja/sdk/1.5_r3/installing.jd
index bd464c6..99807e1 100644
--- a/docs/html/intl/ja/sdk/1.5_r3/installing.jd
+++ b/docs/html/intl/ja/sdk/1.5_r3/installing.jd
@@ -167,7 +167,7 @@ JKS</pre>
 <p><strong>サンプル コードの参照</strong></p>
 <ul>
   <li><a href="{@docRoot}training/basics/firstapp/index.html">Hello World アプリケーション</a>を構築します（特に Eclipse ユーザーにおすすめです）。</li>
-  <li><a href="{@docRoot}resources/tutorials/notepad/index.html">Notepad チュートリアル</a>に沿って Android アプリケーションを完全に構築します。 </li>
+  <li><a href="{@docRoot}training/notepad/index.html">Notepad チュートリアル</a>に沿って Android アプリケーションを完全に構築します。 </li>
   <li><code><em>&lt;sdk&gt;</em>/platforms/<em>&lt;platfrom&gt;</em>/samples</code> に収められている他のサンプル アプリケーションのいずれかを新しいプロジェクトとして作成し、自分の開発環境でコンパイルし、実行します。</li>
 </ul>
 
diff --git a/docs/html/sitemap.txt b/docs/html/sitemap.txt
index 548ee2b..783267b 100644
--- a/docs/html/sitemap.txt
+++ b/docs/html/sitemap.txt
@@ -213,7 +213,7 @@ http://developer.android.com/training/basics/firstapp/index.html
 http://developer.android.com/resources/tutorials/views/index.html
 http://developer.android.com/resources/tutorials/localization/index.html
 http://developer.android.com/resources/tutorials/testing/helloandroid_test.html
-http://developer.android.com/resources/tutorials/notepad/index.html
+http://developer.android.com/training/notepad/index.html
 http://developer.android.com/tools/testing/activity_test.html
 http://developer.android.com/resources/samples/get.html
 http://developer.android.com/resources/samples/index.html
@@ -2863,10 +2863,10 @@ http://developer.android.com/reference/org/apache/http/auth/UsernamePasswordCred
 http://developer.android.com/resources/tutorials/views/hello-tablelayout.html
 http://developer.android.com/resources/tutorials/views/hello-relativelayout.html
 http://developer.android.com/reference/org/apache/http/impl/conn/tsccm/package-descr.html
-http://developer.android.com/resources/tutorials/notepad/notepad-ex1.html
-http://developer.android.com/resources/tutorials/notepad/notepad-ex2.html
-http://developer.android.com/resources/tutorials/notepad/notepad-ex3.html
-http://developer.android.com/resources/tutorials/notepad/notepad-extra-credit.html
+http://developer.android.com/training/notepad/notepad-ex1.html
+http://developer.android.com/training/notepad/notepad-ex2.html
+http://developer.android.com/training/notepad/notepad-ex3.html
+http://developer.android.com/training/notepad/notepad-extra-credit.html
 http://developer.android.com/resources/samples/BluetoothChat/res/index.html
 http://developer.android.com/resources/samples/BluetoothChat/src/index.html
 http://developer.android.com/resources/samples/BluetoothChat/AndroidManifest.html
diff --git a/docs/html/tools/sdk/installing.jd b/docs/html/tools/sdk/installing.jd
index 4837ab7..126d992 100644
--- a/docs/html/tools/sdk/installing.jd
+++ b/docs/html/tools/sdk/installing.jd
@@ -516,7 +516,7 @@ how to set up an Android-powered device so you can run and test your application
 <p><strong>Follow the Notepad tutorial</strong></p>
 
 <ul>
-  <li>The <a href="{@docRoot}resources/tutorials/notepad/index.html">
+  <li>The <a href="{@docRoot}training/notepad/index.html">
   Notepad Tutorial</a> shows you how to build a full Android application
   and provides  helpful commentary on the Android system and API. The
   Notepad tutorial helps you bring together the important design
diff --git a/docs/html/resources/tutorials/notepad/codelab/NotepadCodeLab.zip b/docs/html/training/notepad/codelab/NotepadCodeLab.zip
index cd30f29..cd30f29 100644
--- a/docs/html/resources/tutorials/notepad/codelab/NotepadCodeLab.zip
+++ b/docs/html/training/notepad/codelab/NotepadCodeLab.zip
diff --git a/docs/html/resources/tutorials/notepad/index.jd b/docs/html/training/notepad/index.jd
index 1f37c41..87a57d1 100644
--- a/docs/html/resources/tutorials/notepad/index.jd
+++ b/docs/html/training/notepad/index.jd
@@ -83,7 +83,7 @@ previous exercises.</p>
 table lists the
 tutorial examples and describes what each covers. ">
     <tr>
-      <th width="120"><a href="{@docRoot}resources/tutorials/notepad/notepad-ex1.html">Exercise
+      <th width="120"><a href="{@docRoot}training/notepad/notepad-ex1.html">Exercise
 1</a></th>
       <td>Start here. Construct a simple notes list that lets the user add new notes but not
 edit them. Demonstrates the basics of <code>ListActivity</code> and creating
@@ -91,7 +91,7 @@ and handling
       menu options. Uses a SQLite database to store the notes.</td>
     </tr>
     <tr>
-      <th><a href="{@docRoot}resources/tutorials/notepad/notepad-ex2.html">Exercise 2</a></th>
+      <th><a href="{@docRoot}training/notepad/notepad-ex2.html">Exercise 2</a></th>
       <td>Add a second Activity to the
 application. Demonstrates constructing a
 new Activity, adding it to the Android manifest, passing data between the
@@ -100,13 +100,13 @@ invoke another Activity to return a result, using
 <code>startActivityForResult()</code>.</td>
     </tr>
     <tr>
-      <th><a href="{@docRoot}resources/tutorials/notepad/notepad-ex3.html">Exercise 3</a></th>
+      <th><a href="{@docRoot}training/notepad/notepad-ex3.html">Exercise 3</a></th>
       <td>Add handling of life-cycle events to
 the application, to let it
 maintain application state across the life cycle. </td>
     </tr>
     <tr>
-    <th><a href="{@docRoot}resources/tutorials/notepad/notepad-extra-credit.html">Extra
+    <th><a href="{@docRoot}training/notepad/notepad-extra-credit.html">Extra
 Credit</a></th>
     <td>Demonstrates how to use the Eclipse
 debugger and how you can use it to
diff --git a/docs/html/resources/tutorials/notepad/notepad-ex1.jd b/docs/html/training/notepad/notepad-ex1.jd
index 13ab0a6..0decbb2 100644
--- a/docs/html/resources/tutorials/notepad/notepad-ex1.jd
+++ b/docs/html/training/notepad/notepad-ex1.jd
@@ -44,7 +44,7 @@ selections. </em></li>
       In the New Android Project dialog, select <strong>Create project from existing source</strong>.</li>
     <li>
       Click <strong>Browse</strong> and navigate to where you copied the <code>NotepadCodeLab</code> 
-      (downloaded during <a href="{@docRoot}resources/tutorials/notepad/index.html#preparing">setup</a>) 
+      (downloaded during <a href="{@docRoot}training/notepad/index.html#preparing">setup</a>) 
       and select <code>Notepadv1</code>.</li>
     <li>
       The Project Name and other properties should be automatically filled for you. 
diff --git a/docs/html/resources/tutorials/notepad/notepad-ex2.jd b/docs/html/training/notepad/notepad-ex2.jd
index 1334d7a..1334d7a 100644
--- a/docs/html/resources/tutorials/notepad/notepad-ex2.jd
+++ b/docs/html/training/notepad/notepad-ex2.jd
diff --git a/docs/html/resources/tutorials/notepad/notepad-ex3.jd b/docs/html/training/notepad/notepad-ex3.jd
index e31ecda..e31ecda 100644
--- a/docs/html/resources/tutorials/notepad/notepad-ex3.jd
+++ b/docs/html/training/notepad/notepad-ex3.jd
diff --git a/docs/html/resources/tutorials/notepad/notepad-extra-credit.jd b/docs/html/training/notepad/notepad-extra-credit.jd
index d5fd771..d5fd771 100644
--- a/docs/html/resources/tutorials/notepad/notepad-extra-credit.jd
+++ b/docs/html/training/notepad/notepad-extra-credit.jd
diff --git a/docs/html/resources/tutorials/notepad/notepad-index.jd b/docs/html/training/notepad/notepad-index.jd
index 151c50d..151c50d 100644
--- a/docs/html/resources/tutorials/notepad/notepad-index.jd
+++ b/docs/html/training/notepad/notepad-index.jd