Automatic merge of gitlab-org/gitlab-ce master

app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue

@@ -350,8 +350,8 @@ export default {
       <project-setting-row
         v-if="pagesAvailable && pagesAccessControlEnabled"
         :help-path="pagesHelpPath"
-        label="Pages"
-        help-text="Static website for the project."
+        label="Pages access control"
+        help-text="Access control for the project's static website"
       >
         <project-feature-setting
           v-model="pagesAccessLevel"

app/helpers/projects_helper.rb

@@ -490,7 +490,7 @@ module ProjectsHelper
       lfsHelpPath: help_page_path('workflow/lfs/manage_large_binaries_with_git_lfs'),
       pagesAvailable: Gitlab.config.pages.enabled,
       pagesAccessControlEnabled: Gitlab.config.pages.access_control,
-      pagesHelpPath: help_page_path('user/project/pages/index.md')
+      pagesHelpPath: help_page_path('user/project/pages/introduction', anchor: 'gitlab-pages-access-control-core-only')
     }
   end
 

changelogs/unreleased/54142-pages-in-project-s-permission-should-be-named-pages-access-control.yml

+---
+title: Make the Pages permission setting more clear
+merge_request: 23146
+author:
+type: changed