Merge branch 'mod' of github.com:savetheinternet/Tinyboard into mod

4 files changed, 27 insertions, 19 deletions

diff --git a/LICENSE b/LICENSE
index 3c10b3ca..3a742f99 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,13 +1,21 @@
-Copyright (c) 2010 by Omega Software Development Group

-

-Permission to use, copy, modify, and/or distribute this software for any

-purpose with or without fee is hereby granted, provided that the above copyright

-notice and this permission notice appear in all copies.

-

-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES

-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR

-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN

-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
\ No newline at end of file
+Copyright (c) 2010-2011, Omega Software Development Group <http://omegasdg.com/>
+
+Permission to use, copy, modify, and/or distribute this software is granted, 
+provided that the following terms are obeyed.
+
+1. The above copyright notice, this permission notice, and these terms must 
+appear in all copies and modifications of this software.
+
+2. This software must not be utilized in any manner that is primarily intended 
+for or directed toward commercial advantage or private monetary compensation.
+
+3. Any changes to this software must be made easily publicly available in the 
+form of source code.
+
+THIS SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH 
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND 
+FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, 
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS 
+OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER 
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF 
+THIS SOFTWARE.
diff --git a/templates/index.html b/templates/index.html
index d24f5b28..6cc87fe9 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -105,6 +105,6 @@
 	Pages: {pages:

 		[<a href="{pages[link]}">{pages[num]}</a>]{!%last? }

 	}

-	<p class="unimportant" style="text-align:center;">Copyright &copy; 2010-2011 <a href="http://omegasdg.com/">OmegaSDG</a></p>

+	<p class="unimportant" style="text-align:center;">TinyBoard Software Copyright &copy; 2010-2011 <a href="http://omegasdg.com/">OmegaSDG</a></p>

 </body>

-</html>
\ No newline at end of file
+</html>

diff --git a/templates/page.html b/templates/page.html
index 5246dd62..75b9ecdd 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -11,6 +11,6 @@
 	<div class="title">{subtitle?{subtitle}}<p>{mod?<a href="?/">Return to dashboard</a>}</p></div>

 	{body}

 	<hr/>

-	<p class="unimportant" style="text-align:center;">Copyright &copy; 2010-2011 <a href="http://omegasdg.com/">OmegaSDG</a></p>

+	<p class="unimportant" style="text-align:center;">TinyBoard Software Copyright &copy; 2010-2011 <a href="http://omegasdg.com/">OmegaSDG</a></p>

 </body>

-</html>
\ No newline at end of file
+</html>

diff --git a/templates/thread.html b/templates/thread.html
index a2f61df8..bd89299d 100644
--- a/templates/thread.html
+++ b/templates/thread.html
@@ -96,6 +96,6 @@
 	</div>

 	</form>

 	<a href="{return}">[Return.]</a>

-	<p class="unimportant" style="text-align:center;">Copyright &copy; 2010-2011 <a href="http://omegasdg.com/">OmegaSDG</a></p>

+	<p class="unimportant" style="text-align:center;">TinyBoard Software Copyright &copy; 2010-2011 <a href="http://omegasdg.com/">OmegaSDG</a></p>

 </body>

-</html>
\ No newline at end of file
+</html>