Rename contest themes, put carls as new default

diff --git a/docs/NEWS b/docs/NEWS
index 6c6a7edcb5461ec85bc08d47ec31f1652337c3a6..18ac2fd6627608783ab4aa95f1347baac28fa6ec 100644 (file)
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -1,13 +1,10 @@
 # $Id$
 
-Version 1.1-alpha1()
-------------------------------------------------------------------------
-
-   * Added first patches for image directory permissions. (garvinhicking)
-
 Version 1.0-beta2 ()
 ------------------------------------------------------------------------
 
+   * Added new competition theme winner by Carl Galloway
+
    * Enable Spamblock plugin to allow registered authors to not enter
      captchas and other spamchecks (garvinhicking)
 

diff --git a/serendipity_config.inc.php b/serendipity_config.inc.php
index 307f4751bad75fece1f8d70d4fdd9a0d0bbb00b5..3b801f1316372a1fc7e435cf9473439e325372d2 100644 (file)
--- a/serendipity_config.inc.php
+++ b/serendipity_config.inc.php
@@ -21,10 +21,10 @@ if (IS_installed === true && !defined('IN_serendipity')) {
 include_once(S9Y_INCLUDE_PATH . 'include/compat.inc.php');
 
 // The version string
-$serendipity['version']         = '1.1-alpha1';
+$serendipity['version']         = '1.0-beta2';
 
 // Name of folder for the default theme
-$serendipity['defaultTemplate'] = 'default';
+$serendipity['defaultTemplate'] = 'carl_contest';
 
 // Setting this to 'false' will enable debugging output. All alpa/beta/cvs snapshot versions will emit debug information by default. To increase the debug level (to enable Smarty debugging), set this flag to 'debug'.
 $serendipity['production']      = (preg_match('@\-(alpha|beta|cvs)@', $serendipity['version']) ? false : true);

diff --git a/templates/carl_contest/info.txt b/templates/carl_contest/info.txt
index 1db89b4195c1ae9e8ea1a68c08e8a6344f24669b..42270afef9af17147254c12d1d46047dfaec6496 100644 (file)
--- a/templates/carl_contest/info.txt
+++ b/templates/carl_contest/info.txt
@@ -1,3 +1,3 @@
-Name: #1 Carl Galloway
+Name: Serendipity v3.0
 Author: Carl Galloway
 Date: 26-01-2006

diff --git a/templates/competition/info.txt b/templates/competition/info.txt
index 13d04ed446dee4d7d0c91655b6b10016a1ed807c..3717510b8f53b2b472e6a1077d7a37d50e8ff734 100644 (file)
--- a/templates/competition/info.txt
+++ b/templates/competition/info.txt
@@ -1,4 +1,4 @@
-Name: #2 David Cummins
+Name: Coffee Cup
 Author: David Cummins
 Date: 6-2-06
 

diff --git a/templates/contest/info.txt b/templates/contest/info.txt
index 7b40dcd5a15d989b365f8ea005be90f4c08a2f27..5149c7794c9b81ea934e514d8ef918cc26e4670b 100644 (file)
--- a/templates/contest/info.txt
+++ b/templates/contest/info.txt
@@ -1,4 +1,4 @@
-Name: #3 Garvin Hicking
+Name: Blue Streak
 Author: Garvin Hicking
 Date: 2005-02-15
 Require Serendipity: 0.8