[xiph-commits] r10937 - in websites-new/speex.org: . fsos software

comatoast at svn.xiph.org comatoast at svn.xiph.org
Thu Feb 23 00:57:27 PST 2006 

Author: comatoast
Date: 2006-02-23 00:57:25 -0800 (Thu, 23 Feb 2006)
New Revision: 10937

Added:
   websites-new/speex.org/fsos/
   websites-new/speex.org/fsos/index.shtml.en
Modified:
   websites-new/speex.org/.htaccess
   websites-new/speex.org/index.shtml.en
   websites-new/speex.org/software/index.shtml.en
Log:
* Made the perma-redirects a bit less flaky.
* Added /fsos/.
* Fixed URLs on / and /download/.


Modified: websites-new/speex.org/.htaccess
===================================================================
--- websites-new/speex.org/.htaccess	2006-02-23 08:49:32 UTC (rev 10936)
+++ websites-new/speex.org/.htaccess	2006-02-23 08:57:25 UTC (rev 10937)
@@ -1,8 +1,12 @@
-Redirect permanent contact.html http://www.speex.org/contact/
-Redirect permanent projects.html http://www.speex.org/software/
-Redirect permanent todo.html http://www.speex.org/roadmap/
-Redirect permanent docs.html http://www.speex.org/docs/
-Redirect permanent download.html http://www.speex.org/downloads/
-Redirect permanent samples.html http://www.speex.org/samples/
-Redirect permanent comparison.html http://www.speex.org/comparison/
-Redirect permanent news.html http://www.speex.org/news/
+Redirect permanent /contact.html http://www.speex.org/contact/
+Redirect permanent /projects.html http://www.speex.org/software/
+Redirect permanent /todo.html http://www.speex.org/roadmap/
+Redirect permanent /docs.html http://www.speex.org/docs/
+Redirect permanent /download.html http://www.speex.org/downloads/
+Redirect permanent /samples.html http://www.speex.org/samples/
+Redirect permanent /comparison.html http://www.speex.org/comparison/
+Redirect permanent /news.html http://nspeex.frogorbits.com/news/
+Redirect permanent /API/ http://nspeex.frogorbits.com/docs/api/
+Options +MultiViews +Indexes
+
+DirectoryIndex index.html index.shtml

Copied: websites-new/speex.org/fsos/index.shtml.en (from rev 10913, websites-new/speex.org/templates/index.shtml.en)
===================================================================
--- websites-new/speex.org/templates/index.shtml.en	2006-02-22 08:06:36 UTC (rev 10913)
+++ websites-new/speex.org/fsos/index.shtml.en	2006-02-23 08:57:25 UTC (rev 10937)
@@ -0,0 +1,64 @@
+<!--#include virtual="/ssi/header.include" -->
+<!--  Enter custom page information and styles here -->
+
+<title>Speex: Free and Open Source Software</title>
+<style type="text/css">
+<!--
+#navlink_ a {
+	text-decoration: underline !important;
+}
+-->
+</style>
+
+<!--#include virtual="/ssi/xiphbar.include" -->
+<!--#include virtual="/ssi/pagetop.include" -->
+
+<h1>Free and Open Source Software</h1>
+<p>
+	Speex is available under the terms of the
+	<a href='http://www.xiph.org/licenses/bsd/speex/'>Xiph.Org variant of the
+	BSD license</a>, which is both an
+	<a href="http://www.opensource.org/">open source</a> and
+	<a href="http://www.gnu.org/philosophy/free-sw.html">free software</a>
+	license.  Since there’s some confusion as to what this actually
+	<em>means</em> to current and potential users of Speex, this page
+	exists to clear up any misunderstandings.
+</p>
+<p>
+	A program is free software per the
+	<a href="http://www.gnu.org/philosophy/free-sw.html">Free Software Definition</a>)
+	if its users may:
+</p>
+<ul>
+	<li>run the program for any purpose</li>
+	<li>study how the program works and adapt it to their needs</li>
+	<li>redistribute copies at will</li>
+	<li>improve the program and distribute the altered version</li>
+</ul>
+<p>
+	A program is open source if its license complies with the
+	<a href="http://www.opensource.org/docs/definition.php">Open Source Definition</a>,
+	which, unlike the Free Software Definition, is a bit long to be copied
+	here. Most popular free software licenses are open source licenses,
+	and vice versa.
+</p>
+<p>
+	There are many licenses that qualify as free software licenses, and
+	the Xiph.Org variant of the BSD license is one of them. However,
+	some people prefer to release free software under a license that
+	<em>copylefts</em> the work, which ensures that all derivative works
+	of the copylefted program are <em>also</em> copylefted free software
+	programs. The <abbr title="GNU’s Not Unix">GNU</abbr>
+	<a href="http://www.gnu.org/copyleft/gpl.html"
+	   title="General Public License">GPL</a> is one popular
+	copyleft free software/open source license.
+</p>
+<p>
+	The Xiph.Org variant of the BSD license is
+	<strong>not</strong> a copyleft license.
+	<br/>
+	This means that you can integrate it in proprietary programs, without
+	having to release your source code, or anything else.
+</p>
+
+<!--#include virtual="/ssi/pagebottom.include" -->
\ No newline at end of file

Modified: websites-new/speex.org/index.shtml.en
===================================================================
--- websites-new/speex.org/index.shtml.en	2006-02-23 08:49:32 UTC (rev 10936)
+++ websites-new/speex.org/index.shtml.en	2006-02-23 08:57:25 UTC (rev 10937)
@@ -17,7 +17,7 @@
 <h1>Speex Home</h1>
 <h2>Overview</h2>
 <p>
-	Speex is an <a href="fsos.html">Open Source/Free Software</a>
+	Speex is an <a href="/fsos/">Open Source/Free Software</a>
 
 	patent-free audio compression format designed for speech.
 	The Speex Project aims to lower the barrier of entry for voice applications
@@ -53,7 +53,7 @@
 	such as intensity stereo encoding, integration of multiple sampling rates
 	in the same bitstream, and a
 	<abbr title="variable bitrate (operation)">VBR</abbr> mode; see our
-	<a href="comparison.html">comparison page</a> for more.
+	<a href="/comparison/">comparison page</a> for more.
 
 </p>
 <h2>Getting Involved</h2>
@@ -63,20 +63,20 @@
 	<abbr title="Voice over IP">VoIP</abbr>, internet audio streaming,
 	data archival (like voice mail), and audio books.
 	Currently, <a href="http://www.linphone.org/">LinPhone</a>,
-	<a href="http://www.openh323.org">OpenH323</a>, and
-	<a href="http://www.gnomemeeting.org">GnomeMeeting</a> are some of the
+	<a href="http://www.openh323.org/">OpenH323</a>, and
+	<a href="http://www.gnomemeeting.org/">GnomeMeeting</a> are some of the
 	projects currently using Speex. For a list of projects with
 	Speex support, visit our 
-	<a href="projects.html">Plugins &amp; Software</a> page.
+	<a href="/software/">Plugins &amp; Software</a> page.
 
 </p>
 <p> 
 	If you are interested in participating
 	in the project, have a look at our
-	<a href="todo.html">roadmap</a>, contact the Project Lead,
+	<a href="/roadmap/">roadmap</a>, contact the Project Lead,
 	<a href="http://people.xiph.org/~jm/">Jean-Marc Valin</a>, or
 	<a href="http://lists.xiph.org/mailman/listinfo/speex-dev">join our mailing list</a>. Or
-	<a href='http://xiph.org/ogg/vorbis/donate.html'>send us money</a>
+	<a href='http://www.xiph.org/donate/'>send us money</a>
 	so we can keep working on Speex.
 </p>
 

Modified: websites-new/speex.org/software/index.shtml.en
===================================================================
--- websites-new/speex.org/software/index.shtml.en	2006-02-23 08:49:32 UTC (rev 10936)
+++ websites-new/speex.org/software/index.shtml.en	2006-02-23 08:57:25 UTC (rev 10937)
@@ -141,7 +141,7 @@
 
 <h2>Other Implementations &amp; Language Bindings</h2>
 <dl class="appList">
-	<dt><a href="download/jspeex.zip">Jspeex</a>, Java bindings to the C-based libspeex</dt>
+	<dt><a href="http://downloads.xiph.org/releases/speex/jspeex.zip">Jspeex</a>, Java bindings to the C-based libspeex</dt>
 
 	<dd>
 	written by Boyd Ebsworthy

More information about the commits mailing list