Adjusting permission names which weren't clear from the spec

--HG--
branch : 1.x

src/Orchard.Web/Core/Contents/Permissions.cs

@@ -4,12 +4,20 @@ using Orchard.Security.Permissions;
 
 namespace Orchard.Core.Contents {
     public class Permissions : IPermissionProvider {
-        public static readonly Permission PublishOthersContent = new Permission { Description = "Publish or unpublish content for others", Name = "PublishOthersContent" };
-        public static readonly Permission PublishOwnContent = new Permission { Description = "Publish or unpublish own content", Name = "PublishOwnContent", ImpliedBy = new[] { PublishOthersContent } };
-        public static readonly Permission EditOthersContent = new Permission { Description = "Edit content for others", Name = "EditOthersContent", ImpliedBy = new[] { PublishOthersContent } };
-        public static readonly Permission EditOwnContent = new Permission { Description = "Edit own content", Name = "EditOwnContent", ImpliedBy = new[] { EditOthersContent, PublishOwnContent } };
-        public static readonly Permission DeleteOthersContent = new Permission { Description = "Delete content for others", Name = "DeleteOthersContent" };
-        public static readonly Permission DeleteOwnContent = new Permission { Description = "Delete own content", Name = "DeleteOwnContent", ImpliedBy = new[] { DeleteOthersContent } };
+
+        // Note - in code you should demand PublishContent, EditContent, or DeleteContent
+        // Do not demand the "Own" variation - those are applied automatically when you demand the main three
+        
+        // Also - the internal name EditContent is used instead of EditOthersContent
+        // because demanding "EditContent" is correct and looks right, 
+        // but demanding "EditOthersContent" looks wrong so wasn't used when it should have been
+
+        public static readonly Permission PublishContent = new Permission { Description = "Publish or unpublish content for others", Name = "PublishContent" };
+        public static readonly Permission PublishOwnContent = new Permission { Description = "Publish or unpublish own content", Name = "PublishOwnContent", ImpliedBy = new[] { PublishContent } };
+        public static readonly Permission EditContent = new Permission { Description = "Edit content for others", Name = "EditContent", ImpliedBy = new[] { PublishContent } };
+        public static readonly Permission EditOwnContent = new Permission { Description = "Edit own content", Name = "EditOwnContent", ImpliedBy = new[] { EditContent, PublishOwnContent } };
+        public static readonly Permission DeleteContent = new Permission { Description = "Delete content for others", Name = "DeleteContent" };
+        public static readonly Permission DeleteOwnContent = new Permission { Description = "Delete own content", Name = "DeleteOwnContent", ImpliedBy = new[] { DeleteContent } };
 
         public static readonly Permission MetaListContent = new Permission { ImpliedBy = new[] { EditOwnContent, PublishOwnContent, DeleteOwnContent } };
 
@@ -18,11 +26,11 @@ namespace Orchard.Core.Contents {
         public IEnumerable<Permission> GetPermissions() {
             return new [] {
                 EditOwnContent,
-                EditOthersContent,
+                EditContent,
                 PublishOwnContent,
-                PublishOthersContent,
+                PublishContent,
                 DeleteOwnContent,
-                DeleteOthersContent,
+                DeleteContent,
             };
         }
 
@@ -30,11 +38,11 @@ namespace Orchard.Core.Contents {
             return new[] {
                 new PermissionStereotype {
                     Name = "Administrator",
-                    Permissions = new[] {PublishOthersContent,EditOthersContent,DeleteOthersContent}
+                    Permissions = new[] {PublishContent,EditContent,DeleteContent}
                 },
                 new PermissionStereotype {
                     Name = "Editor",
-                    Permissions = new[] {PublishOthersContent,EditOthersContent,DeleteOthersContent}
+                    Permissions = new[] {PublishContent,EditContent,DeleteContent}
                 },
                 new PermissionStereotype {
                     Name = "Moderator",