From 908dee6b154d6e83add98607124896740dce0139 Mon Sep 17 00:00:00 2001
From: Will Kahn-Greene <willg@bluesock.org>
Date: Wed, 13 Apr 2011 10:13:35 -0400
Subject: [PATCH] Clarifies licensing for the project.

---
 docs/hackinghowto.rst | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/docs/hackinghowto.rst b/docs/hackinghowto.rst
index 8356f435..4586188e 100644
--- a/docs/hackinghowto.rst
+++ b/docs/hackinghowto.rst
@@ -75,17 +75,21 @@ Run::
 Creating a new file
 ===================
 
-All new files need to have the standard GNU MediaGoblin
-license/copyright header.
+All new files need to have license/copyright information.
 
-For Python files, include the license/copyright header at the top such
-that each line of the header starts with ``#``.
+The following kinds of files get the GNU AGPL header:
 
-For Jinja2 template files, FIXME.
+* Python files
+* JavaScript files
+* templates
+* other files with code in them
 
-For JavaScript files, FIXME.
+The following files get a CC BY header:
 
-For CSS files, FIXME.
+* CSS files
 
-If you're doing the copy-paste thing, make sure to update the
-copyright year.
+The following files don't get a header because that's hard, but are
+under the CC BY license:
+
+* image files
+* video files