From 90fb4089ce616e49e9333ff33396bf2e2578be7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Corr=C3=AAa=20Gomes?= Date: Thu, 6 Oct 2016 15:25:03 -0300 Subject: [PATCH 1/2] Good practice, license in readme file It's very interesting for forks too. --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 5f6b4716af5d1..bfcc1a411909a 100644 --- a/README.md +++ b/README.md @@ -79,3 +79,7 @@ To report security vulnerabilities in Magento software or web sites, please e-ma Stay up-to-date on the latest vulnerabilities and patches for Magento by signing up for Security Alert Notifications. +

License

+ +OSL 3.0 (c) [Magento Inc.](https://github.com/magento/) + From 54c08cc1e78c9f8a484662117bf09bacb8f7639c Mon Sep 17 00:00:00 2001 From: Eugene Tulika Date: Wed, 12 Apr 2017 14:25:58 -0500 Subject: [PATCH 2/2] MAGETWO-66741: Good practice, license in readme file #6910 - Expanded the text of the license section - Changed the text of the Security news link --- README.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6bc95cbf2a2dc..85681e2f74d6b 100644 --- a/README.md +++ b/README.md @@ -31,9 +31,15 @@ To suggest documentation improvements, click [here][4]. To report security vulnerabilities in Magento software or web sites, please e-mail security@magento.com. Please do not report security issues using GitHub. Be sure to encrypt your e-mail with our encryption key if it includes sensitive information. Learn more about reporting security issues here. -Stay up-to-date on the latest vulnerabilities and patches for Magento by signing up for Security Alert Notifications. +Stay up-to-date on the latest security news and patches for Magento by signing up for Security Alert Notifications.

License

-OSL 3.0 (c) [Magento Inc.](https://github.com/magento/) +Each Magento source file included in this distribution is licensed under OSL 3.0 or the Magento Enterprise Edition (MEE) license + +http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +Please see LICENSE.txt for the full text of the OSL 3.0 license or contact license@magentocommerce.com for a copy. + +Subject to Licensee's payment of fees and compliance with the terms and conditions of the MEE License, the MEE License supersedes the OSL 3.0 license for each source file. +Please see LICENSE_EE.txt for the full text of the MEE License or visit http://magento.com/legal/terms/enterprise.