From 5f0462a4f57d857a7fda3c5b7ecc075c7b9c1f6f Mon Sep 17 00:00:00 2001
From: Dirk Dougherty <ddougherty@google.com>
Date: Tue, 19 Nov 2013 13:15:07 -0800
Subject: [PATCH] Doc change: move localized files into an intl dir. Build
 output remains the same for online, offline, and ds docs.

Change-Id: Ia75712323563cf56f0224822cb7977f3421f8527
---
 Android.mk                                                    | 4 ++--
 .../es/training/monitoring-device-state/battery-monitoring.jd | 0
 .../monitoring-device-state/connectivity-monitoring.jd        | 0
 .../es/training/monitoring-device-state/docking-monitoring.jd | 0
 .../{ => intl}/es/training/monitoring-device-state/index.jd   | 0
 .../es/training/monitoring-device-state/manifest-receivers.jd | 0
 docs/html-intl/{ => intl}/es/training/multiscreen/adaptui.jd  | 0
 docs/html-intl/{ => intl}/es/training/multiscreen/index.jd    | 0
 .../{ => intl}/es/training/multiscreen/screendensities.jd     | 0
 .../{ => intl}/es/training/multiscreen/screensizes.jd         | 0
 docs/html-intl/{ => intl}/ja/guide/publishing/app-signing.jd  | 0
 docs/html-intl/{ => intl}/ja/guide/publishing/preparing.jd    | 0
 docs/html-intl/{ => intl}/ja/guide/publishing/versioning.jd   | 0
 docs/html-intl/{ => intl}/ja/guide/topics/fundamentals.jd     | 0
 .../ja/training/monitoring-device-state/battery-monitoring.jd | 0
 .../monitoring-device-state/connectivity-monitoring.jd        | 0
 .../ja/training/monitoring-device-state/docking-monitoring.jd | 0
 .../{ => intl}/ja/training/monitoring-device-state/index.jd   | 0
 .../ja/training/monitoring-device-state/manifest-receivers.jd | 0
 docs/html-intl/{ => intl}/ja/training/multiscreen/adaptui.jd  | 0
 docs/html-intl/{ => intl}/ja/training/multiscreen/index.jd    | 0
 .../{ => intl}/ja/training/multiscreen/screendensities.jd     | 0
 .../{ => intl}/ja/training/multiscreen/screensizes.jd         | 0
 .../ko/training/monitoring-device-state/battery-monitoring.jd | 0
 .../monitoring-device-state/connectivity-monitoring.jd        | 0
 .../ko/training/monitoring-device-state/docking-monitoring.jd | 0
 .../{ => intl}/ko/training/monitoring-device-state/index.jd   | 0
 .../ko/training/monitoring-device-state/manifest-receivers.jd | 0
 docs/html-intl/{ => intl}/ko/training/multiscreen/adaptui.jd  | 0
 docs/html-intl/{ => intl}/ko/training/multiscreen/index.jd    | 0
 .../{ => intl}/ko/training/multiscreen/screendensities.jd     | 0
 .../{ => intl}/ko/training/multiscreen/screensizes.jd         | 0
 .../ru/training/monitoring-device-state/battery-monitoring.jd | 0
 .../monitoring-device-state/connectivity-monitoring.jd        | 0
 .../ru/training/monitoring-device-state/docking-monitoring.jd | 0
 .../{ => intl}/ru/training/monitoring-device-state/index.jd   | 0
 .../ru/training/monitoring-device-state/manifest-receivers.jd | 0
 docs/html-intl/{ => intl}/ru/training/multiscreen/adaptui.jd  | 0
 docs/html-intl/{ => intl}/ru/training/multiscreen/index.jd    | 0
 .../{ => intl}/ru/training/multiscreen/screendensities.jd     | 0
 .../{ => intl}/ru/training/multiscreen/screensizes.jd         | 0
 .../training/monitoring-device-state/battery-monitoring.jd    | 0
 .../monitoring-device-state/connectivity-monitoring.jd        | 0
 .../training/monitoring-device-state/docking-monitoring.jd    | 0
 .../zh-cn/training/monitoring-device-state/index.jd           | 0
 .../training/monitoring-device-state/manifest-receivers.jd    | 0
 .../{ => intl}/zh-cn/training/multiscreen/adaptui.jd          | 0
 docs/html-intl/{ => intl}/zh-cn/training/multiscreen/index.jd | 0
 .../{ => intl}/zh-cn/training/multiscreen/screendensities.jd  | 0
 .../{ => intl}/zh-cn/training/multiscreen/screensizes.jd      | 0
 docs/html/channels/io2013.jd                                  | 1 +
 docs/html/develop/index.jd                                    | 1 +
 docs/html/index.jd                                            | 1 +
 docs/html/license.jd                                          | 1 +
 docs/html/offline.jd                                          | 1 +
 docs/html/support.jd                                          | 1 +
 docs/html/tools/sdk/preview/features.jd                       | 1 +
 docs/html/tools/sdk/preview/index.jd                          | 1 +
 docs/html/tools/sdk/preview/installing.jd                     | 1 +
 docs/html/tools/sdk/preview/requirements.jd                   | 1 +
 docs/html/tools/sdk/preview/upgrading.jd                      | 1 +
 docs/html/training/notepad/index.jd                           | 1 +
 docs/html/training/notepad/notepad-ex1.jd                     | 1 +
 docs/html/training/notepad/notepad-ex2.jd                     | 3 ++-
 docs/html/training/notepad/notepad-ex3.jd                     | 1 +
 docs/html/training/notepad/notepad-extra-credit.jd            | 1 +
 docs/html/training/notepad/notepad-index.jd                   | 1 +
 67 files changed, 20 insertions(+), 3 deletions(-)
 rename docs/html-intl/{ => intl}/es/training/monitoring-device-state/battery-monitoring.jd (100%)
 rename docs/html-intl/{ => intl}/es/training/monitoring-device-state/connectivity-monitoring.jd (100%)
 rename docs/html-intl/{ => intl}/es/training/monitoring-device-state/docking-monitoring.jd (100%)
 rename docs/html-intl/{ => intl}/es/training/monitoring-device-state/index.jd (100%)
 rename docs/html-intl/{ => intl}/es/training/monitoring-device-state/manifest-receivers.jd (100%)
 rename docs/html-intl/{ => intl}/es/training/multiscreen/adaptui.jd (100%)
 rename docs/html-intl/{ => intl}/es/training/multiscreen/index.jd (100%)
 rename docs/html-intl/{ => intl}/es/training/multiscreen/screendensities.jd (100%)
 rename docs/html-intl/{ => intl}/es/training/multiscreen/screensizes.jd (100%)
 rename docs/html-intl/{ => intl}/ja/guide/publishing/app-signing.jd (100%)
 rename docs/html-intl/{ => intl}/ja/guide/publishing/preparing.jd (100%)
 rename docs/html-intl/{ => intl}/ja/guide/publishing/versioning.jd (100%)
 rename docs/html-intl/{ => intl}/ja/guide/topics/fundamentals.jd (100%)
 rename docs/html-intl/{ => intl}/ja/training/monitoring-device-state/battery-monitoring.jd (100%)
 rename docs/html-intl/{ => intl}/ja/training/monitoring-device-state/connectivity-monitoring.jd (100%)
 rename docs/html-intl/{ => intl}/ja/training/monitoring-device-state/docking-monitoring.jd (100%)
 rename docs/html-intl/{ => intl}/ja/training/monitoring-device-state/index.jd (100%)
 rename docs/html-intl/{ => intl}/ja/training/monitoring-device-state/manifest-receivers.jd (100%)
 rename docs/html-intl/{ => intl}/ja/training/multiscreen/adaptui.jd (100%)
 rename docs/html-intl/{ => intl}/ja/training/multiscreen/index.jd (100%)
 rename docs/html-intl/{ => intl}/ja/training/multiscreen/screendensities.jd (100%)
 rename docs/html-intl/{ => intl}/ja/training/multiscreen/screensizes.jd (100%)
 rename docs/html-intl/{ => intl}/ko/training/monitoring-device-state/battery-monitoring.jd (100%)
 rename docs/html-intl/{ => intl}/ko/training/monitoring-device-state/connectivity-monitoring.jd (100%)
 rename docs/html-intl/{ => intl}/ko/training/monitoring-device-state/docking-monitoring.jd (100%)
 rename docs/html-intl/{ => intl}/ko/training/monitoring-device-state/index.jd (100%)
 rename docs/html-intl/{ => intl}/ko/training/monitoring-device-state/manifest-receivers.jd (100%)
 rename docs/html-intl/{ => intl}/ko/training/multiscreen/adaptui.jd (100%)
 rename docs/html-intl/{ => intl}/ko/training/multiscreen/index.jd (100%)
 rename docs/html-intl/{ => intl}/ko/training/multiscreen/screendensities.jd (100%)
 rename docs/html-intl/{ => intl}/ko/training/multiscreen/screensizes.jd (100%)
 rename docs/html-intl/{ => intl}/ru/training/monitoring-device-state/battery-monitoring.jd (100%)
 rename docs/html-intl/{ => intl}/ru/training/monitoring-device-state/connectivity-monitoring.jd (100%)
 rename docs/html-intl/{ => intl}/ru/training/monitoring-device-state/docking-monitoring.jd (100%)
 rename docs/html-intl/{ => intl}/ru/training/monitoring-device-state/index.jd (100%)
 rename docs/html-intl/{ => intl}/ru/training/monitoring-device-state/manifest-receivers.jd (100%)
 rename docs/html-intl/{ => intl}/ru/training/multiscreen/adaptui.jd (100%)
 rename docs/html-intl/{ => intl}/ru/training/multiscreen/index.jd (100%)
 rename docs/html-intl/{ => intl}/ru/training/multiscreen/screendensities.jd (100%)
 rename docs/html-intl/{ => intl}/ru/training/multiscreen/screensizes.jd (100%)
 rename docs/html-intl/{ => intl}/zh-cn/training/monitoring-device-state/battery-monitoring.jd (100%)
 rename docs/html-intl/{ => intl}/zh-cn/training/monitoring-device-state/connectivity-monitoring.jd (100%)
 rename docs/html-intl/{ => intl}/zh-cn/training/monitoring-device-state/docking-monitoring.jd (100%)
 rename docs/html-intl/{ => intl}/zh-cn/training/monitoring-device-state/index.jd (100%)
 rename docs/html-intl/{ => intl}/zh-cn/training/monitoring-device-state/manifest-receivers.jd (100%)
 rename docs/html-intl/{ => intl}/zh-cn/training/multiscreen/adaptui.jd (100%)
 rename docs/html-intl/{ => intl}/zh-cn/training/multiscreen/index.jd (100%)
 rename docs/html-intl/{ => intl}/zh-cn/training/multiscreen/screendensities.jd (100%)
 rename docs/html-intl/{ => intl}/zh-cn/training/multiscreen/screensizes.jd (100%)

diff --git a/Android.mk b/Android.mk
index 9955d9ba96727..bd82970667fc5 100644
--- a/Android.mk
+++ b/Android.mk
@@ -832,7 +832,7 @@ LOCAL_DROIDDOC_SOURCE_PATH:=$(framework_docs_LOCAL_DROIDDOC_SOURCE_PATH)
 LOCAL_DROIDDOC_HTML_DIR:=$(framework_docs_LOCAL_DROIDDOC_HTML_DIR)
 LOCAL_ADDITIONAL_JAVA_DIR:=$(framework_docs_LOCAL_ADDITIONAL_JAVA_DIR)
 LOCAL_ADDITIONAL_DEPENDENCIES:=$(framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES)
-LOCAL_ADDITIONAL_HTML_DIR:=docs/html-intl /intl/
+LOCAL_ADDITIONAL_HTML_DIR:=docs/html-intl /
 
 LOCAL_MODULE := online-sdk
 
@@ -859,7 +859,7 @@ LOCAL_DROIDDOC_HTML_DIR:=$(framework_docs_LOCAL_DROIDDOC_HTML_DIR)
 LOCAL_ADDITIONAL_JAVA_DIR:=$(framework_docs_LOCAL_ADDITIONAL_JAVA_DIR)
 LOCAL_ADDITIONAL_DEPENDENCIES:=$(framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES)
 # specify a second html input dir and an output path relative to OUT_DIR)
-LOCAL_ADDITIONAL_HTML_DIR:=docs/html-intl /
+LOCAL_ADDITIONAL_HTML_DIR:=docs/html-intl/intl /
 
 LOCAL_MODULE := ds
 
diff --git a/docs/html-intl/es/training/monitoring-device-state/battery-monitoring.jd b/docs/html-intl/intl/es/training/monitoring-device-state/battery-monitoring.jd
similarity index 100%
rename from docs/html-intl/es/training/monitoring-device-state/battery-monitoring.jd
rename to docs/html-intl/intl/es/training/monitoring-device-state/battery-monitoring.jd
diff --git a/docs/html-intl/es/training/monitoring-device-state/connectivity-monitoring.jd b/docs/html-intl/intl/es/training/monitoring-device-state/connectivity-monitoring.jd
similarity index 100%
rename from docs/html-intl/es/training/monitoring-device-state/connectivity-monitoring.jd
rename to docs/html-intl/intl/es/training/monitoring-device-state/connectivity-monitoring.jd
diff --git a/docs/html-intl/es/training/monitoring-device-state/docking-monitoring.jd b/docs/html-intl/intl/es/training/monitoring-device-state/docking-monitoring.jd
similarity index 100%
rename from docs/html-intl/es/training/monitoring-device-state/docking-monitoring.jd
rename to docs/html-intl/intl/es/training/monitoring-device-state/docking-monitoring.jd
diff --git a/docs/html-intl/es/training/monitoring-device-state/index.jd b/docs/html-intl/intl/es/training/monitoring-device-state/index.jd
similarity index 100%
rename from docs/html-intl/es/training/monitoring-device-state/index.jd
rename to docs/html-intl/intl/es/training/monitoring-device-state/index.jd
diff --git a/docs/html-intl/es/training/monitoring-device-state/manifest-receivers.jd b/docs/html-intl/intl/es/training/monitoring-device-state/manifest-receivers.jd
similarity index 100%
rename from docs/html-intl/es/training/monitoring-device-state/manifest-receivers.jd
rename to docs/html-intl/intl/es/training/monitoring-device-state/manifest-receivers.jd
diff --git a/docs/html-intl/es/training/multiscreen/adaptui.jd b/docs/html-intl/intl/es/training/multiscreen/adaptui.jd
similarity index 100%
rename from docs/html-intl/es/training/multiscreen/adaptui.jd
rename to docs/html-intl/intl/es/training/multiscreen/adaptui.jd
diff --git a/docs/html-intl/es/training/multiscreen/index.jd b/docs/html-intl/intl/es/training/multiscreen/index.jd
similarity index 100%
rename from docs/html-intl/es/training/multiscreen/index.jd
rename to docs/html-intl/intl/es/training/multiscreen/index.jd
diff --git a/docs/html-intl/es/training/multiscreen/screendensities.jd b/docs/html-intl/intl/es/training/multiscreen/screendensities.jd
similarity index 100%
rename from docs/html-intl/es/training/multiscreen/screendensities.jd
rename to docs/html-intl/intl/es/training/multiscreen/screendensities.jd
diff --git a/docs/html-intl/es/training/multiscreen/screensizes.jd b/docs/html-intl/intl/es/training/multiscreen/screensizes.jd
similarity index 100%
rename from docs/html-intl/es/training/multiscreen/screensizes.jd
rename to docs/html-intl/intl/es/training/multiscreen/screensizes.jd
diff --git a/docs/html-intl/ja/guide/publishing/app-signing.jd b/docs/html-intl/intl/ja/guide/publishing/app-signing.jd
similarity index 100%
rename from docs/html-intl/ja/guide/publishing/app-signing.jd
rename to docs/html-intl/intl/ja/guide/publishing/app-signing.jd
diff --git a/docs/html-intl/ja/guide/publishing/preparing.jd b/docs/html-intl/intl/ja/guide/publishing/preparing.jd
similarity index 100%
rename from docs/html-intl/ja/guide/publishing/preparing.jd
rename to docs/html-intl/intl/ja/guide/publishing/preparing.jd
diff --git a/docs/html-intl/ja/guide/publishing/versioning.jd b/docs/html-intl/intl/ja/guide/publishing/versioning.jd
similarity index 100%
rename from docs/html-intl/ja/guide/publishing/versioning.jd
rename to docs/html-intl/intl/ja/guide/publishing/versioning.jd
diff --git a/docs/html-intl/ja/guide/topics/fundamentals.jd b/docs/html-intl/intl/ja/guide/topics/fundamentals.jd
similarity index 100%
rename from docs/html-intl/ja/guide/topics/fundamentals.jd
rename to docs/html-intl/intl/ja/guide/topics/fundamentals.jd
diff --git a/docs/html-intl/ja/training/monitoring-device-state/battery-monitoring.jd b/docs/html-intl/intl/ja/training/monitoring-device-state/battery-monitoring.jd
similarity index 100%
rename from docs/html-intl/ja/training/monitoring-device-state/battery-monitoring.jd
rename to docs/html-intl/intl/ja/training/monitoring-device-state/battery-monitoring.jd
diff --git a/docs/html-intl/ja/training/monitoring-device-state/connectivity-monitoring.jd b/docs/html-intl/intl/ja/training/monitoring-device-state/connectivity-monitoring.jd
similarity index 100%
rename from docs/html-intl/ja/training/monitoring-device-state/connectivity-monitoring.jd
rename to docs/html-intl/intl/ja/training/monitoring-device-state/connectivity-monitoring.jd
diff --git a/docs/html-intl/ja/training/monitoring-device-state/docking-monitoring.jd b/docs/html-intl/intl/ja/training/monitoring-device-state/docking-monitoring.jd
similarity index 100%
rename from docs/html-intl/ja/training/monitoring-device-state/docking-monitoring.jd
rename to docs/html-intl/intl/ja/training/monitoring-device-state/docking-monitoring.jd
diff --git a/docs/html-intl/ja/training/monitoring-device-state/index.jd b/docs/html-intl/intl/ja/training/monitoring-device-state/index.jd
similarity index 100%
rename from docs/html-intl/ja/training/monitoring-device-state/index.jd
rename to docs/html-intl/intl/ja/training/monitoring-device-state/index.jd
diff --git a/docs/html-intl/ja/training/monitoring-device-state/manifest-receivers.jd b/docs/html-intl/intl/ja/training/monitoring-device-state/manifest-receivers.jd
similarity index 100%
rename from docs/html-intl/ja/training/monitoring-device-state/manifest-receivers.jd
rename to docs/html-intl/intl/ja/training/monitoring-device-state/manifest-receivers.jd
diff --git a/docs/html-intl/ja/training/multiscreen/adaptui.jd b/docs/html-intl/intl/ja/training/multiscreen/adaptui.jd
similarity index 100%
rename from docs/html-intl/ja/training/multiscreen/adaptui.jd
rename to docs/html-intl/intl/ja/training/multiscreen/adaptui.jd
diff --git a/docs/html-intl/ja/training/multiscreen/index.jd b/docs/html-intl/intl/ja/training/multiscreen/index.jd
similarity index 100%
rename from docs/html-intl/ja/training/multiscreen/index.jd
rename to docs/html-intl/intl/ja/training/multiscreen/index.jd
diff --git a/docs/html-intl/ja/training/multiscreen/screendensities.jd b/docs/html-intl/intl/ja/training/multiscreen/screendensities.jd
similarity index 100%
rename from docs/html-intl/ja/training/multiscreen/screendensities.jd
rename to docs/html-intl/intl/ja/training/multiscreen/screendensities.jd
diff --git a/docs/html-intl/ja/training/multiscreen/screensizes.jd b/docs/html-intl/intl/ja/training/multiscreen/screensizes.jd
similarity index 100%
rename from docs/html-intl/ja/training/multiscreen/screensizes.jd
rename to docs/html-intl/intl/ja/training/multiscreen/screensizes.jd
diff --git a/docs/html-intl/ko/training/monitoring-device-state/battery-monitoring.jd b/docs/html-intl/intl/ko/training/monitoring-device-state/battery-monitoring.jd
similarity index 100%
rename from docs/html-intl/ko/training/monitoring-device-state/battery-monitoring.jd
rename to docs/html-intl/intl/ko/training/monitoring-device-state/battery-monitoring.jd
diff --git a/docs/html-intl/ko/training/monitoring-device-state/connectivity-monitoring.jd b/docs/html-intl/intl/ko/training/monitoring-device-state/connectivity-monitoring.jd
similarity index 100%
rename from docs/html-intl/ko/training/monitoring-device-state/connectivity-monitoring.jd
rename to docs/html-intl/intl/ko/training/monitoring-device-state/connectivity-monitoring.jd
diff --git a/docs/html-intl/ko/training/monitoring-device-state/docking-monitoring.jd b/docs/html-intl/intl/ko/training/monitoring-device-state/docking-monitoring.jd
similarity index 100%
rename from docs/html-intl/ko/training/monitoring-device-state/docking-monitoring.jd
rename to docs/html-intl/intl/ko/training/monitoring-device-state/docking-monitoring.jd
diff --git a/docs/html-intl/ko/training/monitoring-device-state/index.jd b/docs/html-intl/intl/ko/training/monitoring-device-state/index.jd
similarity index 100%
rename from docs/html-intl/ko/training/monitoring-device-state/index.jd
rename to docs/html-intl/intl/ko/training/monitoring-device-state/index.jd
diff --git a/docs/html-intl/ko/training/monitoring-device-state/manifest-receivers.jd b/docs/html-intl/intl/ko/training/monitoring-device-state/manifest-receivers.jd
similarity index 100%
rename from docs/html-intl/ko/training/monitoring-device-state/manifest-receivers.jd
rename to docs/html-intl/intl/ko/training/monitoring-device-state/manifest-receivers.jd
diff --git a/docs/html-intl/ko/training/multiscreen/adaptui.jd b/docs/html-intl/intl/ko/training/multiscreen/adaptui.jd
similarity index 100%
rename from docs/html-intl/ko/training/multiscreen/adaptui.jd
rename to docs/html-intl/intl/ko/training/multiscreen/adaptui.jd
diff --git a/docs/html-intl/ko/training/multiscreen/index.jd b/docs/html-intl/intl/ko/training/multiscreen/index.jd
similarity index 100%
rename from docs/html-intl/ko/training/multiscreen/index.jd
rename to docs/html-intl/intl/ko/training/multiscreen/index.jd
diff --git a/docs/html-intl/ko/training/multiscreen/screendensities.jd b/docs/html-intl/intl/ko/training/multiscreen/screendensities.jd
similarity index 100%
rename from docs/html-intl/ko/training/multiscreen/screendensities.jd
rename to docs/html-intl/intl/ko/training/multiscreen/screendensities.jd
diff --git a/docs/html-intl/ko/training/multiscreen/screensizes.jd b/docs/html-intl/intl/ko/training/multiscreen/screensizes.jd
similarity index 100%
rename from docs/html-intl/ko/training/multiscreen/screensizes.jd
rename to docs/html-intl/intl/ko/training/multiscreen/screensizes.jd
diff --git a/docs/html-intl/ru/training/monitoring-device-state/battery-monitoring.jd b/docs/html-intl/intl/ru/training/monitoring-device-state/battery-monitoring.jd
similarity index 100%
rename from docs/html-intl/ru/training/monitoring-device-state/battery-monitoring.jd
rename to docs/html-intl/intl/ru/training/monitoring-device-state/battery-monitoring.jd
diff --git a/docs/html-intl/ru/training/monitoring-device-state/connectivity-monitoring.jd b/docs/html-intl/intl/ru/training/monitoring-device-state/connectivity-monitoring.jd
similarity index 100%
rename from docs/html-intl/ru/training/monitoring-device-state/connectivity-monitoring.jd
rename to docs/html-intl/intl/ru/training/monitoring-device-state/connectivity-monitoring.jd
diff --git a/docs/html-intl/ru/training/monitoring-device-state/docking-monitoring.jd b/docs/html-intl/intl/ru/training/monitoring-device-state/docking-monitoring.jd
similarity index 100%
rename from docs/html-intl/ru/training/monitoring-device-state/docking-monitoring.jd
rename to docs/html-intl/intl/ru/training/monitoring-device-state/docking-monitoring.jd
diff --git a/docs/html-intl/ru/training/monitoring-device-state/index.jd b/docs/html-intl/intl/ru/training/monitoring-device-state/index.jd
similarity index 100%
rename from docs/html-intl/ru/training/monitoring-device-state/index.jd
rename to docs/html-intl/intl/ru/training/monitoring-device-state/index.jd
diff --git a/docs/html-intl/ru/training/monitoring-device-state/manifest-receivers.jd b/docs/html-intl/intl/ru/training/monitoring-device-state/manifest-receivers.jd
similarity index 100%
rename from docs/html-intl/ru/training/monitoring-device-state/manifest-receivers.jd
rename to docs/html-intl/intl/ru/training/monitoring-device-state/manifest-receivers.jd
diff --git a/docs/html-intl/ru/training/multiscreen/adaptui.jd b/docs/html-intl/intl/ru/training/multiscreen/adaptui.jd
similarity index 100%
rename from docs/html-intl/ru/training/multiscreen/adaptui.jd
rename to docs/html-intl/intl/ru/training/multiscreen/adaptui.jd
diff --git a/docs/html-intl/ru/training/multiscreen/index.jd b/docs/html-intl/intl/ru/training/multiscreen/index.jd
similarity index 100%
rename from docs/html-intl/ru/training/multiscreen/index.jd
rename to docs/html-intl/intl/ru/training/multiscreen/index.jd
diff --git a/docs/html-intl/ru/training/multiscreen/screendensities.jd b/docs/html-intl/intl/ru/training/multiscreen/screendensities.jd
similarity index 100%
rename from docs/html-intl/ru/training/multiscreen/screendensities.jd
rename to docs/html-intl/intl/ru/training/multiscreen/screendensities.jd
diff --git a/docs/html-intl/ru/training/multiscreen/screensizes.jd b/docs/html-intl/intl/ru/training/multiscreen/screensizes.jd
similarity index 100%
rename from docs/html-intl/ru/training/multiscreen/screensizes.jd
rename to docs/html-intl/intl/ru/training/multiscreen/screensizes.jd
diff --git a/docs/html-intl/zh-cn/training/monitoring-device-state/battery-monitoring.jd b/docs/html-intl/intl/zh-cn/training/monitoring-device-state/battery-monitoring.jd
similarity index 100%
rename from docs/html-intl/zh-cn/training/monitoring-device-state/battery-monitoring.jd
rename to docs/html-intl/intl/zh-cn/training/monitoring-device-state/battery-monitoring.jd
diff --git a/docs/html-intl/zh-cn/training/monitoring-device-state/connectivity-monitoring.jd b/docs/html-intl/intl/zh-cn/training/monitoring-device-state/connectivity-monitoring.jd
similarity index 100%
rename from docs/html-intl/zh-cn/training/monitoring-device-state/connectivity-monitoring.jd
rename to docs/html-intl/intl/zh-cn/training/monitoring-device-state/connectivity-monitoring.jd
diff --git a/docs/html-intl/zh-cn/training/monitoring-device-state/docking-monitoring.jd b/docs/html-intl/intl/zh-cn/training/monitoring-device-state/docking-monitoring.jd
similarity index 100%
rename from docs/html-intl/zh-cn/training/monitoring-device-state/docking-monitoring.jd
rename to docs/html-intl/intl/zh-cn/training/monitoring-device-state/docking-monitoring.jd
diff --git a/docs/html-intl/zh-cn/training/monitoring-device-state/index.jd b/docs/html-intl/intl/zh-cn/training/monitoring-device-state/index.jd
similarity index 100%
rename from docs/html-intl/zh-cn/training/monitoring-device-state/index.jd
rename to docs/html-intl/intl/zh-cn/training/monitoring-device-state/index.jd
diff --git a/docs/html-intl/zh-cn/training/monitoring-device-state/manifest-receivers.jd b/docs/html-intl/intl/zh-cn/training/monitoring-device-state/manifest-receivers.jd
similarity index 100%
rename from docs/html-intl/zh-cn/training/monitoring-device-state/manifest-receivers.jd
rename to docs/html-intl/intl/zh-cn/training/monitoring-device-state/manifest-receivers.jd
diff --git a/docs/html-intl/zh-cn/training/multiscreen/adaptui.jd b/docs/html-intl/intl/zh-cn/training/multiscreen/adaptui.jd
similarity index 100%
rename from docs/html-intl/zh-cn/training/multiscreen/adaptui.jd
rename to docs/html-intl/intl/zh-cn/training/multiscreen/adaptui.jd
diff --git a/docs/html-intl/zh-cn/training/multiscreen/index.jd b/docs/html-intl/intl/zh-cn/training/multiscreen/index.jd
similarity index 100%
rename from docs/html-intl/zh-cn/training/multiscreen/index.jd
rename to docs/html-intl/intl/zh-cn/training/multiscreen/index.jd
diff --git a/docs/html-intl/zh-cn/training/multiscreen/screendensities.jd b/docs/html-intl/intl/zh-cn/training/multiscreen/screendensities.jd
similarity index 100%
rename from docs/html-intl/zh-cn/training/multiscreen/screendensities.jd
rename to docs/html-intl/intl/zh-cn/training/multiscreen/screendensities.jd
diff --git a/docs/html-intl/zh-cn/training/multiscreen/screensizes.jd b/docs/html-intl/intl/zh-cn/training/multiscreen/screensizes.jd
similarity index 100%
rename from docs/html-intl/zh-cn/training/multiscreen/screensizes.jd
rename to docs/html-intl/intl/zh-cn/training/multiscreen/screensizes.jd
diff --git a/docs/html/channels/io2013.jd b/docs/html/channels/io2013.jd
index 977eb2f2aed34..2efda28d2b8c6 100644
--- a/docs/html/channels/io2013.jd
+++ b/docs/html/channels/io2013.jd
@@ -1,3 +1,4 @@
+excludeFromSuggestions=true
 fullpage=true
 page.title=Google I/O 13
 @jd:body
diff --git a/docs/html/develop/index.jd b/docs/html/develop/index.jd
index 61a98b7ad8a82..3f88b9d57bbd1 100644
--- a/docs/html/develop/index.jd
+++ b/docs/html/develop/index.jd
@@ -3,6 +3,7 @@ page.title=Develop
 header.hide=1
 carousel=1
 tabbedList=1
+excludeFromSuggestions=true
 @jd:body
 
 <style>
diff --git a/docs/html/index.jd b/docs/html/index.jd
index 3e59068f3e224..191e0fbfa22cc 100644
--- a/docs/html/index.jd
+++ b/docs/html/index.jd
@@ -1,6 +1,7 @@
 fullpage=true
 no_footer_links=true
 carousel=true
+excludeFromSuggestions=true
 page.metaDescription=The official site for Android developers. Provides the Android SDK and documentation for app developers and designers.
 page.customHeadTag=<meta name="google-site-verification" content="sa-bIAI6GKvct3f61-WpRguHq-aNjtF7xJjMTSi79as" />
 
diff --git a/docs/html/license.jd b/docs/html/license.jd
index 20e68fabc6cc2..b98c912860457 100644
--- a/docs/html/license.jd
+++ b/docs/html/license.jd
@@ -1,5 +1,6 @@
 page.title=Content License
 fullpage=1
+excludeFromSuggestions=true
 @jd:body
 
 <div class="wrap" style="width:940px;">
diff --git a/docs/html/offline.jd b/docs/html/offline.jd
index 73da7799fdcc2..6d4483fd15021 100644
--- a/docs/html/offline.jd
+++ b/docs/html/offline.jd
@@ -1,5 +1,6 @@
 home=true
 page.title=Welcome
+excludeFromSuggestions=true
 @jd:body
 
 <style type="text/css">
diff --git a/docs/html/support.jd b/docs/html/support.jd
index 2f1222fb3fdcd..1f21b58d15ccb 100644
--- a/docs/html/support.jd
+++ b/docs/html/support.jd
@@ -1,5 +1,6 @@
 page.title=Developer Support
 fullpage=1
+excludeFromSuggestions=true
 @jd:body
 
 <div class="wrap" style="width:940px;">
diff --git a/docs/html/tools/sdk/preview/features.jd b/docs/html/tools/sdk/preview/features.jd
index 02897cd5c3048..2bdb0f42fbcfd 100644
--- a/docs/html/tools/sdk/preview/features.jd
+++ b/docs/html/tools/sdk/preview/features.jd
@@ -1,3 +1,4 @@
+excludeFromSuggestions=true
 @jd:body
 
 <script type="text/javascript">
diff --git a/docs/html/tools/sdk/preview/index.jd b/docs/html/tools/sdk/preview/index.jd
index d96df93dd9d30..713730efb7c6f 100644
--- a/docs/html/tools/sdk/preview/index.jd
+++ b/docs/html/tools/sdk/preview/index.jd
@@ -1,3 +1,4 @@
 sdk.redirect=true
 page.template=sdk
+excludeFromSuggestions=true
 @jd:body
diff --git a/docs/html/tools/sdk/preview/installing.jd b/docs/html/tools/sdk/preview/installing.jd
index c40e531cdf172..d248b67704ee9 100644
--- a/docs/html/tools/sdk/preview/installing.jd
+++ b/docs/html/tools/sdk/preview/installing.jd
@@ -1,3 +1,4 @@
+excludeFromSuggestions=true
 @jd:body
 
 <script type="text/javascript">
diff --git a/docs/html/tools/sdk/preview/requirements.jd b/docs/html/tools/sdk/preview/requirements.jd
index b5aed80ef6447..b62ee05005071 100644
--- a/docs/html/tools/sdk/preview/requirements.jd
+++ b/docs/html/tools/sdk/preview/requirements.jd
@@ -1,3 +1,4 @@
+excludeFromSuggestions=true
 @jd:body
 
 <script type="text/javascript">
diff --git a/docs/html/tools/sdk/preview/upgrading.jd b/docs/html/tools/sdk/preview/upgrading.jd
index 1c53bdbfe07f0..3b9069623b906 100644
--- a/docs/html/tools/sdk/preview/upgrading.jd
+++ b/docs/html/tools/sdk/preview/upgrading.jd
@@ -1,3 +1,4 @@
+excludeFromSuggestions=true
 @jd:body
 
 <script type="text/javascript">
diff --git a/docs/html/training/notepad/index.jd b/docs/html/training/notepad/index.jd
index 64ba14466a33f..d1aa221c270b4 100644
--- a/docs/html/training/notepad/index.jd
+++ b/docs/html/training/notepad/index.jd
@@ -1,3 +1,4 @@
+excludeFromSuggestions=true
 page.title=Notepad Tutorial
 parent.title=Tutorials
 @jd:body
diff --git a/docs/html/training/notepad/notepad-ex1.jd b/docs/html/training/notepad/notepad-ex1.jd
index 0decbb21fe463..f680f1505d5f5 100644
--- a/docs/html/training/notepad/notepad-ex1.jd
+++ b/docs/html/training/notepad/notepad-ex1.jd
@@ -1,3 +1,4 @@
+excludeFromSuggestions=true
 page.title=Notepad Exercise 1
 parent.title=Notepad Tutorial
 parent.link=index.html
diff --git a/docs/html/training/notepad/notepad-ex2.jd b/docs/html/training/notepad/notepad-ex2.jd
index 895a071a29a29..d15499b3750f6 100644
--- a/docs/html/training/notepad/notepad-ex2.jd
+++ b/docs/html/training/notepad/notepad-ex2.jd
@@ -1,4 +1,5 @@
-Rpage.title=Notepad Exercise 2
+excludeFromSuggestions=true
+page.title=Notepad Exercise 2
 parent.title=Notepad Tutorial
 parent.link=index.html
 @jd:body
diff --git a/docs/html/training/notepad/notepad-ex3.jd b/docs/html/training/notepad/notepad-ex3.jd
index e31ecda2e20b8..648f9f2d9bb74 100644
--- a/docs/html/training/notepad/notepad-ex3.jd
+++ b/docs/html/training/notepad/notepad-ex3.jd
@@ -1,3 +1,4 @@
+excludeFromSuggestions=true
 page.title=Notepad Exercise 3
 parent.title=Notepad Tutorial
 parent.link=index.html
diff --git a/docs/html/training/notepad/notepad-extra-credit.jd b/docs/html/training/notepad/notepad-extra-credit.jd
index d5fd7716d2621..8ab20218788c5 100644
--- a/docs/html/training/notepad/notepad-extra-credit.jd
+++ b/docs/html/training/notepad/notepad-extra-credit.jd
@@ -1,3 +1,4 @@
+excludeFromSuggestions=true
 page.title=Notepad Extra Credit
 parent.title=Notepad Tutorial
 parent.link=index.html
diff --git a/docs/html/training/notepad/notepad-index.jd b/docs/html/training/notepad/notepad-index.jd
index 151c50dcda674..fde43fa7db268 100644
--- a/docs/html/training/notepad/notepad-index.jd
+++ b/docs/html/training/notepad/notepad-index.jd
@@ -1,3 +1,4 @@
+excludeFromSuggestions=true
 page.title=Notepad Tutorial
 @jd:body