Merge branch 'main' into landing-page-getting-started-guides

content/admin/configuration/configuring-network-settings/configuring-dns-nameservers.md

@@ -35,7 +35,8 @@ The nameservers you specify must resolve {% data variables.product.product_locat
   ```
 3. Append any `nameserver` entries, then save the file.
 4. After verifying your changes, save the file.
-5. To add your new nameserver entries to {% data variables.product.product_location %}, enter:
+5. To add your new nameserver entries to {% data variables.product.product_location %}, run the following:
   ```shell
   $ sudo service resolvconf restart
+  $ sudo service dnsmasq restart
   ```

content/admin/configuration/managing-connections-between-github-enterprise-server-and-github-enterprise-cloud/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server.md

@@ -24,7 +24,7 @@ To identify vulnerable dependencies in your repository and receive vulnerability
 - The dependency graph
 - {% ifversion ghes > 2.21 %}{% data variables.product.prodname_dependabot %}{% else %}Security{% endif %} alerts
 
-For more information, see "[About the dependency graph](/code-security/supply-chain-security/understanding-your-software-supply-chain/about-the-dependency-graph)" and "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)."
+For more information, see "[About the dependency graph](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph)" and "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)."
 
 {% data reusables.repositories.tracks-vulnerabilities %} 
 

content/billing/managing-billing-for-github-actions/about-billing-for-github-actions.md

@@ -23,6 +23,8 @@ If you purchased {% data variables.product.prodname_enterprise %} through a Micr
 
 Minutes reset every month, while storage usage does not.
 
+### Included storage and minutes
+
 |Product | Storage | Minutes (per month)|
 |------- | ------- | ---------|
 | {% data variables.product.prodname_free_user %} | 500 MB | 2,000 |
@@ -33,6 +35,8 @@ Minutes reset every month, while storage usage does not.
 
 Jobs that run on Windows and macOS runners that {% data variables.product.prodname_dotcom %} hosts consume minutes at 2 and 10 times the rate that jobs on Linux runners consume. For example, using 1,000 Windows minutes would consume 2,000 of the minutes included in your account. Using 1,000 macOS minutes, would consume 10,000 minutes included in your account.
 
+### Minute multipliers
+
 | Operating system | Minute multiplier |
 |------- | ---------|
 | Linux | 1 |
@@ -49,6 +53,8 @@ The storage used by a repository is the total storage used by {% data variables.
 
 {% endnote %}
 
+### Per-minute rates
+
 | Operating system | Per-minute rate |
 |------- | ---------|
 | Linux | $0.008 |
@@ -61,13 +67,21 @@ The number of jobs you can run concurrently across all repositories in your user
 
 ## Calculating minute and storage spending
 
-At the end of the month, {% data variables.product.prodname_dotcom %} calculates the cost of minutes and storage used over the amount included in your account. For example, if your organization uses {% data variables.product.prodname_team %} and allows unlimited spending, using 15,000 minutes could have a total storage and minute overage cost of $56, depending on the operating systems used to run jobs.
+At the end of the month, {% data variables.product.prodname_dotcom %} calculates the cost of minutes and storage used over the amount included in your account.
+
+### Sample minutes cost calculation
+
+For example, if your organization uses {% data variables.product.prodname_team %} and allows unlimited spending, using 15,000 minutes could have a total storage and minute overage cost of $56, depending on the operating systems used to run jobs.
 
 - 5,000 (3,000 Linux and 2,000 Windows) minutes = $56 ($24 + $32).
   - 3,000 Linux minutes at $0.008 per minute = $24.
   - 2,000 Windows minutes at $0.016 per minute = $32.
 
-{% data variables.product.prodname_dotcom %} calculates your storage usage for each month based on hourly usage during that month. For example, if you use 3 GB of storage for 10 days of March and 12 GB for 21 days of March, your storage usage would be:
+{% data variables.product.prodname_dotcom %} calculates your storage usage for each month based on hourly usage during that month.
+
+### Sample storage cost calculation
+
+For example, if you use 3 GB of storage for 10 days of March and 12 GB for 21 days of March, your storage usage would be:
 
 - 3 GB x 10 days x (24 hours per day) = 720 GB-Hours
 - 12 GB x 21 days x (24 hours per day) = 6,048 GB-Hours

content/get-started/onboarding/getting-started-with-github-enterprise-server.md

@@ -74,10 +74,15 @@ You can also require two-factor authentication for each of your organizations. F
 ### 2. Staying in compliance
 You can implement required status checks and commit verifications to enforce your organization's compliance standards and automate compliance workflows. You can also use the audit log for your organization to review actions performed by your team. For more information, see "[Enforcing policy with pre-receive hooks](/admin/policies/enforcing-policy-with-pre-receive-hooks)" and "[Audit logging](/admin/user-management/monitoring-activity-in-your-enterprise/audit-logging)."
 
+{% ifversion ghes > 2.22 %}
 ### 3. Configuring security features for your organizations
 {% data reusables.getting-started.configuring-security-features %}
-### 4. Enabling {% data variables.product.prodname_GH_advanced_security %} features
+{% endif %}
+
+{% ifversion ghes > 2.21 %}
+### {% ifversion ghes = 2.22 %}3.{% else %}4.{% endif %} Enabling {% data variables.product.prodname_GH_advanced_security %} features
 You can upgrade your {% data variables.product.product_name %} license to include {% data variables.product.prodname_GH_advanced_security %}. This provides extra features that help users find and fix security problems in their code, such as code and secret scanning. For more information, see "[{% data variables.product.prodname_GH_advanced_security %} for your enterprise](/admin/advanced-security/enabling-github-advanced-security-for-your-enterprise)."
+{% endif %}
 
 ## Part 4: Customizing and automating your enterprise's work on {% data variables.product.prodname_dotcom %}
 You can customize and automate work in organizations in your enterprise with {% data variables.product.prodname_dotcom %} and {% data variables.product.prodname_oauth_apps %}, {% data variables.product.prodname_dotcom %} API, {% data variables.product.prodname_actions %}, {% data variables.product.prodname_registry %} , and {% data variables.product.prodname_pages %}.
@@ -86,6 +91,8 @@ You can customize and automate work in organizations in your enterprise with {%
 You can build integrations with the {% data variables.product.prodname_dotcom %} API, such as {% data variables.product.prodname_github_apps %} or {% data variables.product.prodname_oauth_apps %}, for use in organizations in your enterprise to complement and extend your workflows. For more information, see "[About apps](/developers/apps/getting-started-with-apps/about-apps)."
 ### 2. Using the {% data variables.product.prodname_dotcom %} API
 {% data reusables.getting-started.api %}
+
+{% ifversion ghes > 2.21 %}
 ### 3. Building {% data variables.product.prodname_actions %}
 {% data reusables.getting-started.actions %}
 
@@ -95,7 +102,9 @@ For more information on enabling and configuring {% data variables.product.prodn
 {% data reusables.getting-started.packages %}
 
 For more information on enabling and configuring {% data variables.product.prodname_registry %} for {% data variables.product.product_location %}, see "[Getting started with {% data variables.product.prodname_registry %} for your enterprise](/admin/packages/getting-started-with-github-packages-for-your-enterprise)."
-### 5. Using {% data variables.product.prodname_pages %}
+{% endif %}
+
+### {% ifversion ghes = 2.21 %}3.{% else %}5.{% endif %} Using {% data variables.product.prodname_pages %}
 {% data reusables.getting-started.github-pages-enterprise %}
 
 ## Part 5: Connecting with other {% data variables.product.prodname_dotcom %} resources

content/get-started/onboarding/getting-started-with-your-github-account.md

@@ -150,26 +150,32 @@ You can enable {% data variables.product.prodname_discussions %} for your reposi
 ### {% ifversion fpt %}2.{% else %}1.{% endif %} Using the {% data variables.product.prodname_dotcom %} API
 {% data reusables.getting-started.api %}
 
+{% ifversion fpt or ghae or ghes > 2.21 %}
 ### {% ifversion fpt %}3.{% else %}2.{% endif %} Building {% data variables.product.prodname_actions %}
 {% data reusables.getting-started.actions %}
 
 ### {% ifversion fpt %}4.{% else %}3.{% endif %} Publishing and managing {% data variables.product.prodname_registry %} 
 {% data reusables.getting-started.packages %}
+{% endif %}
 
+{% ifversion fpt or ghae or ghes > 2.22 %}
 ## Part 5: Building securely on {% data variables.product.product_name %}
 {% data variables.product.product_name %} has a variety of security features that help keep code and secrets secure in repositories. Some features are available for all repositories, while others are only available for public repositories and repositories with a {% data variables.product.prodname_GH_advanced_security %} license. For an overview of {% data variables.product.product_name %} security features, see "[{% data variables.product.prodname_dotcom %} security features](/code-security/getting-started/github-security-features)."
+
 ### 1. Securing your repository
 As a repository administrator, you can secure your repositories by configuring repository security settings. These include managing access to your repository, setting a security policy, and managing dependencies. For public repositories, and for private repositories owned by organizations where {% data variables.product.prodname_GH_advanced_security %} is enabled, you can also configure code and secret scanning to automatically identify vulnerabilities and ensure tokens and keys are not exposed. 
 
 For more information on steps you can take to secure your repositories, see "[Securing your repository](/code-security/getting-started/securing-your-repository)."
+{% endif %}
 
 {% ifversion fpt %}
 ### 2. Managing your dependencies
 A large part of building securely is maintaining your project's dependencies to ensure that all packages and applications you depend on are updated and secure. You can manage your repository's dependencies on {% data variables.product.product_name %} by exploring the dependency graph for your repository, using Dependabot to automatically raise pull requests to keep your dependencies up-to-date, and receiving Dependabot alerts and security updates for vulnerable dependencies. 
 
 For more information, see "[Securing your software supply chain](/code-security/supply-chain-security)."
 {% endif %}
-## Part 6: Participating in {% data variables.product.prodname_dotcom %}'s community
+
+## Part {% ifversion ghes < 3.0 %}5:{% else %}6:{% endif %} Participating in {% data variables.product.prodname_dotcom %}'s community
 
 {% data reusables.getting-started.participating-in-community %}
 

data/reusables/code-scanning/run-additional-queries.md

@@ -10,7 +10,7 @@ The options available to specify the additional queries you want to run are:
 
 You can use both `packs` and `queries` in the same workflow.
 {% else %}
-Any additional queries you want to run must belong to a {% data variables.product.prodname_ql %} pack in a repository. For more information, see "[About code scanning with CodeQL](/code-security/secure-coding/automatically-scanning-your-code-for-vulnerabilities-and-errors/about-code-scanning-with-codeql#about-codeql-queries)."
+Any additional queries you want to run must belong to a {% data variables.product.prodname_ql %} pack in a repository. For more information, see {% ifversion ghes < 3.0 %}"[About {% data variables.product.prodname_code_scanning %}](/github/finding-security-vulnerabilities-and-errors-in-your-code/automatically-scanning-your-code-for-vulnerabilities-and-errors/about-code-scanning#about-codeql)."{% else %}"[About {% data variables.product.prodname_code_scanning %} with {% data variables.product.prodname_codeql %}](/code-security/secure-coding/automatically-scanning-your-code-for-vulnerabilities-and-errors/about-code-scanning-with-codeql#about-codeql-queries)."{% endif %}
 
 You can specify a single _.ql_ file, a directory containing multiple _.ql_ files, a _.qls_ query suite definition file, or any combination. For more information about query suite definitions, see "[Creating {% data variables.product.prodname_codeql %} query suites](https://codeql.github.com/docs/codeql-cli/creating-codeql-query-suites/)."
 {% endif %}