Textual Changes + Link Changes

app/views/shared/promotions/_promote_burndown_charts.html.haml

-.user-callout.promotion-callout{ id: 'promote_burndown_charts', data: { uid: 'promote_burndown_charts_dismissed' } }
+.user-callout.promotion-callout#promote_burndown_charts{ data: { uid: 'promote_burndown_charts_dismissed' } }
   .bordered-box.content-block
     %button.btn.btn-default.close.js-close-callout{ type: 'button', 'aria-label' => 'Dismiss burndown charts promotion' }
       = icon('times', class: 'dismiss-icon', 'aria-hidden' => 'true')
@@ -12,6 +12,6 @@
           Improve milestone with Burndown Charts.
       %p
         Burndown Charts are visual representations of the progress of completing a milestone. At a glance, you see the current state for the completion a given milestone. Without them, you would have to organize the data from the milestone and plot it yourself to have the same sense of progress.
-        %a{ href: '/help/user/project/milestones/burndown_charts.html', target: '_blank' } Read more
+        = link_to 'Read more', help_page_path('user/project/milestones/burndown_charts.html'), target: '_blank'
 
       = render 'shared/promotions/promotion_link_project'

app/views/shared/promotions/_promote_contribution_analytics.html.haml

@@ -4,11 +4,11 @@
   .user-callout-copy
     %h4
       - if current_application_settings.should_check_namespace_plan?
-        Upgrade your plan to activate Contribution analytics.
+        Upgrade your plan to activate Contribution Analytics.
       - else
-        Track activity with Contribution analytics and GitLab Enterprise Edition.
+        Track activity with Contribution Analytics and GitLab Enterprise Edition.
     %p
       With contribution analytics you can have an overview for the activity of issues, merge requests and push events of your organization and its members.
-      %a{ href: '/user/analytics/contribution_analytics.html', target: '_blank' } Read more
+      = link_to 'Read more', help_page_path('user/analytics/contribution_analytics.html'), target: '_blank'
 
     = render 'shared/promotions/promotion_link_project'

app/views/shared/promotions/_promote_csv_export.html.haml

@@ -15,5 +15,5 @@
               Export issues with GitLab Enterprise Edition.
           %p
             Export Issues to CSV enables you and your team to export all the data collected from issues into a comma-separated values (CSV) file, which stores tabular data in plain text.
-            %a{ href: '/help/user/project/issues/csv_export.html', target: '_blank' } Read more
+            = link_to 'Read more', help_page_path('user/project/issues/csv_export.html'), target: '_blank'
           = render 'shared/promotions/promotion_link_project'

app/views/shared/promotions/_promote_mr_approval.html.haml

 .user-callout.promotion-callout.append-bottom-20.js-mr-approval-callout{ id: 'promote_mr_approval', data: { uid: 'promote_mr_approval_dismissed' } }
   .bordered-box.content-block
-    %button.btn.btn-default.close.js-close-callout{ type: 'button', 'aria-label' => 'Dismiss merge request promotion' }
+    %button.btn.btn-default.close.js-close-callout{ type: 'button', 'aria-label' => 'Dismiss Merge Request promotion' }
       = icon('times', class: 'dismiss-icon', 'aria-hidden' => 'true')
     .user-callout-copy
       %h4
@@ -10,11 +10,11 @@
           Improve Merge Request and customer support with GitLab Enterprise Edition.
       %ul
         %li
-          %a{ href: '/help/user/project/merge_requests/merge_request_approvals.html', target: '_blank' } Merge Request Approvals
+          = link_to 'Merge Request Approvals', help_page_path('user/project/merge_requests/merge_request_approvals.html'), target: '_blank'
           %p
             Merge request approvals allow you to set the number of necessary approvals and predefine a list of approvers that will need to approve every merge request in a project.
         %li
-          %a{ href: '/help/user/project/merge_requests/fast_forward_merge.html', target: '_blank' } Fast-forward Merge
+          = link_to 'Fast-forward Merge', help_page_path('user/project/merge_requests/fast_forward_merge.html'), target: '_blank'
           %p
             If you prefer a linear Git history and a way to accept merge requests without creating merge commits, you can configure this on a per-project basis.
 

app/views/shared/promotions/_promote_repository_features.html.haml

@@ -12,15 +12,15 @@
           Improve repositories with GitLab Enterprise Edition.
       %ul
         %li
-          %a{ href: '/help/push_rules/push_rules.md#push-rules', target: '_blank' } Push Rules
+          = link_to 'Push Rules', help_page_path('push_rules/push_rules.md#push-rules'), target: '_blank'
           %p
             Push Rules are defined per project so you can have different rules applied to different projects depends on your needs.
         %li
-          %a{ href: '/help/workflow/repository_mirroring.html', target: '_blank' } Repository Mirroring
+          = link_to 'Repository Mirroring', help_page_path('workflow/repository_mirroring.html'), target: '_blank'
           %p
             Repository Mirroring is a way to mirror repositories from external sources. It can be used to mirror all branches, tags, and commits that you have in your repository.
         %li
-          %a{ href: '/help/user/project/protected_branches.html', target: '_blank' } Protected Branches
+          = link_to 'Protected Branches', help_page_path('user/project/protected_branches.html'), target: '_blank'
           %p
             With GitLab Enterprise Edition you can restrict access to protected branches by choosing a role (Masters, Developers) as well as certain users.
 

app/views/shared/promotions/_promote_servicedesk.html.haml

 .user-callout.promotion-callout.js-service-desk-callout{ id: 'promote_service_desk', data: { uid: 'promote_service_desk_dismissed' } }
   .bordered-box.content-block
-    %button.btn.btn-default.close.js-close-callout{ type: 'button', 'aria-label' => 'Dismiss service desk promotion' }
+    %button.btn.btn-default.close.js-close-callout{ type: 'button', 'aria-label' => 'Dismiss Service Desk promotion' }
       = icon('times', class: 'dismiss-icon', 'aria-hidden' => 'true')
     .svg-container
       = custom_icon('icon_service_desk')
@@ -12,6 +12,6 @@
           Improve customer support with GitLab Service Desk.
       %p
         GitLab Service Desk is a simple way to allow people to create issues in your GitLab instance without needing their own user account. It provides a unique email address for end users to create issues in a project, and replies can be sent either through the GitLab interface or by email. End users will only see the thread through email.
-        %a{ href: '/help/user/project/service_desk.html', target: '_blank' } Read more
+        = link_to 'Read more', help_page_path('user/project/service_desk.html'), target: '_blank'
 
       = render 'shared/promotions/promotion_link_project'

app/views/shared/promotions/_promote_squash_commits.html.haml

@@ -10,6 +10,6 @@
           Improve Merge Requests with squash commit and GitLab Enterprise Edition.
       %p
         Squashing lets you tidy up the commit history of a branch when accepting a merge request. It applies all of the changes in the merge request as a single commit, and then merges that commit using the merge method set for the project.
-        %a{ href: '/help/user/project/merge_requests/squash_and_merge.html', target: '_blank' } Read more
+        = link_to 'Read more', help_page_path('user/project/merge_requests/squash_and_merge.html'), target: '_blank'
 
       = render 'shared/promotions/promotion_link_project'

app/views/shared/promotions/_promotion_link_project.html.haml

@@ -2,10 +2,10 @@
   - if (@project.owner.present? && @project.owner == @current_user) || @project.group&.has_owner?(@current_user)
     = link_to 'Upgrade your plan', upgrade_plan_url, class: 'btn btn-primary'
   - elsif @project.group
-    %p Contact an owner of group #{ @project.group.name } to upgrade the license.
+    %p Contact an owner of group #{ @project.group.name } to upgrade the plan.
   - else
     - owner = @project.namespace.owner
-    %p Contact owner #{ link_to(simple_sanitize(owner.name), user_path(owner)) } to upgrade the license.
+    %p Contact owner #{ link_to(owner.name, user_path(owner)) } to upgrade the plan.
 - elsif current_user && current_user.admin?
   - if License.current&.expired?
     = link_to 'Buy GitLab Enterprise Edition', Gitlab::SUBSCRIPTIONS_PLANS_URL, class: 'btn btn-primary'