Merge branch 'main' into 5765-private-profile

Author: Martin Lopes

.github/CODEOWNERS

@@ -24,15 +24,11 @@ package.json @github/docs-engineering
 /translations/log/ @github/docs-localization @Octomerger
 
 # Site Policy
-/content/github/site-policy/ @github/site-policy-admins
+/content/site-policy/ @github/site-policy-admins
 
 # Content strategy
 /contributing/content-markup-reference.md @github/docs-content-strategy
 /contributing/content-style-guide.md @github/docs-content-strategy
 /contributing/content-model.md @github/docs-content-strategy
 /contributing/content-style-guide.md @github/docs-content-strategy
 /contributing/content-templates.md @github/docs-content-strategy
-
-# Make sure that Octokit maintainers get notified about changes
-# relevant to the Octokit libraries (https://github.com/octokit)
-/content/rest/reference @github/octokit-maintainers

.github/workflows/optimize-images.yml

@@ -23,6 +23,10 @@ jobs:
         uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
         with:
           ref: ${{ github.head_ref }}
+          # Need to specify a PAT here because otherwise GITHUB_TOKEN is used
+          # by default.  Workflows won't trigger in that case because actions
+          # performed with GITHUB_TOKEN don't trigger other workflows.
+          token: ${{ secrets.DOCUBOT_REPO_PAT }}
 
       - name: Check out base ref
         run: git fetch --no-tags --depth=1 origin $GITHUB_BASE_REF

assets/images/help/profile/organization-profile-following.png

@@ -40,9 +40,23 @@ You can also find a list of your recently visited repositories, teams, and proje
 
 ## Staying updated with activity from the community
 
-In the "All activity" section of your news feed, you can view updates from repositories you're subscribed to and people you follow. The "All activity" section shows updates from repositories you watch or have starred, and from users you follow.
+{% if for-you-feed %}
+The main section of your dashboard has two activity feeds:
+
+- Following: Activity by people you follow and from repositories you watch.
+- For you: Activity and recommendations based on your {% data variables.product.product_name %} network.
+
+### Following feed
+
+This feed shows activity from repositories and users you have shown a direct interest in, by following a user or watching a repository. For example, you'll see updates when a user you follow:
+
+{% else %}
+In the "All activity" section of your news feed, you can view updates from repositories you watch and users you follow.
 
 You'll see updates in your news feed when a user you follow:
+{% endif %}
+
+
 - Stars a repository.
 - Follows another user.{% ifversion fpt or ghes or ghec %}
 - Creates a public repository.{% endif %}
@@ -51,7 +65,26 @@ You'll see updates in your news feed when a user you follow:
 - Forks a public repository.{% endif %}
 - Publishes a new release.
 
-For more information about starring repositories and following people, see "[Saving repositories with stars](/articles/saving-repositories-with-stars/)" and "[Following people](/articles/following-people)."
+For more information about starring repositories and following people, see "[Following people](/articles/following-people)" and "[Be social](/get-started/quickstart/be-social)."
+
+{% if for-you-feed %}
+### For you feed
+
+{% note %}
+
+**Note:** This new tab is currently in public beta and subject to change. 
+
+{% endnote %}
+
+This feed shows activity and recommendations based on your network on {% data variables.product.product_name %}. It's designed to provide updates that inspire you, keep you up-to-date, and help you find new communities you want to participate in. Your network includes:
+
+- Repositories you have starred
+- Repositories you've contributed to
+- Users you follow or sponsor
+- Users you've collaborated with
+- Organizations you follow
+
+{% endif %}
 
 ## Exploring recommended repositories
 

assets/images/help/profile/organization-profile-unfollowing.png

@@ -16,7 +16,11 @@ topics:
 ---
 If you configure a hostname instead of a hard-coded IP address, you will be able to change the physical hardware that {% data variables.product.product_location %} runs on without affecting users or client software.
 
-The hostname setting in the {% data variables.enterprise.management_console %} should be set to an appropriate fully qualified domain name (FQDN) which is resolvable on the internet or within your internal network. For example, your hostname setting could be `github.companyname.com.` We also recommend enabling subdomain isolation for the chosen hostname to mitigate several cross-site scripting style vulnerabilities. For more information on hostname settings, see [Section 2.1 of the HTTP RFC](https://tools.ietf.org/html/rfc1123#section-2).
+The hostname setting in the {% data variables.enterprise.management_console %} should be set to an appropriate fully qualified domain name (FQDN) which is resolvable on the internet or within your internal network. For example, your hostname setting could be `github.companyname.com.` Web and API requests will automatically redirect to the hostname configured in the {% data variables.enterprise.management_console %}.
+
+After you configure a hostname, you can enable subdomain isolation to further increase the security of {% data variables.product.product_location %}. For more information, see "[Enabling subdomain isolation](/enterprise/{{ currentVersion }}/admin/guides/installation/enabling-subdomain-isolation/)."
+
+For more information on the supported hostname types, see [Section 2.1 of the HTTP RFC](https://tools.ietf.org/html/rfc1123#section-2).
 
 {% data reusables.enterprise_installation.changing-hostname-not-supported %}
 
@@ -30,4 +34,4 @@ The hostname setting in the {% data variables.enterprise.management_console %} s
 {% data reusables.enterprise_management_console.test-domain-settings-failure %}
 {% data reusables.enterprise_management_console.save-settings %}
 
-After you configure a hostname, we recommend that you enable subdomain isolation for {% data variables.product.product_location %}. For more information, see "[Enabling subdomain isolation](/enterprise/{{ currentVersion }}/admin/guides/installation/enabling-subdomain-isolation/)."
+To help mitigate various cross-site scripting vulnerabilities, we recommend that you enable subdomain isolation for {% data variables.product.product_location %} after you configure a hostname. For more information, see "[Enabling subdomain isolation](/enterprise/{{ currentVersion }}/admin/guides/installation/enabling-subdomain-isolation/)."

content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/about-your-personal-dashboard.md

@@ -18,25 +18,32 @@ The time required to failover depends on how long it takes to manually promote t
 
 {% data reusables.enterprise_installation.promoting-a-replica %}
 
-1. To allow replication to finish before you switch appliances, put the primary appliance into maintenance mode:
-    - To use the management console, see "[Enabling and scheduling maintenance mode](/enterprise/admin/guides/installation/enabling-and-scheduling-maintenance-mode/)"
-    - You can also use the `ghe-maintenance -s` command.
-      ```shell
-      $ ghe-maintenance -s
-      ```
-2.  When the number of active Git operations, MySQL queries, and Resque jobs reaches zero, wait 30 seconds. 
+1. If the primary appliance is available, to allow replication to finish before you switch appliances, on the primary appliance, put the primary appliance into maintenance mode.
+
+    - Put the appliance into maintenance mode.
+
+       - To use the management console, see "[Enabling and scheduling maintenance mode](/enterprise/admin/guides/installation/enabling-and-scheduling-maintenance-mode/)"
+
+       - You can also use the `ghe-maintenance -s` command.
+         ```shell
+         $ ghe-maintenance -s
+         ```
+
+   - When the number of active Git operations, MySQL queries, and Resque jobs reaches zero, wait 30 seconds. 
 
-    {% note %}
+      {% note %}
 
-    **Note:** Nomad will always have jobs running, even in maintenance mode, so you can safely ignore these jobs.
+      **Note:** Nomad will always have jobs running, even in maintenance mode, so you can safely ignore these jobs.
 
-    {% endnote %}
+      {% endnote %}
 
-3. To verify all replication channels report `OK`, use the `ghe-repl-status -vv` command.
-  ```shell
-  $ ghe-repl-status -vv
-  ```
-4. To stop replication and promote the replica appliance to primary status, use the `ghe-repl-promote` command. This will also automatically put the primary node in maintenance node if it’s reachable.
+   - To verify all replication channels report `OK`, use the `ghe-repl-status -vv` command.
+
+      ```shell
+      $ ghe-repl-status -vv
+      ```
+
+4. On the replica appliance, to stop replication and promote the replica appliance to primary status, use the `ghe-repl-promote` command. This will also automatically put the primary node in maintenance node if it’s reachable.
   ```shell
   $ ghe-repl-promote
   ```

content/admin/configuration/configuring-network-settings/configuring-a-hostname.md

@@ -24,7 +24,7 @@ There are three types of migrations you can perform:
 
 In a migration, everything revolves around a repository. Most data associated with a repository can be migrated. For example, a repository within an organization will migrate the repository *and* the organization, as well as any users, teams, issues, and pull requests associated with the repository.
 
-The items in the table below can be migrated with a repository. Any items not shown in the list of migrated data can not be migrated.
+The items in the table below can be migrated with a repository. Any items not shown in the list of migrated data can not be migrated, including {% data variables.large_files.product_name_short %} assets.
 
 {% data reusables.enterprise_migrations.fork-persistence %}
 

content/admin/enterprise-management/configuring-high-availability/initiating-a-failover-to-your-replica-appliance.md

@@ -25,7 +25,7 @@ shortTitle: Check for existing SSH key
   # Lists the files in your .ssh directory, if they exist
   ```
 
-3. Check the directory listing to see if you already have a public SSH key. By default, the {% ifversion ghae %}filename of a supported public key for {% data variables.product.product_name %} is *id_rsa.pub*.{% elsif fpt or ghes %}filenames of supported public keys for {% data variables.product.product_name %} are one of the following.
+3. Check the directory listing to see if you already have a public SSH key. By default, the {% ifversion ghae %}filename of a supported public key for {% data variables.product.product_name %} is *id_rsa.pub*.{% else %}filenames of supported public keys for {% data variables.product.product_name %} are one of the following.
     - *id_rsa.pub*
     - *id_ecdsa.pub*
     - *id_ed25519.pub*{% endif %}

content/admin/user-management/migrating-data-to-and-from-your-enterprise/about-migrations.md

@@ -32,7 +32,7 @@ If that worked, great! If not, you may need to [follow our troubleshooting guide
 
 If you are able to SSH into `git@ssh.{% data variables.command_line.backticks %}` over port 443, you can override your SSH settings to force any connection to {% data variables.product.product_location %} to run through that server and port.
 
-To set this in your SSH confifguration file, edit the file at `~/.ssh/config`, and add this section:
+To set this in your SSH configuration file, edit the file at `~/.ssh/config`, and add this section:
 
 ```
 Host {% data variables.command_line.codeblock %}