Apply trunk r10543, r10544, r10547, r10572, r10756, and r10757 to 0.5,

and update the changelog.

1 files changed, 7 insertions, 2 deletions

diff --git a/crawl-ref/docs/crawl_manual.txt b/crawl-ref/docs/crawl_manual.txt
index b76f5c56ee..aeaa407330 100644
--- a/crawl-ref/docs/crawl_manual.txt
+++ b/crawl-ref/docs/crawl_manual.txt
@@ -59,11 +59,12 @@ gameplay and design, to be accessed by pressing '?Q' in the game.
 
 While Dungeon Crawl is a strict single player game, you can play on a
 server together with many others. These are the relevant webpage and
-telnet addresses (akrasiac.org is situated in Northern America, while
-develz.org is located in Europe):
+telnet and ssh addresses (akrasiac.org is situated in Northern America, 
+while develz.org is located in Europe):
 
     http://crawl.akrasiac.org
     telnet://crawl.akrasiac.org
+    ssh joshua@crawl.akrasiac.org (password joshua)
 
     http://crawl.develz.org
     telnet://crawl.develz.org:345
@@ -78,6 +79,10 @@ The server carries no guarantees, though it is pretty much always
 running and no one has lost their save file yet. :) More information
 is available at the URLs above.
 
+There is also a lively IRC channel dedicated to Crawl at ##crawl on
+freenode. You can ask for help and there will always be someone to 
+supervise your game and give hints if you happen to play on a server.
+
 
 ------------------------------------------------------------------------
 B.                      STARTING SCREEN