Merge "Add 4.0.4 to the list of builds"
diff --git a/scripts/micro-httpd.py b/scripts/micro-httpd.py
index 9292dab..1cffa08 100755
--- a/scripts/micro-httpd.py
+++ b/scripts/micro-httpd.py
@@ -18,10 +18,12 @@
import SocketServer
import os
+
+outdir = os.path.join(os.path.dirname(__file__), '..', 'out')
+os.chdir(outdir)
PORT = int(os.environ.get('HTTP_PORT', 8080))
Handler = SimpleHTTPServer.SimpleHTTPRequestHandler
httpd = SocketServer.TCPServer(('0.0.0.0', PORT), Handler)
httpd.allow_reuse_address = True
print 'Serving on port %d' % PORT
httpd.serve_forever()
-
diff --git a/src/source/initializing.md b/src/source/initializing.md
index 51f5123..8e8bf8b 100644
--- a/src/source/initializing.md
+++ b/src/source/initializing.md
@@ -72,10 +72,9 @@
## Installing required packages (Ubuntu 10.04 -- 11.10) ##
-Ubuntu 10.04 64-bit is recommended. Building using a newer version of Ubuntu or a 32-bit Ubuntu is
-currently only experimentally supported and is not guaranteed to work on branches other than master.
-
-64-bit (recommended)
+You will need a 64-bit version of Ubuntu. Ubuntu 10.04 is recommended.
+Building using a newer version of Ubuntu is currently only experimentally
+supported and is not guaranteed to work on branches other than master.
$ sudo apt-get install git-core gnupg flex bison gperf build-essential \
zip curl zlib1g-dev libc6-dev lib32ncurses5-dev ia32-libs \
@@ -91,13 +90,6 @@
$ sudo apt-get install libx11-dev:i386
-32-bit (experimental)
-
- $ 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 libreadline6-dev libgl1-mesa-dev tofrodos python-markdown \
- libxml2-utils xsltproc
-
## Installing required packages (Ubuntu 12.04) ##
Building on Ubuntu 12.04 is currently only experimentally supported and is not