Merge branch 'MAGETWO-54323-update' of github.com:magento-frontend/magento2ce into MAGETWO-53630-2

Author: Karpenko, Oleksandr

app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Websites.php

@@ -154,8 +154,8 @@ protected function getFieldsForFieldset()
         $tooltip = [
             'link' => 'http://docs.magento.com/m2/ce/user_guide/configuration/scope.html',
             'description' => __(
-                'If your Magento site has multiple views, ' .
-                'you can set the scope to apply to a specific view.'
+                'If your Magento installation has multiple websites, ' .
+                'you can edit the scope to use the product on specific sites.'
             ),
         ];
         $sortOrder = 0;

app/code/Magento/Customer/view/base/ui_component/customer_form.xml

@@ -104,7 +104,7 @@
                     </item>
                     <item name="tooltip" xsi:type="array">
                         <item name="link" xsi:type="string">http://docs.magento.com/m2/ce/user_guide/configuration/scope.html</item>
-                        <item name="description" xsi:type="string" translate="true">If your Magento site has multiple views, you can set the scope to apply to a specific view.</item>
+                        <item name="description" xsi:type="string" translate="true">If your Magento installation has multiple websites, you can edit the scope to associate the customer with a specific site.</item>
                     </item>
                 </item>
             </argument>