1
=== modified file 'docs/about.rst'
2
--- docs/about.rst	2016-04-11 16:23:26 +0000
3
+++ docs/about.rst	2016-09-09 15:20:35 +0000
4
@@ -1,6 +1,15 @@
5
1
About this documentation
1
About this documentation
6
2
========================
2
========================
7
3
3
8
4
This is API and developer documentation only. MAAS 2.0 user documentation is
9
5
published on `http://maas.io_` and its source is found on `GitHub_`.
10
6
11
7
.. _http://maas.io:
12
8
  http://maas.io/docs/
13
9
14
10
.. _GitHub:
15
11
  https://github.com/CanonicalLtd/maas-docs
16
12
17
4
This is the documentation for Canonical's MAAS software. If you aren't
13
This is the documentation for Canonical's MAAS software. If you aren't
18
5
sure what that is, you should probably skip everything else and head
14
sure what that is, you should probably skip everything else and head
19
6
straight to the :ref:`orientation` section where it is explained.
15
straight to the :ref:`orientation` section where it is explained.
20
7
16
21
=== modified file 'docs/index.rst'
22
--- docs/index.rst	2016-05-25 17:32:50 +0000
23
+++ docs/index.rst	2016-09-09 15:20:35 +0000
24
@@ -6,6 +6,15 @@
25
6
6
26
7
This is the documentation for the `MAAS project`_.
7
This is the documentation for the `MAAS project`_.
27
8
8
28
9
This is API and developer documentation only. MAAS 2.0 user documentation is
29
10
published on `http://maas.io_` and its source is found on `GitHub_`.
30
11
31
12
.. _http://maas.io:
32
13
  http://maas.io/docs/
33
14
34
15
.. _GitHub:
35
16
  https://github.com/CanonicalLtd/maas-docs
36
17
37
9
Metal as a Service -- MAAS -- lets you treat physical servers like
18
Metal as a Service -- MAAS -- lets you treat physical servers like
38
10
virtual machines in the cloud. Rather than having to manage each
19
virtual machines in the cloud. Rather than having to manage each
39
11
server individually, MAAS turns your bare metal into an elastic
20
server individually, MAAS turns your bare metal into an elastic
Status:	Merged
Approved by:	Andres Rodriguez on 2016-09-14
Approved revision:	no longer in the source branch.
Merged at revision:	5194
Proposed branch:	lp:~petermatulis/maas/clarifying-where-user-docs-are
Merge into:	lp:maas/2.0
Diff against target:	39 lines (+18/-0) 2 files modified docs/about.rst (+9/-0) docs/index.rst (+9/-0)
To merge this branch:	bzr merge lp:~petermatulis/maas/clarifying-where-user-docs-are
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Andres Rodriguez (community)		2016-09-09	Approve on 2016-09-09
Review via email: mp+305356@code.launchpad.net