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

CHANGELOG

@@ -5,6 +5,20 @@ N.B.: You *must* run
 
 after installing the new software, to enjoy the benefits of this new version.
 
+------------------------------------------------------------------------------
+* 0.19.2
+
+New Features:
+* MathJax rendering for non-MathML capable browsers.
+* RedCloth (Textile) upgraded to 4.x (now handled
+  by Bundler).
+
+Bugs Fixed:
+* Redirects and categories of included pages should
+  not be inherited. (Suggestion of Andrew Stacey).
+* Bug in Maruku equation handling (reported by Andrew Stacey).
+* SVG-Edit updates and bug-fixes.
+
 ------------------------------------------------------------------------------
 * 0.19.1
 

README

@@ -15,7 +15,7 @@ Instiki on BeOS, Amiga OS, OS2, Zeta OS and support for various exotic Platforms
 
 == 3 easy Steps to get the Instiki experience
 
-  Step 1. Get Ruby and Instiki, run "ruby bundle"
+  Step 1. Get Instiki and run "ruby bundle"
   Step 2. Run "instiki"
   Step 3. Chuckle... "There's no step three!" (TM)
  

UPGRADING

@@ -5,9 +5,17 @@ See the upgrading instructions
 
      http://golem.ph.utexas.edu/wiki/instiki/show/Upgrading
 
-for detailed instructions. At a minimum, you need to backup your database.
+for detailed instructions.
+
+At a minimum, you need to backup your database.
 After installing the new software and restoring your database, you need to run
 
+     ruby bundle
      rake upgrade_instiki
 
-from the commandline, to complete the upgrade.
+from the commandline, to complete the upgrade. Doing a
+
+
+     ruby bundle update
+
+will update the installed gems (used by Instiki) to the latest versions.