Merge branch 'revert-3487441b' into 'master'

Revert "Merge branch 'tc-info-version-check' into 'master'"

See merge request gitlab-org/gitlab-ce!17269

app/views/admin/application_settings/_form.html.haml

@@ -647,11 +647,8 @@
           = f.label :version_check_enabled do
             = f.check_box :version_check_enabled
             Version check enabled
-            = link_to icon('question-circle'), help_page_path("user/admin_area/settings/usage_statistics", anchor: "version-check")
           .help-block
-            Let GitLab inform you when an update is available. When
-            enabled, GitLab Inc. will collect info about your hostname
-            and version.
+            Let GitLab inform you when an update is available.
     .form-group
       .col-sm-offset-2.col-sm-10
         - can_be_configured = @application_setting.usage_ping_can_be_configured?

changelogs/unreleased/tc-info-version-check.yml

----
-title: Add more info about data collected when version check is enabled
-merge_request: 17257
-author:
-type: changed

doc/user/admin_area/settings/usage_statistics.md

@@ -10,9 +10,8 @@ under **Admin area > Settings > Usage statistics**.
 
 GitLab can inform you when an update is available and the importance of it.
 
-GitLab Inc. collects version statistics, but no information other than
-the GitLab version and the instance's hostname (through the HTTP
-referer) is collected.
+No information other than the GitLab version and the instance's hostname (through the HTTP referer)
+are collected.
 
 In the **Overview** tab you can see if your GitLab version is up to date. There
 are three cases: 1) you are up to date (green), 2) there is an update available