summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenrik Brix Andersen <brix@gentoo.org>2005-05-18 14:38:39 +0000
committerHenrik Brix Andersen <brix@gentoo.org>2005-05-18 14:38:39 +0000
commit5d2c18c1a7f938ee0c03550d64a028c7dec36101 (patch)
treee97cf42c00edbe097e5dc25e78deb9ade7843066 /licenses
parentRemoved * postfix from >= dependency. (diff)
downloadgentoo-2-5d2c18c1a7f938ee0c03550d64a028c7dec36101.tar.gz
gentoo-2-5d2c18c1a7f938ee0c03550d64a028c7dec36101.tar.bz2
gentoo-2-5d2c18c1a7f938ee0c03550d64a028c7dec36101.zip
Updated to reflect new wording from upstream, the intent hasn't changed.
Diffstat (limited to 'licenses')
-rw-r--r--licenses/ipw2200-fw23
1 files changed, 13 insertions, 10 deletions
diff --git a/licenses/ipw2200-fw b/licenses/ipw2200-fw
index a3e83f562d37..fa26c671a306 100644
--- a/licenses/ipw2200-fw
+++ b/licenses/ipw2200-fw
@@ -46,16 +46,19 @@ data files generated by the Software. Your rights to redistribute the Software
shall be contingent upon your installation of this Agreement in its entirety in
the same directory as the Software.
-CONFIDENTIALITY. If you wish to have a third party consultant or subcontractor
-("Contractor") perform work on your behalf which involves access to or use of
-Software, you shall obtain a written confidentiality agreement from the
-Contractor which contains provisions with respect to access to or use of the
-Software no less restrictive than those set forth in this Agreement and
-excluding any distribution rights, and use for any other purpose. Except as
-expressly provided herein, you shall not disclose the terms or existence of
-this Agreement or use Intel's name in any publications, advertisements, or
-other announcements without Intel's prior written consent. You do not have any
-rights to use any Intel trademarks or logos.
+CONTRACTORS. For the purpose of this Agreement, and notwithstanding anything
+to the contrary hereunder, solely with respect to the requirements for
+compliance with the terms hereunder, any contractors or consultants that You
+use to perform the work or otherwise assist You in the development or products
+using this Software shall be deemed to be End Users and accordingly, upon
+receipt of the Software, shall be bound by the terms of Exhibit A, Software
+License Agreement. No additional agreement between You and such consultants or
+contractors is required under this Agreement to detail such compliance.
+
+TRADEMARKS. Except as expressly provided herein, you shall not use Intel's
+name in any publications, advertisements, or other announcements without
+Intel's prior written consent. You do not have any rights to use any Intel
+trademarks or logos.
OWNERSHIP OF SOFTWARE AND COPYRIGHTS. Software and accompanying materials, if
any, are owned by Intel or its suppliers and licensors and may be protected by