summaryrefslogtreecommitdiffstats
path: root/Tools/msi/crtlicense.txt
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2008-09-15 01:31:40 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2008-09-15 01:31:40 (GMT)
commit4e80cdd739772406bba00a31fdd98539cdcca651 (patch)
tree9256a976a0a01d75defaf24ffd676ea96131c0ad /Tools/msi/crtlicense.txt
parentb29f2d710189c1eff01d50e5b9adaa663a0d96ee (diff)
downloadcpython-4e80cdd739772406bba00a31fdd98539cdcca651.zip
cpython-4e80cdd739772406bba00a31fdd98539cdcca651.tar.gz
cpython-4e80cdd739772406bba00a31fdd98539cdcca651.tar.bz2
Merged revisions 66463 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r66463 | martin.v.loewis | 2008-09-15 03:30:21 +0200 (Mo, 15 Sep 2008) | 2 lines Fix grammar. ........
Diffstat (limited to 'Tools/msi/crtlicense.txt')
-rw-r--r--Tools/msi/crtlicense.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Tools/msi/crtlicense.txt b/Tools/msi/crtlicense.txt
index 04e88b9..8ecd499 100644
--- a/Tools/msi/crtlicense.txt
+++ b/Tools/msi/crtlicense.txt
@@ -31,10 +31,10 @@ suggests your programs come from or are endorsed by Microsoft;
- distribute Microsoft's Distributable Code to run on a platform other
than Microsoft operating systems, run-time technologies or application
-platforms;
+platforms; or
- include Microsoft Distributable Code in malicious, deceptive or
-unlawful programs; or
+unlawful programs.
These restrictions apply only to the Microsoft Distributable Code as
defined above, not to Python itself or any programs running on the