Merge lp:~adam-collard/juju-core/implicit-relations-typo into lp:juju-core/docs

Proposed by Adam Collard
Status: Merged
Merged at revision: 141
Proposed branch: lp:~adam-collard/juju-core/implicit-relations-typo
Merge into: lp:juju-core/docs
Diff against target: 25 lines (+3/-3)
1 file modified
htmldocs/authors-implicit-relations.html (+3/-3)
To merge this branch: bzr merge lp:~adam-collard/juju-core/implicit-relations-typo
Reviewer Review Type Date Requested Status
Nick Veitch Pending
Review via email: mp+188816@code.launchpad.net

Description of the change

Fix small typo in Implicit Relations page and a tiny whitespace issue.

To post a comment you must log in.
Revision history for this message
Nick Veitch (evilnick) wrote :

Ta. I also noticed the use of Juju, which we (should) use caps for when not talking about the command.

Revision history for this message
Adam Collard (adam-collard) wrote :

> Ta. I also noticed the use of Juju, which we (should) use caps for when not
> talking about the command.

Do you want me to include fixes to that in this branch?

Revision history for this message
Nick Veitch (evilnick) wrote :

If you can, that would be cool, then I will merge. Thanks for looking all this over, it really is a help!

Revision history for this message
Adam Collard (adam-collard) wrote :

> If you can, that would be cool, then I will merge. Thanks for looking all this
> over, it really is a help!

Done! No problem, glad I can help :)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'htmldocs/authors-implicit-relations.html'
2--- htmldocs/authors-implicit-relations.html 2013-09-27 14:53:30 +0000
3+++ htmldocs/authors-implicit-relations.html 2013-10-05 11:32:36 +0000
4@@ -67,10 +67,10 @@
5 <div class="grid-9 doc-content">
6 <!--End-Preamble-->
7 <article>
8- <section id ="implicit-relations">
9+ <section id="implicit-relations">
10 <h1>Implicit relations</h1>
11 <p>Implicit relations allow for interested services to gather lifecycle-oriented events and data about other services without expecting or requiring any modifications on the part of the author of the other service's charm.</p>
12- <p>Implicit relationships are named in the reserved the juju-* namespace. Both the relation name and interface names provided by juju are prefixed with <cite>juju-</cite>. Charms attempting to provide new relationships in this namespace will trigger an error.</p>
13+ <p>Implicit relationships are named in the reserved juju-* namespace. Both the relation name and interface names provided by Juju are prefixed with <cite>juju-</cite>. Charms attempting to provide new relationships in this namespace will trigger an error.</p>
14 <p>Juju currently provides one implicit relationship to all deployed services.</p>
15 <p><cite>juju-info</cite>, if specified would look like:</p>
16 <pre>provides:
17@@ -95,7 +95,7 @@
18 <p>The admin then issues the following</p>
19 <pre>juju add-relation wordpress rsyslog</pre>
20
21- <p>If the wordpress charm author doesn't define the <cite>logging-directory</cite> interface juju will use the less-specific (in the sense that it likely provides less information) <cite>juju-info</cite> interface. juju always attempts to match user provided relations outside the <cite>juju-*</cite> namespace before looking for possible relationship matches in the <cite>juju-*</cite> namespace.</p>
22+ <p>If the wordpress charm author doesn't define the <cite>logging-directory</cite> interface Juju will use the less-specific (in the sense that it likely provides less information) <cite>juju-info</cite> interface. Juju always attempts to match user provided relations outside the <cite>juju-*</cite> namespace before looking for possible relationship matches in the <cite>juju-*</cite> namespace.</p>
23
24 </section>
25 </article>

Subscribers

People subscribed via source and target branches