Copyleft/copyleft-wiki Changeset - 0032084459b8

Changeset - 0032084459b8

Parent rev.

Child rev.

[Not reviewed]

Merge

0 1 0

Bradley Kuhn (bkuhn) - 9 years ago 2014-11-08 00:25:13
bkuhn@ebb.org

Merge branch 'master' of copyleft.org:copyleft

Conflicts:
index.mdwn

1 file changed with 12 insertions and 16 deletions:

index.mdwn

0 comments (0 inline, 0 general)

index.mdwn

➞

Show inline comments

@@ ... @@
 information, tutorial material, and new policy ideas regarding all forms of
 copyleft licensing.  Its primary project is currently a
 [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.
 copyleft licensing.
 ### The Copyleft Guide and Tutorial
 The primary project currently on this site is the
 [tutorial book entitled *Copyleft and the GNU General Public License: A Comprehensive Guide and Tutorial*](/guide/).
 The primary project currently on this site is a tutorial book entitled
 [*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.
@@ ... / @@ -19,8 +17,6 @@ The primary project currently on this site is the @@
 There are various ways to get involved with this project.  The primary
 copyleft.org website is a wiki, and we welcome additional information.
 Please edit this wiki with more information about copyleft.
 copyleft.org website is a wiki, and we welcome helpful edits and additions.
 However, the primary project available on this site is the aforementioned
 guide and tutorial about GPL and other copyleft concepts.  We seek
 contributors to get involved in the following ways:
 For the aforementioned guide and tutorial about GPL and other copyleft concepts,
 we seek help in the following ways:
@@ ... / @@ -36,3 +32,3 @@ formatting-related. @@
-   * 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).
@@ ... / @@ -48,4 +44,4 @@ The [IRC logs are public here on this site](/irclogs/). @@
 This site is a joint project of
 [Software Freedom Conservancy](https://sfconservancy.org) and
 [the Free Software Foundation](https://fsf.org).  The editor-in-chief of
 [Software Freedom Conservancy](https://sfconservancy.org) and the
 [Free Software Foundation](https://fsf.org).  The editor-in-chief of
 [the guide](/guide/) is [Bradley M. Kuhn](http://ebb.org/bkuhn).  The

0 comments (0 inline, 0 general)