Rework of about section, including many content changes and a few
formatting ones.
This commit is contained in:
		
							parent
							
								
									f426e60136
								
							
						
					
					
						commit
						d2af6a0cb5
					
				
					 9 changed files with 100 additions and 86 deletions
				
			
		|  | @ -7,9 +7,21 @@ | |||
| 
 | ||||
| <p>The Conservancy is directed by the following Board of Directors.</p> | ||||
| 
 | ||||
| <h2>Loic Dachary</h2> | ||||
| <h2>Jeremy Allison</h2> | ||||
| 
 | ||||
| <p>Loic Dachary has been involved with Free Software since 1987 when he | ||||
| <p>Jeremy Allison works for Google's Open Source Programs Office, as part | ||||
| of a team helping Google work with and release Open Source software. He is | ||||
| one of Google's representatives to the Open Source community and has been | ||||
| writing Open Source software for over twenty years.  Jeremy is also one of | ||||
| the lead developers on the Samba Team, a group of programmers developing | ||||
| an Open Source Windows (tm) compatible file and print server product for | ||||
| UNIX (tm) systems. As well as writing code, Jeremy handles the | ||||
| co-ordination of Samba development efforts and acts as a corporate liaison | ||||
| to companies using the Samba code commercially.</p> | ||||
| 
 | ||||
| <h2>Loïc Dachary</h2> | ||||
| 
 | ||||
| <p>Loïc Dachary has been involved with Free Software since 1987 when he | ||||
| started distributing GNU tapes to the general public in France.  His first | ||||
| contact was with GNU Emacs and in 1989 with GCC which he used to port a | ||||
| Unix System V kernel to a embeded motorola 68030 motherboard.  He | ||||
|  | @ -25,7 +37,17 @@ dedicated to Free Software with over 5,500 members.</p> | |||
| 
 | ||||
| <h2>Mark Galassi</h2> | ||||
| 
 | ||||
| <p>Mark Galassi has been involved in the GNU project since 1984. He currently works as a researcher in the International, Space, and Response division at Los Alamos National Laboratory, where he has worked on the HETE-2 satellite, ISIS/Genie, the Raptor telescope, the Swift satellite, and the muon tomography project. In 1997 Mark took a couple of years off from Los Alamos (where he was previously in the  ISR division and the Theoretical Astrophysics group) to work for Cygnus (now a part of Red Hat) writing software and books for eCos,although he continued working on the HETE-2 satellite (an astrophysical Gamma Ray Burst mission) part time. Mark earned his BA in Physics at Reed College and a PhD from the Institute for Theoretical Physics at Stony Brook. </p> | ||||
| <p>Mark Galassi has been involved in the GNU project since 1984. He | ||||
| currently works as a researcher in the International, Space, and Response | ||||
| division at Los Alamos National Laboratory, where he has worked on the | ||||
| HETE-2 satellite, ISIS/Genie, the Raptor telescope, the Swift satellite, | ||||
| and the muon tomography project. In 1997 Mark took a couple of years off | ||||
| from Los Alamos (where he was previously in the ISR division and the | ||||
| Theoretical Astrophysics group) to work for Cygnus (now a part of Red Hat) | ||||
| writing software and books for eCos,although he continued working on the | ||||
| HETE-2 satellite (an astrophysical Gamma Ray Burst mission) part | ||||
| time. Mark earned his BA in Physics at Reed College and a PhD from the | ||||
| Institute for Theoretical Physics at Stony Brook. </p> | ||||
| 
 | ||||
| <h2>Bradley M. Kuhn</h2> | ||||
| 
 | ||||
|  |  | |||
|  | @ -5,23 +5,22 @@ | |||
| 
 | ||||
| <h1>Contact the Conservancy</h1> | ||||
| 
 | ||||
| <p>The best way to contact the Conservancy is via email to <a | ||||
| href='mailto:info@sfconservancy.org'><info@sfconservancy.org></a>. | ||||
| We do our best to respond to all email within a reasonable time | ||||
| period.  If you don't hear from us within a few days, please try | ||||
| again.</p> | ||||
| <p>The best way to contact the Conservancy is via email | ||||
| to <a href='mailto:info@sfconservancy.org'><info@sfconservancy.org></a>. | ||||
| We do our best to respond to all email within a reasonable time period. | ||||
| If you don't hear from us within a week, please try again.</p> | ||||
| 
 | ||||
| <h2>Telephone</h2> | ||||
| <p>+1-212-461-3245 tel<br /> | ||||
| +1-212-580-0898 fax</p> | ||||
| </p> | ||||
| 
 | ||||
| <h2>Postal Address</h2> | ||||
| <p>Software Freedom Conservancy<br /> | ||||
| 1995 Broadway FL 17<br /> | ||||
| New York, NY 10023-5882</p> | ||||
| <p>Software Freedom Conservancy, Inc.<br /> | ||||
| 137 MONTAGUE ST  STE 380<br/> | ||||
| Brooklyn, NY 11201-3548 | ||||
| 
 | ||||
| <h2>Internet Relay Chat</h2> | ||||
| 
 | ||||
| <p>Our IRC room is #conservancy on irc.freenode.net.</p> | ||||
| <p>Our IRC channel is #conservancy on irc.freenode.net.</p> | ||||
| 
 | ||||
| {% endblock %} | ||||
|  |  | |||
							
								
								
									
										24
									
								
								www/conservancy/static/about/filings/index.html
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										24
									
								
								www/conservancy/static/about/filings/index.html
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,24 @@ | |||
| {% extends "base_about.html" %} | ||||
| {% block subtitle %}About - {% endblock %} | ||||
| {% block content %} | ||||
| 
 | ||||
| <h1>Public Filings</h1> | ||||
| 
 | ||||
| <p>Like all USA non-profits, the Conservancy files an annual Form 990 and, | ||||
| as a non-profit in the State of New York, files an annual CHAR-500 with | ||||
| New York State.  Below, Conservancy makes available these filings for | ||||
| public inspection, in reverse chronological order:</p> | ||||
| 
 | ||||
| <p> | ||||
| <ul> | ||||
| <li>Fiscal Year 2009</li> | ||||
| Conservancy's FY 2009 Form 990 and CHAR-500 should be available circa 2010-10-25.  | ||||
| 
 | ||||
| <li>Fiscal Year 2008</li> | ||||
| <ul> | ||||
| <li><a href="/docs/conservancy-form-990-fy-2008.pdf">Federal Form 900 (PDF)</a></li> | ||||
| 
 | ||||
| <li><a href="/docs/conservancy-CHAR-500-fy-2008.pdf">New York State | ||||
|     CHAR-500 (PDF)</a></li> | ||||
| </li> | ||||
| </ul></p> | ||||
|  | @ -2,47 +2,29 @@ | |||
| {% block subtitle %}About - {% endblock %} | ||||
| {% block content %} | ||||
| 
 | ||||
| <h1>About</h1> | ||||
| <h1>About the Software Freedom Conservancy, Inc.</h1> | ||||
| 
 | ||||
| <p>The Software Freedom Conservancy, Inc. is a 501(c)(3) not-for-profit | ||||
| organization incorporated in New York.  Conservancy is managed by | ||||
| its <a href="/about/board/"> board of directors.</a></p> | ||||
| its <a href="/about/board/">board of directors</a>, who appoint | ||||
| its <a href="/about/officers/">officers</a> and hire | ||||
| its <a href="/about/staff/">staff</a>.</p> | ||||
| 
 | ||||
| <p>We hold, protect and manage copyrights and trademarks for FLOSS | ||||
| projects.  Conservancy aims to act as long-term caretakers for our member | ||||
| projects, ensuring that free software stays free.</p> | ||||
| <p>Conservancy strives to be as transparent as possible, and makes | ||||
|   its <a href="/about/filings/">public filings available on its | ||||
|   website</a>.  Bradley M. Kuhn, Conservancy's Executive | ||||
|   Director <a href="/blog/">blogs regularly</a> about Conservancy's | ||||
|   activities.</p> | ||||
| 
 | ||||
| <p>Conservancy frees FLOSS projects to concentrate on what they do best: | ||||
| writing code.  We do this by shouldering some of the administrative burden | ||||
| that comes with running a FOSS project.  Our fiscal sponsorship program | ||||
| gives projects all the benefits of a not-for-profit structure without the | ||||
| overhead of managing a corporation.  We can help projects with | ||||
| organizational structure, contributor's license agreements, financial | ||||
| controls, accounting, fund-raising and more.</p> | ||||
| <p>A <a href="/overview/">general overview</a> of Conservancy's | ||||
|   work can be found on this site, and <a href="/members/">detailed | ||||
|   information about the work that Conservancy does for its member | ||||
|   projects</a> is also available.</p> | ||||
| 
 | ||||
| <p>In addition to our relationship with individual projects, Conservancy | ||||
| facilitates communication and coordination between FLOSS projects.  We act | ||||
| as a central store of knowledge and experience and help advance the goals | ||||
| of both individual FOSS projects and the movement as a whole.</p> | ||||
| <p>If you have general questions about Conservancy and its | ||||
|   work, <a href="/about/contact/">contact information</a> is available. | ||||
|   Conservancy is primarily supported by <a href="/donate">your charitable | ||||
|   donations</a>.</p> | ||||
| 
 | ||||
| <p>If we might be able to help your FLOSS project, email us | ||||
| at <a href="mailto:conservancy@softwarefreedom.org">conservancy@softwarefreedom.org</a>.</p> | ||||
| 
 | ||||
| <h2>Public Filings</h2> | ||||
| 
 | ||||
| <p>Like all USA non-profits, the Conservancy files an annual Form 990 and, as | ||||
| a non-profit in the State of New York, files an annual CHAR-500 with New | ||||
| York State.  Below, Conservancy makes available these filings for public | ||||
| inspection:</p> | ||||
| 
 | ||||
| <p><ul> | ||||
| <li>Fiscal Year 2008</li> | ||||
| <ul> | ||||
| <li><a href="/docs/conservancy-form-990-fy-2008.pdf">Federal Form 900 (PDF)</a></li> | ||||
| 
 | ||||
| <li><a href="/docs/conservancy-CHAR-500-fy-2008.pdf">New York State | ||||
|     CHAR-500 (PDF)</a></li> | ||||
| </li> | ||||
| 
 | ||||
| </ul></p> | ||||
| {% endblock %} | ||||
|  |  | |||
|  | @ -230,6 +230,7 @@ span.subsubsectionToc { padding-left: 6em;} | |||
| body.conservancy-overview #navbar ul li.overview a, | ||||
| body.conservancy-members #navbar ul li.members a, | ||||
| body.conservancy-news #navbar ul li.news a, | ||||
| body.conservancy-blog #navbar ul li.blog a, | ||||
| body.conservancy-About #navbar ul li.About a, | ||||
| body.conservancy-officers #navbar ul li.officers a, | ||||
| body.conservancy-contact #navbar ul li.contact a, | ||||
|  |  | |||
|  | @ -3,13 +3,19 @@ | |||
| {% block category %}donate{% endblock %} | ||||
| {% block content %} | ||||
| 
 | ||||
| <h1>Donations</h1> | ||||
| <h1>Become a Conservancy Supporter!</h1> | ||||
| 
 | ||||
| <p>The various ways to donate to the Conservancy's general fund are below. | ||||
|   To donate to the directed funds for our <a href="/members/">member | ||||
|   projects, visit their individual web pages</a>.</p> | ||||
| <p>As a not-for-profit charity, Conservancy relies on support from the | ||||
|   public to continue its work.  Please give generously to support | ||||
|   Conservancy's work.</p> | ||||
| 
 | ||||
| <h3>Donating via Google Checkout</h3> | ||||
| <p>By donating below, you'll directly support the operation of Conservancy | ||||
|   itself.  Conservancy also maintains directed donation programs for | ||||
|   its <a href="/members/">member projects</a>.  Donation links for these | ||||
|   directed donation programs can found on the individual websites | ||||
|   of our <a href="/members/">members</a>.</p> | ||||
| 
 | ||||
| <h3>Donate via Google Checkout</h3> | ||||
| 
 | ||||
| <p>Donating via Google Checkout puts more of your donation to work, since | ||||
|   Google charges no Checkout fees to 501(c)(3) organizations.</p> | ||||
|  | @ -46,17 +52,17 @@ function validateAmount(amount){ | |||
|     </table> | ||||
| </form> | ||||
| 
 | ||||
| <h3>Donating by paper check</h3> | ||||
| <h3>Donate by paper check</h3> | ||||
| 
 | ||||
| <p>Send paper check donations to:</p> | ||||
| 
 | ||||
| <p>Software Freedom Conservancy<br /> | ||||
| 1995 Broadway 17th Floor<br /> | ||||
| New York, NY 10023-5882<br /> | ||||
| 137 MONTAGUE ST  STE 380<br/> | ||||
| Brooklyn, NY 11201-3548<br/> | ||||
| USA | ||||
| </p> | ||||
| 
 | ||||
| <h3>Donating via Paypal</h3> | ||||
| <h3>Donate via Paypal, Visa, Mastercard, AMEX or ACH</h3> | ||||
| 
 | ||||
| <form action="https://www.paypal.com/cgi-bin/webscr" method="post"> | ||||
| <input type="hidden" name="cmd" value="_s-xclick"/> | ||||
|  | @ -67,8 +73,7 @@ USA | |||
| </form> | ||||
| 
 | ||||
| 
 | ||||
| <p>The Software Freedom Conservancy is a 501(c)(3) organization, and donations made to it are fully tax-deductible to the extent permitted by law.</p> | ||||
| 
 | ||||
| <p>Please also consider making an additional donation to the Conservancy's law firm, the <a href="http://www.softwarefreedom.org/about/donate/">Software Freedom Law Center</a>.</p> | ||||
| <p>The Software Freedom Conservancy, Inc. is a 501(c)(3) organization | ||||
|   incorporated in New York, and donations made to it are fully tax-deductible to the extent permitted by law.</p> | ||||
| 
 | ||||
| {% endblock %} | ||||
|  |  | |||
|  | @ -1,27 +1,3 @@ | |||
| {% | ||||
| # Copyright 2005-2008, James Garrison | ||||
| # Copyright 2010, Bradley M. Kuhn | ||||
| 
 | ||||
| # This software's license gives you freedom; you can copy, convey, | ||||
| # propagate, redistribute, modify and/or redistribute modified versions of | ||||
| # this program under the terms of the GNU Affero General Public License | ||||
| # (AGPL) as published by the Free Software Foundation (FSF), either | ||||
| # version 3 of the License, or (at your option) any later version of the | ||||
| # AGPL published by the FSF. | ||||
| # | ||||
| # This program is distributed in the hope that it will be useful, but | ||||
| # WITHOUT ANY WARRANTY; without even the implied warranty of | ||||
| # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero | ||||
| # General Public License for more details. | ||||
| # | ||||
| # You should have received a copy of the GNU Affero General Public License | ||||
| # along with this program in a file in the toplevel directory called | ||||
| # "AGPLv3".  If not, see <http://www.gnu.org/licenses/>. | ||||
| 
 | ||||
| # req.subprocess_env is not set when the PostReadRequestHandler runs, | ||||
| # so we just bypass it altogether and set the relevant variable here. | ||||
| # See deployment documentation for more info. | ||||
| 
 | ||||
| {% extends "base_conservancy.html" %} | ||||
| {% block outercontent %} | ||||
|     <div id="container"> | ||||
|  | @ -32,6 +8,7 @@ | |||
|             <li class="Directors"><a href="/about/board/">Directors</a></li> | ||||
|             <li class="Officers"><a href="/about/officers/">Officers</a></li> | ||||
|             <li class="Staff"><a href="/about/officers/">Staff</a></li> | ||||
|             <li class="Staff"><a href="/about/filings/">Filings</a></li> | ||||
|             </ul> | ||||
|          </div> | ||||
|                <div id="mainContent">{% block content %}{% endblock %} | ||||
|  |  | |||
|  | @ -20,8 +20,9 @@ | |||
|       <div id="navbar"> | ||||
| 	<ul> | ||||
|           <li class="overview"><a href="/overview/">Overview</a></li> | ||||
| 	  <li class="members"><a href="/members/">Member Projects</a></li> | ||||
|           <li class="news"><a href="/news/">News</a></li> | ||||
|           <li class="blog"><a href="/blog/">Blog</a></li> | ||||
| 	  <li class="members"><a href="/members/">Member Projects & Services</a></li> | ||||
|           <li class="About"><a href="/about/">About</a></li> | ||||
| 	  <li class="donate"><a href="/donate/">Support Conservancy!</a></li> | ||||
| 	</ul> | ||||
|  |  | |||
|  | @ -4,8 +4,11 @@ | |||
| 
 | ||||
| {% block content %} | ||||
| 
 | ||||
| <div id="mainContent"> | ||||
| 
 | ||||
| <h1><a href="/feeds/news/" class="feedlink"><img src="/img/feed-icon-14x14.png" alt="[RSS]"/></a> Conservancy News</h1> | ||||
| 
 | ||||
| 
 | ||||
| {% ifnotequal page 1 %}<p>(page {{ page }} of {{ pages }})</p>{% endifnotequal %} | ||||
| 
 | ||||
| {% for object in object_list %} | ||||
|  | @ -31,5 +34,5 @@ | |||
| <ul> | ||||
| {% for year in date_list %}<li><a href="{{ year|date:"Y" }}/">{{ year|date:"Y" }}</a></li>{% endfor %} | ||||
| </ul> | ||||
| 
 | ||||
| </div> | ||||
| {% endblock %} | ||||
|  |  | |||
		Loading…
	
	Add table
		
		Reference in a new issue
	
	 Bradley M. Kuhn
						Bradley M. Kuhn