From 9ef8a62f0badaf7ed69a3b13ff9df9e5431ce81c Mon Sep 17 00:00:00 2001 From: Brett Smith Date: Sat, 31 Dec 2016 14:31:34 -0500 Subject: [PATCH] copyleft-compliance: Update old linux-compliance URLs. --- .../static/copyleft-compliance/about.html | 2 +- .../static/copyleft-compliance/principles.html | 2 +- .../copyleft-compliance/principles.kr.html | 2 +- .../vmware-lawsuit-appeal.html | 4 ++-- .../copyleft-compliance/vmware-lawsuit-faq.html | 16 ++++++++-------- .../static/projects/current/index.html | 2 +- .../supporter/original-supporter-appeal.html | 2 +- www/conservancy/templates/base_compliance.html | 10 +++++----- www/conservancy/templates/base_conservancy.html | 2 +- 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/www/conservancy/static/copyleft-compliance/about.html b/www/conservancy/static/copyleft-compliance/about.html index e2b38070..d8a37461 100644 --- a/www/conservancy/static/copyleft-compliance/about.html +++ b/www/conservancy/static/copyleft-compliance/about.html @@ -89,7 +89,7 @@ Conservancy should contact &l with Free Software licenses. Toward this goal, in its compliance efforts, Conservancy helps distributors of Free Software in a friendly spirit of cooperation and participation. In this spirit, Conservancy has co-published, - with the Free Software Foundation (FSF), the principles that both organizations + with the Free Software Foundation (FSF), the principles that both organizations follow in their compliance efforts. Also in collaboration with the FSF, Conservancy also sponsors the Copyleft and the GNU diff --git a/www/conservancy/static/copyleft-compliance/principles.html b/www/conservancy/static/copyleft-compliance/principles.html index 0ec804a1..4fe793ca 100644 --- a/www/conservancy/static/copyleft-compliance/principles.html +++ b/www/conservancy/static/copyleft-compliance/principles.html @@ -197,6 +197,6 @@ communities.

Copyright © 2015, Free Software Foundation, Inc., Software Freedom Conservancy, Inc., Bradley M. Kuhn, Allison Randal, Karen M. Sandler.
Licensed under the Creative Commons Attribution-ShareAlike 4.0 International License. -
The copyright holders ask that per §3(a)(1)(A)(i) and §3(a)(1)(A)(v) of that license, you ensure these two links ([1], +
The copyright holders ask that per §3(a)(1)(A)(i) and §3(a)(1)(A)(v) of that license, you ensure these two links ([1], [2]) are preserved in modified and/or redistributed versions.

{% endblock %} diff --git a/www/conservancy/static/copyleft-compliance/principles.kr.html b/www/conservancy/static/copyleft-compliance/principles.kr.html index 5fc61da3..74e8e33f 100644 --- a/www/conservancy/static/copyleft-compliance/principles.kr.html +++ b/www/conservancy/static/copyleft-compliance/principles.kr.html @@ -158,7 +158,7 @@ GPL 에 대한 전적인 컴플라이언스 및 사용자가 소프트웨어를
에 의거 허가됨. 해당 라이선스의 제 3 조제(a)항제(1)호제(A)목제(i)단 및 제 3 조제(a)항제(1)호제(A)목제(v)단에 의거하여 본 문서의 저작권자는 본 문서의 -변경 및/또는 재배포 버전에 두 링크가 ([1], +변경 및/또는 재배포 버전에 두 링크가 ([1], [2]) 유지되기를 요청하는 바입니다.
이 번역자료는 한국저작권위원회(www.copyright.or.kr)의 지원으로 번역, 배포 되었습니다.
diff --git a/www/conservancy/static/copyleft-compliance/vmware-lawsuit-appeal.html b/www/conservancy/static/copyleft-compliance/vmware-lawsuit-appeal.html index 8ba58291..07f8f70d 100644 --- a/www/conservancy/static/copyleft-compliance/vmware-lawsuit-appeal.html +++ b/www/conservancy/static/copyleft-compliance/vmware-lawsuit-appeal.html @@ -87,7 +87,7 @@ software communities alike.

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 -judges think. (Check out our FAQ to find out more +judges think. (Check out our FAQ to find out more information.)

Help us pay for this expensive lawsuit and to generally defend software @@ -117,7 +117,7 @@ information.)

-

Or, read our FAQ about +

Or, read our FAQ about the lawsuit.

{% endblock %} diff --git a/www/conservancy/static/copyleft-compliance/vmware-lawsuit-faq.html b/www/conservancy/static/copyleft-compliance/vmware-lawsuit-faq.html index 9e2c6baa..a652a393 100644 --- a/www/conservancy/static/copyleft-compliance/vmware-lawsuit-faq.html +++ b/www/conservancy/static/copyleft-compliance/vmware-lawsuit-faq.html @@ -47,7 +47,7 @@ the purposes of pursuing this specific legal action in Germany. Conservancy is funding this legal action specifically as part of Conservancy's program activity in - its GPL Compliance + its GPL Compliance Project for Linux Developers.
Is this the Great Test Case of Combined / Derivative Works?
@@ -156,15 +156,15 @@ understand it. The diagram compares the technical architecture of a full, running Linux kernel with a full, running VMware kernel:

- - [Diagram of Linux and VMware running kernels] + + [Diagram of Linux and VMware running kernels]

If you want to download the diagram, it's available - in SVG - (English), PNG - (English), SVG - (German), and PNG + in SVG + (English), PNG + (English), SVG + (German), and PNG (German).

@@ -572,7 +572,7 @@ at bin/vmtar inside VMware's work?
Conservancy -published its +published its comparison analysis between Christoph's code and VMware's code. This 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 diff --git a/www/conservancy/static/projects/current/index.html b/www/conservancy/static/projects/current/index.html index c0ff206d..d5303255 100644 --- a/www/conservancy/static/projects/current/index.html +++ b/www/conservancy/static/projects/current/index.html @@ -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 and Open Source under the MIT License.

-

GPL Compliance Project for Linux Developers

+

GPL Compliance Project for Linux Developers

The GPL Compliance Project for Linux Developers is comprised of copyright holders in the kernel, Linux, who have contributed to Linux diff --git a/www/conservancy/static/supporter/original-supporter-appeal.html b/www/conservancy/static/supporter/original-supporter-appeal.html index d0501dee..1142341a 100644 --- a/www/conservancy/static/supporter/original-supporter-appeal.html +++ b/www/conservancy/static/supporter/original-supporter-appeal.html @@ -58,7 +58,7 @@ open source software. We are the home of over 30 projects like Git, Inkscape, Samba, -Wine, Selenium, the GPL Compliance Project for Linux +Wine, Selenium, the GPL Compliance Project for Linux Developers, PyPy and Sugar Labs just to name a few. Conservancy is a "fiscal sponsor plus", providing everything that our projects need in a nonprofit. We help our diff --git a/www/conservancy/templates/base_compliance.html b/www/conservancy/templates/base_compliance.html index fa558623..2e91a418 100644 --- a/www/conservancy/templates/base_compliance.html +++ b/www/conservancy/templates/base_compliance.html @@ -41,14 +41,14 @@

diff --git a/www/conservancy/templates/base_conservancy.html b/www/conservancy/templates/base_conservancy.html index 32c37eb1..5ab6102b 100644 --- a/www/conservancy/templates/base_conservancy.html +++ b/www/conservancy/templates/base_conservancy.html @@ -34,7 +34,7 @@
  • News
  • Blog
  • Projects
    • -
  • Copyleft Compliance
    • +
  • Copyleft Compliance
  • NPOAcct
  • Sponsors
  • About