From 88ef25012f00f980d63deda7efe51458c87e9064 2010-10-04 01:50:16
From: Bradley M. Kuhn <bkuhn@ebb.org>
Date: 2010-10-04 01:50:16
Subject: [PATCH] Moved some overview text over to frontpage; fixed typo in overview;
s/.../&hellip;/

---

diff --git a/www/conservancy/static/overview/index.html b/www/conservancy/static/overview/index.html
index 9e10a1e886c134c9e46e52ccf35b3c9761a54946..e23da9c99564bc0896e7064b651447a63282722c 100644
--- a/www/conservancy/static/overview/index.html
+++ b/www/conservancy/static/overview/index.html
@@ -10,7 +10,7 @@
   Software (FLOSS) projects.  Conservancy provides a non-profit home and
   infrastructure for FLOSS projects.  This allows FLOSS developers to
   focus on what they do best &mdash; writing and improving FLOSS for the
-  general public, while Conservancy takes care of the projects' needs that
+  general public &mdash; while Conservancy takes care of the projects' needs that
   do not relate directly to software development.</p>
 
 <p>FLOSS projects whose <a href="/members/apply">applications are
@@ -41,7 +41,7 @@
   their capacity as project leaders, receive some protection from personal
   liability for their work on the project.</p>
 
-<p>A full and detailed <a href="/member/services/">list of Conservancy's
+<p>A full and detailed <a href="/members/services/">list of Conservancy's
   services for its member projects</a> and a <a href="/members/current/">a
   list of Conservancy's current member projects</a> are available.</p>
 
diff --git a/www/conservancy/templates/frontpage.html b/www/conservancy/templates/frontpage.html
index b9e28083520e159a1c9aaaefb43262e1247cd3b4..3b9f6b37455f7cb16120a0d76a9330fe184b18b7 100644
--- a/www/conservancy/templates/frontpage.html
+++ b/www/conservancy/templates/frontpage.html
@@ -7,32 +7,19 @@
 
 {% block content %}
 
-<h1>Welcome</h1>
+<h1>The Software Freedom Conservancy</h1>
 
-<p>The Software Freedom Conservancy is an organization composed of Free
-and Open Source Software (FOSS) projects. As a fiscal sponsor for FOSS
-projects, the Conservancy provides member projects with free financial
-and administrative services, but does not involve itself with
-technological and artistic decisions.</p>
-
-<p>By joining the Conservancy, member FOSS projects obtain the benefits of
-a formal legal structure while keeping themselves focused on software
-development.  These benefits include, most notably, the ability to collect
-earmarked project donations and protection from personal liability for the
-developers of the project.  Another benefit of joining the Conservancy is
-that projects can use it to hold assets, which are managed by the
-Conservancy on behalf of and at the direction of the project.  The
-Conservancy is a tax-exempt 501(c)(3) organization, so member projects can
-receive tax-deductible donations to the extent allowed by law.  To make a
-donation to the Conservancy or to its member projects,
-please <a href="/donate/">visit our donations page</a>.</p>
-
-<p>If you think your FOSS project might benefit from joining the
-Conservancy, please <a href="/about/contact/">contact us</a>.</p>
+<p>The Software Freedom Conservancy is a not-for-profit organization that
+  helps promote, improve, develop, and defend Free, Libre, and Open Source
+  Software (FLOSS) projects.  Conservancy provides a non-profit home and
+  infrastructure for FLOSS projects.  This allows FLOSS developers to
+  focus on what they do best &mdash; writing and improving FLOSS for the
+  general public &mdash; while Conservancy takes care of the projects' needs that
+  do not relate directly to software development.</p>
 
 <p>
-<span class="continued"><a href="/overview/">Overview of the Conservancy...</a></span>
-<span class="continued"><a href="/members/">Member projects...</a></span>
+<span class="continued"><a href="/overview/">More about Conservancy&hellip;</a></span>
+<span class="continued"><a href="/members/">Conservancy's member projects&hellip;</a></span>
 </p>
 
 {% if press_releases.0.pub_date|date_within_past_days:30 %}