launchpad-reviewers team mailing list archive

[Julian Edwards <julian.edwards@xxxxxxxxxxxxx>]

Julian Edwards has proposed merging lp:~julian-edwards/maas/1.2-backport1277 into lp:maas/1.2.

Commit message:
Merge r1277 from trunk: "[r=allenap][bug=1067261][author=evilnick] Changed link in UI templates to point to https://maas.ubuntu.com";

Requested reviews:
  Julian Edwards (julian-edwards)

For more details, see:
https://code.launchpad.net/~julian-edwards/maas/1.2-backport1277/+merge/130258

Merge r1277 from trunk
-- 
https://code.launchpad.net/~julian-edwards/maas/1.2-backport1277/+merge/130258
Your team MAAS Maintainers is subscribed to branch lp:maas/1.2.

=== modified file 'README'
--- README	2012-06-15 11:36:19 +0000
+++ README	2012-10-17 23:54:19 +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-17 23:54:19 +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>