Conservancy/website
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

copyleft-compliance: Update old linux-compliance URLs.

Browse source
This commit is contained in:
Brett Smith 2016-12-31 14:31:34 -05:00
parent 359cc7a068
commit 9ef8a62f0b
9 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
www/conservancy/static/copyleft-compliance/about.html
View file

@ -89,7 +89,7 @@ Conservancy should contact <a href="mailto:debian-services@sfconservancy.org">&l
with Free Software licenses. Toward this goal, in its compliance efforts, with Free Software licenses. Toward this goal, in its compliance efforts,
Conservancy helps distributors of Free Software in a friendly spirit of Conservancy helps distributors of Free Software in a friendly spirit of
cooperation and participation. In this spirit, Conservancy has co-published, cooperation and participation. In this spirit, Conservancy has co-published,
with the Free Software Foundation (FSF), <a href="/linux-compliance/principles.html">the principles that both organizations with the Free Software Foundation (FSF), <a href="/copyleft-compliance/principles.html">the principles that both organizations
follow in their compliance efforts</a>. follow in their compliance efforts</a>.
Also in collaboration with the FSF, Conservancy also sponsors Also in collaboration with the FSF, Conservancy also sponsors
the <a href="https://copyleft.org/guide/"><cite>Copyleft and the GNU the <a href="https://copyleft.org/guide/"><cite>Copyleft and the GNU

2
www/conservancy/static/copyleft-compliance/principles.html
View file

@ -197,6 +197,6 @@ communities.
<p>Copyright &copy; 2015, Free Software Foundation, Inc., Software Freedom Conservancy, Inc., Bradley M. Kuhn, Allison Randal, Karen M. Sandler. <p>Copyright &copy; 2015, Free Software Foundation, Inc., Software Freedom Conservancy, Inc., Bradley M. Kuhn, Allison Randal, Karen M. Sandler.
<br/>Licensed under the <a rel="license" href="https://creativecommons.org/licenses/by-sa/4.0">Creative Commons Attribution-ShareAlike 4.0 International License</a>. <br/>Licensed under the <a rel="license" href="https://creativecommons.org/licenses/by-sa/4.0">Creative Commons Attribution-ShareAlike 4.0 International License</a>.
<br/>The copyright holders ask that per &sect;3(a)(1)(A)(i) and &sect;3(a)(1)(A)(v) of that license, you ensure these two links (<a href="https://sfconservancy.org/linux-compliance/principles.html">[1]</a>, <br/>The copyright holders ask that per &sect;3(a)(1)(A)(i) and &sect;3(a)(1)(A)(v) of that license, you ensure these two links (<a href="https://sfconservancy.org/copyleft-compliance/principles.html">[1]</a>,
<a href="https://fsf.org/licensing/enforcement-principles">[2]</a>) are preserved in modified and/or redistributed versions.</p> <a href="https://fsf.org/licensing/enforcement-principles">[2]</a>) are preserved in modified and/or redistributed versions.</p>
{% endblock %} {% endblock %}

2
www/conservancy/static/copyleft-compliance/principles.kr.html
View file

@ -158,7 +158,7 @@ GPL 에 대한 전적인 컴플라이언스 및 사용자가 소프트웨어를
<br/>에 의거 <br/>에 의거
허가됨. 해당 라이선스의 제 3 조제(a)항제(1)호제(A)목제(i)단 및 허가됨. 해당 라이선스의 제 3 조제(a)항제(1)호제(A)목제(i)단 및
제 3 조제(a)항제(1)호제(A)목제(v)단에 의거하여 본 문서의 저작권자는 본 문서의 제 3 조제(a)항제(1)호제(A)목제(v)단에 의거하여 본 문서의 저작권자는 본 문서의
변경 및/또는 재배포 버전에 두 링크가 (<a href="https://sfconservancy.org/linux-compliance/principles.html">[1]</a>, 변경 및/또는 재배포 버전에 두 링크가 (<a href="https://sfconservancy.org/copyleft-compliance/principles.html">[1]</a>,
<a href="https://fsf.org/licensing/enforcement-principles">[2]</a>) <a href="https://fsf.org/licensing/enforcement-principles">[2]</a>)
유지되기를 요청하는 바입니다.<br/> 유지되기를 요청하는 바입니다.<br/>
이 번역자료는 한국저작권위원회(www.copyright.or.kr)의 지원으로 번역, 배포 되었습니다.<br/> 이 번역자료는 한국저작권위원회(www.copyright.or.kr)의 지원으로 번역, 배포 되었습니다.<br/>

4
www/conservancy/static/copyleft-compliance/vmware-lawsuit-appeal.html
View file

@ -87,7 +87,7 @@ software communities alike.</p>
<p>We don't think so, but this case will let the court to decide that question. <p>We don't think so, but this case will let the court to decide that question.
Either way, it's beneficial to our entire community to find out what the Either way, it's beneficial to our entire community to find out what the
judges think. (Check out our <a href="/linux-compliance/vmware-lawsuit-faq.html">FAQ to find out more judges think. (Check out our <a href="/copyleft-compliance/vmware-lawsuit-faq.html">FAQ to find out more
information</a>.)</p> information</a>.)</p>
<p>Help us pay for this expensive lawsuit and to generally defend software <p>Help us pay for this expensive lawsuit and to generally defend software
@ -117,7 +117,7 @@ information</a>.)</p>
</video> </video>
</p> </p>
<p>Or, read <a href="/linux-compliance/vmware-lawsuit-faq.html">our FAQ about <p>Or, read <a href="/copyleft-compliance/vmware-lawsuit-faq.html">our FAQ about
the lawsuit</a>.</p> the lawsuit</a>.</p>
{% endblock %} {% endblock %}

16
www/conservancy/static/copyleft-compliance/vmware-lawsuit-faq.html
View file

@ -47,7 +47,7 @@
the purposes of pursuing this specific legal action in Germany. the purposes of pursuing this specific legal action in Germany.
Conservancy is funding this legal action specifically as part of Conservancy is funding this legal action specifically as part of
Conservancy's program activity in Conservancy's program activity in
its <a href="/linux-compliance/about.html">GPL Compliance its <a href="/copyleft-compliance/about.html">GPL Compliance
Project for Linux Developers</a>.</dd> Project for Linux Developers</a>.</dd>
<dt id="combined-and-derivative-works">Is this the Great Test Case of Combined / Derivative Works?</dt> <dt id="combined-and-derivative-works">Is this the Great Test Case of Combined / Derivative Works?</dt>
@ -156,15 +156,15 @@
understand it. The diagram compares the technical architecture of a full, understand it. The diagram compares the technical architecture of a full,
running Linux kernel with a full, running VMware kernel: running Linux kernel with a full, running VMware kernel:
<p> <p>
<a href="/linux-compliance/linux-vs-vmkernel_en.png"> <a href="/copyleft-compliance/linux-vs-vmkernel_en.png">
<img class="inside-faq" alt="[Diagram of Linux and VMware running kernels]" src="/linux-compliance/linux-vs-vmkernel_en_scaled.png" /></a> <img class="inside-faq" alt="[Diagram of Linux and VMware running kernels]" src="/copyleft-compliance/linux-vs-vmkernel_en_scaled.png" /></a>
</p> </p>
<p>If you want to download the diagram, it's available <p>If you want to download the diagram, it's available
in <a href="/linux-compliance/linux-vs-vmkernel_en.svg">SVG in <a href="/copyleft-compliance/linux-vs-vmkernel_en.svg">SVG
(English)</a>, <a href="/linux-compliance/linux-vs-vmkernel_en.png">PNG (English)</a>, <a href="/copyleft-compliance/linux-vs-vmkernel_en.png">PNG
(English)</a>, <a href="/linux-compliance/linux-vs-vmkernel_de.svg">SVG (English)</a>, <a href="/copyleft-compliance/linux-vs-vmkernel_de.svg">SVG
(German)</a>, and <a href="/linux-compliance/linux-vs-vmkernel_de.png">PNG (German)</a>, and <a href="/copyleft-compliance/linux-vs-vmkernel_de.png">PNG
(German)</a>.</p> (German)</a>.</p>
</dd> </dd>
@ -572,7 +572,7 @@ at <code>bin/vmtar</code> inside
VMware's work?</dt> VMware's work?</dt>
<dd>Conservancy <dd>Conservancy
published <a href="/linux-compliance/vmware-code-similarity.html">its published <a href="/copyleft-compliance/vmware-code-similarity.html">its
comparison analysis between Christoph's code and VMware's code</a>. This comparison analysis between Christoph's code and VMware's code</a>. This
particular analysis uses a two step process: (a) use Linux's public Git logs particular analysis uses a two step process: (a) use Linux's public Git logs
to find Christoph's contributions from Christoph, and (b) use a widely to find Christoph's contributions from Christoph, and (b) use a widely

2
www/conservancy/static/projects/current/index.html
View file

@ -147,7 +147,7 @@ engine. It provides a huge set of common tools, so you can just focus on
making your game without reinventing the wheel. Godot is is completely Free making your game without reinventing the wheel. Godot is is completely Free
and Open Source under the MIT License.</p> and Open Source under the MIT License.</p>
<h2><a href="/linux-compliance/">GPL Compliance Project for Linux Developers</a></h2> <h2><a href="/copyleft-compliance/">GPL Compliance Project for Linux Developers</a></h2>
<p>The GPL Compliance Project for Linux Developers is comprised of <p>The GPL Compliance Project for Linux Developers is comprised of
copyright holders in the kernel, Linux, who have contributed to Linux copyright holders in the kernel, Linux, who have contributed to Linux

2
www/conservancy/static/supporter/original-supporter-appeal.html
View file

@ -58,7 +58,7 @@ open source software. We are the home of over
<a href="/members/current/">30 projects</a> like <a href="/members/current/">30 projects</a> like
<a href="http://git-scm.org">Git</a>, <a href="http://git-scm.org">Git</a>,
<a href="http://inkscape.org">Inkscape</a>, <a href="http://samba.org">Samba</a>, <a href="http://inkscape.org">Inkscape</a>, <a href="http://samba.org">Samba</a>,
<a href="http://winehq.org">Wine</a>, <a href="http://www.seleniumhq.org/">Selenium</a>, the <a href="/linux-compliance/">GPL Compliance Project for Linux <a href="http://winehq.org">Wine</a>, <a href="http://www.seleniumhq.org/">Selenium</a>, the <a href="/copyleft-compliance/">GPL Compliance Project for Linux
Developers</a>, <a href="http://pypy.org">PyPy</a> and Developers</a>, <a href="http://pypy.org">PyPy</a> and
<a href="http://sugarlabs.org/">Sugar Labs</a> just to name a few. Conservancy is a "fiscal sponsor plus", <a href="http://sugarlabs.org/">Sugar Labs</a> just to name a few. Conservancy is a "fiscal sponsor plus",
providing everything that our projects need in a nonprofit. We help our providing everything that our projects need in a nonprofit. We help our

10
www/conservancy/templates/base_compliance.html
View file

@ -41,14 +41,14 @@
<div id="sidebar" class="{% block submenuselection %}other{% endblock %}"> <div id="sidebar" class="{% block submenuselection %}other{% endblock %}">
<h2>Our Copyleft {% block category %}Compliance{% endblock %} Projects</h2> <h2>Our Copyleft {% block category %}Compliance{% endblock %} Projects</h2>
<ul> <ul>
<li class="AboutCompliance"><a href="/linux-compliance/about.html">About</a></li> <li class="AboutCompliance"><a href="/copyleft-compliance/about.html">About</a></li>
<li class="CopyleftPrinciples"><a href="/linux-compliance/principles.html">Principles of Community-Oriented GPL Enforcement</a></li> <li class="CopyleftPrinciples"><a href="/copyleft-compliance/principles.html">Principles of Community-Oriented GPL Enforcement</a></li>
<li class="VMwareLawsuitAppeal"><a href="/linux-compliance/vmware-lawsuit-appeal.html">Stand Up For GPL!</a></li> <li class="VMwareLawsuitAppeal"><a href="/copyleft-compliance/vmware-lawsuit-appeal.html">Stand Up For GPL!</a></li>
<li><a href="/news/2015/mar/05/vmware-lawsuit/">VMware Lawsuit: Original Press Release</a></li> <li><a href="/news/2015/mar/05/vmware-lawsuit/">VMware Lawsuit: Original Press Release</a></li>
<li><a href="/news/2016/aug/09/vmware-appeal/">VMware Lawsuit: Announcement of Appeal</a></li> <li><a href="/news/2016/aug/09/vmware-appeal/">VMware Lawsuit: Announcement of Appeal</a></li>
<li class="VMwareLawsuitFAQ"><a href="/linux-compliance/vmware-lawsuit-faq.html"> <li class="VMwareLawsuitFAQ"><a href="/copyleft-compliance/vmware-lawsuit-faq.html">
<abbr title="Frequently Asked Questions">FAQ</abbr> on VMware Lawsuit</a></li> <abbr title="Frequently Asked Questions">FAQ</abbr> on VMware Lawsuit</a></li>
<li class="VMwareCodeSimilarity"><a href="/linux-compliance/vmware-code-similarity.html">VMware's &amp; Christoph's Code Similarity Analysis</a></li> <li class="VMwareCodeSimilarity"><a href="/copyleft-compliance/vmware-code-similarity.html">VMware's &amp; Christoph's Code Similarity Analysis</a></li>
<li class="CopyleftOrg"><a href="https://copyleft.org/">copyleft.org</a></li> <li class="CopyleftOrg"><a href="https://copyleft.org/">copyleft.org</a></li>
</ul> </ul>
</div> </div>

2
www/conservancy/templates/base_conservancy.html
View file

@ -34,7 +34,7 @@
<li class="news"><a href="/news/">News</a></li> <li class="news"><a href="/news/">News</a></li>
<li class="blog"><a href="/blog/">Blog</a></li> <li class="blog"><a href="/blog/">Blog</a></li>
<li class="Projects"><a href="/projects/">Projects</a></li> <li class="Projects"><a href="/projects/">Projects</a></li>
<li class="compliance"><a href="/linux-compliance/">Copyleft Compliance</a></li> <li class="compliance"><a href="/copyleft-compliance/">Copyleft Compliance</a></li>
<li class="npoacct"><a href="/npoacct/">NPOAcct</a></li> <li class="npoacct"><a href="/npoacct/">NPOAcct</a></li>
<li class="sponsors"><a href="/sponsors/">Sponsors</a></li> <li class="sponsors"><a href="/sponsors/">Sponsors</a></li>
<li class="About"><a href="/about/">About</a></li> <li class="About"><a href="/about/">About</a></li>