r109362 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r109361‎ | r109362 | r109363 >
Date:13:41, 18 January 2012
Author:demon
Status:ok
Tags:
Comment:
Modified paths:
  • /branches/wmf/1.18wmf1/extensions/CongressLookup/SpecialCongressLookup.php (modified) (history)

Diff [purge]

Index: branches/wmf/1.18wmf1/extensions/CongressLookup/SpecialCongressLookup.php
@@ -169,7 +169,7 @@
170170
171171 <div class="sopaSectionHeadline">Why?</div>
172172 <p>
173 - SOPA and PIPA put the burden on website owners to police user-contributed material and call for the unnecessary blocking of entire sites. Small sites won't have sufficient resources to defend themselves. Big media companies may seek to cut off funding sources for their foreign competitors, even if copyright isn't being infringed. Foreign sites will be blacklisted, which means they won't show up in major search engines. SOPA and PIPA build a framework for future restrictions and suppression.
 173+ SOPA and PIPA would put the burden on website owners to police user-contributed material and call for the unnecessary blocking of entire sites. Small sites won't have sufficient resources to defend themselves. Big media companies may seek to cut off funding sources for their foreign competitors, even if copyright isn't being infringed. Foreign sites will be blacklisted, which means they won't show up in major search engines. SOPA and PIPA would build a framework for future restrictions and suppression.
174174 </p>
175175
176176 <p>
@@ -177,7 +177,7 @@
178178 </p>
179179
180180 <p>
181 - Congress says it's trying to protect the rights of copyright owners, but the "cure" that SOPA and PIPA represent is worse than the disease. SOPA and PIPA are not the answer: they will fatally damage the free and open Internet.
 181+ Congress says it's trying to protect the rights of copyright owners, but the "cure" that SOPA and PIPA represent is worse than the disease. SOPA and PIPA are not the answer: they would fatally damage the free and open Internet.
182182 </p>
183183 </div>
184184 <div id="contacts">
Property changes on: branches/wmf/1.18wmf1/extensions/CongressLookup/SpecialCongressLookup.php
___________________________________________________________________
Added: svn:mergeinfo
185185 Merged /branches/REL1_15/phase3/extensions/CongressLookup/SpecialCongressLookup.php:r51646
186186 Merged /branches/REL1_18/extensions/CongressLookup/SpecialCongressLookup.php:r101758,103190
187187 Merged /branches/REL1_17/phase3/extensions/CongressLookup/SpecialCongressLookup.php:r81445,81448
188188 Merged /trunk/extensions/CongressLookup/SpecialCongressLookup.php:r95614,99592,99653,100092,100419,100516,100686,100692,100699,103260,103315,103378,103382,103669,104337,104736,104862-104863,104865,104971,105275,105902,105908,107043,107050,107337,107783,107816,107818,108701,108789,109359
189189 Merged /branches/sqlite/extensions/CongressLookup/SpecialCongressLookup.php:r58211-58321
190190 Merged /trunk/phase3/extensions/CongressLookup/SpecialCongressLookup.php:r92580,92634,92713,92762,92765,92791,92854,92884,92886-92887,92894,92898,92907,92932,92958,93141,93149,93151,93233-93234,93258,93266,93303,93516-93518,93520,93818-93822,93847,93858,93891,93935-93936,94058,94062,94068,94107,94155,94235,94277,94346,94372,94422,94425,94444,94448,94456,94498,94517,94601,94630,94728,94738,94825,94862,94995-94997,95023,95042,95072-95073,95155,95327,95332,95410,95422,95426,95442,95468,95601,95812,98578,98598,98656
191191 Merged /branches/new-installer/phase3/extensions/CongressLookup/SpecialCongressLookup.php:r43664-66004

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r109359Fixing wording per email by Suejohnduhart13:24, 18 January 2012

Status & tagging log