Merge lp:~redhatter/juju-core/docs-fix-maas-hyperlink into lp:juju-core/docs

[Stuart Longland]

Fix a typo in a hyperlink: links to remote sites need to specify a protocol otherwise the browser assumes they're relative links.

[Stuart Longland (redhatter)]

On 28/06/13 10:35, Stuart Longland wrote:
> Stuart Longland has proposed merging lp:~redhatter/juju-core/docs-fix-maas-hyperlink into lp:juju-core.
>
> Requested reviews:
> juju hackers (juju)
>
> For more details, see:
> https://code.launchpad.net/~redhatter/juju-core/docs-fix-maas-hyperlink/+merge/171937
>
> Fix a typo in a hyperlink: links to remote sites need to specify a protocol otherwise the browser assumes they're relative links.
>

Errm... okay, that attachment looks nothing like my commit. I was
changing one line in one file:

> ------------------------------------------------------------
> revno: 11
> committer: Stuart Longland <email address hidden>
> branch nick: juju-docs
> timestamp: Fri 2013-06-28 10:29:40 +1000
> message:
> config-maas.html: Fix broken link to maas.ubuntu.com
>
> The link should have a protocol specified, as it is a link to another site, not
> a relative link to a file called 'maas.ubuntu.com'.
> diff:
> === modified file 'htmldocs/config-maas.html'
> --- htmldocs/config-maas.html 2013-06-27 17:56:54 +0000
> +++ htmldocs/config-maas.html 2013-06-28 00:29:40 +0000
> @@ -103,7 +103,7 @@
> <article>
> <section id="config_maas">
> <h1>Configuring for MAAS</h1>
> - <p>Metal As A Service is software which allows you to deal with physical hardware just as easily as virtual nodes. For more information about MAAS, see <a href="maas.ubuntu.com"> maas.ubuntu.com </a> </p>
> + <p>Metal As A Service is software which allows you to deal with physical hardware just as easily as virtual nodes. For more information about MAAS, see <a href="http://maas.ubuntu.com"> maas.ubuntu.com </a> </p>
> <h1> Get your API key</h1>
> <p>You'll need an API key from MAAS so that the Juju client can access it. Each user account in MAAS can have as many API keys as desired. One hard and fast rule is that you'll need to use a different API key for each Juju environment you set up within a single MAAS cluster.</p>
> <p>To get the API key:</p>

Hope that clears up the noise.
Regards,
--
## -,-''''-. ###### Stuart Longland, Contractor
##. : ## : ## 38b Douglas Street
 ## # ## -'` .#' Milton, QLD, 4064
 '#' *' '-. *' http://www.vrt.com.au
     S Y S T E M S T: [phone] F: [phone]

[William Reade (fwereade)]

Please target this into lp:juju-core/docs. There's talk of merging the two, but nothing conclusive at the moment.

[Stuart Longland (redhatter)]

Okay, that's the magic URL I was trying to guess. For whatever reason, the URL in the previous merge request was the default; and adding docs/ to it didn't fix it.

[John A Meinel (jameinel)]

LGTM

review: Approve

[Nick Veitch (evilnick)]

merged. thanks!

=== modified file 'htmldocs/config-maas.html'
--- htmldocs/config-maas.html	2013-06-27 17:56:54 +0000
+++ htmldocs/config-maas.html	2013-06-30 22:07:28 +0000
@@ -103,7 +103,7 @@
           <article>
             <section id="config_maas">
             <h1>Configuring for MAAS</h1>
-            <p>Metal As A Service is software which allows you to deal with physical hardware just as easily as virtual nodes. For more information about MAAS, see <a href="maas.ubuntu.com"> maas.ubuntu.com </a> </p>
+            <p>Metal As A Service is software which allows you to deal with physical hardware just as easily as virtual nodes. For more information about MAAS, see <a href="http://maas.ubuntu.com"> maas.ubuntu.com </a> </p>
             <h1> Get your API key</h1>
             <p>You'll need an API key from MAAS so that the Juju client can access it. Each user account in MAAS can have as many API keys as desired. One hard and fast rule is that you'll need to use a different API key for each Juju environment you set up within a single MAAS cluster.</p>
             <p>To get the API key:</p>