Merged branch '4.6'

Author: alongosz

LICENSE

@@ -25,14 +25,14 @@ Ibexa Trial and Test License Agreement ("Ibexa TTL") Version 2.2
 IMPORTANT: Please read the following license agreement carefully.
 
 This license agreement is between Ibexa AS (Norwegian business
-registration no. 981 601 564, formerly eZ Systems AS), a Norwegian company
-("Licensor" or "Ibexa"), and a test or trial user ("Licensee" or "you").
-By installing all or any portion of the software (or authorizing any other
-person to do so), you accept the terms and conditions of this license.
-If you acquired the software without an opportunity to review this license
-and do not accept the license, you must: (a) not use the software and (b)
-return or delete the software, with your certification of deletion, within
-thirty (30) days of the acquire date.
+registration no. 981 601 564), a Norwegian company ("Licensor" or "Ibexa"),
+and a test or trial user ("Licensee" or "you"). By installing all or any
+portion of the software (or authorizing any other person to do so), you
+accept the terms and conditions of this license. If you acquired the
+software without an opportunity to review this license and do not accept
+the license, you must: (a) not use the software and (b) return or delete
+the software, with your certification of deletion, within thirty (30)
+days of the acquire date.
 
 This license agreement is entered into in connection with Licensee's
 participation in testing a new version of Licensor software and is valid
@@ -44,9 +44,9 @@ The parties hereby agree to the following software license terms:
 1. Definitions
 
 "Licensed Software" means the Ibexa Digital Experience Platform (DXP)
-or other Ibexa software product (such as eZ Platform Enterprise Edition,
-eZ Publish Platform) downloaded, ordered or otherwise legally acquired
-(licensed) by you from Ibexa (or other party authorized by Ibexa).
+or other software product (such as Ibexa Commerce) downloaded, ordered or
+otherwise legally acquired (licensed) by Licensee from Licensor (or
+other party authorized by the Licensor) under these terms.
 
 "Licensed Copy" means one sample of the Licensed Software.