website Changeset - 11af508b9947 · Conservancy Kallithea

Changeset - 11af508b9947

Parent rev.

Child rev.

[Not reviewed]

Merge

0 4 0

Bradley Kuhn (bkuhn) - 9 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:

www/conservancy/static/linux-compliance/vmware-lawsuit-faq.html

www/conservancy/static/supporter/index.html

www/conservancy/templates/base_compliance.html

0 comments (0 inline, 0 general)

www/conservancy/static/linux-compliance/vmware-lawsuit-faq.html

➞

Show inline comments

@@ ... / @@ -7,3 +7,3 @@ @@
 <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
@@ ... / @@ -102,3 +102,3 @@ @@
    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>

www/conservancy/static/supporter/index.html

➞

Show inline comments

@@ ... / @@ -60,10 +60,2 @@ Other annual supporters methods: @@
  <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
@@ ... / @@ -90,3 +82,3 @@ contribute to the cause.</p> @@
 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
@@ ... @@
 <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">

www/conservancy/templates/base_compliance.html

➞

Show inline comments

@@ ... / @@ -26,2 +26,3 @@ of $<span id="fundraiser-goal">50,000</span> match met.<br/> @@
 <p>Donate now via PayPal:
 </p>
 <!-- PayPal start -->
@@ ... / @@ -34,3 +35,2 @@ of $<span id="fundraiser-goal">50,000</span> match met.<br/> @@
 <!-- PayPal end -->
 </p>
@@ ... / @@ -48,3 +48,3 @@ of $<span id="fundraiser-goal">50,000</span> match met.<br/> @@
             <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>

0 comments (0 inline, 0 general)