Merge lp:~petermatulis/maas/clarifying-where-user-docs-are into lp:maas/2.0

Proposed by Peter Matulis on 2016-09-09
Status: Merged
Approved by: Andres Rodriguez on 2016-09-14
Approved revision: 5194
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
Reviewer Review Type Date Requested Status
Andres Rodriguez 2016-09-09 Approve on 2016-09-09
Review via email: mp+305356@code.launchpad.net

Commit message

Clarifying that 2.0 docs maintained by maas team are now only for API & dev stuff and that the 2.0 user docs are found on maas.io/docs with its source on GitHub.

Description of the change

Clarifying that 2.0 docs maintained by maas team are now only for API & dev stuff and that the 2.0 user docs are found on maas.io/docs with its source on GitHub.

To post a comment you must log in.
review: Approve
MAAS Lander (maas-lander) wrote :
Download full text (1.3 MiB)

The attempt to merge lp:~petermatulis/maas/clarifying-where-user-docs-are into lp:maas/2.0 failed. Below is the output from the failed tests.

Hit:1 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial InRelease
Get:2 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-updates InRelease [95.7 kB]
Get:3 http://security.ubuntu.com/ubuntu xenial-security InRelease [94.5 kB]
Hit:4 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-backports InRelease
Get:5 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-updates/main amd64 Packages [383 kB]
Get:6 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-updates/universe amd64 Packages [324 kB]
Fetched 897 kB in 0s (1,663 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
    --no-install-recommends install apache2 archdetect-deb authbind bash bind9 bind9utils build-essential bzr bzr-builddeb chromium-browser chromium-chromedriver curl daemontools debhelper dh-apport dh-systemd distro-info dnsutils firefox freeipmi-tools git gjs ipython isc-dhcp-common libjs-angularjs libjs-jquery libjs-jquery-hotkeys libjs-yui3-full libjs-yui3-min libpq-dev make nodejs-legacy npm postgresql pxelinux python3-all python3-apt python3-bson python3-convoy python3-crochet python3-cssselect python3-curtin python3-dev python3-distro-info python3-django python3-django-nose python3-django-piston3 python3-dnspython python3-docutils python3-formencode python3-hivex python3-httplib2 python3-jinja2 python3-jsonschema python3-lxml python3-netaddr python3-netifaces python3-novaclient python3-oauth python3-oauthlib python3-openssl python3-paramiko python3-petname python3-pexpect python3-psycopg2 python3-pyinotify python3-pyparsing python3-pyvmomi python3-requests python3-seamicroclient python3-setuptools python3-simplestreams python3-sphinx python3-tempita python3-twisted python3-txtftp python3-tz python3-yaml python3-zope.interface python-bson python-crochet python-django python-django-piston python-djorm-ext-pgarray python-formencode python-lxml python-netaddr python-netifaces python-pocket-lint python-psycopg2 python-simplejson python-tempita python-twisted python-yaml socat syslinux-common tgt ubuntu-cloudimage-keyring wget xvfb
Reading package lists...
Building dependency tree...
Reading state information...
archdetect-deb is already the newest version (1.117ubuntu2).
authbind is already the newest version (2.1.1+nmu1).
build-essential is already the newest version (12.1ubuntu2).
debhelper is already the newest version (9.20160115ubuntu3).
distro-info is already the newest version (0.14build1).
freeipmi-tools is already the newest version (1.4.11-1ubuntu1).
git is already the newest version (1:2.7.4-0ubuntu1).
libjs-angularjs is already the newest version (1.2.28-1ubuntu2).
libjs-jquery is already the newest version (1.11.3+dfsg-4).
libjs-yui3-full is already the newest version (3.5.1-1ubuntu3).
libjs-yui3-min is already the newest version (3.5.1-1ubuntu3).
make is already the newest version (4.1-6).
postgresql is already the newest version (9.5+173).
pxelinux is already the newest version (3:6.03+dfsg-11ubuntu1).
python-formencode is alrea...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
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 About this documentation
6 ========================
7
8+This is API and developer documentation only. MAAS 2.0 user documentation is
9+published on `http://maas.io_` and its source is found on `GitHub_`.
10+
11+.. _http://maas.io:
12+ http://maas.io/docs/
13+
14+.. _GitHub:
15+ https://github.com/CanonicalLtd/maas-docs
16+
17 This is the documentation for Canonical's MAAS software. If you aren't
18 sure what that is, you should probably skip everything else and head
19 straight to the :ref:`orientation` section where it is explained.
20
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
26 This is the documentation for the `MAAS project`_.
27
28+This is API and developer documentation only. MAAS 2.0 user documentation is
29+published on `http://maas.io_` and its source is found on `GitHub_`.
30+
31+.. _http://maas.io:
32+ http://maas.io/docs/
33+
34+.. _GitHub:
35+ https://github.com/CanonicalLtd/maas-docs
36+
37 Metal as a Service -- MAAS -- lets you treat physical servers like
38 virtual machines in the cloud. Rather than having to manage each
39 server individually, MAAS turns your bare metal into an elastic

Subscribers

People subscribed via source and target branches

to all changes: