Merge lp:~rvb/maas/doc-bug-1391191-1.7 into lp:maas/1.7

[Raphaël Badin]

Backport revision 3358: Fix documentation to point to the hacking guide (which explain where to get the source and how to build MAAS) and add reference to the development PPAs.

This is a pure documentation update: it has no impact on the code and this is why I'm landing it on 1.7.

[Raphaël Badin (rvb)]

Simple backport: self-approving.

review: Approve

=== modified file 'INSTALL.txt'
--- INSTALL.txt	2014-10-31 02:10:48 +0000
+++ INSTALL.txt	2014-11-10 17:00:51 +0000
@@ -4,7 +4,7 @@
 Installing MAAS
 ===============
 
-There are two main ways to install MAAS
+There are two main ways to install MAAS:
 
  * :ref:`From Ubuntu's package archive on an existing Ubuntu
    install. <pkg-install>`
@@ -12,7 +12,15 @@
    media. <disc-install>`
 
 If you are interested in testing the latest development version you
-can also check out the very latest source and build MAAS yourself.
+can also check out the very latest source and build MAAS — see
+the :doc:`hacking guide <hacking>` — or use the `Testing PPA`_ or the
+`Daily PPA`_. Note that these PPAs contain development versions of
+MAAS that are potentially unstable, so use with caution.
+
+.. _Testing PPA:
+  https://launchpad.net/~maas-maintainers/+archive/ubuntu/testing
+.. _Daily PPA:
+  https://launchpad.net/~maas-maintainers/+archive/ubuntu/dailybuilds
 
 
 .. _pkg-install:

=== modified file 'docs/about.rst'
--- docs/about.rst	2013-08-06 05:38:39 +0000
+++ docs/about.rst	2014-11-10 17:00:51 +0000
@@ -15,15 +15,18 @@
 ----------
 
 In a cunning move, the current documentation always lives, and is
-built from, the main MAAS source code. That means that whatever MAAS
-package you have installed, or even if you are really living life on
-the edge and have checked out a development version from Launchpad,
-this documentation should be the latest and most appropriate version
-for the software you are running.  However, it is also possible that
-there have been further sections or more helpful, or clearer bits
-added since the package you are using was made. For this reason you
-can always find the latest documentation online here:
-http://maas.ubuntu.com
+built from, the main MAAS source code (in the top-level ``docs/``
+directory). That means that whatever MAAS package you have installed,
+or even if you are really living life on the edge and have checked out
+a development version from Launchpad, this documentation should be the
+latest and most appropriate version for the software you are running.
+However, it is also possible that there have been additional sections,
+or more helpful and clearer bits added since the package you are using
+was made. For this reason you can always find the latest documentation
+online here: `http://maas.ubuntu.com`_.
+
+.. _http://maas.ubuntu.com:
+  http://maas.ubuntu.com
 
 
 Contributing
@@ -44,4 +47,4 @@
 Download the source to MAAS by following the instructions in
 :doc:`the hacking guide <hacking>`, make your changes, and propose a merge
 against lp:maas on Launchpad.  The documentation source lives in the top-level
-``doc/`` directory.
+``docs/`` directory.