Merge branch 'main' into packages-azure-storage-note

Author: sanjeevh93

assets/images/help/codespaces/add-constraint-dropdown-ports.png

@@ -14,9 +14,14 @@ redirect_from:
   - /admin/github-actions/enabling-github-actions-with-minio-gateway-for-nas-storage
 shortTitle: MinIO Gateway for NAS storage
 ---
-## Prerequisites
 
-{% data reusables.actions.enterprise-s3-support-warning %}
+{% warning %}
+
+**Warning**: MinIO has announced removal of MinIO Gateways. Starting June 1st, 2022, support and bug fixes for the current MinIO NAS Gateway implementation will only be available for paid customers via their LTS support contract. If you want to continue using MinIO Gateways with {% data variables.product.prodname_actions %}, we recommend moving to MinIO LTS support. For more information, see [Scheduled removal of MinIO Gateway for GCS, Azure, HDFS](https://github.com/minio/minio/issues/14331) in the minio/minio repository.
+
+{% endwarning %}
+
+## Prerequisites
 
 Before enabling {% data variables.product.prodname_actions %}, make sure you have completed the following steps:
 

assets/images/help/codespaces/add-constraint-dropdown-timeout.png

@@ -48,7 +48,7 @@ Each action is a repository in the `actions` organization, and each action repos
 
 **Notes:** 
 - When using setup actions (such as `actions/setup-LANGUAGE`) on {% data variables.product.product_name %} with self-hosted runners, you might need to set up the tools cache on runners that do not have internet access. For more information, see "[Setting up the tool cache on self-hosted runners without internet access](/enterprise/admin/github-actions/setting-up-the-tool-cache-on-self-hosted-runners-without-internet-access)."
-- Upgrades to {% data variables.product.product_name %} will not result in the bundled actions being updated.
+- Bundled actions are automatically updated when {% data variables.product.product_name %} is updated.
 
 {% endnote %}
 

assets/images/help/codespaces/add-constraint-dropdown.png

@@ -12,6 +12,8 @@ shortTitle: Set the timeout
 
 A codespace will stop running after a period of inactivity. You can specify the length of this timeout period. The updated setting will apply to any newly created codespace.
 
+Some organizations may have a maximum idle timeout policy. If an organization policy sets a maximum timeout which is less than the default timeout you have set, the organization's timeout will be used instead of your setting, and you will be notified of this after the codespace is created. For more information, see "[Restricting the idle timeout period](/codespaces/managing-codespaces-for-your-organization/restricting-the-idle-timeout-period)."
+
 {% warning %}
 
 **Warning**: Codespaces are billed per minute. If you are not actively using a codespace but the codespace has not yet timed out, you are still billed for the time that the codespace is running. For more information, see "[About billing for Codespaces](/billing/managing-billing-for-github-codespaces/about-billing-for-codespaces#codespaces-pricing)."

assets/images/help/codespaces/edit-timeout-constraint.png

@@ -15,6 +15,7 @@ children:
   - /reviewing-your-organizations-audit-logs-for-codespaces
   - /restricting-access-to-machine-types
   - /restricting-the-visibility-of-forwarded-ports
+  - /restricting-the-idle-timeout-period
 shortTitle: Managing your organization
 ---
 

assets/images/help/codespaces/maximum-minutes-timeout.png

@@ -1,9 +1,9 @@
 ---
 title: Restricting access to machine types
-shortTitle: Machine type access
+shortTitle: Restrict machine types
 intro: You can set constraints on the types of machines users can choose when they create codespaces in your organization.
 product: '{% data reusables.gated-features.codespaces %}'
-permissions: 'To manage access to machine types for the repositories in an organization, you must be an organization owner.'
+permissions: 'To manage access to machine types for the repositories in an organization, you must be an owner of the organization.'
 versions:
   fpt: '*'
   ghec: '*'
@@ -47,33 +47,22 @@ If you add an organization-wide policy, you should set it to the largest choice
 
 {% data reusables.profile.access_org %}
 {% data reusables.profile.org_settings %}
-1. In the "Code, planning, and automation" section of the sidebar, select **{% octicon "codespaces" aria-label="The codespaces icon" %} {% data variables.product.prodname_codespaces %}** then click **Policy**.
-2. On the "Codespace policies" page, click **Create Policy**.
-3. Enter a name for your new policy.
-4. Click **Add constraint** and choose **Machine types**.
+{% data reusables.codespaces.codespaces-org-policies %}
+1. Click **Add constraint** and choose **Machine types**.
 
    ![Add a constraint for machine types](/assets/images/help/codespaces/add-constraint-dropdown.png)
 
-5. Click {% octicon "pencil" aria-label="The edit icon" %} to edit the constraint, then clear the selection of any machine types that you don't want to be available.
+1. Click {% octicon "pencil" aria-label="The edit icon" %} to edit the constraint, then clear the selection of any machine types that you don't want to be available.
 
    ![Edit the machine type constraint](/assets/images/help/codespaces/edit-machine-constraint.png)
 
-6. In the "Change policy target" area, click the dropdown button.
-7. Choose either **All repositories** or **Selected repositories** to determine which repositories this policy will apply to.
-8. If you chose **Selected repositories**:
-   1. Click {% octicon "gear" aria-label="The settings icon" %}.
-
-      ![Edit the settings for the policy](/assets/images/help/codespaces/policy-edit.png)
-
-   2. Select the repositories you want this policy to apply to.
-   3. At the bottom of the repository list, click **Select repositories**.
-
-      ![Select repositories for this policy](/assets/images/help/codespaces/policy-select-repos.png)
-
-9. Click **Save**.
-
+{% data reusables.codespaces.codespaces-policy-targets %}
+1. If you want to add another constraint to the policy, click **Add constraint** and choose another constraint. For information about other constraints, see "[Restricting the visibility of forwarded ports](/codespaces/managing-codespaces-for-your-organization/restricting-the-visibility-of-forwarded-ports)" and "[Restricting the idle timeout period](/codespaces/managing-codespaces-for-your-organization/restricting-the-idle-timeout-period)."
+1. After you have finished adding constraints to your policy, click **Save**.
 ## Editing a policy
 
+You can edit an existing policy. For example, you may want to add or remove constraints to or from a policy.
+
 1. Display the "Codespace policies" page. For more information, see "[Adding a policy to limit the available machine types](#adding-a-policy-to-limit-the-available-machine-types)."
 1. Click the name of the policy you want to edit.
 1. Make the required changes then click **Save**.