Merge "Move debugging info into tech section"
diff --git a/src/source/sidebar.md b/src/source/sidebar.md
index 373db15..4a9f797 100644
--- a/src/source/sidebar.md
+++ b/src/source/sidebar.md
@@ -26,7 +26,6 @@
- [Git Resources](git-resources.html)
- [Using Eclipse](using-eclipse.html)
- [Code Style Guidelines](code-style.html)
-- [Development Tips and Tricks](developing.html)
- [FAQs](/faqs.html)
diff --git a/src/tech/debugging/index.md b/src/tech/debugging/index.md
new file mode 100644
index 0000000..4ae4fc9
--- /dev/null
+++ b/src/tech/debugging/index.md
@@ -0,0 +1,23 @@
+<!--
+ Copyright 2010 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+# Debugging the Android platform #
+
+The following sections contain information, documentation, tips and tricks
+about debugging Android at the platform level, typically during development
+of platform-level features.
+
+[» Debugging Native Memory Use](/tech/debugging/native-memory.html)
diff --git a/src/source/developing.md b/src/tech/debugging/native-memory.md
similarity index 86%
rename from src/source/developing.md
rename to src/tech/debugging/native-memory.md
index 042ec6a..755a429 100644
--- a/src/source/developing.md
+++ b/src/tech/debugging/native-memory.md
@@ -14,14 +14,11 @@
limitations under the License.
-->
-# Development Tips and Tricks #
+# Debugging Native Memory Use #
-A collection of helpful tricks and available facilities for developing
-the platform code. This tips assume that you are working with an eng
+This tip assume that you are working with an eng
or userdebug build of the platform, not on a production device.
-## Debugging Native Memory Use ##
-
Android's native memory allocator has some useful debugging features. You
can turn on memory tracking with:
diff --git a/src/tech/debugging/sidebar2.md b/src/tech/debugging/sidebar2.md
new file mode 100644
index 0000000..3ab9f67
--- /dev/null
+++ b/src/tech/debugging/sidebar2.md
@@ -0,0 +1,2 @@
+# Debugging Topics #
+- [Native Memory Use](/tech/debugging/native-memory.html)
diff --git a/src/tech/index.md b/src/tech/index.md
index 9bf5867..3fec768 100644
--- a/src/tech/index.md
+++ b/src/tech/index.md
@@ -30,6 +30,13 @@
[» Dalvik Information](/tech/dalvik/index.html)
+## Debugging ##
+Android is a large and complex system. This section includes tips and tricks
+about debugging at the platform level.
+
+[» Debugging Information](/tech/debugging/index.html)
+
+
## Encryption Technical Information ##
The Android Open-Source Project includes the ability to encrypt the user's data.
This document is written for 3rd parties developing Android devices who want to
diff --git a/src/tech/sidebar.md b/src/tech/sidebar.md
index b770eb8..75a4379 100644
--- a/src/tech/sidebar.md
+++ b/src/tech/sidebar.md
@@ -1,3 +1,4 @@
# Topics #
- [Dalvik](/tech/dalvik/index.html)
+- [Debugging](/tech/debugging/index.html)
- [Encryption](/tech/encryption/index.html)