(no commit message)

[wiki.git] / doc.mdwn

diff --git a/doc.mdwn b/doc.mdwn
index f7615bed3cbb88bb2efe436041cf41f1750ea4ad..a6e09c4e83fcfe417de3cbfa6195ea1e98dc7779 100644 (file)
--- a/doc.mdwn
+++ b/doc.mdwn
@@ -6,8 +6,8 @@ Writing and editing this documentation is an [[ongoing project|doc/project]].  E
 
 
 ## Recent Documentation
-* [[Using Gutenbach|doc/using-gutenbach]] <br />
-A guide on setting your computer up to use gutenbach to queue music to sipbmp3, the system SIPB uses to play music in the office.
+* [[Using sipbmp3|doc/using-sipbmp3]] <br />
+A guide to queue music to sipbmp3, the gutenbach system SIPB uses to play music in the office.
 
 * [[Using Zephyr|doc/zephyr]] <br />
 A guide on using Zephyr today with BarnOwl (and GNU Screen). Aimed at newcomers to Zephyr, and a pretty good reference.  See also [the Barnowl wiki](http://barnowl.mit.edu/).
@@ -38,11 +38,11 @@ Send and receive text messages through Zephyr.
 
 * [Learning Debian Packaging](http://debathena.mit.edu/packaging/)
 
+* [[Using CPAN|doc/cpan]] CPAN is a source of many useful libraries, but the tools often seem determined not to let you have them. Here's how to beat them into submission.
+
 * [[doc/Enabling Client Certificate Auth in Chrome]] <br />
 Recent versions of Google Chrome and Chromium should mostly work without surprises. This documentation is primarily for Linux users.
 
-* [[Using CPAN|doc/cpan]] CPAN is a source of many useful libraries, but the tools often seem determined not to let you have them. Here's how to beat them into submission.
-
 * [[Configuring Client-Side Certificate Authentication on Apache|doc/apache-client-certs]] <br />
 How to configure your own server to accept client-side certificates just like [scripts.mit.edu](http://scripts.mit.edu)
 
@@ -116,3 +116,12 @@ A guide to using and enjoying the Discuss bulletin board system on Athena.
 
 * [[So you want to learn Git...|doc/&git ]]
 Pointers to resources from which Git, the Version Control System many of us use.
+
+
+## Licensing
+
+While we love free and open source software, there are [http://www.opensource.org/proliferation](too many licenses) and the options can get a bit confusing. SIPB has some official recommendations for what to use and how to effect these licenses.
+
+* [[Code Licensing Recommendation|doc/code-licensing]]
+
+* [[Documentation Licensing Recommendation|doc/doc-licensing]]