[xiph-cvs] r6785 - in websites-ngen: . xiph.org/vorbis xiph.org/vorbis/license

[comatoast at xiph.org]

Author: comatoast
Date: 2004-05-29 15:47:41 -0400 (Sat, 29 May 2004)
New Revision: 6785

Added:
   websites-ngen/xiph.org/vorbis/license/index.markdown
Modified:
   websites-ngen/style.txt
   websites-ngen/xiph.org/vorbis/beforecontent.inherit
   websites-ngen/xiph.org/vorbis/license/
Log:
Added in /vorbis/license/ and some style guide updates.

Modified: websites-ngen/style.txt
===================================================================
--- websites-ngen/style.txt	2004-05-29 18:34:47 UTC (rev 6784)
+++ websites-ngen/style.txt	2004-05-29 19:47:41 UTC (rev 6785)
@@ -70,12 +70,21 @@
 ----------------
 
 *	Due to cross-platform and build restrictions, we can’t use symlinks or hard links.
-	Instead, use HTTP redirects in .htaccess files. For more information, see the Apache 2
-	information on the Redirect directive at
+	Instead, use the Redirect and RedirectMatch directives in the top-level .htaccess file.
+	For more information, see the Apache 2 information at
         <http://httpd.apache.org/docs-2.0/mod/mod_alias.html#redirect>.
 
 *	Redirect to <http://www.xiph.org/>, not <http://xiph.org/>.
 
+*	Do not abbreviate directory names. For example, make URLs so they look like
+	“/vorbis/documentation/”, not “/vorbis/doc/”, with the exception of “/faq/”.
+
+	However, add in a RedirectMatch in the .htaccess file to perma-redirect
+	from /doc/ to /documentation/, because people may try /doc/ and we don’t want to disappoint.
+
+*	Use U.S. English for URL spelling (“license”, “optimize”), but pop in a RedirectMatch from
+	the Commonwealth spelling.
+
 *	Page URLs are to be in the style of /foo/bar/baz/quux/ for reasons described on
         [Slash Forward][].
 

Modified: websites-ngen/xiph.org/vorbis/beforecontent.inherit
===================================================================
--- websites-ngen/xiph.org/vorbis/beforecontent.inherit	2004-05-29 18:34:47 UTC (rev 6784)
+++ websites-ngen/xiph.org/vorbis/beforecontent.inherit	2004-05-29 19:47:41 UTC (rev 6785)
@@ -9,7 +9,8 @@
 ><li><a href='/vorbis/compare/'>Compare</a></li
 ><li><a href='/vorbis/samples/'>Samples</a></li
 ><li><a href='/vorbis/download/'>Download</a></li
-><li><a href='/vorbis/doc/'>Documentation</a></li
+><li><a href='/vorbis/documentation/'>Documentation</a></li
+><li><a href='/vorbis/license/'>License</a></li
 ><li><a href='/vorbis/users/'>Users</a></li></ul>
 </div>
 

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

<p>Added: websites-ngen/xiph.org/vorbis/license/index.markdown
===================================================================
--- websites-ngen/xiph.org/vorbis/license/index.markdown	2004-05-29 18:34:47 UTC (rev 6784)
+++ websites-ngen/xiph.org/vorbis/license/index.markdown	2004-05-29 19:47:41 UTC (rev 6785)
@@ -0,0 +1,25 @@
+Ogg Vorbis Licensing
+====================
+
+<!-- unresolved: Are the Ogg and Vorbis specs separate? -->
+
+## The Ogg and Vorbis Specifications
+
+The [Vorbis specification][spec] has been placed into the public domain, and is free for both
+commercial and noncommercial use. This means that you can write an Ogg Vorbis implementation
+which is compatible with the specification at no charge.
+
+
+## The Reference Ogg and Vorbis Libraries
+
+Our reference libraries are available under the terms of the Xiph.Org BSD License.
+
+
+## The Reference Ogg and Vorbis Software
+
+Most, but not all of our utility software is available under the terms of the [GNU GPL][].
+
+Note that you can use our BSD-licensed libraries (or even the public-domain specification)
+to write your own software if the licenses to our reference tools are too restrictive.
+
+	[gnu gpl]:	http://www.gnu.org/licenses/gpl.html "The GNU General Public License, version 2"

--- >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.