Reconcile with ics-mr1-release
Change-Id: I56d869af62a0a636d28d79507ee46774562dc1a3
diff --git a/src/source/initializing.md b/src/source/initializing.md
index e15df10..115d842 100644
--- a/src/source/initializing.md
+++ b/src/source/initializing.md
@@ -51,7 +51,6 @@
Java 6: for Gingerbread and newer
$ sudo add-apt-repository "deb http://archive.canonical.com/ lucid partner"
- $ sudo add-apt-repository "deb-src http://archive.canonical.com/ubuntu lucid partner"
$ sudo apt-get update
$ sudo apt-get install sun-java6-jdk
@@ -64,7 +63,7 @@
## Installing required packages ##
-To set up your development environment, install the following required packages:
+Ubuntu 10.04 (recommended)
$ sudo apt-get install git-core gnupg flex bison gperf build-essential \
zip curl zlib1g-dev libc6-dev lib32ncurses5-dev ia32-libs \
@@ -72,6 +71,13 @@
libgl1-mesa-dev g++-multilib mingw32 tofrodos python-markdown \
libxml2-utils
+Ubuntu 11.10 (experimental)
+
+ $ sudo apt-get install git-core gnupg flex bison gperf build-essential \
+ zip curl zlib1g-dev libc6-dev libncurses5-dev ia32-libs-multiarch \
+ x11proto-core-dev libx11-dev libreadline6-dev libgl1-mesa-dev \
+ g++-multilib mingw32 tofrodos python-markdown libxml2-utils
+
## Configuring USB Access ##
Under GNU/linux systems (and specifically under Ubuntu systems),
@@ -130,7 +136,10 @@
## Installing required packages ##
-- Install XCode from [the Apple developer site](http://developer.apple.com/). We recommend version 3.0 or newer. If you are not already registered as an Apple developer, you will have to create an Apple ID in order to download.
+- Install XCode from [the Apple developer site](http://developer.apple.com/).
+We recommend version 3.1.4 or newer, i.e. gcc 4.2.
+If you are not already registered as an Apple developer, you will have to
+create an Apple ID in order to download.
- Install MacPorts from [macports.org](http://www.macports.org/install.php).