[xiph-cvs] r6773 - in websites-ngen/xiph.org: . CSS map speex speex/documentation speex/documentation/CSS speex/license

comatoast at xiph.org comatoast at xiph.org
Fri May 28 14:46:03 PDT 2004



Author: comatoast
Date: 2004-05-28 17:46:02 -0400 (Fri, 28 May 2004)
New Revision: 6773

Added:
   websites-ngen/xiph.org/map/
   websites-ngen/xiph.org/map/index.markdown
   websites-ngen/xiph.org/speex/documentation/
   websites-ngen/xiph.org/speex/documentation/CSS/
   websites-ngen/xiph.org/speex/documentation/CSS/all.css
   websites-ngen/xiph.org/speex/documentation/css.include
   websites-ngen/xiph.org/speex/documentation/index.markdown
   websites-ngen/xiph.org/speex/license/
   websites-ngen/xiph.org/speex/license/index.markdown
Modified:
   websites-ngen/xiph.org/.htaccess
   websites-ngen/xiph.org/CSS/all.css
   websites-ngen/xiph.org/aftermaintext.inherit
   websites-ngen/xiph.org/css.include
   websites-ngen/xiph.org/index.markdown
   websites-ngen/xiph.org/speex/beforecontent.inherit
   websites-ngen/xiph.org/speex/index.markdown
Log:
* added /speex/license/ and /speex/documentation/.
* Changed the h[1-6] elements to use Trebuchet MS as their first choice.
* /map/ added. It's not done.

<p>Modified: websites-ngen/xiph.org/.htaccess
===================================================================
--- websites-ngen/xiph.org/.htaccess	2004-05-28 20:55:11 UTC (rev 6772)
+++ websites-ngen/xiph.org/.htaccess	2004-05-28 21:46:02 UTC (rev 6773)
@@ -2,7 +2,10 @@
 DirectoryIndex index.html index.markdown index.txt
 
 # good guess, but not good enough
-Redirect permanent /svn/ http://www.xiph.org/subversion/ 
+RedirectMatch permanent ^/svn/?$				/subversion/ 
+RedirectMatch permanent ^/help/?$				/contribute/ 
+RedirectMatch permanent ^/speex/licence/?$		/speex/license/
+RedirectMatch permanent ^/speex/doc/?$			/speex/documentation/
 
 ErrorDocument 404 /Error/404/
 ErrorDocument 410 /Error/410/

Modified: websites-ngen/xiph.org/CSS/all.css
===================================================================
--- websites-ngen/xiph.org/CSS/all.css	2004-05-28 20:55:11 UTC (rev 6772)
+++ websites-ngen/xiph.org/CSS/all.css	2004-05-28 21:46:02 UTC (rev 6773)
@@ -32,22 +32,24 @@
 }
 
 h1, h2, h3, h4, h5, h6 {
-	font-family: Baskerville, Garamond, Georgia, serif;
+	/* If you ever remove Trebuchet from the list, be sure to reenable the font-size adjustments
+	   in the headers */
+	font-family: 'Trebuchet MS', Baskerville, Garamond, Georgia, serif;
         font-weight: normal;
         color: #088;
         margin: .25em 0 .125em;
+	padding-top: .25em;
 }
 
 h1 {
         margin-top: 0;
-	padding-top: .25em;
-	font-size: 225%;
+	/*font-size: 225%;*/
 }
 
 h2 {
         margin-bottom: .125em;
         padding-bottom: 0;
-	font-size: 200%;
+	/*font-size: 200%;
 }
 
 h3 {
@@ -63,7 +65,7 @@
 }
 
 h6 {
-	font-size: 125%;
+	font-size: 125%;*/
 }
 
 p	{
@@ -83,7 +85,7 @@
         display: none;
 }
 
-code, kbd {
+code, kbd, tt {
         font: 100% Monaco, "Lucida Console", monospace;
 }
 

Modified: websites-ngen/xiph.org/aftermaintext.inherit
===================================================================
--- websites-ngen/xiph.org/aftermaintext.inherit	2004-05-28 20:55:11 UTC (rev 6772)
+++ websites-ngen/xiph.org/aftermaintext.inherit	2004-05-28 21:46:02 UTC (rev 6773)
@@ -7,12 +7,17 @@
         <a href='/donate/'
            title='Give us money'>Donate</a> |
         -->
+	<a href='/map/'
+	   title='See a bird’s-eye view of the site'>Map</a> |
+	
         <a href='/contribute/'
            title='See how you can help us out'>Contribute</a> |
+	<!--
         <a href='/codecs/'
            title='Our multimedia codecs'>Codecs</a> |
         <a href='/tools/'
            title='Tools we’ve written'>Tools</a> |
+	-->
         <a href='/lists/'
            title='Read or subscribe to one of our mailing lists'>Mail</a> |
         <a href='/subversion/'

Modified: websites-ngen/xiph.org/css.include
===================================================================
--- websites-ngen/xiph.org/css.include	2004-05-28 20:55:11 UTC (rev 6772)
+++ websites-ngen/xiph.org/css.include	2004-05-28 21:46:02 UTC (rev 6773)
@@ -1,3 +1,7 @@
         <style type='text/css'>
                 @import url(/CSS/sidebars/captionedbuttons.css);
+		img.logo {
+			float: right;
+			padding: 0 0 .5em .1em;
+		}
         </style>

Modified: websites-ngen/xiph.org/index.markdown
===================================================================
--- websites-ngen/xiph.org/index.markdown	2004-05-28 20:55:11 UTC (rev 6772)
+++ websites-ngen/xiph.org/index.markdown	2004-05-28 21:46:02 UTC (rev 6773)
@@ -1,4 +1,4 @@
-<img alt='' src='/Images/logos/xiph.gif' style='float: right;'>
+<img alt='' src='/Images/logos/xiph.gif' class='logo'>
 
 
 Welcome to Xiph.Org!

<p>Property changes on: websites-ngen/xiph.org/map
___________________________________________________________________
Name: svn:ignore
   + index.html

<p>Added: websites-ngen/xiph.org/map/index.markdown
===================================================================
--- websites-ngen/xiph.org/map/index.markdown	2004-05-28 20:55:11 UTC (rev 6772)
+++ websites-ngen/xiph.org/map/index.markdown	2004-05-28 21:46:02 UTC (rev 6773)
@@ -0,0 +1,52 @@
+Site Map
+========
+
+<!-- cut and paste these (U+00B7, MIDDLE DOT)
+·······
+-->
+
+## Audio and video codecs
+
+[Vorbis][] · [FLAC][] · [Speex][] · [Theora][]
+
+
+## Other Things 
+
+[Ogg][] · [Icecast][] · [Postfish][]
+
+
+## Getting In Touch
+
+[Who We Are][who] · [Mailing Lists][lists] · [Wiki][] ·
+·····
+
+
+## Developer Resources
+
+[Xiph.Org Bugzilla][zilla] · ····
+
+## Contribute to Xiph.Org
+
+[Improve Our Stuff][imp] · [Use Our Stuff][use] · [Donate][] ·
+[Buy OggWear from Cafeshops][oggwear] ·
+
+
+
+
+	[ogg]:		/ogg/			"Our multimedia container format"
+	[vorbis]:	/vorbis/		"Our lossy audio compression codec for music"
+	[flac]:		/flac/			"Our lossless audio compression codec for high-quality archives"
+	[speex]:	/speex/			"Our lossy audio compression codec for speech"
+	[theora]:	/theora/		"Our video compression codec based on VP3"
+	
+	[icecast]:	/icecast/		"Our industrial-strength multimedia streaming server"
+	[postfish]:	/postfish/		"Our compander"
+	
+	[who]:		/who/			"Who We Are"
+	[lists]:	/mailinglists/	"Subscribe to one of our mailing lists or read their archives"
+	[wiki]:		http://wiki.xiph.org/
+	
+	[zilla]:	http://bugs.xiph.org/ "Our defect reporting system"
+	
+	[donate]:	/donate/
+	[oggwear]:	http://www.cafeshops.com/cp/store.aspx?s=oggwear

Modified: websites-ngen/xiph.org/speex/beforecontent.inherit
===================================================================
--- websites-ngen/xiph.org/speex/beforecontent.inherit	2004-05-28 20:55:11 UTC (rev 6772)
+++ websites-ngen/xiph.org/speex/beforecontent.inherit	2004-05-28 21:46:02 UTC (rev 6773)
@@ -7,7 +7,8 @@
 ><li><a href='/speex/compare/'>Compare</a></li
 ><li><a href='/speex/samples/'>Samples</a></li
 ><li><a href='/speex/download/'>Download</a></li
-><li><a href='/speex/doc/'>Documentation</a></li
+><li><a href='/speex/documentation/'>Documentation</a></li
+><li><a href='/speex/license/'>License</a></li
 ><li><a href='/speex/roadmap/'>Roadmap</a></li
 ><li><a href='/speex/users/'>Users</a></li></ul>
 </div>

<p>Property changes on: websites-ngen/xiph.org/speex/documentation
___________________________________________________________________
Name: svn:ignore
   + index.html

<p>Added: websites-ngen/xiph.org/speex/documentation/CSS/all.css
===================================================================
--- websites-ngen/xiph.org/speex/documentation/CSS/all.css	2004-05-28 20:55:11 UTC (rev 6772)
+++ websites-ngen/xiph.org/speex/documentation/CSS/all.css	2004-05-28 21:46:02 UTC (rev 6773)
@@ -0,0 +1,16 @@
+td, th {
+	vertical-align: top;
+	width: 50%;
+}
+
+th {
+	font-weight: normal;
+}
+
+table p {
+	margin: 0;
+}
+
+table ul {
+	margin-top: .125em;
+}

Added: websites-ngen/xiph.org/speex/documentation/css.include
===================================================================
--- websites-ngen/xiph.org/speex/documentation/css.include	2004-05-28 20:55:11 UTC (rev 6772)
+++ websites-ngen/xiph.org/speex/documentation/css.include	2004-05-28 21:46:02 UTC (rev 6773)
@@ -0,0 +1,3 @@
+	<style type='text/css'>
+		@import url(CSS/all.css);
+	</style>

Added: websites-ngen/xiph.org/speex/documentation/index.markdown
===================================================================
--- websites-ngen/xiph.org/speex/documentation/index.markdown	2004-05-28 20:55:11 UTC (rev 6772)
+++ websites-ngen/xiph.org/speex/documentation/index.markdown	2004-05-28 21:46:02 UTC (rev 6773)
@@ -0,0 +1,46 @@
+Speex Documentation
+===================
+
+<!-- Yes, this is a table-based layout, which I know will imperil my immortal soul. -->
+<table>
+	<tr>
+		<td>
+			<h2>Manual</h2>
+			<p>
+				The Speex manual provides an introduction to Speex and
+				<abbr title="Code Excited Linear Prediction">CELP</abbr> coding,
+				<tt>speexenc</tt> and <tt>speexdec</tt> information, 
+				libspeex <abbr title="Application Programming Interface">API</abbr>
+				information, and miscellaneous format information.
+			</p>
+		</td>
+		<td>
+			<h2><abbr title='Application Programming Interface'>API</abbr> Reference</h2>
+			<p>
+				The Speex <abbr title="Application Programming Interface">API</abbr>
+				Reference Manual provides information on programming with libspeex.
+			</p>
+		</td>
+	</tr>
+	<tr>
+		<td>
+			<ul>
+				<li><a href="manual.pdf"><abbr title="Portable Document Format">PDF</abbr></a></li>
+				<li>Postscript</li>
+				<li>HTML (online)</li>
+				<li>HTML (tarball)</li>
+			</ul>
+		</td>
+		<td>
+			<ul>
+				<li>
+					<a href="api/refman.pdf">
+						<abbr title="Portable Document Format">PDF</abbr></a>
+				</li>
+				<li>Postscript</li>
+				<li>HTML (online)</li>
+				<li>HTML (tarball)</li>
+			</ul>
+		</td>
+	</tr>
+</table>

Modified: websites-ngen/xiph.org/speex/index.markdown
===================================================================
--- websites-ngen/xiph.org/speex/index.markdown	2004-05-28 20:55:11 UTC (rev 6772)
+++ websites-ngen/xiph.org/speex/index.markdown	2004-05-28 21:46:02 UTC (rev 6773)
@@ -7,12 +7,13 @@
 Moreover, Speex is well-adapted to Internet applications and provides useful features that
 are not present in most other codecs.
 Finally, Speex is part of the [<abbr title='GNU’s Not Unix'>GNU</abbr> Project][gnu]
-and is available under the [Xiph.org variant of the BSD license][xiph-bsd].
+and is available under the terms of the [BSD license][license].
 
         [osfs]:		./osfs/
         [gnu]:		http://www.gnu.org/
-	[xiph-bsd]:	/licenses/bsd/
-	
+	[license]:	./license/
+
+
 ## The Technology
 
 Speex is based on <abbr title='Code-Excited Linear Prediction'>CELP</abbr> and is designed

<p>Property changes on: websites-ngen/xiph.org/speex/license
___________________________________________________________________
Name: svn:ignore
   + index.html

<p>Added: websites-ngen/xiph.org/speex/license/index.markdown
===================================================================
--- websites-ngen/xiph.org/speex/license/index.markdown	2004-05-28 20:55:11 UTC (rev 6772)
+++ websites-ngen/xiph.org/speex/license/index.markdown	2004-05-28 21:46:02 UTC (rev 6773)
@@ -0,0 +1,21 @@
+Speex License Requirements
+==========================
+
+Speex is licensed under the Xiph.Org license, which is similar to the revised BSD license.
+Here’s a **summary** of what you need to do to implement
+the requirements of the [Speex distribution terms][copying]:
+
+*	Don’t erase the copyright disclaimers on any file of Speex source code.
+
+*	Include our [COPYING][] file with your distribution; you could include it in your end-user
+	manual or your application’s About box, or simply provide it as, say,
+	<tt>%programfiles%\<var>yourapp</var>\copying.txt</tt>.
+
+*	Don’t claim or imply that you wrote Speex.
+
+*	Don’t use the name of Xiph.Org or its contributors (Jean-Marc Valin, et. al.) to promote your
+	product unless you get prior written permission from us.
+
+*	Keep in mind that there is **no warranty** for Speex.
+
+	[copying]: http://svn.xiph.org/trunk/speex/COPYING

--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.



More information about the commits mailing list