Merge branch 'master' of copyleft.org:copyleft

Conflicts:
	index.mdwn
This commit is contained in:
Bradley M. Kuhn 2014-11-07 19:25:13 -05:00
commit 0032084459

View file

@ -3,26 +3,22 @@ copyleft.org
copyleft.org is a collaborative project to create and disseminate useful copyleft.org is a collaborative project to create and disseminate useful
information, tutorial material, and new policy ideas regarding all forms of information, tutorial material, and new policy ideas regarding all forms of
copyleft licensing. Its primary project is currently a copyleft licensing.
[comprehensive tutorial and guide](/guide/), which describes the policy
motivations for copyleft exists, presents a detailed analysis of the text of
various copyleft licenses, and gives examples and case studies of copyleft
compliance situations.
### The Copyleft Guide and Tutorial ### The Copyleft Guide and Tutorial
The primary project currently on this site is the The primary project currently on this site is a tutorial book entitled
[tutorial book entitled *Copyleft and the GNU General Public License: A Comprehensive Guide and Tutorial*](/guide/). [*Copyleft and the GNU General Public License: A Comprehensive Guide and Tutorial*](/guide/).
This guide describes the policy motivations for copyleft, presents a detailed analysis of the text of
various copyleft licenses, and gives examples and case studies of copyleft compliance situations.
### Getting Involved ### Getting Involved
There are various ways to get involved with this project. The primary There are various ways to get involved with this project. The primary
copyleft.org website is a wiki, and we welcome additional information. copyleft.org website is a wiki, and we welcome helpful edits and additions.
Please edit this wiki with more information about copyleft.
However, the primary project available on this site is the aforementioned For the aforementioned guide and tutorial about GPL and other copyleft concepts,
guide and tutorial about GPL and other copyleft concepts. We seek we seek help in the following ways:
contributors to get involved in the following ways:
#### Proposing Improvements to the Guide #### Proposing Improvements to the Guide
@ -34,7 +30,7 @@ formatting-related.
#### Joining Mailing Lists #### Joining Mailing Lists
* Subscribe to [our low-traffic, announcements-only mailing list](https://lists.copyleft.org/cgi-bin/mailman/listinfo/announce) * Subscribe to our low-traffic [announcements-only mailing list](https://lists.copyleft.org/cgi-bin/mailman/listinfo/announce)
* Join discussion on our [primary mailing list, called "discuss"](https://lists.copyleft.org/cgi-bin/mailman/listinfo/discuss). * Join discussion on our [primary mailing list, called "discuss"](https://lists.copyleft.org/cgi-bin/mailman/listinfo/discuss).
#### IRC Discussion #### IRC Discussion
@ -46,8 +42,8 @@ The [IRC logs are public here on this site](/irclogs/).
### Who Contributes to copyleft.org? ### Who Contributes to copyleft.org?
This site is a joint project of This site is a joint project of
[Software Freedom Conservancy](https://sfconservancy.org) and [Software Freedom Conservancy](https://sfconservancy.org) and the
[the Free Software Foundation](https://fsf.org). The editor-in-chief of [Free Software Foundation](https://fsf.org). The editor-in-chief of
[the guide](/guide/) is [Bradley M. Kuhn](http://ebb.org/bkuhn). The [the guide](/guide/) is [Bradley M. Kuhn](http://ebb.org/bkuhn). The
[recent changes page](/recentchanges) shows who has [recent changes page](/recentchanges) shows who has
contributed to the wiki, and you can see the contributed to the wiki, and you can see the