Added correct license info to Santiago files.

.gitignore

@@ -18,5 +18,6 @@ doc/oneline.txt
 doc/plinth.1
 templates/*.py
 TODO
+ugly_hacks/santiago.html
 \#*
 .#*

ugly_hacks/santiago.py

@@ -8,19 +8,16 @@ Santiagi" or "Santiago's Dance").  The idea is that systems can share
 identification information without ever revealing their location (where in the
 world is Santiago?).
 
-This *is* signed identity statements, just on a
+This *is* signed identity statements, just on a service per person level.
-service-by-service-for-individual-people level.  Granularity, bitches!
-
-hackyhackyhacky hacks, but the right structure sans details (a tracer-bullet
-structure, see "The Pragmatic Programmer", Hunt & Thomas, 2000, pg. 48).  If
-you have a copy of TPP around, also see pgs: 111 120 161 186 192 238 248 258.
-
-This file is distributed under the GPL, version 3 or later, at your discretion.
 
                                   Santiago, he
                           smiles like a Buddah, 'neath
                                his red sombrero.
 
+This file is distributed under the GNU Affero General Public License, Version 3
+or later.  A copy of GPLv3 is available [from the Free Software Foundation]
+<http://www.gnu.org/licenses/gpl.html>.
+
 """
 
 # If you're crazy like me, you can turn this script into its own
@@ -43,6 +40,8 @@ from simplejson import JSONEncoder
 DEBUG = 0
 encoder = JSONEncoder()
 
+# random setup tools
+# ==================
 
 if DEBUG:
     for x in range(0, 3):
@@ -73,6 +72,9 @@ if cherrypy.__version__ < "3.2":
     fix_old_cherrypy()
 
 
+# actual Santiago
+# ===============
+
 class Santiago(object):
     """Santiago's base class, containing listener and sender defaults."""
 
@@ -210,7 +212,7 @@ class SantiagoListener(Santiago):
 
 class SantiagoSender(Santiago):
     """Sendss the Santiago request to a Santiago service."""
-    
+
     def __init__(self, instance, proxy):
         super(SantiagoSender, self).__init__(instance=instance)
 

ugly_hacks/santiago.rst

@@ -7,10 +7,19 @@
 Less Discoverable Discovery?
 ----------------------------
 
+This file is distributed under a Creative Commons Attribution-ShareAlike 3.0
+Unported, Version 3 license. This CC-By-SA license is available in both full_
+and summarized_ versions from Creative Commons.  This file is also distributed
+under the `GNU Free Documentation License`_, version 1.3 or later.
+
+.. _full: http://creativecommons.org/licenses/by-sa/3.0/legalcode
+.. _summarized: http://creativecommons.org/licenses/by-sa/3.0/
+.. _GNU Free Documentation License: http://www.gnu.org/licenses/fdl.html
+
 Disclaimer
 ==========
 
-**The following is an ugly hack.  Beware!**
+**The following is an incomplete hack.  Beware!**
 
 Santiago's Map
 ==============
@@ -41,10 +50,11 @@ manage, but they're implied by and built on the system above.
 Our Cheats
 ----------
 
-Right now, we're cheating.  We start by pairing boxes, exchanging both
+Right now, we're cheating.  There's no discovery.  We start by pairing boxes,
-box-specific PGP keys and Tor Hidden Service IDs.  This allows boxes to trust
+exchanging both box-specific PGP keys and Tor Hidden Service IDs.  This allows
-and communicate with one another, regardless of any adverserial interference.
+boxes to trust and communicate with one another, regardless of any adverserial
-Or, rather, any adverserial interference will be obvious and ignorable.
+interference.  Or, rather, any adverserial interference will be obvious and
+ignorable.
 
 Message Exchange
 ----------------