Soks 0.0.4 → 0.0.5

data/lib/soks-model.rb

@@ -60,14 +60,15 @@ class Page
   	# Revises the content of this page, creating a new revision class that stores the changes
 	def revise( new_content, author )
 		return nil if new_content == @content
-		if the_same_author_recently_revised_this_page( author )
-			changes = changes_between(  previous_content, new_content )
-			@revisions[-1] = Revision.new( self,  @revisions.length - 1, changes , author )
-		else
+		#I've abandoned this, because it tends to confuse users.
+		#if the_same_author_recently_revised_this_page( author )
+		#	changes = changes_between(  previous_content, new_content )
+		#	@revisions[-1] = Revision.new( self,  @revisions.length - 1, changes , author )
+		#else
 			changes = changes_between( @content, new_content )
 			return nil if changes.empty?
 			@revisions << Revision.new( self,  @revisions.length, changes , author ) 
-		end
+		#end
 		@content = new_content
 		@revisions.last
 	end
@@ -115,6 +116,7 @@ class Page
 		old_content.split("\n").diff( new_content.split("\n") ).map { |changeset| changeset.map { |change| change.to_a } }
 	end
 	
+	# This is no longer used, because I've found it confuses people.
 	def the_same_author_recently_revised_this_page( author )
 		return false if empty? 
 		return false unless author == self.author

data/lib/soks-servlet.rb

@@ -2,22 +2,7 @@
 require 'authenticators'
 require 'yaml'
 
-$SETTINGS = {
-	:name => 'test',
-	:description => 'A Soks Wiki',
-	:root_directory => 'soks-wiki',
-	:check_files_every => 60, # Seconds
-	:url => 'http://localhost:8000',
-	:port => 8000,
-	:dont_frame_templates => ['print','rss'],
-	:strict_html_removal => true, # True to prevent users from adding html.
-	:authenticators => [ [ %r{/(view|rss|print|find|meta)/.*}, WEBrick::HTTPAuth::NoAuthenticationRequired.new ],
-								# [ %r{/upload/.*}, WEBrick::HTTPAuth::NotPermitted.new ],
-								# [ %r{/(edit|save)/home page}, WEBrick::HTTPAuth::SiteWidePassword.new('password','You need to enter the site wide password to edit the home page') ],
-								# [ %r{/(view|edit|save)/private.*},WEBrick::HTTPAuth::BasicAuth.new( :UserDB => htpasswd, :Realm => realm ) ], # See webrick documentation
-								[ %r{.*}, WEBrick::HTTPAuth::AskForUserName.new( 'No password, just enter a name') ]						
-							 ] 
-}
+# Default settings moved to soks.rb
 
 class WikiServlet < WEBrick::HTTPServlet::AbstractServlet
 
@@ -27,6 +12,10 @@ class WikiServlet < WEBrick::HTTPServlet::AbstractServlet
 		
 	def service( request, response )
 		case request.path
+		# Redirect some requests to static file servlet
+		when '/robots.txt', '/favicon.ico' ; 
+			response.set_redirect(WEBrick::HTTPStatus::Found, "#{@wikiurl}/attachment#{request.path}")
+		# If request of the form /verb/pagename then execute the approriate method
 		when /\/(\w+?)\/(.+)/
 			verb, pagename = $1, $2
 			authenticate request, response	
@@ -35,8 +24,8 @@ class WikiServlet < WEBrick::HTTPServlet::AbstractServlet
 			else
 				response.body = @wiki.view( pagename, verb, request.user )
 			end
-		when /\/(.+)/	; redirect( response, $1, 'view' )	 # No command given
-		when "/"			; redirect( response, "Home Page", 'view' ) # No page or command given
+		when /\/(.+)/	; redirect( response, $1, 'view' )	 # No verb given
+		when "/"		; redirect( response, "Home Page", 'view' ) # No page or verb given
 		end
 				
 		response['Content-Type'] ||= "text/html"
@@ -63,7 +52,7 @@ class WikiServlet < WEBrick::HTTPServlet::AbstractServlet
 	end
 
 	def doFind( request, response, pagename, person ) 
-		response.body = @wiki.find( request.query['regex'] )	
+		response.body = @wiki.find( request.query['regex'].strip )	
 	end
 
 	def doSave( request, response, pagename, person )

data/lib/soks-view.rb

@@ -1,3 +1,16 @@
+# This module is used to extend each erb page to provide helper methods
+module ErbHelper
+	
+	def url( name, view = 'view' )
+		"#{$SETTINGS[:url]}/#{view}/#{name}"
+	end
+	
+	def file( name )
+		"#{$SETTINGS[:url]}/attachment/#{name}"
+	end
+end
+
+# This class records all the links between pages
 class Links
 	def initialize
 		@links = Hash.new
@@ -110,130 +123,55 @@ end
 # * Automaticlly links anytime the title of another page appears in the text
 # * Automatically links things that look like email addresses and urls
 class WikiRedCloth < RedCloth
-	def initialize( wiki, page, string, restrictions = [] )
-		super(string, restrictions)
+	
+	RULES = [:refs_soks_bracketed_link, :textile, :markdown, :inline_soks ]
+	
+	def initialize( wiki, page, string )
 		@wiki, @page = wiki, page
-		@rules = [ :soks, :textile ]
+		@internal_links_from_page = []
+		super(insert_sub_strings( string.dup ), [ :no_span_caps])
+	end
+	
+	def to_html
+		super( *RULES )
 	end
 		
-	def to_html( lite = nil )
-				
-        @lite = lite unless lite.nil?
-
-        # make our working copy
-        text = self.dup
-        
-        @urlrefs = {}
-        @shelf = []
-	    @internal_links_from_page = [] # NEW
-	    
-	    no_textile text
-	    insert_sub_strings text	# NEW
-		no_textile text # NEW (again in case any sub pages had it, BODGE doesn't work recursively)
-		clean_white_space text 
-		  pre_list = rip_offtags text # NEW wasteful to duplicate, but reduces overloading 	
-			
-		  hide_tags text # NEW		  	
-		  hide_textile_links text   # NEW
-		  hide_textile_image_tags text # NEW
-		  inline_soks_bracketed_link text # NEW 
-		  inline_soks_external_link text # NEW
-		  inline_soks_automatic_link text # NEW
-		  
-		  @wiki.links.set_links_from( @page, @internal_links_from_page ) # NEW
-		  unhide_textile text # NEW  
-		  smooth_offtags text, pre_list # NEW wasteful to duplicate
-		
-		incoming_entities text 
-        get_refs text 
-        inline text
-
-        unless @lite
-            fold text
-            block text
-        end
-
-        retrieve text
-
-        text.gsub!( /<\/?notextile>/, '' )
-        text.gsub!( /x%x%/, '&#38;' ) 
-        text.gsub!( /<br \/>/, "<br />\n" )
-        text.strip!
-
-		clean_html text if $SETTINGS[:strict_html_removal]
-		
+	def inline_soks( text )
+		hide_html_links text
+		hide_html_tags text 	
+		inline_soks_external_link text
+		inline_soks_automatic_link text
+		unhide text
+		@wiki.links.set_links_from( @page, @internal_links_from_page )
         text
 	end
 
 	private
+	
+	def hide_html_links( text )
+		text.gsub!(/<a.*?<\/a.*?>/i) { |m| hide m }
+	end
 
-	def hide_tags( text )
-		text.gsub!(/<.*?>/) { |m| hide_textile m }
+	def hide_html_tags( text )
+		text.gsub!(/<.*?>/) { |m| hide m }
 	end 
+	
+	def unhide( text )
+	  hidden.each_with_index do |r, i|
+         text.gsub!( / --!!#{ i + 1 }!!-- /, r ) 
+      end
+	  text
+	end
 
-    ## Dictionary describing allowable HTML
-    ## tags and attributes.
-    BASIC_TAGS = {
-        'a' => ['href', 'title'],
-        'img' => ['src', 'alt', 'title'],
-        'br' => [],
-        'i' => nil,
-        'u' => nil,
-        'b' => nil,
-        'pre' => nil,
-        'kbd' => nil,
-        'code' => ['lang'],
-        'cite' => nil,
-        'strong' => nil,
-        'em' => nil,
-        'ins' => nil,
-        'sup' => nil,
-        'sub' => nil,
-        'del' => nil,
-        'table' => [ 'class', 'style' ],
-        'tr' => [ 'class', 'style' ],
-        'td' => [ 'class', 'style' ],
-        'th' => [ 'class', 'style' ],
-        'ol' => nil,
-        'ul' => nil,
-        'li' => nil,
-        'p' => [ 'class', 'style' ],
-        'h1' => nil,
-        'h2' => nil,
-        'h3' => nil,
-        'h4' => nil,
-        'h5' => nil,
-        'h6' => nil,
-        'blockquote' => ['cite'],
-		  'div' => [ 'class', 'id', 'style' ],
-		  'span' => [ 'class', 'id','style'],
-    }
+	def hidden
+		@hidden ||= []
+	end	
+
+	def hide( text )
+		hidden << text
+		" --!!#{hidden.length}!!-- "
+	end
 
-    ## Method which cleans the String of HTML tags
-    ## and attributes outside of the allowed list.
-    def clean_html( text, tags = BASIC_TAGS )
-        text.gsub!( /<(\/*)(\w+)([^>\/]*?)( *\/*)>/ ) do
-            raw = $~
-            tag = raw[2].downcase
-            if tags.has_key? tag
-                pcs = [tag]
-                tags[tag].each do |prop|
-                    ['"', "'", ''].each do |q|
-                        q2 = ( q != '' ? q : '\s' )
-                        if raw[3] =~ /#{prop}\s*=\s*#{q}([^#{q2}]+)#{q}/i
-                            pcs << "#{prop}=\"#{$1.gsub('"', '\\"')}\"" 
-                            break
-                        end
-                    end
-                end if tags[tag]
-                "<#{raw[1]}#{pcs.join " "}#{raw[4]}>" 
-            else
-                " " 
-            end
-        end
-		text
-   end
-	
 	def insert_sub_strings( text, count = 0 )
 	  return text if count > 5 # Stops us getting locked into a cycle if people mess up the insert
 	  text.gsub!(/\[\[\s*insert (.+?)\]\]/i) do |m|
@@ -244,17 +182,17 @@ class WikiRedCloth < RedCloth
 		 end
 		insert_sub_strings( "#{inserted_page.textile}\n", count + 1 ) 
 	  end
-	  "\n\n#{text}\n\n"
+	  text
 	end		
 
 	def inline_soks_external_link( text )
-	    text.gsub!(/http:\/\/[^ \n<]+/i) 				{ |m| link m }
-	    text.gsub!(/https:\/\/[^ \n<]+/i) 				{ |m| link m }
-	    text.gsub!(/www\.[^ \n<]*/i) 					{ |m| link( "http://#{m}", m) }
-	    text.gsub!(/[A-Za-z0-9.]+?@[A-Za-z0-9.]+/)	{ |m| link( "mailto:#{m}", m) }
+	    text.gsub!(/http:\/\/\S*\w\/?/i) 				{ |m| link m }
+	    text.gsub!(/https:\/\/\S*\w\/?/i) 				{ |m| link m }
+	    text.gsub!(/www\.\S*\w\/?/i) 					{ |m| link( "http://#{m}", m) }
+	    text.gsub!(/[A-Za-z0-9.]+?@[A-Za-z0-9.]*[A-Za-z]/)	{ |m| link( "mailto:#{m}", m) }
 	end
 		
-	def inline_soks_bracketed_link( text )
+	def refs_soks_bracketed_link( text )
 		text.gsub!(/\[\[\s*(.*?)\s*(|=>\s*(.*?)\s*)\]\]/) do |m| 
      		title, pagename = $1, $3
 			pagename ||= title
@@ -281,58 +219,24 @@ class WikiRedCloth < RedCloth
 			@internal_links_from_page << @wiki.page( pagename )
 			css_class ||= ''
 		end
-		link(url_encode_pagename( pagename ),title, css_class || 'missing')
+		link( url_for(pagename), title, css_class || 'missing')
 	end
 	
 	def link( url, title = url, css_class = '' )
 		shelve "<a href='#{url}' class='#{css_class}'>#{title}</a>"
 	end
 	
-	# This makes sure punctuation can be used in the name of the page
-	# by url encoding anything that isn't a letter of a number.
-	# The complexity is to check that a command hasn't been embedded inside
-	# a pagename (e.g. /edit/home page ) in which case the command should not
-	# be encoded. 
-	def url_encode_pagename( pagename )
-		if pagename =~ /\/(\w+)\/(.*)/
-			return "/#{$1}/#{$2.url_encode}"
-		end
-		return pagename.url_encode
-	end
-	
-	def hide_textile_image_tags( text )
-		text.gsub!( IMAGE_RE ) do |match|
-			hide_textile match
-		end
-		text
-	end
-	
-	def hide_textile_links( text )
-		text.gsub!( LINK_RE ) do |match|
-			hide_textile match
-		end
-		text
-	end
-	
-	def unhide_textile( text )
-		hidden_textile.each_with_index do |r, i|
-         text.gsub!( " <$%#{ i + 1 }%$> ", r )
-      end
-		text
-	end
-	
-	def hide_textile( text )
-		hidden_textile << text
-		" <$%#{hidden_textile.length}%$> "
-	end
-	
-	def hidden_textile
-		@hidden_textile_links ||= []
+	def url_for( pagename, view = 'view' )
+		view, pagename = $1, $2 if pagename =~ /\/(\w+)\/(.*)/
+		"#{$SETTINGS[:url]}/#{view}/#{pagename}"
 	end
 	
 end
 
 class View
+
+	include ErbHelper
+
 	attr_reader :rollingmatch, :links
 
 	def initialize( wiki, name )
@@ -377,7 +281,7 @@ class View
 	
 	def move( oldpagename, person, newpagename )
 		unless newpagename == oldpagename
-			@wiki.revise( newpagename, "#{$MESSAGES[:content_moved_from]} [[#{pagename}]]", 'AutomaticPageMover')
+			@wiki.revise( newpagename, "#{$MESSAGES[:content_moved_from]} [[#{oldpagename}]]", 'AutomaticPageMover')
 			@wiki.revise( newpagename, @wiki.page( oldpagename ).content, person)
 			@wiki.revise( oldpagename, "#{$MESSAGES[:content_moved_to]} [[#{newpagename}]]", person)
 		end
@@ -414,7 +318,11 @@ class View
 	def erb_filename( klass, view )
 		$stderr.puts "Looking for #{path_for( klass, view)}"
 		 until File.exists?( path_for( klass, view ) )
-		   klass = klass.superclass
+		 	if klass.superclass
+		   		klass = klass.superclass
+		   	else
+				 raise WEBrick::HTTPStatus::NotFound
+		   	end
 	    end
 	    path_for( klass, view )
 	end

data/lib/soks.rb

@@ -2,7 +2,7 @@
 
 require 'webrick'
 require 'erb'
-require 'redcloth-2.0.11'
+require 'redcloth-3.0.3'
 require 'ftools'
 require 'diff/lcs'
 require 'diff/lcs/array'
@@ -15,7 +15,25 @@ require 'soks-storage'
 require 'soks-model'
 require 'soks-view'
 require 'soks-servlet'
-require 'soks-helpers'
+require 'helpers/default-helpers'
 
 Thread.abort_on_exception = true
 Socket.do_not_reverse_lookup = true
+
+# These are the default settings.  Can be overriden in the call to soks-servlet.rb#start_wiki
+$SETTINGS = {
+	:name => 'test',
+	:description => 'A Soks Wiki',
+	:root_directory => 'soks-wiki',
+	:check_files_every => 60, # Seconds
+	:url => 'http://localhost:8000',
+	:port => 8000,
+	:dont_frame_templates => ['print','rss'],
+	:strict_html_removal => true, # True to prevent users from adding html.
+	:authenticators => [ [ %r{/(view|rss|print|find|meta)/.*}, WEBrick::HTTPAuth::NoAuthenticationRequired.new ],
+								# [ %r{/upload/.*}, WEBrick::HTTPAuth::NotPermitted.new ],
+								# [ %r{/(edit|save)/home page}, WEBrick::HTTPAuth::SiteWidePassword.new('password','You need to enter the site wide password to edit the home page') ],
+								# [ %r{/(view|edit|save)/private.*},WEBrick::HTTPAuth::BasicAuth.new( :UserDB => htpasswd, :Realm => realm ) ], # See webrick documentation
+								[ %r{.*}, WEBrick::HTTPAuth::AskForUserName.new( 'No password, just enter a name') ]
+							 ] 
+}

data/templates/default/attachment/robots.txt

@@ -0,0 +1,5 @@
+User-agent: *
+Disallow: /edit/
+Disallow: /find/
+Disallow: /rss/
+Disallow: /print/

data/templates/default/attachment/stylesheet.css

@@ -43,6 +43,7 @@ td {
 
 img {
 	border-style: none;
+	max-width: 600px;
 }
 
 .disclaimer {

data/templates/default/content/Attached%20ruby%20logo.textile

@@ -0,0 +1 @@
+page deleted

data/templates/default/content/Attached%20test%20thing.textile

@@ -0,0 +1 @@
+content moved to [[Attached ruby logo]]

data/templates/default/content/Automatic%20Summaries.textile

@@ -61,7 +61,7 @@ AutomaticSummary.new( wiki, {
 
 You might also use it to construct a basic blog class:
 <code>
-AutomaticSummary.new( wiki, { 
+AutomaticSummary.new( wiki, {
  	:regexp_for_title => /^Blog:.*/ # Match all pages starting with blog
         :pagename => 'Recent Blog Entries',
 	:author => 'Automatic Blog Watcher',

data/templates/default/content/Bug%3A%20%5BFATAL%5D%20When%20renaming%20upload%20%2F%20picture%2.textile

@@ -0,0 +1 @@
+content moved to [[Fixed Bug: [FATAL] When renaming upload / picture pages]]

data/templates/default/content/Bug%3A%20Duplicate%20links%2Dto%20a%20page%20sometimes%20appear.textile

@@ -1 +1 @@
-On the right hand side of a page are normally links to other pages that link to this page.  In some cases these might have several copies of the same link.
+content moved to [[Fixed Bug: Duplicate links-to a page sometimes appear]]

data/templates/default/content/Bug%3A%20External%20links%20incorrectly%20include%20trailing%20pu.textile

@@ -1 +1 @@
-External links, such as www.slashdot.org incorrectly include trailing punctuation like the full stop on the end of this sentence: www.slashdot.org.
+content moved to [[Fixed Bug: External links incorrectly include trailing punctuation]]

data/templates/default/content/Bug%3A%20No%20robots%2Etxt%20or%20favicon%2Eico.textile

@@ -1 +1 @@
-By default no robots.txt or favicon.ico (and no way of including favicon.ico at all?)
+content moved to [[Fixed Bug: No robots.txt or favicon.ico]]

data/templates/default/content/Bug%3A%20Page%20titles%20cannot%20have%20html%20tags%20in%20them.textile

@@ -1 +1 @@
-Any page that has anything like an html tag <pre><html></pre> or whatever cannot be autolinked, and if a forced link is made then server errors occur.
+page deleted

data/templates/default/content/Bug%3A%20Punctuation%20in%20page%20titles%20still%20problematic.textile

@@ -0,0 +1,7 @@
+Not sure if this is general, but if using apache to proxy forward onto the webrick server (as occurs on http://soks.counsell.org ), punctuation in the title sometimes stops apache from forwarding the request.
+
+E.g. Bug: [FATAL] When renaming upload / picture pages exists, but apache doesn't even pass the request 
+
+To be specific:
+
+Slashes, and colons definitely work, quesion marks and square brackets definitely don't.  Others sometimes work. 

data/templates/default/content/Bug%3A%20Search%20includes%20leading%20and%20trailing%20spaces.textile

@@ -0,0 +1 @@
+content moved to [[Fixed Bug: Search includes leading and trailing spaces]]

data/templates/default/content/Bug%3A%20Search%20inluced%20leading%20and%20trailing%20spaces.textile

@@ -0,0 +1 @@
+content moved to [[Bug: Search includes leading and trailing spaces]]

data/templates/default/content/Bug%3A%20no%20superclass%20method%20%60%5Fdeprecated%5Fbase64.textile

@@ -0,0 +1 @@
+content moved to [[Fixed Bug: no superclass method `_deprecated_base64]]

data/templates/default/content/Bug%3A%20notextile%20does%20not%20prevent%20page%20inserts.textile

@@ -0,0 +1 @@
+Page inserts like @[ [insert other page]]@ should not insert another page if they are surrounded by notextile tags (or code, or pre?).  

data/templates/default/content/Fixed%20Bug%3A%20%5BFATAL%5D%20When%20renaming%20upload%20%2F%20p.textile

@@ -0,0 +1,34 @@
+Fixed in v-0-0-5
+
+<pre>
+ERROR NoMethodError: undefined method `pagename' for #<Wiki:0x2ae7c94c>
+        /usr/local/lib/ruby/gems/1.8/gems/Soks-0.0.4/lib/soks-view.rb:441:in `send'
+        /usr/local/lib/ruby/gems/1.8/gems/Soks-0.0.4/lib/soks-view.rb:441:in `method_missing'
+        /usr/local/lib/ruby/gems/1.8/gems/Soks-0.0.4/lib/soks-view.rb:380:in `move'
+        /usr/local/lib/ruby/gems/1.8/gems/Soks-0.0.4/lib/soks-servlet.rb:92:in `doUpload'
+        /usr/local/lib/ruby/gems/1.8/gems/Soks-0.0.4/lib/soks-servlet.rb:34:in `send'
+        /usr/local/lib/ruby/gems/1.8/gems/Soks-0.0.4/lib/soks-servlet.rb:34:in `service'
+        /usr/local/lib/ruby/1.8/webrick/httpserver.rb:97:in `service'
+        /usr/local/lib/ruby/1.8/webrick/httpserver.rb:58:in `run'
+        /usr/local/lib/ruby/1.8/webrick/server.rb:153:in `start_thread'
+        /usr/local/lib/ruby/1.8/webrick/server.rb:147:in `start'
+        /usr/local/lib/ruby/1.8/webrick/server.rb:147:in `start_thread'
+        /usr/local/lib/ruby/1.8/webrick/server.rb:97:in `start'
+        /usr/local/lib/ruby/1.8/webrick/server.rb:89:in `each'
+        /usr/local/lib/ruby/1.8/webrick/server.rb:89:in `start'                      
+        /usr/local/lib/ruby/1.8/webrick/server.rb:79:in `start'                      
+        /usr/local/lib/ruby/1.8/webrick/server.rb:79:in `start'
+        /usr/local/lib/ruby/gems/1.8/gems/Soks-0.0.4/lib/soks-servlet.rb:143:in `start_wiki'
+        start.rb:26:in `start'
+</pre>
+
+Fix is that line 380 of Soks-view.rb should be changed from:
+<code>
+@wiki.revise( newpagename, "#{$MESSAGES[:content_moved_from]} [[#{pagename}]]", 'AutomaticPageMover')
+<code>
+To:
+<code>
+@wiki.revise( newpagename, "#{$MESSAGES[:content_moved_from]} [[#{oldpagename}]]", 'AutomaticPageMover')
+<code>
+
+Will fix in the next release

data/templates/default/content/Fixed%20Bug%3A%20Duplicate%20links%2Dto%20a%20page%20sometimes%20.textile

@@ -0,0 +1,3 @@
+On the right hand side of a page are normally links to other pages that link to this page.  In some cases these might have several copies of the same link.
+
+Not seen this recently. May have been fixed when added the code to make sure two threads couldn't edit the same page at the same time.

data/templates/default/content/Fixed%20Bug%3A%20External%20links%20incorrectly%20include%20trail.textile

@@ -0,0 +1,3 @@
+External links, such as www.slashdot.org incorrectly include trailing punctuation like the full stop on the end of this sentence: www.slashdot.org.
+
+Fixed in v-0-0-5.

data/templates/default/content/Fixed%20Bug%3A%20No%20robots%2Etxt%20or%20favicon%2Eico.textile

@@ -0,0 +1,4 @@
+By default no robots.txt or favicon.ico (and no way of including favicon.ico at all?)
+
+Ok, as of v-0-0-5, these now re-direct to a robots.txt and or a favicon.ico file in the attachment directory.  This seems ok for some browsers, but not for others.  
+

data/templates/default/content/Fixed%20Bug%3A%20Search%20includes%20leading%20and%20trailing%20s.textile

@@ -0,0 +1,3 @@
+If there are any leading or trailing spaces in what is entered into the search box, then it assumes you actually wanted to search for them: e.g. Looks for 'soks ' rather than 'soks'. 
+
+Fixed in v-0-0-5

data/templates/default/content/Fixed%20Bug%3A%20no%20superclass%20method%20%60%5Fdeprecated%5Fba.textile

@@ -0,0 +1,3 @@
+This occurs in at least ruby-1.8.1-r7 (gentoo), and can be fixed by updating to 1.8.2 
+
+Hopefully this has been fixed in v-0-0-5 although I haven't checked on ruby 1.8.1

data/templates/default/content/Home%20Page.textile

@@ -2,7 +2,7 @@ h1. Congratulations, you have installed SOKS
 
 Welcome to Soks.  It is yet another wiki, written in ruby.  Please bear in mind that it is alpha, and therefore do not trust your mission critical sites to it.  Please feel free to use and adapt, the soks licence is free and liberal (although if you feel like contributing towards a new mac for the author that would be apreciated).  
 
-p{background:yellow;padding:10px;}. A limited selection of help and bug reports are included here.  For more information, and to share experiences, please visit http://soks.counsell.org
+p{background:yellow;padding:10px;}. A limited selection of help and bug reports are included here.  For more information, and to share experiences, please visit http://soks.counsell.org. If you are upgrading, you may wish to look at the list of changes.
 
 [[insert SOKS features]]
 
@@ -13,7 +13,7 @@ p{background:yellow;padding:10px;}. A limited selection of help and bug reports
 h2. Feedback
 
 * Please send me your feedback.  tamc@rubyforge.com.  
-* Or submit a bug at  http://rubyforge.org/projects/soks/.  
+* Or add to the list of known bugs.  
 * To keep track of developments, you may wish to subscribe to the mailing list at http://rubyforge.org/projects/soks.
 
 [[insert picture of a pair of soks]]

data/templates/default/content/How%20to%20administrate%20this%20wiki.textile

@@ -59,4 +59,4 @@ Open start.rb and uncomment:
 
 h2. To add a page that summarises other pages:
 
-See AutomaticSummary
+See Automatic summaries

data/templates/default/content/How%20to%20report%20a%20bug.textile

@@ -0,0 +1,8 @@
+h1. How to report a bug
+
+I really appreciate bug reports.
+
+Please go to http://soks.counsell.org and create a new page whose title starts with bug:, e.g. @bug: does not make tea@.
+
+In that page, please give as much information as you can and leave some contact details.
+

data/templates/default/content/Instructions%20and%20Howtos.textile

@@ -12,6 +12,7 @@ p{font-size: x-small;}. Instructions and Howtos was created automatically from p
 * [[ How to install Soks ]] 
 * [[ How to use the keyboard shortcuts ]] 
 * [[ How to use this wiki ]] 
+* [[ How to report a bug ]] 
 
 
 </automaticsummary>

data/templates/default/content/Known%20bugs.textile

@@ -5,12 +5,11 @@ p{font-size: x-small;}. Known bugs was created automatically from pages whose ti
 <automaticsummary>
 
 * [[ Bug: Does not make use of if-modified-since request headers ]] revised on 2005 Jan 25 18:23 by AutomaticImport
-* [[ Bug: Duplicate links-to a page sometimes appear ]] revised on 2005 Jan 25 18:23 by AutomaticImport
-* [[ Bug: External links incorrectly include trailing punctuation ]] revised on 2005 Jan 25 18:23 by AutomaticImport
 * [[ Bug: Uploads are not password protected ]] revised on 2005 Jan 25 18:23 by AutomaticImport
-* [[ Bug: Page titles cannot have html tags in them ]] revised on 2005 Jan 26 08:11 by tamc2
-* [[ Bug: No robots.txt or favicon.ico ]] revised on 2005 Jan 26 08:12 by tamc2
 * [[ Bug: GEM limits title lengths ]] revised on 2005 Jan 26 08:55 by tamc2
-
+* [[ Bug: Punctuation in page titles still problematic ]] revised on 2005 Feb 12 10:08 by tamc2
+* [[ Bug: notextile does not prevent page inserts ]] revised on 2005 Feb 12 12:00 by tamc2
 
 </automaticsummary>
+
+How to report a bug