Merge pull request #10 from jmertic/master

merge from fork

zowe_conformance/terms_and_conditions.md

@@ -16,10 +16,8 @@ In this document, these terms have the following meanings:
 Together with these terms and conditions, the following documents are part of the Conformance Program, each as updated from time to time:
 
 - "**Test Evaluation Guide**": the conformance testing instructions and requirements for the Conformance Program, available at <https://www.openmainframeproject.org/projects/zowe/conformance/test-evaluation-guide>;
-- "**Visual** **Branding Guide**": the Conformance Program Visual Branding Guide, available at <https://www.openmainframeproject.org/projects/zowe/conformance/branding-guide>
-
+- "**Visual Branding Guide**": the Conformance Program Visual Branding Guide, available at <https://www.openmainframeproject.org/projects/zowe/conformance/branding-guide>
 - "**Trademark Usage Guidelines**": The Linux Foundation's Trademark Usage Guidelines, available at <https://www.linuxfoundation.org/trademark-usage>; and
-
 - "**Participation Form**": the Conformance Program Participation Form, available at <https://www.openmainframeproject.org/projects/zowe/conformance/participation-form-esign>.
 
 ## Introduction
@@ -71,12 +69,11 @@ The participant must continue to abide by the terms and conditions of the Confor
 >
 > *Reported Non-Conformance*: If The Linux Foundation subsequently determines or is informed that a Qualifying Offering does not successfully meet the evaluation criteria, then upon written notice from The Linux Foundation the Participant must address any non-conformance concerns raised by The Linux Foundation; successfully pass the corresponding tests and satisfy the applicable criteria; and submit to The Linux Foundation a copy of the new testing results generated by the testing evaluation program and/or confirmations of conformance, as applicable, within 30 days following such notice. Otherwise, the Participant will be subject to the requirements set forth below for removal of the Conformance Marks from that product or service.
 >
-> *Removal of the Conformance Marks at End of Conformance or Participation*. If a Qualifying Offering ceases to remain conformant with the applicable tests and evaluation criteria, or upon any other termination of participation in the Conformance Program, a Participant may no longer use the Conformance Marks in new materials for that formerly Qualifying Offering, and must remove the Conformance Marks from existing marketing materials and websites for that formerly Qualifying Offering within 30 days.
+> *Removal of the Conformance Marks at End of Conformance or Participation*: If a Qualifying Offering ceases to remain conformant with the applicable tests and evaluation criteria, or upon any other termination of participation in the Conformance Program, a Participant may no longer use the Conformance Marks in new materials for that formerly Qualifying Offering, and must remove the Conformance Marks from existing marketing materials and websites for that formerly Qualifying Offering within 30 days.
 
 ## Use of the Conformance Marks
 
-Use of the Conformance Marks is only permitted for Participants who have
-satisfied the requirements of the Conformance Program, and is only permitted in connection with its Qualifying Offerings. No other rights to use the Conformance Marks or the Project Word Mark are permitted hereunder, except to the extent permitted under "fair use" or other applicable law.
+Use of the Conformance Marks is only permitted for Participants who have satisfied the requirements of the Conformance Program, and is only permitted in connection with its Qualifying Offerings. No other rights to use the Conformance Marks or the Project Word Mark are permitted hereunder, except to the extent permitted under "fair use" or other applicable law.
 
 All use of the Conformance Marks is subject to the Trademark Usage Guidelines, which are incorporated herein.