From 64b1188356febf76967444e5aeb5f68e6a389c15 Mon Sep 17 00:00:00 2001 From: Scott Main Date: Fri, 29 Jun 2012 16:04:25 -0700 Subject: [PATCH] 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. Change-Id: I828e0bb8df32ee5658cae22c8f34b9fc1512fbae --- docs/html/about/versions/index.jd | 2 +- docs/html/{resources => guide}/faq/commontasks.jd | 2 +- docs/html/{resources => guide}/faq/framework.jd | 0 docs/html/{resources => guide}/faq/index.jd | 0 .../{resources => guide}/faq/licensingandoss.jd | 0 docs/html/{resources => guide}/faq/security.jd | 0 .../{resources => guide}/faq/troubleshooting.jd | 0 docs/html/intl/ja/guide/basics/what-is-android.jd | 2 +- docs/html/intl/ja/sdk/1.5_r2/installing.jd | 2 +- docs/html/intl/ja/sdk/1.5_r3/installing.jd | 2 +- docs/html/sitemap.txt | 10 +++++----- docs/html/tools/sdk/installing.jd | 2 +- .../notepad/codelab/NotepadCodeLab.zip | Bin .../tutorials => training}/notepad/index.jd | 8 ++++---- .../tutorials => training}/notepad/notepad-ex1.jd | 2 +- .../tutorials => training}/notepad/notepad-ex2.jd | 0 .../tutorials => training}/notepad/notepad-ex3.jd | 0 .../notepad/notepad-extra-credit.jd | 0 .../tutorials => training}/notepad/notepad-index.jd | 0 19 files changed, 16 insertions(+), 16 deletions(-) rename docs/html/{resources => guide}/faq/commontasks.jd (99%) rename docs/html/{resources => guide}/faq/framework.jd (100%) rename docs/html/{resources => guide}/faq/index.jd (100%) rename docs/html/{resources => guide}/faq/licensingandoss.jd (100%) rename docs/html/{resources => guide}/faq/security.jd (100%) rename docs/html/{resources => guide}/faq/troubleshooting.jd (100%) rename docs/html/{resources/tutorials => training}/notepad/codelab/NotepadCodeLab.zip (100%) rename docs/html/{resources/tutorials => training}/notepad/index.jd (94%) rename docs/html/{resources/tutorials => training}/notepad/notepad-ex1.jd (99%) rename docs/html/{resources/tutorials => training}/notepad/notepad-ex2.jd (100%) rename docs/html/{resources/tutorials => training}/notepad/notepad-ex3.jd (100%) rename docs/html/{resources/tutorials => training}/notepad/notepad-extra-credit.jd (100%) rename docs/html/{resources/tutorials => training}/notepad/notepad-index.jd (100%) diff --git a/docs/html/about/versions/index.jd b/docs/html/about/versions/index.jd index 30826c085a0e0..518711fba649b 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.

For more details and a walkthrough of an application, see the Notepad Tutorial.

+href="{@docRoot}training/notepad/index.html">Notepad Tutorial.

Libraries

diff --git a/docs/html/resources/faq/commontasks.jd b/docs/html/guide/faq/commontasks.jd similarity index 99% rename from docs/html/resources/faq/commontasks.jd rename to docs/html/guide/faq/commontasks.jd index c72343a01a3a2..7b90de246759f 100644 --- a/docs/html/resources/faq/commontasks.jd +++ b/docs/html/guide/faq/commontasks.jd @@ -62,7 +62,7 @@ folder in the SDK.

Finally, a great way to started with Android development in Eclipse is to follow both the Hello, World and Notepad code +href="{@docRoot}training/notepad/index.html">Notepad code tutorials. In particular, the start of the Hello Android tutorial is an excellent introduction to creating a new Android application in Eclipse.

diff --git a/docs/html/resources/faq/framework.jd b/docs/html/guide/faq/framework.jd similarity index 100% rename from docs/html/resources/faq/framework.jd rename to docs/html/guide/faq/framework.jd diff --git a/docs/html/resources/faq/index.jd b/docs/html/guide/faq/index.jd similarity index 100% rename from docs/html/resources/faq/index.jd rename to docs/html/guide/faq/index.jd diff --git a/docs/html/resources/faq/licensingandoss.jd b/docs/html/guide/faq/licensingandoss.jd similarity index 100% rename from docs/html/resources/faq/licensingandoss.jd rename to docs/html/guide/faq/licensingandoss.jd diff --git a/docs/html/resources/faq/security.jd b/docs/html/guide/faq/security.jd similarity index 100% rename from docs/html/resources/faq/security.jd rename to docs/html/guide/faq/security.jd diff --git a/docs/html/resources/faq/troubleshooting.jd b/docs/html/guide/faq/troubleshooting.jd similarity index 100% rename from docs/html/resources/faq/troubleshooting.jd rename to 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 fcf670d70ba74..f78b077d3d297 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 とは

アプリケーションの簡単な説明と詳細については、Notepad チュートリアルをご覧ください。

+href="{@docRoot}training/notepad/index.html">Notepad チュートリアルをご覧ください。

ライブラリ

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 bd464c69a8d0d..99807e1fe5549 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

サンプル コードの参照

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 bd464c69a8d0d..99807e1fe5549 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

サンプル コードの参照

diff --git a/docs/html/sitemap.txt b/docs/html/sitemap.txt index 548ee2b5b52ce..783267b736b3f 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 4837ab7ff1e9d..126d992570ca9 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

Follow the Notepad tutorial