Remove more junk output

[wiki.git] / doc.mdwn

diff --git a/doc.mdwn b/doc.mdwn
index 4d3fcf334c7b7c263f8822550f61b3a75ae8a08c..deef7fbcf342978eb674032b4a96ab0b68517dae 100644 (file)
--- a/doc.mdwn
+++ b/doc.mdwn
@@ -6,7 +6,7 @@ Writing and editing this documentation is an [[ongoing project|doc/project]].  E
 
 
 ## Recent Documentation
 
 
 ## Recent Documentation

-* [[Using Gutenbach|doc/gutenbach]] <br />
+* [[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 Zephyr|doc/zephyr]] <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 Zephyr|doc/zephyr]] <br />


@@ -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.
 
 * [[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]]