Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki

CHANGELOG

@@ -16,15 +16,19 @@ New Features:
 * Rails Metal itex endpoint
 * HTML5 support
 * Support IALs on Markdown list items
-* Updated to Rails 2.3.9 and Erubis ( now at 2.6.6)
+* Updated to Rails 2.3.9 and Erubis (now at 2.6.6)
 * Updated for Rack 1.2.1, sqlite3-ruby 1.3.1
-* Manage dependencies using Bundler. Before running Instiki for the first time
+* Manages dependencies using Bundler. Before running Instiki for the first time
   (and whenever you update), run
 
      ruby bundle
      rake upgrade_instiki
 
-  from the instiki directory.
+  from the instiki directory. (You may need to run
+
+     ruby bundle exec rake upgrade_instiki
+
+  instead, if you get a complaint about your version of rake.)
 
 Bugs Fixed:
 

README

@@ -22,7 +22,7 @@ Instiki on BeOS, Amiga OS, OS2, Zeta OS and support for various exotic Platforms
 
 == Details
 
-You need at least Ruby Version 1.8.6, and Rubygems 1.3.6, installed on your System. The second dependency is a Database System, but don't worry, the default sqlite3 will be installed for you, if it's not already installed. You can also use any other database system (MySQL, PostgreSQL, ...) that Rails supports.
+You need at least Ruby Version 1.8.6, and Rubygems 1.3.6, installed on your System. The second dependency is a Database System, but don't worry, the default sqlite3 will be installed for you, if it's not already installed. You can also use any other database system (MySQL, PostgreSQL, ...) supported by Rails.
 
 
 === If you are on Windows

app/controllers/application_controller.rb

@@ -273,7 +273,7 @@ module VERSION #:nodoc:
     MINOR = 19
     TINY  = 0 
     SUFFIX = '(MML+)'
-    PRERELEASE =  'pre'
+    PRERELEASE =  false
     if PRERELEASE
        STRING = [MAJOR, MINOR].join('.') + PRERELEASE + SUFFIX
     else