MAAS

Merge lp:~julian-edwards/maas/doc-bug-1237398 into lp:~maas-committers/maas/trunk

  1. doc-bug-1237398
  2. Merge into trunk
Proposed by Julian Edwards
Status: Merged
Approved by: Julian Edwards
Approved revision: no longer in the source branch.
Merged at revision: 1763
Proposed branch: lp:~julian-edwards/maas/doc-bug-1237398
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
src/maasserver/templates/maasserver/prefs.html (+1/-1)
To merge this branch: bzr merge lp:~julian-edwards/maas/doc-bug-1237398
Reviewer Review Type Date Requested Status
Julian Edwards (community) Approve
Review via email: mp+198198@code.launchpad.net

Commit message

Fix text on user prefs page that stated "separate key required for each juju env" which should be separate *user* not key.

To post a comment you must log in.
Revision history for this message
Julian Edwards (julian-edwards) wrote :

Trivial.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/maasserver/templates/maasserver/prefs.html'
2--- src/maasserver/templates/maasserver/prefs.html 2012-08-03 16:33:05 +0000
3+++ src/maasserver/templates/maasserver/prefs.html 2013-12-09 06:20:15 +0000
4@@ -22,7 +22,7 @@
5 <h2>Keys</h2>
6 <h3>MAAS keys</h3>
7 <div id="api">
8- <p>You'll need a separate MAAS key for each Juju environment.</p>
9+ <p>You'll need a separate MAAS user for each Juju environment.</p>
10 <ul class="list">
11 {% for token in user.get_profile.get_authorisation_tokens %}
12 <li class="bundle">