X-Git-Url: https://sipb.mit.edu/gitweb.cgi/wiki.git/blobdiff_plain/c8a951f04c299c496315074cc6070e583ac2adb2..0e5c645ad8efe31c5eb867c8dc479c26c85ebfff:/doc.mdwn
diff --git a/doc.mdwn b/doc.mdwn
index 4d3fcf3..deef7fb 100644
--- a/doc.mdwn
+++ b/doc.mdwn
@@ -6,7 +6,7 @@ Writing and editing this documentation is an [[ongoing project|doc/project]]. E
## Recent Documentation
-* [[Using Gutenbach|doc/gutenbach]]
+* [[Using Gutenbach|doc/using-gutenbach]]
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 Zephyr|doc/zephyr]]
@@ -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]]