MAAS

Merge lp:~andreserl/maas/lp1681407 into lp:~maas-committers/maas/trunk

  1. lp1681407
  2. Merge into trunk
Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: no longer in the source branch.
Merged at revision: 5949
Proposed branch: lp:~andreserl/maas/lp1681407
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 25 lines (+2/-2)
2 files modified
src/maasserver/templates/maasserver/base.html (+1/-1)
src/maasserver/templates/maasserver/index.html (+1/-1)
To merge this branch: bzr merge lp:~andreserl/maas/lp1681407
Reviewer Review Type Date Requested Status
Blake Rouse (community) Approve
Review via email: mp+322284@code.launchpad.net

Commit message

Update footer links for docs and release notes.

To post a comment you must log in.
Revision history for this message
Blake Rouse (blake-rouse) wrote :

Looks good. Set a commit message.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/maasserver/templates/maasserver/base.html'
--- src/maasserver/templates/maasserver/base.html 2017-04-07 08:58:19 +0000
+++ src/maasserver/templates/maasserver/base.html 2017-04-10 12:58:06 +0000
@@ -132,7 +132,7 @@
132 <small>MAAS name: <strong>{% include "maasserver/site_title.html" %}</strong></small>132 <small>MAAS name: <strong>{% include "maasserver/site_title.html" %}</strong></small>
133 </p>133 </p>
134 <p>134 <p>
135 <small>MAAS version: <strong>{{version}}</strong></small><small class="u-margin--left"><a href="http://maas.ubuntu.com/{{doc_version}}/changelog.html#id1">View release notes</a>&nbsp;&nbsp;|&nbsp;&nbsp;<a href="https://maas.ubuntu.com/{{doc_version}}/">View documentation</a></small>135 <small>MAAS version: <strong>{{version}}</strong></small><small class="u-margin--left"><a href="http://docs.ubuntu.com/maas/{{doc_version}}/en/release-notes">View release notes</a>&nbsp;&nbsp;|&nbsp;&nbsp;<a href="https://docs.ubuntu.com/maas/{{doc_version}}/">View documentation</a></small>
136 </p>136 </p>
137 <p>137 <p>
138 <small>&copy; 2017 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</small>138 <small>&copy; 2017 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</small>
139139
=== modified file 'src/maasserver/templates/maasserver/index.html'
--- src/maasserver/templates/maasserver/index.html 2017-04-07 08:58:19 +0000
+++ src/maasserver/templates/maasserver/index.html 2017-04-10 12:58:06 +0000
@@ -119,7 +119,7 @@
119 <small>MAAS name: <strong>{% include "maasserver/site_title.html" %}</strong></small>119 <small>MAAS name: <strong>{% include "maasserver/site_title.html" %}</strong></small>
120 </p>120 </p>
121 <p>121 <p>
122 <small>MAAS version: <strong>{{version}}</strong></small><small class="u-margin--left"><a href="http://maas.ubuntu.com/{{doc_version}}/changelog.html#id1">View release notes</a>&nbsp;&nbsp;|&nbsp;&nbsp;<a href="https://maas.ubuntu.com/{{doc_version}}/">View documentation</a></small>122 <small>MAAS version: <strong>{{version}}</strong></small><small class="u-margin--left"><a href="http://docs.ubuntu.com/maas/{{doc_version}}/en/release-notes">View release notes</a>&nbsp;&nbsp;|&nbsp;&nbsp;<a href="https://docs.ubuntu.com/maas/{{doc_version}}/">View documentation</a></small>
123 </p>123 </p>
124 <p>124 <p>
125 <small>&copy; 2017 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</small>125 <small>&copy; 2017 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</small>