twitter.diff

diff --git a/old.txt b/new.txt
index 9cf6209..760786a 100644
--- a/old.txt
+++ b/new.txt
@@ -12,7 +12,7 @@ These Terms of Service (“Terms”) govern your access to and use of our servic

4. Using the Services

5.[-Disclaimers and-] Limitations of Liability

6. General

@@ -25,7 +25,9 @@ You are responsible for your use of the Services and for any Content you provide

Any use or reliance on any Content or materials posted via the Services or obtained by you through the Services is at your own risk. We do not endorse, support, represent or guarantee the completeness, truthfulness, accuracy, or reliability of any Content or communications posted via the Services or endorse any opinions expressed via the Services. You understand that by using the Services, you may be exposed to Content that might be offensive, harmful, inaccurate or otherwise inappropriate, or in some cases, postings that have been mislabeled or are otherwise deceptive. All Content is the sole responsibility of the person who originated such Content. We may not monitor or control the Content posted via the Services and, we cannot take responsibility for such Content.

[-Twitter respects the intellectual property rights of others and expects users of the Services to do the same.-]We reserve the right to remove Content[-alleged to be infringing without prior notice, at our sole discretion, and without liability to you. We will respond to notices of alleged copyright infringement-] that [-comply with applicable law-]{+violates the User Agreement, including for example, copyright or trademark violations, impersonation, unlawful conduct, or harassment.  Information regarding specific policies+} and [-are properly provided to us, as described-]{+the process for reporting or appealing violations can be found+} in our [-Copyright policy (https://support.twitter.com/articles/15795).-]{+help center (https://support.twitter.com/articles/15789#specific-violations and https://support.twitter.com/articles/15790).+}

If you believe that your Content has been copied in a way that constitutes copyright infringement, please report this by visiting our Copyright reporting form (https://support.twitter.com/forms/dmca) or contacting our designated copyright agent at:

Twitter, Inc.
Attn: Copyright Agent
@@ -71,23 +73,15 @@ Ending These Terms

You may end your legal agreement with Twitter at any time by deactivating your accounts and discontinuing your use of the Services. See http://support.twitter.com/articles/15358-how-to-deactivate-your-account for instructions on how to deactivate your account and the Privacy Policy for more information on what happens to your information.

We may suspend or terminate your account or cease providing you with all or part of the Services at any time for any or no reason, including, but not limited to, if we reasonably believe: (i) you have violated these Terms or the Twitter Rules, (ii) you create risk or possible legal exposure for us; (iii) your account should be removed due to {+unlawful conduct, (iv) your account should be removed due to+} prolonged inactivity; or [-(iv)-]{+(v)+} our provision of the Services to you is no longer commercially viable. We will make reasonable efforts to notify you by the email address associated with your account or the next time you attempt to access your account, depending on the circumstances. In all such cases, the Terms shall terminate, including, without limitation, your license to use the Services, except that the following sections shall continue to apply: II, III, V, and VI.  [-5. Disclaimers and Limitations of Liability-]
[-The Services are Available “AS-IS”-]

[-Your access to and use of the Services or any Content are at your own risk. You understand and agree that the Services are provided to-]{+If+} you [-on an “AS IS” and “AS AVAILABLE” basis. The “Twitter Entities” refers to Twitter, its parents, affiliates, related companies, officers, directors, employees, agents, representatives, partners, and licensors. Without limiting the foregoing, to the maximum extent permitted under applicable law, THE TWITTER ENTITIES DISCLAIM ALL WARRANTIES AND CONDITIONS, WHETHER EXPRESS OR IMPLIED, OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT. The Twitter Entities make no warranty or representation and disclaim all responsibility and liability for: (i) the completeness, accuracy, availability, timeliness, security or reliability of the Services or any Content; (ii) any harm to-]{+believe+} your [-computer system, loss of data, or other harm that results from your access to or use of the Services or any Content; (iii) the deletion of, or the failure to store or to transmit, any Content and other communications maintained by the Services; and (iv) whether the Services will meet your requirements or be available on-]{+account was terminated in error you can file+} an [-uninterrupted, secure, or error-free basis. No advice or information, whether oral or written, obtained from the Twitter Entities or through-]{+appeal following+} the [-Services, will create any warranty or representation not expressly made herein.-]

[-Limitation of Liability-]

[-THE TWITTER ENTITIES SHALL NOT BE LIABLE FOR ANY INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR PUNITIVE DAMAGES, OR ANY LOSS OF PROFITS OR REVENUES, WHETHER INCURRED DIRECTLY OR INDIRECTLY, OR ANY LOSS OF DATA, USE, GOOD-WILL, OR OTHER INTANGIBLE LOSSES, RESULTING FROM (i) YOUR ACCESS TO OR USE OF OR INABILITY TO ACCESS OR USE THE SERVICES; (ii) ANY CONDUCT OR CONTENT OF ANY THIRD PARTY ON THE SERVICES, INCLUDING WITHOUT LIMITATION, ANY DEFAMATORY, OFFENSIVE OR ILLEGAL CONDUCT OF OTHER USERS OR THIRD PARTIES; (iii) ANY CONTENT OBTAINED FROM THE SERVICES; OR (iv) UNAUTHORIZED ACCESS, USE OR ALTERATION OF YOUR TRANSMISSIONS OR CONTENT. THE LIMITATIONS OF THIS SUBSECTION SHALL APPLY TO ANY THEORY OF LIABILITY, WHETHER BASED ON WARRANTY, CONTRACT, STATUTE, TORT (INCLUDING NEGLIGENCE) OR OTHERWISE, AND WHETHER OR NOT THE TWITTER ENTITIES HAVE BEEN INFORMED OF THE POSSIBILITY OF ANY SUCH DAMAGE, AND EVEN IF A REMEDY SET FORTH HEREIN IS FOUND TO HAVE FAILED OF ITS ESSENTIAL PURPOSE.-]{+steps found in our help center (https://support.twitter.com/forms/general?subtopic=suspended).+}

[-SOME JURISDICTIONS DO NOT ALLOW EXCLUSION OF IMPLIED WARRANTIES OR LIMITATIONS ON THE DURATION OF IMPLIED WARRANTIES, SO THE ABOVE DISCLAIMERS MAY NOT APPLY TO YOU IN THEIR ENTIRETIES, BUT WILL APPLY TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW.-]{+5. Limitations of Liability+}
{+By using the Services you agree that Twitter, its parents, affiliates, related companies, officers, directors, employees, agents representatives, partners and licensors, liability is limited to the maximum extent permissible in your country of residence.+}

6. General
We may revise these Terms from time to time. The changes will not be retroactive, and the most current version of the Terms, which will always be at twitter.com/tos, will govern our relationship with you. [-We-]{+Other than for changes addressing new functions or made for legal reasons, we+} will[-try to-] notify you {+30 days in advance of making effective changes to these Terms that impact the rights or obligations+} of [-material revisions,-]{+any party to these Terms,+} for example via a service notification or an email to the email associated with your account. By continuing to access or use the Services after those revisions become effective, you agree to be bound by the revised Terms.
In the event that any provision of these Terms is held to be invalid or unenforceable, then that provision will be limited or eliminated to the minimum extent necessary, and the remaining provisions of these Terms will remain in full force and effect. Twitter’s failure to enforce any right or provision of these Terms will not be deemed a waiver of such right or provision.

These Terms are an agreement between you and Twitter International Company, an Irish company with its registered office at [-The Academy, 42 Pearse Street,-]{+One Cumberland Place, Fenian Street+} Dublin 2, {+D02 AX07+} Ireland. If you have any questions about these Terms, please contact us.

Effective: [-September 30, 2016-]{+October 2, 2017+}