Merge branch '2.1'

3 files changed, 44 insertions, 3 deletions

diff --git a/README.rdoc b/README.rdoc
index 08dbac1..2e79a18 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -117,6 +117,47 @@ which should produce the following:
     arcfour512: [64, 8] OpenSSL::Cipher::Cipher
     
 
+== RUNNING TESTS
+
+Run the test suite from the net-ssh directory with the following command:
+
+     ruby -Ilib -Itest -rrubygems test/test_all.rb
+
+Run a single test file like this:
+
+     ruby -Ilib -Itest -rrubygems test/transport/test_server_version.rb
+
+
+=== EXPECTED RESULTS
+
+* Ruby 1.8: all tests pass
+
+* Ruby 1.9: all tests pass
+
+* JRuby 1.5: 99% tests pass (448 tests, 1846 assertions, 1 failures)
+
+
+=== PORT FORWARDING TESTS
+
+     ruby -Ilib -Itest -rrubygems test/manual/test_forward.rb
+
+test_forward.rb must be run separately from the test suite because
+it requires authorizing your public SSH keys on you localhost.
+
+If you already have keys you can do this:
+
+     cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys
+
+If you don't have keys see:
+
+     http://kimmo.suominen.com/docs/ssh/#ssh-keygen
+
+You should now be able to login to your localhost with out
+bring prompted for a password:
+
+     ssh localhost
+
+
 == LICENSE:
 
 (The MIT License)
diff --git a/Rakefile b/Rakefile
index 7692d55..3e41be8 100644
--- a/Rakefile
+++ b/Rakefile
@@ -57,7 +57,7 @@ end
 if @spec.rubyforge_project
   desc 'Publish website to rubyforge'
   task 'publish:rdoc' => 'doc/index.html' do
-    sh "scp -rp doc/* rubyforge.org:/var/www/gforge-projects/#{name}/ssh/v2/api/"
+    sh "scp -r doc/* rubyforge.org:/var/www/gforge-projects/#{name}/ssh/v2/api/"
   end
 
   desc 'Public release to rubyforge'
diff --git a/test/README.txt b/test/README.txt
index 88a4dc3..0992e5f 100644
--- a/test/README.txt
+++ b/test/README.txt
@@ -1,4 +1,4 @@
-2010-03-16
+2011-01-19
 
 RUNNING TESTS
 
@@ -17,7 +17,7 @@ EXPECTED RESULTS
 
 * Ruby 1.9: all tests pass
 
-* JRuby 1.4: 96% tests pass (242 tests, 554 assertions, 0 failures, 8 errors)
+* JRuby 1.5: 99% tests pass (448 tests, 1846 assertions, 1 failures)
 
 
 PORT FORWARDING TESTS