X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=README.md;h=27c6036d1a8c5c96fc07a62f1aeb2e027e2f2ae5;hb=7f84c3c9e7dbf862f98d0fa13d888a9bf6a954e5;hp=3bbe9b4e176ef2a8d8977ce34b2a95e96880c7e4;hpb=0648b50cdf0159ac1b946e58086c2ccf30928e5d;p=mono.git

diff --git a/README.md b/README.md
index 3bbe9b4e176..27c6036d1a8 100644
--- a/README.md
+++ b/README.md
@@ -3,13 +3,15 @@ create cross platform applications.  It is an open source
 implementation of Microsoft's .NET Framework based on the ECMA
 standards for C# and the Common Language Runtime.
 
+[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/mono/mono?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
 1. [Compilation and Installation](#compilation-and-installation)
 2. [Using Mono](#using-mono)
 3. [Directory Roadmap](#directory-roadmap)
 4. [Contributing to Mono](#contributing-to-mono)
 5. [Reporting bugs](#reporting-bugs)
 6. [Configuration Options](#configuration-options)
-7. [Working with Submodles](#working-with-submodules)
+7. [Working with Submodules](#working-with-submodules)
 
 **Build Status**
 
@@ -21,9 +23,9 @@ Officially supported architectures:
 
 Community supported architectures:
 
-| debian-ppc64el              | centos-s390x              |
-|-----------------------------|---------------------------|
-| [![debian-ppc64el][11]][12] | [![centos-s390x][13]][14] |
+| centos-s390x              |
+|---------------------------|
+| [![centos-s390x][11]][12] |
 
 [1]: http://jenkins.mono-project.com/job/test-mono-mainline/label=debian-amd64/badge/icon
 [2]: http://jenkins.mono-project.com/job/test-mono-mainline/label=debian-amd64/
@@ -35,10 +37,8 @@ Community supported architectures:
 [8]: http://jenkins.mono-project.com/job/test-mono-mainline/label=debian-armhf/
 [9]: https://ci.appveyor.com/api/projects/status/1e61ebdfpbiei58v/branch/master?svg=true
 [10]: https://ci.appveyor.com/project/ajlennon/mono-817/branch/master
-[11]: http://jenkins.mono-project.com/job/test-mono-mainline-communityarchitectures/label=debian-ppc64el/badge/icon
-[12]: http://jenkins.mono-project.com/job/test-mono-mainline-communityarchitectures/label=debian-ppc64el/
-[13]: http://jenkins.mono-project.com/job/test-mono-mainline-communityarchitectures/label=centos-s390x/badge/icon
-[14]: http://jenkins.mono-project.com/job/test-mono-mainline-communityarchitectures/label=centos-s390x/
+[11]: https://jenkins.mono-project.com/job/z/label=centos-s390x/badge/icon
+[12]: https://jenkins.mono-project.com/job/z/label=centos-s390x
 
 Compilation and Installation
 ============================
@@ -70,7 +70,7 @@ which contains just enough to run the 'mcs' compiler. You do this with:
 This will download and place the files appropriately so that you can then
 just run:
 
-    make EXTERNAL_MCS=${PWD}/mcs/class/lib/monolite/basic.exe
+    make
 
 The build will then use the files downloaded by `make get-monolite-latest`.
 
@@ -145,13 +145,6 @@ runtime as an embedded library.
 
 * `scripts/` - Scripts used to invoke Mono and the corresponding program.
 
-* `../olive/` - Incubation code from [Olive](https://github.com/mono/olive).
-
-  * If the directory ../olive is present (as an
-independent checkout) from the Mono module, that
-directory is automatically configured to share the
-same prefix than this module gets.
-
 Contributing to Mono
 ====================
 
@@ -467,39 +460,39 @@ This section describes how to use it.
 An initial clone should be done recursively so all submodules will also be
 cloned in a single pass:
 
-        $ git clone --recursive git@github.com:mono/mono
+	$ git clone --recursive git@github.com:mono/mono
 
 Once cloned, submodules can be updated to pull down the latest changes.
 This can also be done after an initial non-recursive clone:
 
-        $ git submodule update --init --recursive
+	$ git submodule update --init --recursive
 
 To pull external changes into a submodule:
 
-        $ cd <submodule>
-        $ git pull origin <branch>
-        $ cd <top-level>
-        $ git add <submodule>
-        $ git commit
+	$ cd <submodule>
+	$ git pull origin <branch>
+	$ cd <top-level>
+	$ git add <submodule>
+	$ git commit
 
 By default, submodules are detached because they point to a specific commit.
 Use `git checkout` to move back to a branch before making changes:
 
-        $ cd <submodule>
-        $ git checkout <branch>
-        # work as normal; the submodule is a normal repo
-        $ git commit/push new changes to the repo (submodule)
+	$ cd <submodule>
+	$ git checkout <branch>
+	# work as normal; the submodule is a normal repo
+	$ git commit/push new changes to the repo (submodule)
 
-        $ cd <top-level>
-        $ git add <submodule> # this will record the new commits to xamcore
-        $ git commit
+	$ cd <top-level>
+	$ git add <submodule> # this will record the new commits to the submodule
+	$ git commit
 
 To switch the repo of a submodule (this should not be a common or normal thing
 to do at all), first edit `.gitmodules` to point to the new location, then:
 
-        $ git submodule sync -- <path of the submodule>
-        $ git submodule update --recursive
-        $ git checkout <desired new hash or branch>
+	$ git submodule sync -- <path of the submodule>
+	$ git submodule update --recursive
+	$ git checkout <desired new hash or branch>
 
 The desired output diff is a change in `.gitmodules` to reflect the
 change in the remote URL, and a change in /<submodule> where you see