From c8ef0a3dd48c27ea557d006d32219e2e26c0d4bd Mon Sep 17 00:00:00 2001
From: Jacques Distler <distler@golem.ph.utexas.edu>
Date: Thu, 7 Jan 2010 00:07:10 -0600
Subject: [PATCH] Release Instki 0.18.1

Seems warranted, in light of the
Ruby 1.9 encoding issues.
---
 CHANGELOG                                 | 17 +++++++++++++++++
 app/controllers/application_controller.rb |  2 +-
 public/stylesheets/instiki.css            |  2 +-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index d11aaa77..17db3170 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,23 @@ N.B.: You *must* run
 
 after installing the new software, to enjoy the benefits of this new version.
 
+------------------------------------------------------------------------------
+* 0.18.1
+
+New Features:
+
+* (Markdown-Extra syle) fenced codeblocks. [From Jason Blevins]
+* Fortran syntax colouring. [From Jason Blevins]
+
+Bugs Fixed:
+
+* Fixed some Ruby 1.9 encoding issues, with unicode page names,
+  author names and categories.
+* Better display of inter-web wikilinks
+* various syntax-colouring fixes
+* Corrected length of wiki_references referenced_name (affects
+  MySQL users)
+
 ------------------------------------------------------------------------------
 * 0.18
 
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 45bf6908..29a0155d 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -266,7 +266,7 @@ module Instiki
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 18
-    TINY  = 0 
+    TINY  = 1 
     SUFFIX = '(MML+)'
     PRERELEASE =  false
     if PRERELEASE
diff --git a/public/stylesheets/instiki.css b/public/stylesheets/instiki.css
index 4e5c5eac..82fb1717 100644
--- a/public/stylesheets/instiki.css
+++ b/public/stylesheets/instiki.css
@@ -384,7 +384,7 @@ a.existingWikiWord[title]{
 border: 1px dashed #000;
 }
 
-.web_protected a.existingWikiWord[t, .web_normal a.existingWikiWord[title]{
+.web_protected a.existingWikiWord[title], .web_normal a.existingWikiWord[title]{
 border: none;
 }