Split "Activating optional features" article into separate GitHub App…

…s and OAuth Apps articles (#36684)

Co-authored-by: Sarah Edwards <[email protected]>

content/apps/creating-github-apps/authenticating-with-a-github-app/generating-a-user-access-token-for-a-github-app.md

@@ -131,7 +131,7 @@ You can generate a user access token with this method regardless of whether the
 
 By default, user access tokens expires after 8 hours. If you receive a user access token with an expiration, you will also receive a refresh token. The refresh token expire after 6 months. You can use this refresh token to regenerate a user access token. For more information, see "[AUTOTITLE](/apps/creating-github-apps/authenticating-with-a-github-app/refreshing-user-access-tokens)."
 
-{% data variables.product.company_short %} strongly encourages you to use user access tokens that expire. If you previously opted out of using user access tokens that expire but want to reenable this feature, see "[AUTOTITLE](/apps/maintaining-github-apps/activating-optional-features-for-apps)".
+{% data variables.product.company_short %} strongly encourages you to use user access tokens that expire. If you previously opted out of using user access tokens that expire but want to reenable this feature, see "[AUTOTITLE](/apps/maintaining-github-apps/activating-optional-features-for-github-apps)".
 
 ## Supported endpoints for user access tokens
 

content/apps/maintaining-github-apps/activating-optional-features-for-apps.md → content/apps/maintaining-github-apps/activating-optional-features-for-github-apps.md

@@ -1,10 +1,11 @@
 ---
-title: Activating optional features for apps
-intro: 'You can test new optional features for your {% data variables.product.prodname_github_apps %} and {% data variables.product.prodname_oauth_apps %}.'
+title: Activating optional features for GitHub Apps
+intro: 'You can test new optional features for your {% data variables.product.prodname_github_apps %}.'
 redirect_from:
   - /developers/apps/activating-beta-features-for-apps
   - /developers/apps/activating-optional-features-for-apps
   - /developers/apps/getting-started-with-apps/activating-optional-features-for-apps
+  - /apps/maintaining-github-apps/activating-optional-features-for-apps
 versions:
   fpt: '*'
   ghae: '*'
@@ -22,14 +23,11 @@ shortTitle: Activate optional features
 
 ## Activating optional features for {% data variables.product.prodname_github_apps %}
 
-{% data reusables.user-settings.access_settings %}
+{% data reusables.apps.settings-step %}
 {% data reusables.user-settings.developer_settings %}
-3. Select the {% data variables.product.prodname_github_app %} you want to enable an optional feature for.
+3. Click **Edit** next to the {% data variables.product.prodname_github_app %} you want to enable an optional feature for.
 {% data reusables.apps.optional_feature_activation %}
 
-## Activating optional features for {% data variables.product.prodname_oauth_apps %}
+## Further reading
 
-{% data reusables.user-settings.access_settings %}
-{% data reusables.user-settings.developer_settings %}
-{% data reusables.user-settings.oauth_apps %}
-{% data reusables.apps.optional_feature_activation %}
+- "[AUTOTITLE](/apps/maintaining-github-apps/modifying-a-github-app)"

content/apps/maintaining-github-apps/index.md

@@ -17,7 +17,7 @@ children:
   - /modifying-a-github-app
   - /managing-allowed-ip-addresses-for-a-github-app
   - /installing-github-apps
-  - /activating-optional-features-for-apps
+  - /activating-optional-features-for-github-apps
   - /suspending-a-github-app-installation
   - /transferring-ownership-of-a-github-app
   - /deleting-a-github-app

content/apps/maintaining-github-apps/modifying-a-github-app.md

@@ -26,6 +26,8 @@ You can modify your {% data variables.product.prodname_github_app %} to change a
 
 For example, you can change the name and description of your app, the permissions granted to your app, the webhooks your app subscribes to, or the visibility of your app.
 
+You can also choose to test new optional features for your {% data variables.product.prodname_github_app %}. For more information, see "[AUTOTITLE](/apps/maintaining-github-apps/activating-optional-features-for-github-apps)."
+
 ## Navigating to your {% data variables.product.prodname_github_app %} settings
 
 To modify a {% data variables.product.prodname_github_app %}, first navigate to the app settings page.

content/apps/oauth-apps/maintaining-oauth-apps/activating-optional-features-for-oauth-apps.md

@@ -0,0 +1,25 @@
+---
+title: Activating optional features for OAuth Apps
+intro: 'You can test new optional features for your {% data variables.product.prodname_oauth_apps %}.'
+versions:
+  fpt: '*'
+  ghae: '*'
+  ghes: '*'
+  ghec: '*'
+topics:
+  - OAuth Apps
+shortTitle: Activate optional features
+---
+{% warning %}
+
+**Warning:**  Optional features are subject to change.
+
+{% endwarning %}
+
+## Activating optional features for {% data variables.product.prodname_oauth_apps %}
+
+{% data reusables.apps.settings-step %}
+{% data reusables.user-settings.developer_settings %}
+{% data reusables.user-settings.oauth_apps %}
+3. Select the {% data variables.product.prodname_oauth_app %} you want to enable an optional feature for.
+{% data reusables.apps.optional_feature_activation %}

content/apps/oauth-apps/maintaining-oauth-apps/index.md

@@ -14,6 +14,7 @@ topics:
   - OAuth Apps
 children:
   - /modifying-an-oauth-app
+  - /activating-optional-features-for-oauth-apps
   - /transferring-ownership-of-an-oauth-app
   - /troubleshooting-authorization-request-errors
   - /troubleshooting-oauth-app-access-token-request-errors

content/authentication/keeping-your-account-and-data-secure/token-expiration-and-revocation.md

@@ -59,4 +59,4 @@ The owner of an {% data variables.product.prodname_oauth_app %} can revoke an ac
 
 ## User token revoked due to {% data variables.product.prodname_github_app %} configuration
 
-User access tokens created by a {% data variables.product.prodname_github_app %} will expire after eight hours by default. Owners of {% data variables.product.prodname_github_apps %} can optionally change the default expiration period for their user access tokens, or configure the tokens to never expire. For more information about configuring your {% data variables.product.prodname_dotcom %} App's user access tokens, see "[AUTOTITLE](/apps/maintaining-github-apps/activating-optional-features-for-apps)."
+User access tokens created by a {% data variables.product.prodname_github_app %} will expire after eight hours by default. Owners of {% data variables.product.prodname_github_apps %} can optionally change the default expiration period for their user access tokens, or configure the tokens to never expire. For more information about configuring your {% data variables.product.prodname_dotcom %} App's user access tokens, see "[AUTOTITLE](/apps/maintaining-github-apps/activating-optional-features-for-github-apps)."

data/reusables/apps/optional_feature_activation.md

@@ -1,2 +1,2 @@
-4. In the {% data variables.product.prodname_github_apps %} settings sidebar, click **Optional Features**.
-5. Next to the optional feature you want to enable for your app, click **Opt-in**.
+1. In the settings sidebar, click **Optional features**.
+2. Next to the optional feature you want to enable for your app, click **Opt-in**.

data/reusables/pre-release-program/expiring-user-access-tokens.md

@@ -1,5 +1,5 @@
 {% note %}
 
-**Note:** User access tokens that expire are currently an optional feature and are subject to change. To opt in or out of the token expiration feature, see "[AUTOTITLE](/apps/maintaining-github-apps/activating-optional-features-for-apps)." For more information, see "[Expiring user-to-server access tokens for GitHub Apps](https://developer.github.com/changes/2020-04-30-expiring-user-to-server-access-tokens-for-github-apps)."
+**Note:** User access tokens that expire are currently an optional feature and are subject to change. To opt in or out of the token expiration feature, see "[AUTOTITLE](/apps/maintaining-github-apps/activating-optional-features-for-github-apps)." For more information, see "[Expiring user-to-server access tokens for GitHub Apps](https://developer.github.com/changes/2020-04-30-expiring-user-to-server-access-tokens-for-github-apps)."
 
 {% endnote %}