Licensing foo.

LICENSE

@@ -1,25 +1,36 @@
-Copyright (c) 2011, Mozilla
+***** BEGIN LICENSE BLOCK *****
-All rights reserved.
+Version: MPL 1.1/GPL 2.0/LGPL 2.1
 
-Redistribution and use in source and binary forms, with or without
+The contents of this file are subject to the Mozilla Public License Version 
-modification, are permitted provided that the following conditions are met:
+1.1 (the "License"); you may not use this file except in compliance with 
+the License. You may obtain a copy of the License at 
+http://www.mozilla.org/MPL/
 
-    * Redistributions of source code must retain the above copyright notice,
+Software distributed under the License is distributed on an "AS IS" basis,
-      this list of conditions and the following disclaimer.
+WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-    * Redistributions in binary form must reproduce the above copyright notice,
+for the specific language governing rights and limitations under the
-      this list of conditions and the following disclaimer in the documentation
+License.
-      and/or other materials provided with the distribution.
-    * Neither the name of the copyright owner nor the names of its contributors
-      may be used to endorse or promote products derived from this software
-      without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+The Original Code is mozilla.org.
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+The Initial Developer of the Original Code is
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+Mozilla.
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+Portions created by the Initial Developer are Copyright (C) 2011
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+the Initial Developer. All Rights Reserved.
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+Contributor(s):
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+    The Mozilla Community.
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Alternatively, the contents of this file may be used under the terms of
+either the GNU General Public License Version 2 or later (the "GPL"), or
+the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+in which case the provisions of the GPL or the LGPL are applicable instead
+of those above. If you wish to allow use of your version of this file only
+under the terms of either the GPL or the LGPL, and not to allow others to
+use your version of this file under the terms of the MPL, indicate your
+decision by deleting the provisions above and replace them with the notice
+and other provisions required by the GPL or the LGPL. If you do not delete
+the provisions above, a recipient may use your version of this file under
+the terms of any one of the MPL, the GPL or the LGPL.
+
+***** END LICENSE BLOCK *****

README.md

@@ -1,23 +1,25 @@
-playdoh
+bedrock
 =======
 
-Mozilla's Playdoh is a web application template based on [Django][django].
+*bedrock* is the code name of the new mozilla.org. It is bound to be as shiny,
+awesome, and open sourcy as always. Perhaps even a little more.
+
+Stay tuned.
+
+
+Contributing
+------------
 
 Patches are welcome! Feel free to fork and contribute to this project on
-[github][gh-playdoh].
+[github][gh-bedrock].
 
-Full [documentation][docs] is available as well.
+[gh-bedrock]: https://github.com/mozilla/bedrock
-
-
-[django]: http://www.djangoproject.com/
-[gh-playdoh]: https://github.com/mozilla/playdoh
-[docs]: http://mozilla.github.com/playdoh/
 
 
 License
 -------
-This software is licensed under the [New BSD License][BSD]. For more
+This software is licensed under the [MPL/GPL/LGPL tri-license][MPL]. For more
 information, read the file ``LICENSE``.
 
-[BSD]: http://creativecommons.org/licenses/BSD/
+[MPL]: http://www.mozilla.org/MPL/
 

settings.py

@@ -1,4 +1,4 @@
-# Django settings file for a project based on the playdoh template.
+# Django settings file for bedrock.
 
 import os