Merge pull request #21281 from github/repo-sync

repo sync

content/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/personalizing-your-profile.md

@@ -95,8 +95,40 @@ For a longer-form and more prominent way of displaying customized information ab
 
   {% endtip %}
 
-3. Click **Update profile**.
-	![Update profile button](/assets/images/help/profile/update-profile-button.png)
+{% data reusables.profile.update-profile %}
+
+{% ifversion profile-time-zone %}
+
+## Setting your location and time zone
+
+You can set a location and time zone on your profile to show other people your local time. Your location and time zone will be visible:
+- on your {% data variables.product.product_name %} profile page.
+- when people hover over your username or avatar on {% data variables.product.product_name %}.
+
+When you view your profile, you will see your location, local time, and your time zone in relation to Universal Time Coordinated.
+
+  ![Screenshot of the Octocat profile page emphasizing the location, local time, and time zone fields.](/assets/images/help/profile/profile-location-and-time.png)
+
+When others view your profile, they will see your location, local time, and the time difference in hours from their own local time.
+
+  ![Screenshot of the Octocat profile page emphasizing the location, local time, and relative time fields.](/assets/images/help/profile/profile-relative-time.png)
+
+{% data reusables.user-settings.access_settings %}
+1. Under **Location**, type the location you want to be displayed on your profile.
+
+  ![Screenshot of the location and local time settings emphasizing the location field.](/assets/images/help/profile/location-field.png)
+
+1. Optionally, to display the current local time on your profile, select **Display current local time**.
+
+  ![Screenshot of the location and local time settings emphasizing the display current local time checkbox.](/assets/images/help/profile/display-local-time-checkbox.png)
+
+   - Select the **Time zone** dropdown menu, then click your local time zone.
+
+     ![Screenshot of the location and local time settings emphasizing the time zone dropdown menu.](/assets/images/help/profile/time-zone-dropdown.png)
+   
+{% data reusables.profile.update-profile %}
+
+{% endif %}
 
 ## Setting a status
 

data/features/profile-time-zone.yml

@@ -0,0 +1,5 @@
+versions:
+  fpt: '*'
+  ghec: '*'
+  ghes: '>3.7'
+  ghae: '>3.7'

data/reusables/profile/update-profile.md

@@ -0,0 +1,3 @@
+1. Click **Update profile**.
+
+  ![Screenshot of the update profile button.](/assets/images/help/profile/update-profile-button.png)