From 94c55aa016b4078dc5ea0da9a398f5e6c9f26db2 Mon Sep 17 00:00:00 2001
From: evanweaver <evanweaver@19e92222-5c0b-0410-8929-a290d50e31e9>
Date: Sun, 21 Oct 2007 04:13:37 +0000
Subject: rsync flags don't warn; grammar on homepage

git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@714 19e92222-5c0b-0410-8929-a290d50e31e9
---
 Rakefile                   | 2 +-
 site/README                | 6 ------
 site/src/default.template  | 2 +-
 test/jruby_socket.rb       | 2 +-
 test/test_uriclassifier.rb | 2 +-
 5 files changed, 4 insertions(+), 10 deletions(-)
 delete mode 100644 site/README

diff --git a/Rakefile b/Rakefile
index 8c2fcab..18fd4c2 100644
--- a/Rakefile
+++ b/Rakefile
@@ -188,7 +188,7 @@ task :gem_source => [:package_all] do
 end
 
 task :site_webgen do
-  sh "pushd site; webgen; ruby atom.rb > output/feed.atom; rsync -azv output/* rubyforge.org:/var/www/gforge-projects/mongrel/; popd"
+  sh "pushd site; webgen; ruby atom.rb > output/feed.atom; rsync -azv --no-perms --no-times output/* rubyforge.org:/var/www/gforge-projects/mongrel/; popd"
 end
 
 task :site_rdoc => [:redoc] do
diff --git a/site/README b/site/README
deleted file mode 100644
index d633e5c..0000000
--- a/site/README
+++ /dev/null
@@ -1,6 +0,0 @@
-webgen Website Template 'default'
-
-This is the default website template. It only contains the basic files and is a good
-starting place for any website.
-
-This note can be deleted!
diff --git a/site/src/default.template b/site/src/default.template
index c6433b9..098e8bf 100644
--- a/site/src/default.template
+++ b/site/src/default.template
@@ -70,7 +70,7 @@
 
       <dt><a href="http://rubyforge.org/tracker/?atid=5145&group_id=1306&func=browse"><img src="{relocatable: images/side_p2.gif}" alt="Bugs" /><br /></a></dt>
       <dd>
-      <p><b>Tracker:</b> Found a bug? Well then report it already?!</p>
+      <p><b>Tracker:</b> Found a bug? Well then report it already!</p>
       </dd>
 
       <dt><a href="http://rubyforge.org/mailman/listinfo/mongrel-users"><img src="{relocatable: images/side_p1.gif}" alt=
diff --git a/test/jruby_socket.rb b/test/jruby_socket.rb
index b06cb67..fc81368 100644
--- a/test/jruby_socket.rb
+++ b/test/jruby_socket.rb
@@ -8,7 +8,7 @@ require 'socket'
   this_client = server_socket.accept
   4.times do |n|
     begin
-      data = this_client.readpartial(4)
+      data = this_client.readpartial(2)
       puts "Server got:  #{data}"
       if n == 0
         this_client.close 
diff --git a/test/test_uriclassifier.rb b/test/test_uriclassifier.rb
index f222992..696191c 100644
--- a/test/test_uriclassifier.rb
+++ b/test/test_uriclassifier.rb
@@ -178,7 +178,7 @@ class URIClassifierTest < Test::Unit::TestCase
 
     tests.each do |uri|
       script_name, path_info, handler = uri_classifier.resolve(uri)
-      assert_equal root, script_name
+      assert_equal root, script_name, "#{uri} did not resolve to #{root}"
       assert_equal uri, path_info
       assert_equal 2, handler
     end
-- 
cgit v1.2.3-24-ge0c7