Minor changes since Dan's changes
Changes to source text, and removal of useless images.
Change-Id: I9da0c26021df33cf2bb576b13a18a591d220d2a0
diff --git a/src/compatibility/2.1/versions.md b/src/compatibility/2.1/versions.md
index 9fcf50b..143b4a7 100644
--- a/src/compatibility/2.1/versions.md
+++ b/src/compatibility/2.1/versions.md
@@ -1,8 +1,24 @@
-page.title=Permitted Version Strings for Android 2.1
+<!--
+ Copyright 2010 The Android Open Source Project
-As described in Section 3.2.2 of the [Android 2.1 Compatibility Definition](android-2.1-cdd.pdf)
-Definition</a>, only certain strings are allowable for the system property
-<code>android.os.Build.VERSION.RELEASE</code>. The reason for this is that
+ 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.
+-->
+
+# Permitted Version Strings for Android 2.1 #
+
+As described in Section 3.2.2 of the [Android 2.1 Compatibility Definition](/cdds/android-2.1-cdd.pdf),
+only certain strings are allowable for the system property
+`android.os.Build.VERSION.RELEASE`. The reason for this is that
applications and web sites may rely on predictable values for this string, and
so that end users can easily and reliably identify the version of Android
running on their devices.
@@ -11,8 +27,9 @@
but not change any API behavior, such releases may not be accompanied by a new
Compatibility Definition Document. This page lists the versions that are
allowable by an Android 2.1-based system. The only permitted values for
-<code>android.os.Build.VERSION.RELEASE</code> for Android 2.1 are:
+`android.os.Build.VERSION.RELEASE` for Android 2.1 are:
- 2.1
+
- 2.1-update1
diff --git a/src/compatibility/2.2/versions.md b/src/compatibility/2.2/versions.md
index 80273f9..571760a 100644
--- a/src/compatibility/2.2/versions.md
+++ b/src/compatibility/2.2/versions.md
@@ -1,7 +1,24 @@
-page.title=Permitted Version Strings for Android 2.2
+<!--
+ Copyright 2010 The Android Open Source Project
-As described in Section 3.2.2 of the [Android 2.2 Compatibility Definition](android-2.2-cdd.pdf), only certain strings are allowable for the system property
-<code>android.os.Build.VERSION.RELEASE</code>. The reason for this is that
+ 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.
+-->
+
+# Permitted Version Strings for Android 2.2 #
+
+As described in Section 3.2.2 of the [Android 2.2 Compatibility Definition](/cdds/android-2.2-cdd.pdf),
+only certain strings are allowable for the system property
+`android.os.Build.VERSION.RELEASE`. The reason for this is that
applications and web sites may rely on predictable values for this string, and
so that end users can easily and reliably identify the version of Android
running on their devices.
@@ -9,11 +26,10 @@
Because subsequent releases of the Android software may revise this string,
but not change any API behavior, such releases may not be accompanied by a new
Compatibility Definition Document. This page lists the versions that are
-allowable by an Android 2.2-based system.
-
-The value of <code>android.os.Build.VERSION.RELEASE</code> for Android 2.2
-MUST be one of the following strings:
+allowable by an Android 2.2-based system. The only permitted values for
+`android.os.Build.VERSION.RELEASE` for Android 2.2 are:
- 2.2
+
- 2.2.1
diff --git a/src/compatibility/2.3/versions.md b/src/compatibility/2.3/versions.md
index 1b1bc9d..5cb3e68 100644
--- a/src/compatibility/2.3/versions.md
+++ b/src/compatibility/2.3/versions.md
@@ -1,7 +1,24 @@
-page.title=Permitted Version Strings for Android 2.3
+<!--
+ Copyright 2010 The Android Open Source Project
-As described in Section 3.2.2 of the [Android 2.3 Compatibility Definition](android-2.3-cdd.pdf), only certain strings are allowable for the system property
-<code>android.os.Build.VERSION.RELEASE</code>. The reason for this is that
+ 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.
+-->
+
+# Permitted Version Strings for Android 2.3 #
+
+As described in Section 3.2.2 of the [Android 2.3 Compatibility Definition](/cdds/android-2.3-cdd.pdf),
+only certain strings are allowable for the system property
+`android.os.Build.VERSION.RELEASE`. The reason for this is that
applications and web sites may rely on predictable values for this string, and
so that end users can easily and reliably identify the version of Android
running on their devices.
@@ -9,11 +26,7 @@
Because subsequent releases of the Android software may revise this string,
but not change any API behavior, such releases may not be accompanied by a new
Compatibility Definition Document. This page lists the versions that are
-allowable by an Android 2.2-based system.
+allowable by an Android 2.3-based system. The only permitted values for
+`android.os.Build.VERSION.RELEASE` for Android 2.3 are:
-The value of <code>android.os.Build.VERSION.RELEASE</code> for Android 2.3
-MUST be one of the following strings:
-
-- 2.3
-- 2.3.1
-
+- 2.3.3
diff --git a/src/compatibility/contact-us.md b/src/compatibility/contact-us.md
index 5fd45cb..486677d 100644
--- a/src/compatibility/contact-us.md
+++ b/src/compatibility/contact-us.md
@@ -1,3 +1,19 @@
+<!--
+ 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.
+-->
+
# Contact Us #
Thanks for your interest in Android compatibility!
diff --git a/src/compatibility/cts-development.md b/src/compatibility/cts-development.md
index 1f8f8e6..cb60cf2 100644
--- a/src/compatibility/cts-development.md
+++ b/src/compatibility/cts-development.md
@@ -1,3 +1,19 @@
+<!--
+ 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.
+-->
+
# CTS Development #
## Initializing Your Repo Client ##
diff --git a/src/compatibility/cts-intro.md b/src/compatibility/cts-intro.md
index 0c4e095..5cc5240 100644
--- a/src/compatibility/cts-intro.md
+++ b/src/compatibility/cts-intro.md
@@ -1,3 +1,19 @@
+<!--
+ 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.
+-->
+
# Compatibility Test Suite #
## How does the CTS work? ##
diff --git a/src/compatibility/downloads.md b/src/compatibility/downloads.md
index b308009..b201032 100644
--- a/src/compatibility/downloads.md
+++ b/src/compatibility/downloads.md
@@ -1,3 +1,19 @@
+<!--
+ 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.
+-->
+
# Android Compatibility Downloads #
Thanks for your interest in Android Compatibility! The links below allow
@@ -11,7 +27,7 @@
CTS release for Android 2.3 has not yet been prepared, but one will be
available soon.
-- [Android 2.3 Compatibility Definition Document (CDD)](/cdds/android-2.3-cdd.pdf)
+- [Android 2.3 Compatibility Definition Document (CDD)](2.3/android-2.3.3-cdd.pdf)
<!-- [Android 2.2 R4 Compatibility Test Suite (CTS)](http://dl.google.com/dl/android/cts/android-cts-2.2_r4-x86.zip) -->
## Android 2.2 ##
@@ -20,7 +36,7 @@
FroYo. Source code for Android 2.2 is found in the 'froyo' branch in the
open-source tree.
-- [Android 2.2 Compatibility Definition Document (CDD)](/cdds/android-2.2-cdd.pdf)
+- [Android 2.2 Compatibility Definition Document (CDD)](2.2/android-2.2-cdd.pdf)
- [Android 2.2 R4 Compatibility Test Suite (CTS)](http://dl.google.com/dl/android/cts/android-cts-2.2_r4-x86.zip)
## Android 2.1 ##
@@ -30,7 +46,7 @@
open-source tree. Note that for technical reasons, there is no compatibility
program for Android 2.0 or 2.0.1, and new devices must use Android 2.1.
-- [Android 2.1 Compatibility Definition Document (CDD)](/cdds/android-2.1-cdd.pdf)
+- [Android 2.1 Compatibility Definition Document (CDD)](2.1/android-2.1-cdd.pdf)
- [Android 2.1 R5 Compatibility Test Suite (CTS)](http://dl.google.com/dl/android/cts/android-cts-2.1_r5-x86.zip)
## Android 1.6 ##
@@ -39,14 +55,14 @@
Android 1.6 was obsoleted by Android 2.1. Source code for Android 1.6 is found
in the 'donut' branch in the open-source tree.
-- [Android 1.6 Compatibility Definition Document (CDD)](/cdds/android-1.6-cdd.pdf)
+- [Android 1.6 Compatibility Definition Document (CDD)](1.6/android-1.6-cdd.pdf)
## Compatibility Test Suite Manual ##
The CTS user manual is applicable to any CTS version, but CTS 2.1 R2 and
beyond require [additional steps](cts-intro.html) to run the accessibility tests.
-- [Compatibility Test Suite (CTS) User Manual](/cdds/android-cts-manual-r4.pdf)
+- [Compatibility Test Suite (CTS) User Manual](android-cts-manual-r4.pdf)
## Older Android Versions ##
diff --git a/src/compatibility/index.md b/src/compatibility/index.md
index 862f7c8..67ba133 100644
--- a/src/compatibility/index.md
+++ b/src/compatibility/index.md
@@ -1,3 +1,19 @@
+<!--
+ 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.
+-->
+
# Android Compatibility #
Android's purpose is to establish an open platform for developers to build
diff --git a/src/compatibility/overview.md b/src/compatibility/overview.md
index 5ca207e..2111983 100644
--- a/src/compatibility/overview.md
+++ b/src/compatibility/overview.md
@@ -1,3 +1,19 @@
+<!--
+ 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.
+-->
+
# Compatibility Program Overview #
The Android compatibility program makes it easy for mobile device
@@ -86,7 +102,7 @@
If you want to build a device compatible with a given Android version,
start by checking out the source code for that version, and then read the
corresponding CDD and stay within its guidelines. For additional details,
-simply examine <a href="">the latest CDD</a>.
+simply examine [the latest CDD](2.3/android-2.3.3-cdd.pdf).
# Compatibility Test Suite (CTS) #
diff --git a/src/compatibility/sidebar.md b/src/compatibility/sidebar.md
index 87682e6..abefb40 100644
--- a/src/compatibility/sidebar.md
+++ b/src/compatibility/sidebar.md
@@ -1,12 +1,12 @@
# Getting Started #
-- [Compatibility Overview](overview.html)
-- [Current CDD](/compatibility/2.3/android-2.3-cdd.pdf)
-- [CTS Introduction](cts-intro.html)
-- [CTS Development](cts-development.html)
+- [Compatibility Overview](/compatibility/overview.html)
+- [Current CDD](/compatibility/2.3/android-2.3.3-cdd.pdf)
+- [CTS Introduction](/compatibility/cts-intro.html)
+- [CTS Development](/compatibility/cts-development.html)
# More Information #
-- [Downloads](downloads.html)
+- [Downloads](/compatibility/downloads.html)
- [FAQs](/faqs.html#compatibility)
-- [Contact Us](contact-us.html)
+- [Contact Us](/compatibility/contact-us.html)