summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2015-10-13 08:00:15 -0400
committerJoram Wilander <jwawilander@gmail.com>2015-10-13 08:00:15 -0400
commit2663cede2b16293abe1b29dddf56cc7378a58efe (patch)
treefea41f942c66a2ae397ed12f1013585bcbf7775c
parent0144b6fd8a95c6b65695b07483a528707dce1cfe (diff)
parent9d3248ccec89e533527bb86e082ef445c3cdfe7d (diff)
downloadchat-2663cede2b16293abe1b29dddf56cc7378a58efe.tar.gz
chat-2663cede2b16293abe1b29dddf56cc7378a58efe.tar.bz2
chat-2663cede2b16293abe1b29dddf56cc7378a58efe.zip
Merge pull request #1013 from optimistiks/PLT-590
PLT-590: Change "Manage Team" to "Manage Members"
-rw-r--r--doc/README.md2
-rw-r--r--doc/help/Manage-Members.md (renamed from doc/help/Manage-Team.md)8
-rw-r--r--doc/help/README.md2
-rw-r--r--web/react/components/navbar_dropdown.jsx2
-rw-r--r--web/react/components/sidebar_right_menu.jsx2
5 files changed, 8 insertions, 8 deletions
diff --git a/doc/README.md b/doc/README.md
index fcda4fd08..7ee2bb46c 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -33,7 +33,7 @@ Set up Mattermost in your data center
_Note: End user help documentation is a new feature being completed for the v1.2 release. The materials below are work in progress._
- User Interface
- - [Manage Team](help/Manage-Team.md)
+ - [Manage Members](help/Manage-Members.md)
- Team Settings
- [Slack Import](help/Slack-Import.md)
diff --git a/doc/help/Manage-Team.md b/doc/help/Manage-Members.md
index b45ea4283..04243f9fb 100644
--- a/doc/help/Manage-Team.md
+++ b/doc/help/Manage-Members.md
@@ -1,10 +1,10 @@
-# Manage Team
+# Manage Members
-The Manage Team menu is used to change the user roles assigned to members belonging to a team.
+The Manage Members menu is used to change the user roles assigned to members belonging to a team.
## User Roles
-The following user roles are assigned from the **Manage Team** menu option in the team site main menu.
+The following user roles are assigned from the **Manage Members** menu option in the team site main menu.
### System Admin
@@ -23,7 +23,7 @@ The Team Administrator is typically a non-technical end user and has the followi
- Access to the "Team Settings" menu from the team site main menu
- Ability to change the team name and import data from Slack export files
-- Access to the "Manage Team" menu and change user roles to the levels of Team Administrator, Member and Inactive
+- Access to the "Manage Members" menu and change user roles to the levels of Team Administrator, Member and Inactive
### Member
diff --git a/doc/help/README.md b/doc/help/README.md
index d07424c70..9271d64dd 100644
--- a/doc/help/README.md
+++ b/doc/help/README.md
@@ -8,5 +8,5 @@ _Note: Help documentation is a work-in-progress. Community contributions highly
You can access the **Team Site Main Menu** by clicking on the three vertical dots at the top of the left sidebar in a team site. Here we describe the various options available from the menu:
-- [Manage Teams](Manage-Team.md)
+- [Manage Members](Manage-Members.md)
diff --git a/web/react/components/navbar_dropdown.jsx b/web/react/components/navbar_dropdown.jsx
index b6defc393..49d517419 100644
--- a/web/react/components/navbar_dropdown.jsx
+++ b/web/react/components/navbar_dropdown.jsx
@@ -111,7 +111,7 @@ export default class NavbarDropdown extends React.Component {
data-toggle='modal'
data-target='#team_members'
>
- {'Manage Team'}
+ {'Manage Members'}
</a>
</li>
);
diff --git a/web/react/components/sidebar_right_menu.jsx b/web/react/components/sidebar_right_menu.jsx
index ea2bcf9a4..ac101d631 100644
--- a/web/react/components/sidebar_right_menu.jsx
+++ b/web/react/components/sidebar_right_menu.jsx
@@ -75,7 +75,7 @@ export default class SidebarRightMenu extends React.Component {
data-toggle='modal'
data-target='#team_members'
>
- <i className='glyphicon glyphicon-wrench'></i>Manage Team</a>
+ <i className='glyphicon glyphicon-wrench'></i>Manage Members</a>
</li>
);
}