From 0032084459b8f845b3ac7d5910e13ee1235bf490 2014-11-08 00:25:13
From: Bradley M. Kuhn <bkuhn@ebb.org>
Date: 2014-11-08 00:25:13
Subject: [PATCH] Merge branch 'master' of copyleft.org:copyleft

Conflicts:
	index.mdwn

---

diff --git a/index.mdwn b/index.mdwn
index e95574ee2a379960b4649faa4f6cf56c26527acf..e3620d125a0679ba98e24aabcf4cd3e7f538a4d4 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -3,26 +3,22 @@ copyleft.org
 
 copyleft.org is a collaborative project to create and disseminate useful
 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.
 
 ### Getting Involved
 
 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:
 
 #### Proposing Improvements to the Guide
 
@@ -34,7 +30,7 @@ formatting-related.
 
 #### 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).
 
 #### IRC Discussion
@@ -46,8 +42,8 @@ The [IRC logs are public here on this site](/irclogs/).
 ### Who Contributes to copyleft.org?
 
 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
 [recent changes page](/recentchanges) shows who has
 contributed to the wiki, and you can see the