Merge branch 'main' into patch-1

content/github/authenticating-to-github/keeping-your-account-and-data-secure/about-githubs-ip-addresses.md

@@ -15,11 +15,18 @@ topics:
   - Identity
   - Access management
 ---
+
 You can retrieve a list of {% data variables.product.prodname_dotcom %}'s IP addresses from the [meta](https://api.github.com/meta) API endpoint. For more information, see "[Meta](/rest/reference/meta)."
 
+{% note %}
+
+**Note:** The list of {% data variables.product.prodname_dotcom %} IP addresses returned by the Meta API is not intended to be an exhaustive list. For example, IP addresses for some {% data variables.product.prodname_dotcom %} services might not be listed, such as LFS or {% data variables.product.prodname_registry %}.
+
+{% endnote %}
+
 These ranges are in [CIDR notation](https://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing#CIDR_notation). You can use an online conversion tool such as this  [CIDR / VLSM Supernet Calculator](http://www.subnet-calculator.com/cidr.php) to convert from CIDR notation to IP address ranges.
 
-We make changes to our IP addresses from time to time, and will keep this API up to date. We do not recommend allowing by IP address, however if you use these IP ranges we strongly encourage regular monitoring of our API.
+We make changes to our IP addresses from time to time. We do not recommend allowing by IP address, however if you use these IP ranges we strongly encourage regular monitoring of our API.
 
 For applications to function, you must allow TCP ports 22, 80, 443, and 9418 via our IP ranges for `github.com`.
 

content/github/collaborating-with-pull-requests/working-with-forks/syncing-a-fork.md

@@ -12,6 +12,22 @@ versions:
 topics:
   - Pull requests
 ---
+
+{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.1" or currentVersion == "github-ae@next" %}
+
+### Syncing a fork from the web UI
+
+1. On {% data variables.product.product_name %}, navigate to the main page of the forked repository that you want to sync with the upstream repository.
+1. Select the **Fetch upstream** drop-down.
+    !["Fetch upstream" drop-down](/assets/images/help/repository/fetch-upstream-drop-down.png)
+1. Review the details about the commits from the upstream repository, then click **Fetch and merge**.
+    !["Fetch and merge" button](/assets/images/help/repository/fetch-and-merge-button.png)
+
+If the changes from the upstream repository cause conflicts, {% data variables.product.company_short %} will prompt you to create a pull request to resolve the conflicts.
+
+### Syncing a fork from the command line 
+
+{% endif %}
 Before you can sync your fork with an upstream repository, you must [configure a remote that points to the upstream repository](/articles/configuring-a-remote-for-a-fork) in Git.
 
 {% data reusables.command_line.open_the_multi_os_terminal %}

content/github/committing-changes-to-your-project/index.md

@@ -1,5 +1,6 @@
 ---
 title: Committing changes to your project
+intro: 'You can manage code changes in a repository by grouping work into commits.'
 redirect_from:
   - /categories/21/articles/
   - /categories/commits/
@@ -13,4 +14,3 @@ children:
   - /viewing-and-comparing-commits
   - /troubleshooting-commits
 ---
-

content/github/managing-subscriptions-and-notifications-on-github/index.md

@@ -1,5 +1,6 @@
 ---
 title: Managing subscriptions and notifications on GitHub
+intro: 'You can specify how to receive notifications, the repositories you are interested in, and the types of activity you want to hear about.'
 redirect_from:
   - /categories/76/articles/
   - /categories/notifications/
@@ -15,4 +16,3 @@ children:
   - /viewing-and-triaging-notifications
   - /managing-subscriptions-for-activity-on-github
 ---
-