Soks 0.0.6 → 0.0.7

data/README.txt

@@ -44,6 +44,8 @@ h2. UPGRADE
 
 If you already have a previous version of soks then to upgrade, run @soks-create-wiki.rb --destination-dir=path/to/your/wiki@ and it will guide you through the upgrade.
 
+Note that if you were using the multi page index class before, you will need to manually delete all the old index pages (@rm content/Site%20Index*@).  The new pages will be created automatically.
+
 h2. FEATURES
 
 # Runs on its own webrick server (no independent web server required)
@@ -62,11 +64,13 @@ I suspect there are many, as befits its version number.  In particular it has:
 * Does not permit browsers to cache pages
 * Not user friendly in the way it handles simultaneous edits of a page (last person to save wins)
 * Some bugs in layout and formatting of text.
+* RSS feed does not completely validate
 
 See http://www.soks.org/wiki/KnownBugs for details.
 
 h2. RELEASES
 
+# 2005 Mar 21 - soks-0.0.7 - Fifth public release (alpha)
 # 2005 Mar 15 - soks-0.0.6 - Fourth public release (alpha)
 # 2005 Feb 12 - soks-0.0.5 - Third public release (alpha)
 # 2005 Jan 24 - soks-0.0.4 - Second public release  (alpha)

data/lib/helpers/default-helpers.rb

@@ -48,9 +48,12 @@ end
 class AutomaticSummary
 	
 	DEFAULT_SETTINGS = {
-	 	:regexp_for_title => /.*/, # These three regexps act as an AND
+	 	:regexp_for_title => /.*/, # These six regexps act as an AND, with the exclude three acting as NOT their contents
 		:regexp_for_author => nil, 
 		:regexp_for_content => nil,
+		:regexp_to_exclude_title => nil,
+		:regexp_to_exclude_author => nil,
+		:regexp_to_exclude_content => nil,
 		:max_pages_to_show => nil,
 		:pagename => 'Summary',
 		:author => 'AutomaticSummary',
@@ -61,6 +64,7 @@ class AutomaticSummary
 		:include_metadata => false, # Includes author and time in summary
 		:summarise_revisions => false, # If true, then can contain several revisions for same page
 		:remove_deleted_pages => true, # If false will keep references to deleted pages
+		:merge_revisions => false, # If true, repeats with the same author will be merged
 	}
 
 	attr_reader :settings, :pages_in_summary
@@ -70,53 +74,72 @@ class AutomaticSummary
 		setup_list
 		scan_for_pages_to_summarise_in wiki
 		render_summary
-		start_watching_wiki wiki
+		start_watching wiki
 	end
 	
 	def check_whether_to_add_page( page, revision )
-		return if page.name == @settings[:pagename]
-		if summarise? page
-			@pages_in_summary.add( @settings[:summarise_revisions] ? revision : page ) 
-			render_summary
-		end
+		return unless summarise?( page )
+		remove_previous_revisions( page, revision ) if @settings[:merge_revisions]
+		@pages_in_summary.add( @settings[:summarise_revisions] ? revision : page ) 
+		render_summary
 	end
 	
 	def check_whether_to_remove_page( page, revision )
 		return unless @settings[:remove_deleted_pages]
-		render_summary if @pages_in_summary.remove( @settings[:summarise_revisions] ? revision : page )	
+		return unless summarise?( page )
+		return unless @pages_in_summary.remove( @settings[:summarise_revisions] ? revision : page )
+		render_summary
 	end
 	
 	private
 	
 	def summarise?( page )
+		return false if page.name == @settings[:pagename]
 		return false if @settings[:regexp_for_title] && page.name !~ @settings[:regexp_for_title] 
 		return false if @settings[:regexp_for_author] && page.author !~ @settings[:regexp_for_author] 
 		return false if @settings[:regexp_for_content] && page.content !~ @settings[:regexp_for_content]
+		return false if @settings[:regexp_to_exclude_title] && page.name =~ @settings[:regexp_to_exclude_title] 
+		return false if @settings[:regexp_to_exclude_author] && page.author =~ @settings[:regexp_to_exclude_author] 
+		return false if @settings[:regexp_to_exclude_content] && page.content =~ @settings[:regexp_to_exclude_content]
 		return true 
 	end
 	
 	def scan_for_pages_to_summarise_in( wiki )
 		wiki.each( @settings[:remove_deleted_pages] ) do |name,page| 
-			next if page.name == @settings[:pagename]
-			next unless summarise? page
 			if @settings[:summarise_revisions]
-				page.revisions.each { |revision| @pages_in_summary.add revision }
+				scan_for_revisions_to_summarise_in( page )
 			else
+				next unless summarise? page
 				@pages_in_summary.add page
 			end
 		end
 	end
 	
-	def render_summary
-		if @wiki.exists? @settings[:pagename]
-			old_page = @wiki.page( @settings[:pagename] )
-			if old_page.textile =~ /(.*?<automaticsummary>).*?(<\/automaticsummary>.*)/mi
-				content, tail = $1, $2
-			end
+	def scan_for_revisions_to_summarise_in( page )
+		page.revisions.each do |revision| 
+			next unless summarise? revision
+			remove_previous_revisions( page, revision ) if @settings[:merge_revisions]
+			@pages_in_summary.add revision 
 		end
-		content ||= "h2. #{@settings[:pagename]}\n\np{font-size: x-small;}. #{@settings[:pagename]} was created automatically from pages whose title matches ==#{@settings[:regexp_for_title].inspect}==.\n\n<automaticsummary>"
-		tail ||= "</automaticsummary>"
-		content << "\n\n"
+	end
+	
+	def remove_previous_revisions( page, revision )
+		revision.number.downto(0) do |previous_number|
+			previous_revision = page.revisions.at( previous_number )
+			break unless previous_revision.author == revision.author
+			@pages_in_summary.remove( previous_revision )
+		end
+	end
+	
+	def render_summary
+		@wiki.page( @settings[:pagename] ).textile =~ /(.*?<automaticsummary>).*?(<\/automaticsummary>.*)/mi
+		top = $1 || "h2. #{@settings[:pagename]}\n\np{font-size: x-small;}. #{@settings[:pagename]} was created automatically from pages whose title matches ==#{@settings[:regexp_for_title].inspect}==.\n\n<automaticsummary>"
+		tail = $2 || "</automaticsummary>"
+		@wiki.revise( @settings[:pagename], top + render_list + tail , @settings[:author] )
+	end
+	
+	def render_list
+		content = "\n\n"
 		if @pages_in_summary.empty?
 			content << "No pages found to summarise"
 		elsif @renderer
@@ -127,12 +150,10 @@ class AutomaticSummary
 			@pages_in_summary.each { |page| content << render_link_to(page) }
 		end
 		content << "\n\n"
-		content << tail
-		@wiki.revise( @settings[:pagename], content , @settings[:author] )
 	end
 	
 	def render_page( page )
-		"<div class='subpage'>\n[[#{page.name}]] #{ @settings[:include_metadata] ? render_meta_data( page ) : "" }<br />\n\n#{page.textile.first_lines( @settings[:lines_to_include] ).close_unmatched_html}\n\np(more). [[(more) => #{page.name}]]\n\n</div>\n" 
+		"<div class='subpage'>\n[[ #{page.name} ]] #{ @settings[:include_metadata] ? render_meta_data( page ) : "" }<br />\n\n#{page.textile.first_lines( @settings[:lines_to_include] ).close_unmatched_html}\n\np(more). [[(more) => #{page.name}]]\n\n</div>\n" 
 	end
 	
 	def render_link_to( page )
@@ -144,42 +165,57 @@ class AutomaticSummary
 	end
 	
 	def setup_list
-		@pages_in_summary = FiniteUniqueList.new( @settings[:max_pages_to_show], 
-																@settings[:reverse_sort], 
-																@settings[:sort_pages_by] )
+		@pages_in_summary = FiniteUniqueList.new( @settings[:max_pages_to_show], @settings[:reverse_sort], @settings[:sort_pages_by] )
 	end
 	
-	def start_watching_wiki( wiki )
+	def start_watching( wiki )
 		wiki.watch_for( @settings[:only_new_pages] == true ? :page_created : :page_revised ) { |event, page, revision| check_whether_to_add_page( page, revision ) }
 		wiki.watch_for( :page_deleted ) { |event, page, revision| check_whether_to_remove_page( page, revision ) } if @settings[:remove_deleted_pages]
 	end
 	
-end 
+end
 
-class AutomaticRecentChanges
+class AutomaticRecentChanges < AutomaticSummary
+	
+	def initialize( wiki, changes = 200, title_regexp = /.*/, pagename = "Recent Changes to This Site", author = "AutomaticRecentChanges", exclude_automatic_helpers = true, merge_revisions = true )
+			super( wiki, { 	:pagename => pagename,
+							:regexp_for_title => title_regexp,
+							:regexp_to_exclude_author => exclude_automatic_helpers && /^Automatic/i,
+							:max_pages_to_show => changes,
+							:author => author,
+							:only_new_pages => false,
+							:sort_pages_by => :revised_on,
+							:summarise_revisions => true,
+							:reverse_sort => true,
+							:remove_deleted_pages => false,
+							:merge_revisions => merge_revisions,
+						} )		
+	end
 	
-	def initialize( wiki, changes = 200, pagename = "Recent Changes to This Site", author = "AutomaticRecentChanges" )
-			AutomaticSummary.new( wiki, { :pagename => pagename,
-											:max_pages_to_show => changes,
-											:author => author,
-											:only_new_pages => false,
-											:sort_pages_by => :revised_on,
-											:include_metadata => true,
-											:summarise_revisions => true,
-											:reverse_sort => true,
-											:remove_deleted_pages => false,
-													} )		
+	def render_list
+		content = "<div class='recentchanges'>\n\nh2. Today\n\n"
+		previous_time = Time.now
+		@pages_in_summary.each do |revision| 
+			unless revision.revised_on.same_day?( previous_time )
+				content << "\nh2. #{revision.revised_on.strftime('%a %d %b %Y')}\n\n"
+				previous_time = revision.revised_on
+			end
+			content << "* #{revision.revised_on.strftime('%H:%M')} - [[#{revision.name}]] revised by #{revision.author}\n"	
+		end
+		content << "\n\n</div>"
 	end
+	
 end
 
 class AutomaticOnePageIndex
 	
 	def initialize( wiki, pagename = "Site Index", author = "AutomaticIndex"  )
 		AutomaticSummary.new( wiki, { 	:pagename => pagename,
-													:author => author,
-													:only_new_pages => true,
-													:sort_pages_by => :name_for_index,
-													} )
+										:regexp_to_exclude_title => /#{Regexp.escape(pagename)}/i,
+										:author => author,
+										:only_new_pages => true,
+										:sort_pages_by => :name_for_index,
+										} )
 	end	
 	
 end
@@ -190,20 +226,22 @@ class AutomaticMultiPageIndex
 		content = "h1. #{pageroot}\n\n"
 		('A'..'Z').each do |letter|
 			AutomaticSummary.new( wiki, {  	:regexp_for_title => /^#{letter}.*/i,
-														:pagename => "#{pageroot} #{letter}",
-														:author => author,
-														:only_new_pages => true,
-														:sort_pages_by => :name_for_index,
-														} )
-			content << "* #{pageroot} #{letter}\n"
+											:pagename => "#{pageroot} #{letter}.",
+											:regexp_to_exclude_title => /^#{Regexp.escape(pageroot)} ([a-z]|Other)\./i,
+											:author => author,
+											:only_new_pages => true,
+											:sort_pages_by => :name_for_index,
+											} )
+			content << "* #{pageroot} #{letter}.\n"
 		end
 		AutomaticSummary.new( wiki, {  	:regexp_for_title => /^[^A-Za-z].*/,
-													:pagename => "#{pageroot} Other",
-													:author => author,
-													:only_new_pages => true,
-													:sort_pages_by => :name_for_index,
-													} )
-	 	content << "* #{pageroot} Other\n"
+										:pagename => "#{pageroot} Other.",
+										:regexp_to_exclude_title => /^#{Regexp.escape(pageroot)} ([a-z]|Other)\./i,
+										:author => author,
+										:only_new_pages => true,
+										:sort_pages_by => :name_for_index,
+										} )
+	 	content << "* #{pageroot} Other.\n"
 		wiki.revise( pageroot, content, author )
 	end	
 	

data/lib/helpers/mail2wiki-helper.rb

@@ -1,5 +1,12 @@
 require 'net/imap'
 
+# From Dave Burt on comp.lang.ruby
+class String
+ def from_quoted_printable
+   self.gsub(/\r\n/, "\n").unpack("M").first
+ end
+end
+
 class Message
 	
 	attr_reader :message_id, :subject, :sender_name, :sender_email, :date, :text
@@ -15,12 +22,7 @@ class Message
 	end
 	
 	def plain_text_content_from_message( id )
-		text = @imap.fetch( id, 'BODY[1]' ).first.attr['BODY[1]']
-		text.gsub!(/\r\n/,"\n")
-		text.gsub!(/\r/,"\n")
-		text.gsub!(/=\n/,'')
-		#text.gsub!(/((?:=[0-9a-fA-F]{2})+)/n) { [$1.delete('=')].pack('H*') }
-	
+		text = @imap.fetch( id, 'BODY[1]' ).first.attr['BODY[1]'].from_quoted_printable
 		text
 	end
 	

data/lib/soks-servlet.rb

@@ -16,7 +16,8 @@ class WikiServlet < WEBrick::HTTPServlet::AbstractServlet
 			doAttachment( request, response, request.path[1..-1] )
 		when /\/(\w+?)\/(.+)/ # If request of the form /verb/pagename then doVerb on this class
 			verb, pagename = $1, make_pagename_valid( $2 )
-			authenticate request, response	
+			authenticate request, response
+			make_username_valid( request )	
 			if self.respond_to?( "do#{verb.capitalize}" )
 				self.send( "do#{verb.capitalize}", request, response, pagename, request.user )
 			else
@@ -108,22 +109,21 @@ class WikiServlet < WEBrick::HTTPServlet::AbstractServlet
 		
 	def upload_file_data( upload_data  )
 		path = "#{$SETTINGS[:root_directory]}/attachment/"
-		filename = unique_filename( path , upload_data.filename )
+		filename = File.unique_filename( path , upload_data.filename )
 		File.open( File.join( path, filename ), 'wb' ) { |file| upload_data.list.each { |data| file << data } }
 		"/attachment/#{filename}"
 	end
 	
-	def unique_filename( path, filename )
-		filename.gsub!(' ','') # Unfortunately no spaces permitted in redcloth links
-		return filename unless File.exist? File.join( path, filename ) # Leave as is, if doesn't exist
-		name, counter, extension = File.basename( filename, '.*'), 1, File.extname( filename )
-		counter += 1 while File.exist? File.join( path, "#{name}#{counter}#{extension}" )
-		return "#{name}#{counter}#{extension}"
-	end
-	
 	# Certain characters cause problems in titles, so delete
 	def make_pagename_valid( pagename )
-		pagename.tr('\[]?{}&^`<>','')
+		pagename.to_valid_pagename
+	end
+	
+	# Because the username is also used as a page title, also delete troublesome characters from them
+	# and make sure the name doesn't start with Automatic
+	def make_username_valid( request )
+		request.user = request.user.to_valid_pagename
+		request.user = "External #{request.user}" if request.user =~ /^Automatic/i
 	end
 end
 
@@ -134,23 +134,26 @@ def start_wiki( settings = {}, &automatic_agents )
 	
 	wiki = Wiki.new( "#{$SETTINGS[:root_directory]}/content" )
 	view = View.new( wiki, $SETTINGS[:name] )
-
+	
 	Thread.new( automatic_agents, wiki, view ) do |block, wiki, view|
+		$LOG.info "Starting helper classes"
 		block.call( wiki, view )
+		$LOG.info "Finished starting helper classes"
 	end.priority = -2
 	
 	server = WEBrick::HTTPServer.new( { :Port => $SETTINGS[:port], 
-													:ServerType=> $SETTINGS[:server_type] 
-												} )
+										:ServerType=> $SETTINGS[:server_type] 
+										} )
 												
 	server.mount("/", WikiServlet, view, $SETTINGS  )
 
 	trap("INT") { 
-		$stderr.puts "Trying to shutdown gracefully"
+		$LOG.warn "Trying to shutdown gracefully"
 		server.shutdown 
 		wiki.shutdown
-		$stderr.puts "Shutdown."
+		$LOG.info "Shutdown."
 	}
 
+	$LOG.warn "Starting server"
 	server.start
 end

data/lib/soks-storage.rb

@@ -2,7 +2,7 @@ module WikiFlatFileStore
 
 	CONTENT_EXTENSION = '.textile'
 	REVISIONS_EXTENSION = '.yaml'
-	DEFAULT_AUTHOR = 'AutomaticImport' 
+	DEFAULT_AUTHOR = 'the import script' 
 
 	def load_all_pages
 		move_files_if_names_are_not_url_encoded
@@ -64,9 +64,9 @@ module WikiFlatFileStore
 					revisions[ array[0] ] = Revision.new( page, *array ) } 
 			}
 		rescue
-			$stderr.puts "Error loading revisions with #{$!.to_s} in file #{page.name}"
+			$LOG.error "Error loading revisions with #{$!.to_s} in file #{page.name}"
 		end
-		revisions.each_with_index { |r,i| $stderr.puts "#{page.name} missing revision #{i}" unless r }
+		revisions.each_with_index { |r,i| $LOG.error "#{page.name} missing revision #{i}" unless r }
 		revisions
 	end
 	
@@ -84,8 +84,8 @@ module WikiFlatFileStore
 	def move_files_if_names_are_not_url_encoded
 		Dir[ File.join( @folder, "*#{CONTENT_EXTENSION}" ) ].each do |filename|
 			basename = File.basename( filename, '.*')
-			next if basename.url_decode.url_encode == basename # All ok, so no worry
-			new_name = File.join( File.dirname(filename), basename.url_decode.url_encode) +  File.extname( filename) 
+			next if basename.url_decode.to_valid_pagename.url_encode == basename # All ok, so no worry
+			new_name = File.join( File.dirname(filename), File.unique_filename( File.dirname(filename), basename.url_decode.to_valid_pagename.url_encode +  File.extname( filename) ) )
 			File.rename(filename, new_name )
 		end
 	end
@@ -102,14 +102,13 @@ module WikiFlatFileStore
 	
 	# Appends the last revision onto the yaml file	
 	def save_revisions( page )
-		$stderr.puts "Saving revisions for #{page.name}"
+		$LOG.info "Saving revisions for #{page.name}"
 		File.open(filename_for_revisions( page.name ), 'a' ) do |file| 
 			YAML.dump( page.revisions.last.to_a, file )
 			file.puts # Needed to ensure that documents are separated
 		end
 	end
 	
-
 	def page_name_for( filename )
 		File.basename( filename, '.*').url_decode	
 	end

data/lib/soks-utils.rb

@@ -143,6 +143,11 @@ class String
 		end
 		text
 	end
+	
+	# Removes punctuation and spaces that can cause problems with page names
+	def to_valid_pagename
+		self.tr('\\\[]?{}&^`<>/','').strip
+	end
 end
 
 class FiniteUniqueList
@@ -217,3 +222,24 @@ class Numeric
  end
 end
 
+class Time
+
+	# Checks whether two times are on the same day
+	def same_day?( other_time )
+		return false unless other_time.year == self.year
+		return false unless other_time.yday == self.yday
+		return true
+	end
+end
+
+class File
+	
+	def self.unique_filename( path, filename )
+		filename.tr!(' ','') # Unfortunately no spaces permitted in redcloth links
+		return filename unless exist?( join( path, filename ) )# Leave as is, if doesn't exist
+		name, counter, extension = basename( filename, '.*'), 1, extname( filename )
+		counter += 1 while exist?( join( path, "#{name}#{counter}#{extension}" ) )
+		return "#{name}#{counter}#{extension}"
+	end
+
+end

data/lib/soks-view.rb

@@ -71,7 +71,7 @@ class BruteMatch
 	
 	def match( text )
 		@titles.each do |title|
-			regexp = /#{Regexp.escape(title)}/i
+			regexp = /\b#{Regexp.escape(title)}\b/i
 			page = @matches[ title ]
 			text.gsub!( regexp ) { |match| yield match, page }
 		end
@@ -222,7 +222,7 @@ class View
 
 	def view( pagename, view = 'view', person = nil )
 		page = @wiki.page pagename
-	   renderedview = redcloth( page )
+	   	renderedview = redcloth( page )
 		content_of_page = html( page.class, view, binding )
 		if should_frame? view 
 			frame_erb.result binding
@@ -269,7 +269,7 @@ class View
 	end
 		
 	def refresh_redcloth( page )
-		$stderr.puts "Refreshing #{page}"
+		$LOG.info "Refreshing #{page}"
 		@redcloth_cache[page] = "" if page.textile.strip == ""
 		@redcloth_cache[ page ] = WikiRedCloth.new( self, page, page.textile ).to_html
 	end
@@ -289,7 +289,7 @@ class View
 	end
   
 	def erb_filename( klass, view )
-		$stderr.puts "Looking for #{path_for( klass, view)}"
+		$LOG.info "Looking for #{path_for( klass, view)}"
 		 until File.exists?( path_for( klass, view ) )
 		 	if klass.superclass
 		   		klass = klass.superclass

data/lib/soks.rb

@@ -32,11 +32,12 @@ $SETTINGS = {
 	:dont_frame_templates => ['print','rss'],
 	:force_no_cache => false, # Adds headers to restrict the cacheing of pages
 	:redcloth_hard_breaks => false, # Set Redcloth to use hard breaks
+	:reload_erb_each_request => false, # False faster for production, true speeds development cycle
 	:server_type =>  WEBrick::SimpleServer, # Could be WEBrick::Daemon if you wish to fork
 	:authenticators => [ [ %r{/(view|rss|print|find|meta|attachment)/.*}, 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/newpage.js

@@ -42,9 +42,9 @@ function hotkey( event )
 
 function validateTitle( proposed_title ) 
 {
-	var illegalcharacters = /[\\\[\]\?<>&\^]/;
+	var illegalcharacters = /[\\\[\]\?<>&\^\/]/;
 	if (illegalcharacters.test( proposed_title ) == true ) 
 	{
-		alert( 'Unfortunately the characters \ [ ] ? < > & ^ in titles cause problems with Soks. Please try not to use them');
+		alert( 'Unfortunately the characters \ / [ ] ? < > & ^ in titles cause problems with Soks. Please try not to use them.');
 	}
 }

data/templates/default/attachment/stylesheet.css

@@ -159,6 +159,12 @@ pre.change {
 	height: 75%;
 }
 
+
+.help {
+	color: red;
+	text-align: center;
+}
+
 #tips h1 {
 	padding-left: 5px;
 	margin-top: 0px;
@@ -178,6 +184,10 @@ form.editpage {
 	display: inline;
 }
 
+fieldset {
+	border: none;
+}
+
 div.undochange {
 	border-top: solid 1px #AAAAAA;
 	margin-top: 10px;
@@ -199,7 +209,8 @@ div.undochange {
 	margin-top: 5px;
 }
 
-.help {
-	color: red;
-	text-align: center;
+
+.recentchanges li, .recentchanges ul  {
+	list-style-type: none;
+	padding-left: 5px;
 }

data/templates/default/content/A%20page%20with%20an%20umlaut%20%F6%20in%20its%20title.textile

@@ -0,0 +1 @@
+Test whether this works.

data/templates/default/content/All%20News.textile

@@ -4,6 +4,23 @@ p{font-size: x-small;}. All News was created automatically from pages whose titl
 
 <automaticsummary>
 
-No pages found to summarise
+<div class='subpage'>
+[[ News: Version 0.0.6 Released ]] <br />
+
+It gives me great pleasure to announce version 0.0.6 of Soks - Yet another ruby wiki. You can get it from http://rubyforge.org/frs/?group_id=481&release_id=1807 or, if you have gems, run @sudo gem install Soks@.
+
+This release fixes quite a lot of bugs, provides a few more settings that can be tweaked, and the default 'look' has been toned down. See list of changes for details, and please take a note of the known bugs.
+
+Thanks to all those that helped with bugs, suggestions and code.
+
+Grateful for feedback at tamc@rubyforge.org
+
+*WARNING;* This Bug: Internet Exploror 6.0 incompatibilities during page edits is really annoying for users of IE 6.  Temporary fixes can be found on that page, and I will make a new release soon to fix.
+
+
+p(more). [[(more) => News: Version 0.0.6 Released]]
+
+</div>
+
 
 </automaticsummary>

data/templates/default/content/Bil%20Kleb.textile

@@ -0,0 +1 @@
+A steward of "FUN3D":http://fun3d.larc.nasa.gov software development at "NASA":http://www.larc.nasa.gov.

data/templates/default/content/Bil.textile

@@ -0,0 +1 @@
+See Bil Kleb

data/templates/default/content/Bill%20Wood.textile

@@ -0,0 +1,3 @@
+Research Scientist at NASA Langley
+
+A member of the "FUN3D":http://fun3d.larc.nasa.gov Software Development Team.

data/templates/default/content/Bug%3A%20Does%20not%20make%20use%20of%20if%2Dmodified%2Dsince%20r.textile

@@ -0,0 +1 @@
+Currently tells the browser to not cache any page.  This is wasteful of bandwidth and increases server load.  Should handle the if-modified-since request headers to return 'not modified' messages instead.

data/templates/default/content/Bug%3A%20Type%20a%20title%20here.textile

@@ -0,0 +1,31 @@
+Please click in the box above and give a meaningful title, then fill out any information below that you can.  It is all optional, and I'm grateful for whatever you provide.
+
+* Your name:
+* Soks version:
+* Your operating system:
+* Your version of ruby:
+* Your browser:
+
+And please describe the problem below:
+
+
+
+
+
+
+
+
+
+And if you have any suggestions for the cause or a fix, please put it below:
+
+
+
+
+
+
+
+
+
+Thank you *very* much
+
+tamc

data/templates/default/content/How%20to%20use%20the%20keyboard%20shortcuts.textile

@@ -2,7 +2,7 @@ h1. Keyboard Shortcuts
 
 Soks has a number of keyboard short cuts.  Depending on your browser, only some of them will work:
 
-* ctrl-n : New page.  Will use whatever text you had selected as the title of the new page (definitely only works on a few browsers)
+* ctrl-n : New page.  Will use whatever text you had selected as the title of the new page (definitely only works on a few browsers[1])
 * ctrl-e: Edit page, and if you are editing:
 ** ctrl-s saves the page 
 ** ctrl-c cancels the editing
@@ -12,4 +12,6 @@ Soks has a number of keyboard short cuts.  Depending on your browser, only some
 * ctrl-i: Site Index
 * ctrl-r: Recent changes to this site
 
-Note: on Linux/Firefox, substitute "meta" or "alt" for "ctrl".
+*Note:* On Linux/Firefox and WindowsXP/IE6.0, substitute "meta" or "alt" for "ctrl".  And for WindowsXP/IE6.0, these will only move you to the link on the page -- you then have to hit enter to proceed.
+
+fn1. Does not work on Linux/Firefox1.0 or WindowsXP/IE6.0