Merge pull request #1470 from hioa-cs/master

Merge master into dev

Author: alfreb

README.md

@@ -1,10 +1,6 @@
 ![IncludeOS Logo](./doc/logo.png)
 ================================================
 
-**Update**: Check out [Acorn](examples/acorn/), the innovative web server appliance we [demoed at CppCon](https://www.youtube.com/watch?v=t4etEwG2_LY). Built using [Mana](lib/mana/), the new C++ Web Application Framework for IncludeOS.
-
-A *live demo* of Acorn can be found at [acorn2.unofficial.includeos.io](http://acorn2.unofficial.includeos.io) (sporadically unavailable)
-
 **IncludeOS** is an includable, minimal [unikernel](https://en.wikipedia.org/wiki/Unikernel) operating system for C++ services running in the cloud. Starting a program with `#include <os>` will literally include a tiny operating system into your service during link-time.
 
 The build system will:
@@ -48,22 +44,22 @@ A longer list of features and limitations is on the [wiki feature list](https://
 
 By default the project is installed to /usr/local/includeos.
 
-However, it is recommended to choose a custom location as well as select the compiler we want clang to find.
+However, it is recommended to choose a custom location as well as select the compiler we want clang to find. In this document we assume you install IncludeOS in your home directory, in the folder ~/includeos.
 
-To do this we can edit ~/.bashrc (in the home folder), adding these lines at the end of the file:
+To do this we can edit ~/.bash_profile (mac os) or ~/.bashrc (linux), adding these lines at the end of the file:
 
 ```
-    export CC=/usr/bin/clang-3.8
-    export CXX=/usr/bin/clang++-3.8
-    export INCLUDEOS_PREFIX=<HOME FOLDER>/includeos
+    export INCLUDEOS_PREFIX=~/includeos/
     export PATH=$PATH:$INCLUDEOS_PREFIX/bin
 ```
 
 This will also crucially make the boot program visible globally, so that you can simply run ```boot <myservice>``` inside any service folder.
 
 ### Install libraries
 
-**NOTE:** The script will install packages and create a network bridge.
+If you want to install IncludeOS on Mac OS you'll need a working installation of [brew] so the install script can install its dependencies.
+
+**NOTE:** The script will install packages.
 
 ```
     $ git clone https://github.com/hioa-cs/IncludeOS
@@ -85,13 +81,14 @@ Configuration of your IncludeOS installation can be done inside `build/` with `c
 
 ### Testing the installation
 
-A successful setup enables you to build and run a virtual machine. Running:
+A successful setup enables you to build and run a virtual machine. There are a few demonstration services in the source folder. If you look in the `examples/` folder you see these. If you enter `demo_service` and type `boot --create-bridge .` this script will build the service and boot it using [qemu].
 
 ```
-    $ ./test.sh
+    $ cd examples/demo_service
+    $ boot --create-bridge .
 ```
 
-will build and run [this example service](./examples/demo_service/service.cpp).
+will build and run [this example service](./examples/demo_service/service.cpp). You can visit the service on [http://10.0.0.42/](http://10.0.0.42/).
 
 More information is [available on the wiki](https://github.com/hioa-cs/IncludeOS/wiki/Testing-the-example-service).
 
@@ -130,3 +127,7 @@ We want to adhere as much as possible to the [ISO C++ Core Guidelines](https://g
 We're trying to grow a Wiki, and some questions might already be answered here in the [FAQ](https://github.com/hioa-cs/IncludeOS/wiki/FAQ).
 
 See the [Wiki front page](https://github.com/hioa-cs/IncludeOS/wiki) for a complete introduction, system overview, and more detailed guides.
+
+
+[brew]: https://brew.sh/
+[qemu]: https://www.qemu.org/