Changeset - 11af508b9947
[Not reviewed]
Merge
0 4 0
Bradley Kuhn (bkuhn) - 7 years ago 2015-03-05 19:36:53
bkuhn@ebb.org
Merge branch 'master' from gitorious.

I made some changes before a pull which are herein merged.
3 files changed with 5 insertions and 16 deletions:
0 comments (0 inline, 0 general)
www/conservancy/static/linux-compliance/vmware-lawsuit-faq.html
Show inline comments
...
 
@@ -5,7 +5,7 @@
 
<h1>Frequently Asked Questions about Christoph Hellwig's VMware Lawsuit</h1>
 

	
 
<p>Conservancy maintains this
 
  <acronym title="Frequently Asked Questions">FAQ</acronym> list regarding
 
  <abbr title="Frequently Asked Questions">FAQ</abbr> list regarding
 
  <a href="/news/2015/mar/05/vmware-lawsuit/">Christoph Hellwig's lawsuit against VMware
 
  in Germany over alleged GPL violations on Linux</a> as a service to the
 
  Free Software community, and in particular, the copyleft community.  Conservancy
...
 
@@ -100,7 +100,7 @@
 
   been unable to achieve compliance, either, through his negotiations in
 
   2014.  VMware's last offer was a proposal for a settlement agreement that VMware would
 
   only provide if Christoph signed an NDA, and Christoph chose (quite
 
   reasonably) not to sign an NDA merely to look at settlement offer.</p>
 
   reasonably) not to sign an NDA merely to look at the settlement offer.</p>
 

	
 
 <p>Thus, this lawsuit comes after years of negotiations by Conservancy to
 
 achieve compliance &mdash; negotiations that ended in an outright refusal by
www/conservancy/static/supporter/index.html
Show inline comments
...
 
@@ -58,14 +58,6 @@ Other annual supporters methods:
 
<div style="align:left;width:80%;">
 
  <h1><img class="appeal-header" alt="Become a Conservancy Supporter!" src="/img/conservancy-supporter-header.png"/></h1>
 

	
 
 <img class="appeal-match" alt="*"
 
      src="/img/conservancy-supporter-heart-3x.png"/>
 
<p class="appeal-match-text"><strong>News Update:</strong> We met our
 
        match goal of $2 of every $1 in supporter donations ($5k
 
        total)!  We're looking for donors to pledge a new match; contact us
 
        if you're interested!
 
</p>
 
<br/> <hr/>
 
<p>Software Freedom Conservancy is an essential organization to free and
 
open source software. We are the home of over
 
<a href="/members/current/">30 projects</a> like 
...
 
@@ -88,7 +80,7 @@ contribute to the cause.</p>
 

	
 
<p>For the first time, we're launching a Supporter
 
program. For <a href="#donate-box" class="donate-now">an annual donation of $120</a>, you can
 
download an official Supporter card and receive a Conservancy t-shirt<a id="return-footnote-shirts-when"></a><sup class="footnote-mark"><a href="#footnote-shirts-when">1</a></sup>. If
 
download an official Supporter card and receive a Conservancy t-shirt<a id="return-footnote-shirts-when"></a>. If
 
this is out of reach, please donate at whatever level you can - it makes a
 
big difference to us to know that you <a href="#donate-box" class="donate-now">support us</a>, and a little goes a long
 
way.</p>
...
 
@@ -133,9 +125,6 @@ internal policies</a> are published and available for scrutiny.</p>
 

	
 
<p>Please <a href="#donate-box" class="donate-now">join our Supporter program</a> and spread software freedom!</p>
 

	
 
<p class="footnote"><sup><a href="#return-footnote-shirts-when">1</a></sup><a id="footnote-shirts-when"></a><span class="footnote-1-text">The
 
    shirts will ship during Q1 2015.</span></p>
 

	
 
<div class="supporter-type-selector">
 
<hr/>
 
  <strong>Become a Supporter Now:</strong>  <a id="annualSelector" href="#annual">Annual</a> | <a id="monthlySelector" href="#monthly">Monthly</a></div>
www/conservancy/templates/base_compliance.html
Show inline comments
...
 
@@ -24,6 +24,7 @@ of $<span id="fundraiser-goal">50,000</span> match met.<br/>
 
<div id="progressbar" style="height:20px;"><span id="fundraiser-percentage" style="float:right; align:center; margin-right:40%"></span></div>
 

	
 
<p>Donate now via PayPal:
 
</p>
 
<!-- PayPal start -->
 
<form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top">
 
<input type="hidden" name="cmd" value="_s-xclick">
...
 
@@ -32,7 +33,6 @@ of $<span id="fundraiser-goal">50,000</span> match met.<br/>
 
<img alt="" style="border:0" src="https://www.paypalobjects.com/en_US/i/scr/pixel.gif" width="1" height="1">
 
</form>
 
<!-- PayPal end -->
 
</p>
 

	
 
<p>Or, <a href="/supporter/#annual"><strong>become a Conservancy
 
      Supporter</strong></a>.</p>
...
 
@@ -46,7 +46,7 @@ of $<span id="fundraiser-goal">50,000</span> match met.<br/>
 
            <li class="VMwareLawsuitAppeal"><a href="/linux-compliance/vmware-lawsuit-appeal.html">Stand Up For GPL!</a></li>
 
            <li><a href="/news/2015/mar/05/vmware-lawsuit/">VMware Lawsuit: Press Release</a></li>
 
            <li class="VMwareLawsuitFAQ"><a href="/linux-compliance/vmware-lawsuit-faq.html">
 
                <acronym title="Frequently Asked Questions">FAQ</acronym> on VMware Lawsuit</a></li>
 
                <abbr title="Frequently Asked Questions">FAQ</abbr> on VMware Lawsuit</a></li>
 
            <li class="AboutCompliance"><a href="/linux-compliance/about.html">About GPL Compliance Project for Linux Developers</a></li>
 
            </ul>
 
         </div>
0 comments (0 inline, 0 general)