Merge branch 'main' into repo-sync

Author: Octomerger

.github/actions-scripts/get-preview-app-info.sh

@@ -13,7 +13,6 @@
 [[ -z $APP_NAME_SEED ]] && { echo "Missing APP_NAME_SEED. Exiting."; exit 1; }
 
 PREVIEW_ENV_LOCATION="eastus"
-echo "PREVIEW_ENV_LOCATION=${PREVIEW_ENV_LOCATION}" >> $GITHUB_ENV
 
 REPO_NAME="${GITHUB_REPOSITORY#*\/}"
 echo "REPO_NAME=${REPO_NAME}" >> $GITHUB_ENV
@@ -22,15 +21,14 @@ DEPLOYMENT_NAME="${REPO_NAME}-pr-${PR_NUMBER}"
 echo "DEPLOYMENT_NAME=${DEPLOYMENT_NAME}" >> $GITHUB_ENV
 
 APP_NAME_BASE="${REPO_NAME}-preview-${PR_NUMBER}"
-echo "APP_NAME_BASE=${APP_NAME_BASE}" >> $GITHUB_ENV
 
 # pseudo random string so guessing a preview env URL is more difficult
 APP_SHA=$(echo -n "${APP_NAME_SEED}-${APP_NAME_BASE}" | sha1sum | cut -c1-6)
 
 APP_NAME="${APP_NAME_BASE}-${APP_SHA}"
 echo "APP_NAME=${APP_NAME}" >> $GITHUB_ENV
 
-APP_URL="https://${APP_NAME}.${PREVIEW_ENV_LOCATION}.azurecontainer.io"
+APP_URL="https://${REPO_NAME}-${PR_NUMBER}-${APP_SHA}.preview.ghdocs.com"
 echo "APP_URL=${APP_URL}" >> $GITHUB_ENV
 
 IMAGE_REPO="${GITHUB_REPOSITORY}/pr-${PR_NUMBER}"

.github/workflows/azure-preview-env-deploy.yml

@@ -203,13 +203,10 @@ jobs:
           template: ./azure-preview-env-template.json
           deploymentName: ${{ env.DEPLOYMENT_NAME }}
           parameters: appName="${{ env.APP_NAME }}"
-            location="${{ env.PREVIEW_ENV_LOCATION }}"
             containerImage="${{ env.DOCKER_IMAGE }}"
             dockerRegistryUrl="${{ secrets.NONPROD_REGISTRY_SERVER }}"
             dockerRegistryUsername="${{ secrets.NONPROD_REGISTRY_USERNAME }}"
             dockerRegistryPassword="${{ secrets.NONPROD_REGISTRY_PASSWORD }}"
-            storageAccountName="${{ secrets.AZURE_STORAGE_ACCOUNT_NAME }}"
-            storageAccountKey="${{ secrets.AZURE_STORAGE_ACCOUNT_KEY }}"
           # this shows warnings in the github actions console, because the flag is passed through a validation run,
           # but it *is* functional during the actual execution
           additionalArguments: --no-wait

assets/images/help/repository/security-and-analysis-disable-or-enable-fpt-private.png

@@ -11,9 +11,6 @@
         "description": "A unique name for the app"
       }
     },
-    "location": {
-      "type": "String"
-    },
     "containerImage": {
       "type": "string",
       "defaultValue": null,
@@ -32,12 +29,6 @@
     },
     "dockerRegistryPassword": {
       "type": "SecureString"
-    },
-    "storageAccountName": {
-      "type": "String"
-    },
-    "storageAccountKey": {
-      "type": "SecureString"
     }
   },
   "resources": [
@@ -83,53 +74,6 @@
                 }
               }
             }
-          },
-          {
-            "name": "caddy-ssl-server",
-            "properties": {
-              "image": "caddy:2.4.6",
-              "command": [
-                "caddy",
-                "reverse-proxy",
-                "--from",
-                "[concat(parameters('appName'), '.', parameters('location'), '.azurecontainer.io')]",
-                "--to",
-                "localhost:4000"
-              ],
-              "ports": [
-                {
-                  "protocol": "TCP",
-                  "port": 443
-                },
-                {
-                  "protocol": "TCP",
-                  "port": 80
-                }
-              ],
-              "environmentVariables": [],
-              "resources": {
-                "requests": {
-                  "memoryInGB": 1,
-                  "cpu": 1
-                }
-              },
-              "volumeMounts": [
-                {
-                  "name": "caddy-data",
-                  "mountPath": "/data"
-                }
-              ]
-            }
-          }
-        ],
-        "volumes": [
-          {
-            "name": "caddy-data",
-            "azureFile": {
-                "shareName": "caddy",
-                "storageAccountName": "[parameters('storageAccountName')]",
-                "storageAccountKey": "[parameters('storageAccountKey')]"
-            }
           }
         ],
         "imageRegistryCredentials": [
@@ -142,17 +86,9 @@
         "restartPolicy": "Always",
         "ipAddress": {
           "ports": [
-            {
-              "protocol": "TCP",
-              "port": 443
-            },
             {
               "protocol": "TCP",
               "port": 4000
-            },
-            {
-              "protocol": "TCP",
-              "port": 80
             }
           ],
           "type": "Public",

azure-preview-env-template.json

@@ -65,7 +65,7 @@ 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 "[Following people](/articles/following-people)" and "[Be social](/get-started/quickstart/be-social)."
+For more information about following people and watching repositories, see "[Following people](/get-started/exploring-projects-on-github/following-people)" and "[Be social](/get-started/quickstart/be-social)."
 
 {% if for-you-feed %}
 ### For you feed

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

@@ -16,14 +16,14 @@ shortTitle: GitHub's use of your data
 
 ## About {% data variables.product.product_name %}'s use of your data
 
-{% data variables.product.product_name %} aggregates metadata and parses content patterns for the purposes of delivering generalized insights within the product. It uses data from public repositories, and also uses metadata and aggregate data from private repositories when a repository's owner has chosen to share the data with {% data variables.product.product_name %} through an opt-in. If you opt a private repository into data use, then it will perform read-only analysis of that specific private repository.
+{% data variables.product.product_name %} aggregates metadata and parses content patterns for the purposes of delivering generalized insights within the product. It uses data from public repositories, and also uses metadata and aggregate data from private repositories when a repository's owner has chosen to share the data with {% data variables.product.product_name %} by enabling the dependency graph. If you enable the dependency graph for a private repository, then {% data variables.product.product_name %} will perform read-only analysis of that specific private repository.
+
+If you enable data use for a private repository, we will continue to treat your private data, source code, or trade secrets as confidential and private consistent with our [Terms of Service](/free-pro-team@latest/github/site-policy/github-terms-of-service). The information we learn only comes from aggregated data. For more information, see "[Managing data use settings for your private repository](/get-started/privacy-on-github/managing-data-use-settings-for-your-private-repository)."
 
 {% data reusables.repositories.about-github-archive-program %} For more information, see "[About archiving content and data on {% data variables.product.prodname_dotcom %}](/github/creating-cloning-and-archiving-repositories/about-archiving-content-and-data-on-github#about-the-github-archive-program)."
 
 {% data reusables.user-settings.export-data %} For more information, see "[Requesting an archive of your personal account's data](/articles/requesting-an-archive-of-your-personal-account-s-data)."
 
-If you opt in to data use for a private repository, we will continue to treat your private data, source code, or trade secrets as confidential and private consistent with our [Terms of Service](/free-pro-team@latest/github/site-policy/github-terms-of-service). The information we learn only comes from aggregated data. For more information, see "[Managing data use settings for your private repository](/get-started/privacy-on-github/managing-data-use-settings-for-your-private-repository)."
-
 We'll announce substantial new features that use metadata or aggregate data on the [{% data variables.product.prodname_dotcom %} blog](https://github.com/blog).
 
 ## How data improves security recommendations

content/get-started/privacy-on-github/about-githubs-use-of-your-data.md

@@ -16,9 +16,22 @@ shortTitle: Manage data use for private repo
 
 ## About data use for your private repository
 
+
+You can control data use for your private repository with the security and analysis features. 
+
+- Enable the dependency graph to allow read-only data analysis on your repository. 
+- Disable the dependency graph to block read-only data analysis of your repository. 
+
 When you enable data use for your private repository, you'll be able to access the dependency graph, where you can track your repository's dependencies and receive {% data variables.product.prodname_dependabot_alerts %} when {% data variables.product.product_name %} detects vulnerable dependencies. For more information, see "[About {% data variables.product.prodname_dependabot_alerts %}](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies#dependabot-alerts-for-vulnerable-dependencies)."
 
-## Enabling or disabling data use features
+
+{% note %}
+
+**Note:** If you disable the dependency graph, {% data variables.product.prodname_dependabot_alerts %} and {% data variables.product.prodname_dependabot_security_updates %} are also disabled. For more information, see "[About the dependency graph](/code-security/supply-chain-security/understanding-your-software-supply-chain/about-the-dependency-graph)." 
+
+{% endnote %}
+
+## Enabling or disabling data use through security and analysis features
 
 {% data reusables.security.security-and-analysis-features-enable-read-only %}
 

content/get-started/privacy-on-github/managing-data-use-settings-for-your-private-repository.md

@@ -6,15 +6,15 @@ topics:
   - Policy
   - Legal
 children:
-  - github-sexually-obscene-content
+  - github-acceptable-use-policies
+  - github-active-malware-or-exploits
+  - github-bullying-and-harassment
   - github-disrupting-the-experience-of-other-users
   - github-doxxing-and-invasion-of-privacy
   - github-hate-speech-and-discrimination
-  - github-acceptable-use-policies
-  - github-bullying-and-harassment
-  - github-active-malware-or-exploits
-  - github-threats-of-violence-and-gratuitously-violent-content
   - github-impersonation
   - github-misinformation-and-disinformation
+  - github-sexually-obscene-content
+  - github-threats-of-violence-and-gratuitously-violent-content
   - github-appeal-and-reinstatement
 ---

content/site-policy/acceptable-use-policies/index.md

@@ -7,10 +7,10 @@ topics:
   - Legal
 children:
   - /submitting-content-removal-requests
+  - /dmca-takedown-policy
   - /github-private-information-removal-policy
   - /github-trademark-policy
   - /guide-to-submitting-a-dmca-counter-notice
   - /guide-to-submitting-a-dmca-takedown-notice
-  - /dmca-takedown-policy
 ---
 

content/site-policy/content-removal-policies/index.md

@@ -6,12 +6,12 @@ topics:
   - Policy
   - Legal
 children:
+  - /github-terms-of-service
   - /github-corporate-terms-of-service
-  - /github-community-forum-code-of-conduct
+  - /github-terms-for-additional-products-and-features
   - /github-community-guidelines
-  - /github-terms-of-service
+  - /github-community-forum-code-of-conduct
   - /github-sponsors-additional-terms
-  - /github-terms-for-additional-products-and-features
   - /github-registered-developer-agreement
   - /github-marketplace-terms-of-service
   - /github-marketplace-developer-agreement