Merge lp:~rvb/maas-website/change-doc-link into lp:maas-website

Proposed by Raphaël Badin
Status: Merged
Merged at revision: 15
Proposed branch: lp:~rvb/maas-website/change-doc-link
Merge into: lp:maas-website
Diff against target: 79 lines (+11/-11)
4 files modified
footer.php (+5/-5)
part-header-home.php (+1/-1)
template-charm-store-redirect.php (+2/-2)
template-community.php (+3/-3)
To merge this branch: bzr merge lp:~rvb/maas-website/change-doc-link
Reviewer Review Type Date Requested Status
Jorge Castro Approve
Review via email: mp+216335@code.launchpad.net

Commit message

Link to the documentation for MAAS 1.5 (i.e. the version released in the latest LTS).

To post a comment you must log in.
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
1=== modified file 'footer.php'
2--- footer.php 2013-12-10 09:20:01 +0000
3+++ footer.php 2014-04-17 14:37:33 +0000
4@@ -5,15 +5,15 @@
5 <div>
6 <nav role="navigation" class="clearfix">
7 <ul>
8- <li><a href="https://maas.ubuntu.com/docs/orientation.html">Overview</a></li>
9- <li><a href="https://maas.ubuntu.com/docs/install.html">Setting up a MAAS server</a></li>
10+ <li><a href="https://maas.ubuntu.com/docs1.5/orientation.html">Overview</a></li>
11+ <li><a href="https://maas.ubuntu.com/docs1.5/install.html">Setting up a MAAS server</a></li>
12 <?php wp_list_pages('sort_column=menu_order&title_li=&depth=2&child_of=7'); ?>
13 </ul>
14 <ul>
15 <li><a href="/resources">Resources</a></li>
16- <li><a href="http://maas.ubuntu.com/docs">Documentation</a></li>
17- <li><a href="http://maas.ubuntu.com/docs/api.html">API Documentation</a></li>
18- <li><a href="http://maas.ubuntu.com/docs/maascli.html">CLI Documentation</a></li>
19+ <li><a href="http://maas.ubuntu.com/docs1.5">Documentation</a></li>
20+ <li><a href="http://maas.ubuntu.com/docs1.5/api.html">API Documentation</a></li>
21+ <li><a href="http://maas.ubuntu.com/docs1.5/maascli.html">CLI Documentation</a></li>
22
23 </ul>
24 <ul>
25
26=== modified file 'part-header-home.php'
27--- part-header-home.php 2013-09-17 23:41:08 +0000
28+++ part-header-home.php 2014-04-17 14:37:33 +0000
29@@ -3,7 +3,7 @@
30 </div>
31 <h1>Metal as a Service</h1>
32 <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>
33-<a class="link-action2" href="/docs/install.html">
34+<a class="link-action2" href="/docs1.5/install.html">
35 <span class="cta-left"></span>
36 <span class="cta-center">Get started now</span>
37 <span class="cta-right"></span>
38
39=== modified file 'template-charm-store-redirect.php'
40--- template-charm-store-redirect.php 2013-01-11 15:33:04 +0000
41+++ template-charm-store-redirect.php 2014-04-17 14:37:33 +0000
42@@ -2,5 +2,5 @@
43 /*
44 Template Name: Redirect
45 */
46-header('Location: http://maas.ubuntu.com/docs');
47-?>
48\ No newline at end of file
49+header('Location: http://maas.ubuntu.com/docs1.5');
50+?>
51
52=== modified file 'template-community.php'
53--- template-community.php 2013-12-10 09:44:31 +0000
54+++ template-community.php 2014-04-17 14:37:33 +0000
55@@ -12,21 +12,21 @@
56 <h2>Participate</h2>
57 <ul>
58 <li>
59- <a href="/docs/orientation.html">
60+ <a href="/docs1.5/orientation.html">
61 <img src="<?php echo get_template_directory_uri(); ?>/img/pictogram-cog.png" width="47" height="49" alt="" />
62 <h4>Get started with MAAS</h4>
63 </a>
64 <p>The best way to learn MAAS is to start building a cluster.</p>
65 </li>
66 <li>
67- <a href="/docs">
68+ <a href="/docs1.5">
69 <img src="<?php echo get_template_directory_uri(); ?>/img/pictogram-bird.png" width="61" height="49" alt="" />
70 <h4>Help with documentation &rsaquo;</h4>
71 </a>
72 <p>We're always looking for feedback on how we can improve our documentation</p>
73 </li>
74 <li class="last">
75- <a href="/docs/index.html#developing-maas">
76+ <a href="/docs1.5/index.html#developing-maas">
77 <img src="<?php echo get_template_directory_uri(); ?>/img/pictogram-star.png" width="49" height="49" alt="" />
78 <h4>Contribute to MAAS</h4>
79 </a>

Subscribers

People subscribed via source and target branches

to all changes: