Merge "Fix typo: teh->the"
diff --git a/src/images/cleanup.sh b/scripts/cleanup.sh
similarity index 100%
rename from src/images/cleanup.sh
rename to scripts/cleanup.sh
diff --git a/src/assets/bg_fade.jpg b/src/assets/bg_fade.jpg
old mode 100755
new mode 100644
Binary files differ
diff --git a/src/assets/bg_images_sprite.png b/src/assets/bg_images_sprite.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/src/assets/main.css b/src/assets/main.css
index 1a089e2..59f2dd1 100644
--- a/src/assets/main.css
+++ b/src/assets/main.css
@@ -102,7 +102,7 @@
/* tab highlighting */
.home #home-link a,
.community #community-link a,
-.porting #porting-link a,
+.tech #tech-link a,
.source #source-link a,
.about #about-link a,
.compatibility #compatibility-link a {
diff --git a/src/images/androidBluetooth.gif b/src/images/androidBluetooth.gif
old mode 100755
new mode 100644
Binary files differ
diff --git a/src/images/androidBluetoothProcessDiagram.jpg b/src/images/androidBluetoothProcessDiagram.jpg
old mode 100755
new mode 100644
Binary files differ
diff --git a/src/images/androidPMArchitecture.gif b/src/images/androidPMArchitecture.gif
old mode 100755
new mode 100644
Binary files differ
diff --git a/src/images/android_audio_architecture.gif b/src/images/android_audio_architecture.gif
old mode 100755
new mode 100644
Binary files differ
diff --git a/src/images/cameraPreview.jpg b/src/images/cameraPreview.jpg
old mode 100755
new mode 100644
Binary files differ
diff --git a/src/images/cameraTakePicture.jpg b/src/images/cameraTakePicture.jpg
old mode 100755
new mode 100644
Binary files differ
diff --git a/src/images/camera_video2.gif b/src/images/camera_video2.gif
old mode 100755
new mode 100644
Binary files differ
diff --git a/src/images/open_source.png b/src/images/open_source.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/src/images/stk.gif b/src/images/stk.gif
old mode 100755
new mode 100644
Binary files differ
diff --git a/src/images/stk_display_text.gif b/src/images/stk_display_text.gif
old mode 100755
new mode 100644
Binary files differ
diff --git a/src/images/stk_refresh_init.gif b/src/images/stk_refresh_init.gif
old mode 100755
new mode 100644
Binary files differ
diff --git a/src/images/stk_refresh_reset.gif b/src/images/stk_refresh_reset.gif
old mode 100755
new mode 100644
Binary files differ
diff --git a/src/images/stk_refresh_update.gif b/src/images/stk_refresh_update.gif
old mode 100755
new mode 100644
Binary files differ
diff --git a/src/images/stk_send_SMS.gif b/src/images/stk_send_SMS.gif
old mode 100755
new mode 100644
Binary files differ
diff --git a/src/images/telephony.gif b/src/images/telephony.gif
old mode 100755
new mode 100644
Binary files differ
diff --git a/src/images/telephony_solicted_example.gif b/src/images/telephony_solicted_example.gif
old mode 100755
new mode 100644
Binary files differ
diff --git a/src/images/telephony_unsolicted_example.gif b/src/images/telephony_unsolicted_example.gif
old mode 100755
new mode 100644
Binary files differ
diff --git a/src/source/building-devices.md b/src/source/building-devices.md
index 87e8121..68756d2 100644
--- a/src/source/building-devices.md
+++ b/src/source/building-devices.md
@@ -115,13 +115,13 @@
The recommended builds for the various devices are available through
the lunch menu, accesed when running the `lunch` command with no arguments:
-Device | Build configuration
----------|---------------------
-crespo | full_crespo-userdebug
-crespo4g | full_crespo4g-userdebug
-passion | full_passion-userdebug
-sapphire | full_sapphire-userdebug
-dream | full_dream-userdebug
+Device | Branch | Build configuration
+---------|------------------|------------------------
+crespo | android-2.3.4_r1 | full_crespo-userdebug
+crespo4g | gingerbread | full_crespo4g-userdebug
+passion | android-2.3.4_r1 | full_passion-userdebug
+sapphire | android-2.2.2_r1 | full_sapphire-userdebug
+dream | android-2.2.2_r1 | full_dream-userdebug
## Flashing a device ##
@@ -153,7 +153,7 @@
However, no compatibility issues are expected when running newer systems
with older bootloaders and radio images according to the following tables.
-Nexus S:
+Nexus S (worldwide version "XX"):
Android Version | Preferred Bootloader | Preferred Radio | Also possible
----------------|----------------------|-----------------|--------------
@@ -161,6 +161,20 @@
2.3.3 | I9020XXKA3 | I9020XXKB1 | All previous versions
2.3.4 | I9020XXKA3 | I9020XXKD1 | All previous versions
+Nexus S (850MHz version "UC"):
+
+Android Version | Preferred Bootloader | Preferred Radio | Also possible
+----------------|----------------------|-----------------|--------------
+2.3.3 | I9020XXKA3 | I9020UCKB2
+2.3.4 | I9020XXKA3 | I9020UCKD1 | All previous versions
+
+Nexus S (Korea version "KR"):
+
+Android Version | Preferred Bootloader | Preferred Radio | Also possible
+----------------|----------------------|-----------------|--------------
+2.3.3 | I9020XXKA3 | I9020KRKB3
+2.3.4 | I9020XXKA3 | M200KRKC1 | All previous versions
+
Nexus S 4G:
Android Version | Preferred Bootloader | Preferred Radio | Also possible
@@ -170,6 +184,6 @@
If you're building a new version of Android, if your Nexus S or Nexus S 4G has
an older bootloader and radio image that is marked as being also possible in
-the table above but is not recognized by the build system, you can locally
+the table above but is not recognized by fastboot, you can locally
delete the `version-bootloader` and `version-baseband` lines in
`device/samsung/crespo/board-info.txt` or `device/samsung/crespo4g/board-info.txt`.
diff --git a/src/source/downloading.md b/src/source/downloading.md
index b096248..d932efa 100644
--- a/src/source/downloading.md
+++ b/src/source/downloading.md
@@ -75,6 +75,7 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
+
mQGiBEnnWD4RBACt9/h4v9xnnGDou13y3dvOx6/t43LPPIxeJ8eX9WB+8LLuROSV
lFhpHawsVAcFlmi7f7jdSRF+OvtZL9ShPKdLfwBJMNkU66/TZmPewS4m782ndtw7
8tR1cXb197Ob8kOfQB3A9yk2XZ4ei4ZC3i6wVdqHLRxABdncwu5hOF9KXwCgkxMD
diff --git a/src/source/initializing.md b/src/source/initializing.md
index 6626482..074daa8 100644
--- a/src/source/initializing.md
+++ b/src/source/initializing.md
@@ -64,21 +64,12 @@
## Installing required packages ##
-To set up your development environment, install the following required packages.
+To set up your development environment, install the following required packages:
-64-bit systems:
-
- $ sudo apt-get install git-core gnupg flex bison gperf build-essential zip curl zlib1g-dev libc6-dev
- lib32ncurses5-dev ia32-libs x11proto-core-dev libx11-dev lib32readline5-dev lib32z-dev libgl1-mesa-dev
-
-32-bit systems:
-
- $ sudo apt-get install git-core gnupg flex bison gperf build-essential zip curl zlib1g-dev libc6-dev
- libncurses5-dev x11proto-core-dev libx11-dev libreadline5-dev libz-dev libgl1-mesa-dev
-
-For building Froyo or an older release on a 64-bit system, several other packages are necessary to establish a 32-bit build environment:
-
- $ sudo apt-get install gcc-multilib g++-multilib libc6-i386 libc6-dev-i386
+ $ sudo apt-get install git-core gnupg flex bison gperf build-essential \
+ zip curl zlib1g-dev libc6-dev lib32ncurses5-dev ia32-libs \
+ x11proto-core-dev libx11-dev lib32readline5-dev lib32z-dev \
+ libgl1-mesa-dev g++-multilib
## Configuring USB Access ##
