Merge remote-tracking branch 'origin/2.3-develop' into 2.3-develop-pr13

Author: zakdma

README.md

@@ -3,7 +3,7 @@
 [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/magento/magento2?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 [![Crowdin](https://d322cqt584bo4o.cloudfront.net/magento-2/localized.png)](https://crowdin.com/project/magento-2)
 <h2>Welcome</h2>
-Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a cutting edge, feature-rich eCommerce solution that gets results.
+Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a cutting-edge, feature-rich eCommerce solution that gets results.
 
 ## Magento system requirements
 [Magento system requirements](http://devdocs.magento.com/guides/v2.2/install-gde/system-requirements2.html)

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/Test/AdminConfigurationEnableDisableAnalyticsCest.xml

@@ -16,6 +16,8 @@
             <severity value="MAJOR"/>
             <testCaseId value="MAGETWO-66465"/>
             <group value="analytics"/>
+            <!-- MAGETWO-90659 -->
+            <group value="skip"/>
         </annotations>
         <after>
             <amOnPage stepKey="amOnLogoutPage" url="admin/admin/auth/logout/"/>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/Test/AdminConfigurationIndustryCest.xml

@@ -17,6 +17,8 @@
             <severity value="MAJOR"/>
             <testCaseId value="MAGETWO-63898"/>
             <group value="analytics"/>
+            <!-- MAGETWO-90659 -->
+            <group value="skip"/>
         </annotations>
 
         <actionGroup ref="LoginActionGroup" stepKey="loginAsAdmin"/>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/Test/AdminConfigurationPermissionCest.xml

@@ -17,6 +17,8 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-82648"/>
             <group value="analytics"/>
+            <!-- MAGETWO-90659 -->
+            <group value="skip"/>
         </annotations>
         <before>
             <createData stepKey="noReportUserRole" entity="adminNoReportRole"/>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnNewsletterCest.xml

@@ -16,6 +16,8 @@
             <description value="Admin see TinyMCEv4.6 is native WYSIWYG on Newsletter"/>
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-84683"/>
+            <!-- MAGETWO-90659 -->
+            <group value="skip"/>
         </annotations>
         <before>
             <actionGroup ref="LoginActionGroup" stepKey="loginGetFromGeneralFile"/>

lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php

@@ -495,6 +495,13 @@ public function insertForce($table, array $bind);
     /**
      * Updates table rows with specified data based on a WHERE clause.
      *
+     * The $where parameter in this instance can be a single WHERE clause or an array containing a multiple.  In all
+     * instances, a WHERE clause can be a string or an instance of {@see Zend_Db_Expr}.  In the event you use an array,
+     * you may specify the clause as the key and a value to be bound to it as the value. E.g., ['amt > ?' => $amt]
+     *
+     * If the $where parameter is an array of multiple clauses, they will be joined by AND, with each clause wrapped in
+     * parenthesis.  If you wish to use an OR, you must give a single clause that is an instance of {@see Zend_Db_Expr}
+     *
      * @param  mixed        $table The table to update.
      * @param  array        $bind  Column-value pairs.
      * @param  mixed        $where UPDATE WHERE clause(s).