Merge pull request github#11306 from github/repo-sync

repo sync

Author: Octomerger

content/actions/learn-github-actions/creating-workflow-templates.md

@@ -25,7 +25,11 @@ topics:
 
 ## Creating a workflow template
 
-Workflow templates can be created by users with write access to the organization's `.github` repository. The templates can then be used by organization members who have permission to create workflows. You can share workflow templates if your organization's repository is public or if the repository is private and on an Enterprise plan.
+Workflow templates can be created by users with write access to the organization's `.github` repository. The templates can then be used by organization members who have permission to create workflows.
+
+{% ifversion fpt %}
+Your workflow templates can be used to create workflows in public repositories only. Organizations using {% data variables.product.prodname_ghe_cloud %} can also use workflow templates to create workflows in private repositories. For more information, see the [{% data variables.product.prodname_ghe_cloud %} documentation](/enterprise-cloud@latest/actions/learn-github-actions/creating-workflow-templates).
+{% endif %}
 
 {% ifversion fpt or ghes > 3.3 or ghae-issue-4757 or ghec %}
 {% note %}

content/admin/configuration/configuring-your-enterprise/command-line-utilities.md

@@ -624,6 +624,31 @@ A `top`-like interface for current Git operations.
 ghe-btop [ <port number> | --help | --usage ]
 ```
 
+#### ghe-governor
+
+This utility helps to analyze Git traffic. It queries _Governor_ data files, located under `/data/user/gitmon`. {% data variables.product.company_short %} holds one hour of data per file, retained for two weeks. For more information, see [Analyzing Git traffic using Governor](https://github.saobby.my.eu.orgmunity/t/analyzing-git-traffic-using-governor/13516) in {% data variables.product.prodname_gcf %}.
+
+```bash
+ghe-governor <subcommand> <column> [options]
+```
+
+```
+ghe-governor -h
+Usage: ghe-governor [-h] <subcommand> args
+
+OPTIONS:
+  -h | --help        Show this message.
+
+Valid subcommands are:
+  aggregate              Find the top (n) groups of queries for a grouping function and metric
+  health                 Summarize all recent activity on one or more servers
+  top                    Find the top (n) queries for a given metric
+  dump                   Dump individual operations
+  test-quotas            Check quota information
+
+Try ghe-governor <subcommand> --help for more information on the arguments each subcommand takes.
+```
+
 ### ghe-repo
 
 This utility allows you to change to a repository's directory and open an interactive shell as the `git` user. You can perform manual inspection or maintenance of a repository via commands like `git-*` or `git-nw-*`.

content/admin/configuration/configuring-your-enterprise/verifying-or-approving-a-domain-for-your-enterprise.md

@@ -21,6 +21,7 @@ redirect_from:
   - /github/articles/verifying-your-enterprise-accounts-domain
   - /early-access/github/articles/verifying-your-enterprise-accounts-domain
   - /github/setting-up-and-managing-your-enterprise/verifying-or-approving-a-domain-for-your-enterprise-account
+  - /admin/policies/verifying-or-approving-a-domain-for-your-enterprise
 ---
 
 ## About verification of domains

content/admin/policies/index.md

@@ -4,6 +4,7 @@ intro: 'You can set policies in {% data variables.product.product_name %} to red
 redirect_from:
   - /enterprise/admin/developer-workflow
   - /enterprise/admin/policies
+  - /github/setting-up-and-managing-your-enterprise/setting-policies-for-organizations-in-your-enterprise-account
 versions:
   ghec: '*'
   ghes: '*'

content/billing/managing-your-license-for-github-enterprise/uploading-a-new-license-to-github-enterprise-server.md

@@ -18,6 +18,12 @@ After you purchase or upgrade a license for {% data variables.product.prodname_e
 
 ## Uploading your license to {% data variables.product.product_location_enterprise %}
 
+{% warning %}
+
+**Warning:** Updating your license causes a small amount of downtime for {% data variables.product.product_location %}.
+
+{% endwarning %}
+
 1. Sign into {% data variables.product.product_location_enterprise %} as a site administrator.
 {% data reusables.enterprise-accounts.access-enterprise %}
 {% data reusables.enterprise-accounts.settings-tab %}

content/organizations/managing-membership-in-your-organization/can-i-create-accounts-for-people-in-my-organization.md

@@ -14,10 +14,16 @@ topics:
 shortTitle: Create accounts for people
 ---
 
-Because you access an organization by logging in to a personal account, each of your team members needs a personal account. Once you have user names for each person you'd like to add to your organization, you can add them to teams.
+## About user accounts
+
+Because you access an organization by logging in to a user account, each of your team members needs to create their own user account. After you have usernames for each person you'd like to add to your organization, you can add the users to teams.
+
+{% ifversion fpt or ghec %}
+If you need greater control over the user accounts of your organization members, consider {% data variables.product.prodname_emus %}. {% data reusables.enterprise-accounts.emu-short-summary %}
+{% endif %}
 
 ## Adding users to your organization
 
-1. Provide each person instructions to [create a personal account](/articles/signing-up-for-a-new-github-account).
+1. Provide each person instructions to [create a user account](/articles/signing-up-for-a-new-github-account).
 2. Ask for the username of each person you want to give organization membership to.
 3. [Invite the new personal accounts to join](/articles/inviting-users-to-join-your-organization) your organization. Use [organization roles](/articles/permission-levels-for-an-organization) and [repository permissions](/articles/repository-permission-levels-for-an-organization) to limit the access of each account.

content/packages/working-with-a-github-packages-registry/working-with-the-apache-maven-registry.md

@@ -65,7 +65,7 @@ If your instance has subdomain isolation enabled:
         </repository>
         <repository>
           <id>github</id>
-          <url>https://{% ifversion fpt or ghec %}maven.pkg.github.com{% else %}maven.HOSTNAME{% endif %}/OWNER/*</url>
+          <url>https://{% ifversion fpt or ghec %}maven.pkg.github.com{% else %}maven.HOSTNAME{% endif %}/OWNER/REPOSITORY</url>
           <snapshots>
             <enabled>true</enabled>
           </snapshots>
@@ -107,7 +107,7 @@ If your instance has subdomain isolation disabled:
         </repository>
         <repository>
           <id>github</id>
-          <url>HOSTNAME/_registry/maven/OWNER/*</url>
+          <url>HOSTNAME/_registry/maven/OWNER/REPOSITORY</url>
           <snapshots>
             <enabled>true</enabled>
           </snapshots>

content/repositories/creating-and-managing-repositories/about-repositories.md

@@ -71,7 +71,15 @@ People with admin permissions for a repository can change an existing repository
 
 {% data reusables.repositories.about-internal-repos %} For more information on innersource, see {% data variables.product.prodname_dotcom %}'s whitepaper "[An introduction to innersource](https://resources.github.com/whitepapers/introduction-to-innersource/)."
 
-People who are members of an organization within the enterprise have read permissions to internal repositories, but internal repositories are not visible to people {% ifversion fpt or ghec %}outside of the enterprise{% else %}who are not members of an organization{% endif %}, including outside collaborators on organization repositories. For more information, see {% ifversion fpt or ghae or ghec %}"[Roles in an enterprise](/admin/user-management/managing-users-in-your-enterprise/roles-in-an-enterprise#enterprise-members)" and {% endif %}"[Repository permission levels for an organization](/articles/repository-permission-levels-for-an-organization)."
+All enterprise members have read permissions to the internal repository, but internal repositories are not visible to people {% ifversion fpt or ghec %}outside of the enterprise{% else %}who are not members of any organization{% endif %}, including outside collaborators on organization repositories. For more information, see "[Roles in an enterprise](/github/setting-up-and-managing-your-enterprise/roles-in-an-enterprise#enterprise-members)" and "[Repository permission levels for an organization](/articles/repository-permission-levels-for-an-organization)."
+
+{% ifversion ghes %}
+{% note %}
+
+**Note:** A user must be part of an organization to be an enterprise member and have access to internal repositories. If a user on {% data variables.product.product_location %} is not a member of any organization, that user will not have access to internal repositories.
+
+{% endnote %}
+{% endif %}
 
 {% data reusables.repositories.internal-repo-default %}
 

data/reusables/security-advisory/link-browsing-advisory-db.md

@@ -1,5 +1,5 @@
 {% ifversion fpt or ghec %}
 For more information, see "[Browsing security vulnerabilities in the {% data variables.product.prodname_advisory_database %}](/code-security/supply-chain-security/browsing-security-vulnerabilities-in-the-github-advisory-database)" and "[About {% data variables.product.prodname_security_advisories %}](/code-security/security-advisories/about-github-security-advisories)."
 {% else %}
-For more information about advisory data, see "<a href="/github/managing-security-vulnerabilities/browsing-security-vulnerabilities-in-the-github-advisory-database" class="dotcom-only">Browsing security vulnerabilities in the {% data variables.product.prodname_advisory_database %}</a>."
+For more information about advisory data, see "[Browsing security vulnerabilities in the {% data variables.product.prodname_advisory_database %}](/free-pro-team@latest/code-security/supply-chain-security/browsing-security-vulnerabilities-in-the-github-advisory-database)" in the {% data variables.product.prodname_dotcom_the_website %} documentation.
 {% endif %}

lib/redirects/static/redirect-exceptions.txt

@@ -103,6 +103,8 @@
 /enterprise-cloud@latest/billing/managing-your-license-for-github-enterprise/viewing-license-usage-for-github-enterprise
 - /billing/managing-your-license-for-github-enterprise/viewing-license-usage-for-github-enterprise
 
+/enterprise-cloud@latest/admin/policies/enforcing-policies-for-your-enterprise
+- /github/setting-up-and-managing-your-enterprise/setting-policies-for-organizations-in-your-enterprise-account
 
 # These URLs went from being in free-pro-team to ONLY to being in enterprise-cloud only. 
 # Shipped in pull #20947 on 10/15/21