minor fixes

dougbarth · May 8, 2008 · 4b905ab · 4b905ab
1 parent 991f31e
commit 4b905ab
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/History.txt b/History.txt
@@ -1,7 +1,8 @@
-== 0.3.5 2008-05-07
+== 0.3.5 ?
 
 * Adding merb:migrate recipe
 * Fixing merb monitrc
+* Added preview variables prompt
 
 == 0.3.4 2008-05-05
 

diff --git a/lib/recipes/logrotate/merb.rb b/lib/recipes/logrotate/merb.rb
@@ -7,12 +7,12 @@
     <dl>
     <dt>merb_logrotate_path</dt>
     <dd>Merb logrotate path</dd>
-    <dd class="default">Defaults to @\#{shared_path}/log/merb_*.log@</dd>
+    <dd class="default">Defaults to @\#{shared_path}/log/merb.*.log@</dd>
     </dl>
     "Source":#{link_to_source(__FILE__)}    
     DESC
     task :install do
-      fetch_or_default(:merb_logrotate_path, "#{shared_path}/log/merb_*.log")
+      fetch_or_default(:merb_logrotate_path, "#{shared_path}/log/merb.*.log")
 
       set :logrotate_name, "merb_#{application}"
       set :logrotate_log_path, merb_logrotate_path

diff --git a/website/index.txt b/website/index.txt
@@ -23,7 +23,7 @@ h2. The basics
 
 Capitate has:
 
-* Plugins to help install applications, via yum or manually unpacking, and building. Also to help upload files sanely, prompt for input, install gems, run shell scripts, etc.
+* Plugins to help install applications, via yum or manually unpacking, and building. Also to prompt for input, install gems, run shell scripts, etc.
 * Templates for init scripts and application configuration
 * Templates and recipes for common apps like monit, nginx, sphinx, mongrel, ruby and mysql
 * Common deployment setup and update_code tasks, such as symlinking in database.yml and more advanced recipes such as sphinx configuration.