Merge lp:~evilnick/maas/web-reference into lp:~maas-committers/maas/trunk

[Nick Veitch]

Changed link in UI templates to point to https://maas.ubuntu.com

Fix for Bug #1067261 - out of date web reference on the web UI pages

[Gavin Panella (allenap)]

This link also appears in README; change it there too?

https://wiki.ubuntu.com/ServerTeam/MAAS/AvahiBoot also appears in several places, but maas.ubuntu.com doesn't redirect with path so this can't be changed right now.

review: Approve

[Nick Veitch (evilnick)]

On 16/10/12 10:53, Gavin Panella wrote:
> Review: Approve
>
> This link also appears in README; change it there too?
>
> https://wiki.ubuntu.com/ServerTeam/MAAS/AvahiBoot also appears in several places, but maas.ubuntu.com doesn't redirect with path so this can't be changed right now.
>
The avahi boot stuff can stay for the moment as at least those docs are
still relevant. Good call on the readme though, i shall change that too.

--
Nick Veitch,
Technical Writer, Cloud Engineering, Canonical
https://launchpad.net/~evilnick

=== modified file 'README'
--- README	2012-06-15 11:36:19 +0000
+++ README	2012-10-16 10:28:21 +0000
@@ -29,4 +29,4 @@
 
 For more information see the `MAAS guide`_.
 
-.. _MAAS guide: https://wiki.ubuntu.com/ServerTeam/MAAS
+.. _MAAS guide: https://maas.ubuntu.com/

=== modified file 'src/maasserver/templates/maasserver/base.html'
--- src/maasserver/templates/maasserver/base.html	2012-10-09 10:05:36 +0000
+++ src/maasserver/templates/maasserver/base.html	2012-10-16 10:28:21 +0000
@@ -102,7 +102,7 @@
         {% block footer-copyright %}
           <p>&copy; 2012 Canonical Ltd. Ubuntu and Canonical are registered
           trademarks of Canonical Ltd.
-          <a class="space-left-small" href="https://wiki.ubuntu.com/ServerTeam/MAAS/" target="_blank">View Documentation</a></p>
+          <a class="space-left-small" href="https://maas.ubuntu.com/" target="_blank">View Documentation</a></p>
         {% endblock %}
         <div class="clear"></div>
       </div>