From 17d099f44134a6fb3a7cac03bbe5f780be60e9b4 Mon Sep 17 00:00:00 2001
From: Zbigniew Zabost <zbigniew.zabost@zanox.com>
Date: Tue, 29 Sep 2015 22:55:30 +0200
Subject: [PATCH 1/2] Fixed mixed terminology for refreshing fields mapping

---
 .../kibana/public/settings/sections/indices/_index_header.html  | 2 +-
 src/ui/public/doc_viewer/doc_viewer.html                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/kibana/public/settings/sections/indices/_index_header.html b/src/plugins/kibana/public/settings/sections/indices/_index_header.html
index 7ae9f7972d68..b23049d1a57e 100644
--- a/src/plugins/kibana/public/settings/sections/indices/_index_header.html
+++ b/src/plugins/kibana/public/settings/sections/indices/_index_header.html
@@ -16,7 +16,7 @@
       ng-if="refreshFields"
       confirm-click="refreshFields()"
       confirmation="This will reset the field popularity counters. Are you sure you want to reload your fields?"
-      tooltip="Reload field list"
+      tooltip="Refresh fields mapping"
       class="btn btn-warning">
       <span class="sr-only">Reload field list</span>
       <i aria-hidden="true" class="fa fa-refresh"></i>
diff --git a/src/ui/public/doc_viewer/doc_viewer.html b/src/ui/public/doc_viewer/doc_viewer.html
index cf9b2910219c..29037617eb7c 100644
--- a/src/ui/public/doc_viewer/doc_viewer.html
+++ b/src/ui/public/doc_viewer/doc_viewer.html
@@ -43,7 +43,7 @@
               class="fa fa-warning text-color-warning ng-scope doc-viewer-underscore"></i>
             <i ng-if="!mapping[field] && field[0] !== '_' && !showArrayInObjectsWarning(doc, field)"
               tooltip-placement="top"
-              tooltip="No cached mapping for this field. Refresh your mapping from the Settings > Indices page"
+              tooltip="No cached mapping for this field. Refresh fields mapping from the Settings > Indices page"
               class="fa fa-warning text-color-warning ng-scope doc-viewer-no-mapping"></i>
             <i ng-if="showArrayInObjectsWarning(doc, field)"
               tooltip-placement="top"

From dedd0bdc2d79f221ce2861f94eac42fe202aa198 Mon Sep 17 00:00:00 2001
From: Zbigniew Zabost <zabostz@gmail.com>
Date: Sat, 3 Oct 2015 20:37:42 +0200
Subject: [PATCH 2/2] #5047 - Fixed mixed terminology for refreshing fields
 mapping

---
 .../kibana/public/settings/sections/indices/_index_header.html  | 2 +-
 src/ui/public/doc_viewer/doc_viewer.html                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/kibana/public/settings/sections/indices/_index_header.html b/src/plugins/kibana/public/settings/sections/indices/_index_header.html
index b23049d1a57e..8f708f753ed2 100644
--- a/src/plugins/kibana/public/settings/sections/indices/_index_header.html
+++ b/src/plugins/kibana/public/settings/sections/indices/_index_header.html
@@ -16,7 +16,7 @@
       ng-if="refreshFields"
       confirm-click="refreshFields()"
       confirmation="This will reset the field popularity counters. Are you sure you want to reload your fields?"
-      tooltip="Refresh fields mapping"
+      tooltip="Refresh field list"
       class="btn btn-warning">
       <span class="sr-only">Reload field list</span>
       <i aria-hidden="true" class="fa fa-refresh"></i>
diff --git a/src/ui/public/doc_viewer/doc_viewer.html b/src/ui/public/doc_viewer/doc_viewer.html
index 29037617eb7c..1b2e48d2ca9e 100644
--- a/src/ui/public/doc_viewer/doc_viewer.html
+++ b/src/ui/public/doc_viewer/doc_viewer.html
@@ -43,7 +43,7 @@
               class="fa fa-warning text-color-warning ng-scope doc-viewer-underscore"></i>
             <i ng-if="!mapping[field] && field[0] !== '_' && !showArrayInObjectsWarning(doc, field)"
               tooltip-placement="top"
-              tooltip="No cached mapping for this field. Refresh fields mapping from the Settings > Indices page"
+              tooltip="No cached mapping for this field. Refresh field list from the Settings > Indices page"
               class="fa fa-warning text-color-warning ng-scope doc-viewer-no-mapping"></i>
             <i ng-if="showArrayInObjectsWarning(doc, field)"
               tooltip-placement="top"