From ecd97b0b3534bca7c572dfd708a4e81cef98f2aa Mon Sep 17 00:00:00 2001
From: jmuzsik <jerrymuzsik@icloud.com>
Date: Mon, 19 Mar 2018 13:26:52 -0400
Subject: [PATCH 1/5] enhancement - in reference to #3157 and #3156

---
 warehouse/manage/forms.py             | 2 +-
 warehouse/templates/manage/roles.html | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/warehouse/manage/forms.py b/warehouse/manage/forms.py
index 23fd3cd52734..a25239a89d03 100644
--- a/warehouse/manage/forms.py
+++ b/warehouse/manage/forms.py
@@ -23,8 +23,8 @@ class RoleNameMixin:
     role_name = wtforms.SelectField(
         'Select a role',
         choices=[
-            ('Owner', 'Owner'),
             ('Maintainer', 'Maintainer'),
+            ('Owner', 'Owner'),
         ],
         validators=[
             wtforms.validators.DataRequired(message="Must select a role"),
diff --git a/warehouse/templates/manage/roles.html b/warehouse/templates/manage/roles.html
index cc53db0bfc23..ff53259f94a9 100644
--- a/warehouse/templates/manage/roles.html
+++ b/warehouse/templates/manage/roles.html
@@ -23,10 +23,10 @@ <h2>Collaborators</h2>
   <div class="callout-block">
     <p>There are two possible roles for collaborators:</p>
     <dl>
+      <dt>Maintainer</dt>
+      <dd>May upload releases for a project. Cannot add collaborators, delete files, delete releases or delete the project.</dd>
       <dt>Owner</dt>
       <dd>Owns a package, may add other collaborators for that package, and upload releases for a package.</dd>
-      <dt>Maintainer</dt>
-      <dd>May upload releases for a package.</dd>
     </dl>
   </div>
   <table class="table table--light table--collaborators">

From f070b7c802be28b3d0a0ad1eb09dab9fa979246b Mon Sep 17 00:00:00 2001
From: jmuzsik <jerrymuzsik@icloud.com>
Date: Mon, 19 Mar 2018 13:55:57 -0400
Subject: [PATCH 2/5] enhancement - in reference to #3157 and #3156

---
 warehouse/templates/manage/roles.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/warehouse/templates/manage/roles.html b/warehouse/templates/manage/roles.html
index ff53259f94a9..2ca67daedb38 100644
--- a/warehouse/templates/manage/roles.html
+++ b/warehouse/templates/manage/roles.html
@@ -24,9 +24,9 @@ <h2>Collaborators</h2>
     <p>There are two possible roles for collaborators:</p>
     <dl>
       <dt>Maintainer</dt>
-      <dd>May upload releases for a project. Cannot add collaborators, delete files, delete releases or delete the project.</dd>
+      <dd>Can upload releases for a project. Cannot add collaborators. Cannot delete files, releases, or the project.</dd>
       <dt>Owner</dt>
-      <dd>Owns a package, may add other collaborators for that package, and upload releases for a package.</dd>
+      <dd>Owns a package. Can add other collaborators. Can upload releases. Can delete files, releases, or the entire project.</dd>
     </dl>
   </div>
   <table class="table table--light table--collaborators">

From 7e0b71edb603fba01adf36060b26e7583799ec65 Mon Sep 17 00:00:00 2001
From: jmuzsik <jerrymuzsik@icloud.com>
Date: Mon, 19 Mar 2018 13:58:31 -0400
Subject: [PATCH 3/5] enhancement - in reference to #3157 and #3156

---
 warehouse/templates/manage/roles.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/warehouse/templates/manage/roles.html b/warehouse/templates/manage/roles.html
index 2ca67daedb38..5043ad61b362 100644
--- a/warehouse/templates/manage/roles.html
+++ b/warehouse/templates/manage/roles.html
@@ -26,7 +26,7 @@ <h2>Collaborators</h2>
       <dt>Maintainer</dt>
       <dd>Can upload releases for a project. Cannot add collaborators. Cannot delete files, releases, or the project.</dd>
       <dt>Owner</dt>
-      <dd>Owns a package. Can add other collaborators. Can upload releases. Can delete files, releases, or the entire project.</dd>
+      <dd>Owns a package. Can upload releases. Can add other collaborators. Can delete files, releases, or the entire project.</dd>
     </dl>
   </div>
   <table class="table table--light table--collaborators">

From 4bc59ad2a638f6b439bef64503795d7e63f0722d Mon Sep 17 00:00:00 2001
From: jmuzsik <jerrymuzsik@icloud.com>
Date: Mon, 19 Mar 2018 13:59:29 -0400
Subject: [PATCH 4/5] enhancement - in reference to #3157 and #3156

---
 warehouse/templates/manage/roles.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/warehouse/templates/manage/roles.html b/warehouse/templates/manage/roles.html
index 5043ad61b362..4b8895b7189e 100644
--- a/warehouse/templates/manage/roles.html
+++ b/warehouse/templates/manage/roles.html
@@ -24,7 +24,7 @@ <h2>Collaborators</h2>
     <p>There are two possible roles for collaborators:</p>
     <dl>
       <dt>Maintainer</dt>
-      <dd>Can upload releases for a project. Cannot add collaborators. Cannot delete files, releases, or the project.</dd>
+      <dd>Can upload releases for a package. Cannot add collaborators. Cannot delete files, releases, or the project.</dd>
       <dt>Owner</dt>
       <dd>Owns a package. Can upload releases. Can add other collaborators. Can delete files, releases, or the entire project.</dd>
     </dl>

From 7a83f5686cd55a1169aa78222f4bd18d0853ebee Mon Sep 17 00:00:00 2001
From: jmuzsik <jerrymuzsik@icloud.com>
Date: Mon, 19 Mar 2018 14:08:27 -0400
Subject: [PATCH 5/5] enhancement - in reference to #3157 and #3156

---
 warehouse/templates/manage/roles.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/warehouse/templates/manage/roles.html b/warehouse/templates/manage/roles.html
index 4b8895b7189e..492e8937b04f 100644
--- a/warehouse/templates/manage/roles.html
+++ b/warehouse/templates/manage/roles.html
@@ -26,7 +26,7 @@ <h2>Collaborators</h2>
       <dt>Maintainer</dt>
       <dd>Can upload releases for a package. Cannot add collaborators. Cannot delete files, releases, or the project.</dd>
       <dt>Owner</dt>
-      <dd>Owns a package. Can upload releases. Can add other collaborators. Can delete files, releases, or the entire project.</dd>
+      <dd>Can upload releases. Can add other collaborators. Can delete files, releases, or the entire project.</dd>
     </dl>
   </div>
   <table class="table table--light table--collaborators">