From 4e2ccac2b0b1cbc47481816327bfa7d5918e6241 Mon Sep 17 00:00:00 2001 From: Jordan Cech <18233718+jayczech23@users.noreply.github.com> Date: Tue, 21 Jun 2022 14:38:54 -0600 Subject: [PATCH 1/3] Update permissions.en-us.md A few grammar tweaks to make docs a bit more clear. --- docs/content/doc/usage/permissions.en-us.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/content/doc/usage/permissions.en-us.md b/docs/content/doc/usage/permissions.en-us.md index 1eea78b557134..e1c1cca645407 100644 --- a/docs/content/doc/usage/permissions.en-us.md +++ b/docs/content/doc/usage/permissions.en-us.md @@ -67,7 +67,7 @@ Different from individual repositories, the owner of organization repositories a A team in an organization has unit permissions settings. It can have members and repositories scope. A team could access all the repositories in this organization or special repositories changed by the owner team. A team could also be allowed to create new repositories. -The owner team will be created when the organization created and the creator will become the first member of the owner team. -Notice Gitea will not allow a people is a member of organization but not in any team. The owner team could not be deleted and only +The owner team will be created when the organization is created, and the creator will become the first member of the owner team. +Notice Gitea will not allow a user to be a member of an organization but not in any team. The owner team could not be deleted and only members of owner team could create a new team. Admin team could be created to manage some of repositories, members of admin team could do anything with these repositories. Generate team could be created by the owner team to do the permissions allowed operations. From 3d33aaf93e4c0f7438688a168a3e96a255409155 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Wed, 22 Jun 2022 01:04:30 +0200 Subject: [PATCH 2/3] Apply suggestions from code review Co-authored-by: delvh --- docs/content/doc/usage/permissions.en-us.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/content/doc/usage/permissions.en-us.md b/docs/content/doc/usage/permissions.en-us.md index e1c1cca645407..7ddd04bd672e9 100644 --- a/docs/content/doc/usage/permissions.en-us.md +++ b/docs/content/doc/usage/permissions.en-us.md @@ -68,6 +68,6 @@ A team in an organization has unit permissions settings. It can have members and repositories. The owner team will be created when the organization is created, and the creator will become the first member of the owner team. -Notice Gitea will not allow a user to be a member of an organization but not in any team. The owner team could not be deleted and only -members of owner team could create a new team. Admin team could be created to manage some of repositories, members of admin team -could do anything with these repositories. Generate team could be created by the owner team to do the permissions allowed operations. +Every member of an organization must be in at least one team. The owner team cannot be deleted and only +members of the owner team can create a new team. The admin team can be created to manage some of the repositories, whose members can do anything with these repositories. +The Generate team can be created by the owner team to do the operations allowed by their permissions. From d9107359fc59fb409e7798cb288831acc9147f12 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Wed, 22 Jun 2022 01:06:00 +0200 Subject: [PATCH 3/3] Update docs/content/doc/usage/permissions.en-us.md --- docs/content/doc/usage/permissions.en-us.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/content/doc/usage/permissions.en-us.md b/docs/content/doc/usage/permissions.en-us.md index 7ddd04bd672e9..0c3dc9e09e736 100644 --- a/docs/content/doc/usage/permissions.en-us.md +++ b/docs/content/doc/usage/permissions.en-us.md @@ -69,5 +69,5 @@ repositories. The owner team will be created when the organization is created, and the creator will become the first member of the owner team. Every member of an organization must be in at least one team. The owner team cannot be deleted and only -members of the owner team can create a new team. The admin team can be created to manage some of the repositories, whose members can do anything with these repositories. +members of the owner team can create a new team. An admin team can be created to manage some of the repositories, whose members can do anything with these repositories. The Generate team can be created by the owner team to do the operations allowed by their permissions.