repo sync

Author: Octomerger

assets/images/help/profile/profile-block-or-report-button.png

@@ -134,7 +134,7 @@ To illustrate how `git filter-branch` works, we'll show you how to remove your f
 
   {% endnote %}
 
-## Avoiding accidental commits in the future
+### Avoiding accidental commits in the future
 
 There are a few simple tricks to avoid committing things you don't want committed:
 
@@ -145,5 +145,5 @@ There are a few simple tricks to avoid committing things you don't want committe
 
 ### Further reading
 
-- [`git filter-branch` main page](https://git-scm.com/docs/git-filter-branch)
+- [`git filter-branch` man page](https://git-scm.com/docs/git-filter-branch)
 - [Pro Git: Git Tools - Rewriting History](https://git-scm.com/book/en/Git-Tools-Rewriting-History)

assets/images/help/profile/profile-blockuser.png

@@ -23,7 +23,7 @@ You can unblock a user in your account settings or from the user's profile page.
 ### Unblocking a user from their profile page
 
 {% data reusables.profile.user_profile_page_navigation %}
-2. In the left sidebar, under the user's profile picture, click **Unblock or report user**.
+2. In the left sidebar, under the user's profile picture, click {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %}, then click  **Unblock or report user**.
 ![Unblock or report user link](/assets/images/help/profile/profile-unblock-or-report-user.png)
 3. Click **Unblock user**.
   ![Modal box with option to unblock user or report abuse](/assets/images/help/profile/profile-unblockuser.png)

assets/images/help/profile/profile-report-abuse.png

@@ -1,20 +1,25 @@
 ---
 title: Creating a template repository
 intro: 'You can make an existing repository a template, so you and others can generate new repositories with the same directory structure{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "[email protected]" %}, branches,{% endif %} and files.'
+permissions: 'Anyone with admin permissions to a repository can make the repository a template.'
 redirect_from:
   - /articles/creating-a-template-repository
 versions:
   free-pro-team: '*'
   enterprise-server: '*'
 ---
 
-Anyone with admin permissions to a repository can make the repository a template.
+{% note %}
+
+**Note**: Your template repository cannot include files stored using {% data variables.large_files.product_name_short %}.
+
+{% endnote %}
 
 To create a template repository, you must create a repository, then make the repository a template. For more information about creating a repository, see "[Creating a new repository](/articles/creating-a-new-repository)."
 
 After you make your repository a template, anyone with access to the repository can generate a new repository with the same directory structure and files as your default branch.{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "[email protected]" %} They can also choose to include all the other branches in your repository.{% endif %} For more information, see "[Creating a repository from a template](/articles/creating-a-repository-from-a-template)."
 
 {% data reusables.repositories.navigate-to-repo %}
 {% data reusables.repositories.sidebar-settings %}
-3. Select **Template repository**.
+1. Select **Template repository**.
   ![Checkbox to make a repository a template](/assets/images/help/repository/template-repository-checkbox.png)

assets/images/help/profile/profile-unblock-or-report-user.png

@@ -39,11 +39,13 @@ size 84977953
 
 It tracks the `version` of {% data variables.large_files.product_name_short %} you're using, followed by a unique identifier for the file (`oid`). It also stores the `size` of the final file.
 
-{% tip %}
+{% note %}
 
-**Tip**: {% data variables.large_files.product_name_short %} cannot be used with {% data variables.product.prodname_pages %} sites.
-
-{% endtip %}
+**Notes**:
+- {% data variables.large_files.product_name_short %} cannot be used with {% data variables.product.prodname_pages %} sites.
+- {% data variables.large_files.product_name_short %} cannot be used with template repositories.
+  
+{% endnote %}
 
 ### Further reading
 

assets/images/help/profile/profile-unblockuser.png

@@ -28,7 +28,7 @@ In the left sidebar of your dashboard, you can access your organization's top re
 
 In the "All activity" section of your news feed, you can view updates from other teams and repositories in your organization.
 
-The "All activity" section shows all recent activity in the organization, including activity in repositories you're not subscribed to and of people you're not following. For more information, see {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "[email protected]" %}"About notifications](/github/managing-subscriptions-and-notifications-on-github/about-notifications){% else %}"[Watching and unwatching repositories](/github/receiving-notifications-about-activity-on-github/watching-and-unwatching-repositories){% endif %}" and "[Following people](/articles/following-people)."
+The "All activity" section shows all recent activity in the organization, including activity in repositories you're not subscribed to and of people you're not following. For more information, see {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "[email protected]" %}"[About notifications](/github/managing-subscriptions-and-notifications-on-github/about-notifications){% else %}"[Watching and unwatching repositories](/github/receiving-notifications-about-activity-on-github/watching-and-unwatching-repositories){% endif %}" and "[Following people](/articles/following-people)."
 
 For instance, the organization news feed shows updates when someone in the organization:
  - Creates a new branch.