From c0ac0046c15f966ad0afe2e3abd3c996a938b59e Mon Sep 17 00:00:00 2001
From: dinedine <didier.lafforgue@gmail.com>
Date: Fri, 31 Dec 2010 19:31:22 +0100
Subject: [PATCH] polishing + bump version (beta yeaaah)

---
 config/initializers/locomotive.rb                         | 1 +
 doc/TODO                                                  | 3 +--
 lib/generators/locomotive/install/templates/locomotive.rb | 5 +++--
 lib/locomotive/version.rb                                 | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/config/initializers/locomotive.rb b/config/initializers/locomotive.rb
index 1f49bf0c..52d8d5ea 100644
--- a/config/initializers/locomotive.rb
+++ b/config/initializers/locomotive.rb
@@ -8,6 +8,7 @@ Locomotive.configure do |config|
   # If you use locomotive for a single site in Heroku, use "heroku.com" as default domain name.
   # Your heroku app name (<app_name>.heroku.name) will be used as the sub domain name in Locomotive
   # during the installation wizzard.
+  # ex: config.default_domain = Rails.env.production? ? 'heroku.com' : 'example.com'
   config.default_domain = 'example.com'
 
   # configure how many items we display in sub menu in the "Contents" section.
diff --git a/doc/TODO b/doc/TODO
index 051c1bb8..87361836 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -7,7 +7,7 @@ x rspec 2.3
 x ruby 1.9.2:
   x DelayedJob not working
 x new version of Aloha-Editor
-- locomotive gem: test with staging
+x locomotive gem: test with staging
 
 BACKLOG:
 
@@ -16,7 +16,6 @@ BACKLOG:
   - editable elements should wrap a tag: div, h1, ...etc (default span)
   - edit images (upload new ones, ...etc) => wait for aloha or send them an email ?
 
-- ruby 1.9.2
 - refactor slugify method (use parameterize + create a module)
 - validation for custom fields
 - notify accounts when new instance of models (opt): none, one or many accounts. Used for contact form.
diff --git a/lib/generators/locomotive/install/templates/locomotive.rb b/lib/generators/locomotive/install/templates/locomotive.rb
index f308ee07..0588e131 100644
--- a/lib/generators/locomotive/install/templates/locomotive.rb
+++ b/lib/generators/locomotive/install/templates/locomotive.rb
@@ -6,7 +6,8 @@ Locomotive.configure do |config|
   # If you use locomotive for a single site in Heroku, use "heroku.com" as default domain name.
   # Your heroku app name (<app_name>.heroku.name) will be used as the sub domain name in Locomotive
   # during the installation wizzard.
-  config.default_domain = 'mydomain.com'
+  # ex: config.default_domain = Rails.env.production? ? 'heroku.com' : 'example.com'
+  config.default_domain = 'example.com'
 
   # configure how many items we display in sub menu in the "Contents" section.
   config.lastest_items_nb = 5
@@ -35,4 +36,4 @@ Locomotive.configure do |config|
 
   # default locale (for now, only en and fr are supported)
   config.default_locale = :en
-end
\ No newline at end of file
+end
diff --git a/lib/locomotive/version.rb b/lib/locomotive/version.rb
index daa1e5b5..0a49314d 100644
--- a/lib/locomotive/version.rb
+++ b/lib/locomotive/version.rb
@@ -1,3 +1,3 @@
 module Locomotive #:nodoc
-  VERSION = "0.0.4.beta11"
+  VERSION = "1.0.0.0beta"
 end