Merge lp:~ya-bo-ng/maas-website/update-documentation-redirect into lp:maas-website

Proposed by Anthony Dillon
Status: Merged
Merged at revision: 16
Proposed branch: lp:~ya-bo-ng/maas-website/update-documentation-redirect
Merge into: lp:maas-website
Diff against target: 77 lines (+10/-10)
4 files modified
footer.php (+5/-5)
part-header-home.php (+1/-1)
template-charm-store-redirect.php (+1/-1)
template-community.php (+3/-3)
To merge this branch: bzr merge lp:~ya-bo-ng/maas-website/update-documentation-redirect
Reviewer Review Type Date Requested Status
Jorge Castro Approve
Raphaël Badin (community) Approve
Review via email: mp+262316@code.launchpad.net

Description of the change

# Done
- Updated the documentation redirect to the latest stable version

## QA
- Check when you click on the "Documentation" link in the header you go to http://maas.ubuntu.com/docs1.7 not http://maas.ubuntu.com/docs1.5

To post a comment you must log in.
17. By Anthony Dillon

Updated the documentation links to the latest stable version

Revision history for this message
Raphaël Badin (rvb) wrote :

Looks good!

review: Approve
Revision history for this message
Jorge Castro (jorge) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'footer.php'
--- footer.php 2014-04-17 14:36:50 +0000
+++ footer.php 2015-06-18 12:36:01 +0000
@@ -5,15 +5,15 @@
5 <div>5 <div>
6 <nav role="navigation" class="clearfix">6 <nav role="navigation" class="clearfix">
7 <ul>7 <ul>
8 <li><a href="https://maas.ubuntu.com/docs1.5/orientation.html">Overview</a></li>8 <li><a href="https://maas.ubuntu.com/docs1.7/orientation.html">Overview</a></li>
9 <li><a href="https://maas.ubuntu.com/docs1.5/install.html">Setting up a MAAS server</a></li>9 <li><a href="https://maas.ubuntu.com/docs1.7/install.html">Setting up a MAAS server</a></li>
10 <?php wp_list_pages('sort_column=menu_order&title_li=&depth=2&child_of=7'); ?>10 <?php wp_list_pages('sort_column=menu_order&title_li=&depth=2&child_of=7'); ?>
11 </ul>11 </ul>
12 <ul>12 <ul>
13 <li><a href="/resources">Resources</a></li>13 <li><a href="/resources">Resources</a></li>
14 <li><a href="http://maas.ubuntu.com/docs1.5">Documentation</a></li>14 <li><a href="http://maas.ubuntu.com/docs1.7">Documentation</a></li>
15 <li><a href="http://maas.ubuntu.com/docs1.5/api.html">API Documentation</a></li>15 <li><a href="http://maas.ubuntu.com/docs1.7/api.html">API Documentation</a></li>
16 <li><a href="http://maas.ubuntu.com/docs1.5/maascli.html">CLI Documentation</a></li>16 <li><a href="http://maas.ubuntu.com/docs1.7/maascli.html">CLI Documentation</a></li>
17 17
18 </ul>18 </ul>
19 <ul>19 <ul>
2020
=== modified file 'part-header-home.php'
--- part-header-home.php 2014-04-17 14:36:50 +0000
+++ part-header-home.php 2015-06-18 12:36:01 +0000
@@ -3,7 +3,7 @@
3</div>3</div>
4<h1>Metal as a Service</h1>4<h1>Metal as a Service</h1>
5<h2>Metal as a Service (MAAS) brings the language of the cloud to physical servers. It makes it easy to set up the hardware on which to deploy any service that needs to scale up and down dynamically; a cloud being just one example.</h2>5<h2>Metal as a Service (MAAS) brings the language of the cloud to physical servers. It makes it easy to set up the hardware on which to deploy any service that needs to scale up and down dynamically; a cloud being just one example.</h2>
6<a class="link-action2" href="/docs1.5/install.html">6<a class="link-action2" href="/docs1.7/install.html">
7 <span class="cta-left"></span>7 <span class="cta-left"></span>
8 <span class="cta-center">Get started now</span>8 <span class="cta-center">Get started now</span>
9 <span class="cta-right"></span>9 <span class="cta-right"></span>
1010
=== modified file 'template-charm-store-redirect.php'
--- template-charm-store-redirect.php 2014-04-17 14:36:50 +0000
+++ template-charm-store-redirect.php 2015-06-18 12:36:01 +0000
@@ -2,5 +2,5 @@
2/*2/*
3Template Name: Redirect3Template Name: Redirect
4*/4*/
5header('Location: http://maas.ubuntu.com/docs1.5');5header('Location: http://maas.ubuntu.com/docs1.7');
6?>6?>
77
=== modified file 'template-community.php'
--- template-community.php 2014-04-17 14:36:50 +0000
+++ template-community.php 2015-06-18 12:36:01 +0000
@@ -12,21 +12,21 @@
12 <h2>Participate</h2>12 <h2>Participate</h2>
13 <ul>13 <ul>
14 <li>14 <li>
15 <a href="/docs1.5/orientation.html">15 <a href="/docs1.7/orientation.html">
16 <img src="<?php echo get_template_directory_uri(); ?>/img/pictogram-cog.png" width="47" height="49" alt="" />16 <img src="<?php echo get_template_directory_uri(); ?>/img/pictogram-cog.png" width="47" height="49" alt="" />
17 <h4>Get started with MAAS</h4>17 <h4>Get started with MAAS</h4>
18 </a>18 </a>
19 <p>The best way to learn MAAS is to start building a cluster.</p>19 <p>The best way to learn MAAS is to start building a cluster.</p>
20 </li>20 </li>
21 <li>21 <li>
22 <a href="/docs1.5">22 <a href="/docs1.7">
23 <img src="<?php echo get_template_directory_uri(); ?>/img/pictogram-bird.png" width="61" height="49" alt="" />23 <img src="<?php echo get_template_directory_uri(); ?>/img/pictogram-bird.png" width="61" height="49" alt="" />
24 <h4>Help with documentation &rsaquo;</h4>24 <h4>Help with documentation &rsaquo;</h4>
25 </a>25 </a>
26 <p>We're always looking for feedback on how we can improve our documentation</p>26 <p>We're always looking for feedback on how we can improve our documentation</p>
27 </li>27 </li>
28 <li class="last">28 <li class="last">
29 <a href="/docs1.5/index.html#developing-maas">29 <a href="/docs1.7/index.html#developing-maas">
30 <img src="<?php echo get_template_directory_uri(); ?>/img/pictogram-star.png" width="49" height="49" alt="" />30 <img src="<?php echo get_template_directory_uri(); ?>/img/pictogram-star.png" width="49" height="49" alt="" />
31 <h4>Contribute to MAAS</h4>31 <h4>Contribute to MAAS</h4>
32 </a>32 </a>

Subscribers

People subscribed via source and target branches

to all changes: