Update to the last version of 2014-09-02

I've copied the last version of the guide; but I'm not sure to done it correctly, so a little bit of review is needed :)