Add latest changes from gitlab-org/gitlab@master

4 files changed, 10 insertions, 10 deletions

diff --git a/doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md b/doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md
index 56098680fc2..507940806ea 100644
--- a/doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md
+++ b/doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md
@@ -329,7 +329,7 @@ A similar thing can be done for all Models handled by the [Geo Self-Service Fram
 
 NOTE:
 `GroupWikiRepository` is not in the previous list since verification is not implemented.
-There is an [issue to implement this functionality in the Admin UI](https://gitlab.com/gitlab-org/gitlab/-/issues/364729).
+There is an [issue to implement this functionality in the Admin Area UI](https://gitlab.com/gitlab-org/gitlab/-/issues/364729).
 
 ### Artifacts
 
diff --git a/doc/architecture/blueprints/pods/index.md b/doc/architecture/blueprints/pods/index.md
index adf742c84a8..5129ae3a046 100644
--- a/doc/architecture/blueprints/pods/index.md
+++ b/doc/architecture/blueprints/pods/index.md
@@ -111,8 +111,8 @@ Users are available globally and not restricted to a single Pod. Users can be me
 - Users can create multiple top-level namespaces
 - Users can be a member of multiple top-level namespaces
 - Users can be a member of multiple organizations
-- Users can administrate organizations
-- User activity is aggregated within an organization
+- Users can administer organizations
+- User activity is aggregated in an organization
 - Every user has one personal namespace
 
 ## Goals
diff --git a/doc/architecture/blueprints/pods/proposal-stateless-router.md b/doc/architecture/blueprints/pods/proposal-stateless-router.md
index cdc30d75af1..e723bb36890 100644
--- a/doc/architecture/blueprints/pods/proposal-stateless-router.md
+++ b/doc/architecture/blueprints/pods/proposal-stateless-router.md
@@ -187,10 +187,10 @@ load any global pages like `/dashboard` and will end up being redirected to
 for legacy APIs and such users may only ever be able to use APIs scoped to a
 organization.
 
-## Detailed explanation of admin settings
+## Detailed explanation of Admin Area settings
 
-We believe that maintaining and synchronizing admin settings will be
-frustrating and painful so to avoid this we will decompose and share all admin
+We believe that maintaining and synchronizing Admin Area settings will be
+frustrating and painful so to avoid this we will decompose and share all Admin Area
 settings in the `gitlab_admin` schema. This should be safe (similar to other
 shared schemas) because these receive very little write traffic.
 
@@ -582,11 +582,11 @@ TODO
 
 1. Router picks a random pod `Pod US0`
 1. Pod US0 redirects user to `/admin/pods/podus0`
-1. Pod US0 renders an admin page and also returns a cache header to cache `/admin/podss/podus0/* => Pod US0`. The admin page contains a dropdown showing other pods they could select and it changes the query parameter.
+1. Pod US0 renders an Admin Area page and also returns a cache header to cache `/admin/podss/podus0/* => Pod US0`. The Admin Area page contains a dropdown list showing other pods they could select and it changes the query parameter.
 
-Admin settings are in Postgres are all shared across all pods to avoid
+Admin Area settings in Postgres are all shared across all pods to avoid
 divergence but we still make it clear in the URL and UI which pod is serving
-the admin page as there is dynamic data being generated from these pages and
+the Admin Area page as there is dynamic data being generated from these pages and
 the operator may want to view a specific pod.
 
 ## More Technical Problems To Solve
diff --git a/doc/user/project/remote_development/index.md b/doc/user/project/remote_development/index.md
index 879978f550a..f12428259e7 100644
--- a/doc/user/project/remote_development/index.md
+++ b/doc/user/project/remote_development/index.md
@@ -43,7 +43,7 @@ To point a domain to your remote machine, create an `A` record from `example.rem
 
 #### Install Certbot
 
-[Certbot](https://certbot.eff.org/) is a free and open-source software tool that automatically uses Let's Encrypt certificates on manually administrated websites to enable HTTPS.
+[Certbot](https://certbot.eff.org/) is a free and open-source software tool that automatically uses Let's Encrypt certificates on manually administered websites to enable HTTPS.
 
 To install Certbot, run the following command: