Skip to content

Commit c7c542c

Browse files
committed
docs: update language from access level to relation
1 parent f346bbc commit c7c542c

17 files changed

+76
-86
lines changed

howto/manage-clouds.md

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
# Manage clouds
33
> See first: {ref}`cloud`
44
5-
(manage-access-to-a-cloud)=
6-
## Manage access to a cloud
5+
(manage-an-entitys-relation-to-a-cloud)=
6+
## Manage an entity's relation to a cloud
77

8-
**Grant access to a cloud.** Given an entity A and a cloud, to grant A access to the cloud, add a relation between A and the cloud, specifying the desired access level.
9-
10-
> See more: {ref}`add-a-relation`
11-
12-
**Revoke access to a cloud.** Given an entity A and a cloud, to revoke A's access to the cloud, remove the relation that grants that access.
13-
14-
> See more: {ref}`remove-a-relation`
8+
See {ref}`manage-relations`.

howto/manage-groups.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,11 @@ jimmctl auth group list [options]
5353

5454
> See more: {ref}`jimmctl auth group list <summary-6>`
5555
56+
(manage-an-entitys-relation-to-a-group)=
57+
## Manage an entity's relation to a group
58+
59+
See {ref}`manage-relations`.
60+
5661

5762
(manage-access-to-a-group)=
5863
## Manage access to a group

howto/manage-juju-controllers.md

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -117,14 +117,8 @@ jimmctl controller-info workload-lxd ~/snap/jimmctl/common/lxd-controller-info.y
117117
jimmctl add-controller ~/snap/jimmctl/common/lxd-controller-info.yaml
118118
```
119119

120-
(manage-access-to-a-juju-controller)=
121-
## Manage access to a Juju controller
120+
(manage-an-entitys-relation-to-a-juju-controller)=
121+
## Manage an entity's relation to a Juju controller
122122

123-
**Grant access to a Juju controller.** Given an entity A and a controller, to grant A access to the controller, add a relation between A and the controller, specifying the desired access level.
124-
125-
> See more: {ref}`add-a-relation`
126-
127-
**Revoke access to a Juju controller.** Given an entity A and a controller, to revoke A's access to the controller, remove the relation that grants that access.
128-
129-
> See more: {ref}`remove-a-relation`
123+
See {ref}`manage-relations`.
130124

howto/manage-models.md

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -158,13 +158,7 @@ To inspect the reason for failure, consult the output from `juju debug-log` and
158158

159159

160160

161-
(manage-access-to-a-model)=
162-
## Manage access to a model
161+
(manage-an-entitys-relation-to-a-model)=
162+
## Manage an entity's relation to a model
163163

164-
**Grant access to a model.** Given an entity A and a model, to grant A access to the model, add a relation between A and the model, specifying the desired access level.
165-
166-
> See more: {ref}`add-a-relation`
167-
168-
**Revoke access to a model.** Given an entity A and a model, to revoke A's access to the model, remove the relation that grants that access.
169-
170-
> See more: {ref}`remove-a-relation`
164+
See {ref}`manage-relations`.

howto/manage-offers.md

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
(manage-offers)=
22
# Manage offers
33

4-
(manage-access-to-an offer)=
5-
## Manage access to an offer
4+
(manage-an-entitys-relation-to-an-offer)=
5+
## Manage an entity's relation to an offer
66

7-
**Grant access to an offer.** Given an entity A and an offer, to grant A access to the offer, add a relation between A and the offer, specifying the desired access level.
8-
9-
> See more: {ref}`add-a-relation`
10-
11-
**Revoke access to an offer.** Given an entity A and an offer, to revoke A's access to the offer, remove the relation that grants that access.
12-
13-
> See more: {ref}`remove-a-relation`
7+
See {ref}`manage-relations`.

howto/manage-relations.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ jimmctl auth relation add [email protected] member group-mygroup
1212
```
1313

1414
> See more:
15-
> - {ref}`tag`
1615
> - {ref}`jimmctl auth relation add <summary-10>`
17-
> - {ref}`controller-access-levels`, {ref}`cloud-access-levels`, {ref}`model-access-levels`, {ref}`offer-access-levels`, {ref}`service-account-access-levels`, {ref}`role-access-levels`, {ref}`group-access-levels`
16+
> - {ref}`controller-tag`, {ref}`cloud-tag`, {ref}`model-tag`, {ref}`offer-tag`, {ref}`user-tag`, {ref}`service-account-tag`, {ref}`role-tag`, {ref}`group-tag`
17+
> - {ref}`list-of-controller-relations`, {ref}`list-of-cloud-relations`, {ref}`list-of-model-relations`, {ref}`list-of-offer-relations`, {ref}`list-of-service-account-relations`, {ref}`list-of-role-relations`, {ref}`list-of-group-relations`
1818
1919

2020
(verify-a-relation)=

howto/manage-roles.md

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -49,22 +49,15 @@ jimmctl auth role list [options]
4949

5050
> See more: {ref}`jimmctl auth role list <summary-16>`
5151
52+
(manage-an-entitys-relation-to-a-role)=
53+
## Manage an entity's relation to a role
5254

53-
(manage-access-to-a-role)=
54-
## Manage access to a role
55+
See {ref}`manage-relations`.
5556

56-
**Grant access to a role.** Given an entity A and a role, to grant A access to the role, add a relation between A and the role, specifying the desired access level.
57+
(manage-a-roles-relation-to-an-entity)=
58+
## Manage a role's relation to an entity
5759

58-
> See more: {ref}`add-a-relation`
59-
60-
**Revoke access to a role.** Given an entity A and a role, to revoke A's access to the role, remove the relation that grants that access.
61-
62-
> See more: {ref}`remove-a-relation`
63-
64-
(manage-a-roles-access)=
65-
## Manage a role’s access to a controller, cloud, model, or offer
66-
67-
> See more: {ref}`manage-access-to-a-controller`, {ref}`manage-access-to-a-cloud`, {ref}`manage-access-to-a-model`, {ref}`manage-access-to-an-offer`
60+
See {ref}`manage-relations`.
6861

6962
(rename-a-role)=
7063
## Rename a role

howto/manage-service-accounts.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Manage service accounts
33
> See also: {ref}`service account`
44
5-
(manage-a-service-accounts-access)=
6-
## Manage a service account’s access to a controller, cloud, model, offer, role, or group
5+
(manage-a-service-accounts-relation-to-an-entity)=
6+
## Manage a service account's relation to an entity
77

8-
> See more: {ref}`manage-access-to-a-controller`, {ref}`manage-access-to-a-cloud`, {ref}`manage-access-to-a-model`, {ref}`manage-access-to-an-offer`, {ref}`manage-access-to-a-role`, {ref}`manage-access-to-a-group`
8+
See {ref}`manage-relations`.

howto/manage-users.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Manage users
33
> See first: {ref}`user`
44
5-
(manage-a-users-access)=
6-
## Manage a user’s access to a controller, cloud, model, offer, service-account, role, or group
5+
(manage-a-users-relation-to-an-entity)=
6+
## Manage a user's relation to an entity
77

8-
> See more: {ref}`manage-access-to-a-controller`, {ref}`manage-access-to-a-cloud`, {ref}`manage-access-to-a-model`, {ref}`manage-access-to-an-offer`, {ref}`manage-access-to-a-service-account`, {ref}`manage-access-to-a-role`, {ref}`manage-access-to-a-group`
8+
See {ref}`manage-relations`.

reference/cloud.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,16 @@ A cloud tag has the following format:
1313
cloud-<cloud name>
1414
```
1515

16-
(cloud-access-levels)=
17-
## Cloud access levels
16+
(list-of-cloud-relations)=
17+
## List of cloud relations
18+
> See first: {ref}`relation`
1819
19-
(cloud-access-levels-administrator)=
20+
(cloud-relation-administrator)=
2021
### `administrator`
2122

2223
Abilities: Can do anything that it is possible to do at the level of a cloud.
2324

24-
(cloud-access-levels-can-addmodel)=
25+
(cloud-relation-can-addmodel)=
2526
### `can_addmodel`
2627

2728
Abilities: Can add a model and grant another user model-level permissions.

0 commit comments

Comments
 (0)