7 files changed, 15 insertions, 9 deletions
diff --git a/docs/help/in/connect.in b/docs/help/in/connect.in
index 1c1aa2bb..3330966e 100644
--- a/docs/help/in/connect.in
+++ b/docs/help/in/connect.in
@@ -11,6 +11,7 @@
     -ssl_cert:      The SSL client certificate file.
     -ssl_pkey:      The SSL client private key, if not included in the
                     certificate file.
+    -ssl_pass:      The password for the SSL client private key or certificate.
     -ssl_verify:    Verifies the SSL certificate of the server.
     -ssl_cafile:    The file with the list of CA certificates.
     -ssl_capath:    The directory which contains the CA certificates.
diff --git a/docs/help/in/disconnect.in b/docs/help/in/disconnect.in
index ace1a3df..bd4a4e17 100644
--- a/docs/help/in/disconnect.in
+++ b/docs/help/in/disconnect.in
@@ -10,10 +10,11 @@
 
 %9Description:%9
 
-    Disconnects from one or more IRC servers; the list of all the servers you
-    are connected to can be retrieved via the SERVER command.
+    Disconnects from an IRC server; the list of all the servers you are
+    connected to can be retrieved via the SERVER command.
 
-    Use the wildcard character '*' if you want to disconnect from all servers.
+    Use the wildcard character '*' if you want to disconnect from the active
+    server.
 
 %9Examples:%9
 
diff --git a/docs/help/in/echo.in b/docs/help/in/echo.in
index a730e282..4ff23730 100644
--- a/docs/help/in/echo.in
+++ b/docs/help/in/echo.in
@@ -6,10 +6,10 @@
 %9Parameters:%9
 
     -current:    Displays the output in the active window.
-    -window:     Displays the ouput in the target window.
+    -window:     Displays the output in the target window.
     -level:      Displays the output with a given message level.
 
-    The text ouput; if no target is given, the active window will be used.
+    The text output; if no target is given, the active window will be used.
 
 %9Description:%9
 
diff --git a/docs/help/in/msg.in b/docs/help/in/msg.in
index dc70f1f3..9e0879e4 100644
--- a/docs/help/in/msg.in
+++ b/docs/help/in/msg.in
@@ -11,6 +11,9 @@
 
     The target nickname or channel and the message to send.
 
+    Use the wildcard character '*' if you want to use the active nickname or
+    channel.
+
 %9Description:%9
 
     Sends a message to a nickname or channel.
@@ -19,6 +22,7 @@
 
     /MSG mike Hi, what's up?
     /MSG #irssi I am awesome :)
+    /MSG * Do you want to build a snowman?
 
 %9See also:%9 ACTION, DCC, JOIN
 
diff --git a/docs/help/in/server.in b/docs/help/in/server.in
index d8bcb9a7..f6706daf 100644
--- a/docs/help/in/server.in
+++ b/docs/help/in/server.in
@@ -18,7 +18,7 @@
     -ssl_cert:         The SSL client certificate file.
     -ssl_pkey:         The SSL client private key, if not included in the
                        certificate file.
-    -ssl_pass:         Verifies the SSL certificate of the server.
+    -ssl_pass:         The password for the SSL client private key or certificate.
     -ssl_verify:       Verifies the SSL certificate of the server.
     -ssl_cafile:       The file with the list of CA certificates.
     -ssl_capath:       The directory which contains the CA certificates.
diff --git a/docs/perl.txt b/docs/perl.txt
index 732b73af..79ab5820 100644
--- a/docs/perl.txt
+++ b/docs/perl.txt
@@ -796,7 +796,7 @@ Query->{}
   address - Host address of the queries nick
   server_tag - Server tag used for this nick (doesn't get erased if
                server gets disconnected)
-  unwanted - 1 if the other side closed or some error occured (DCC chats)
+  unwanted - 1 if the other side closed or some error occurred (DCC chats)
 
 Query
 query_create(chat_type, server_tag, nick, automatic)
@@ -1123,7 +1123,7 @@ Netsplit->{}
 
 Netsplitserver->{}
   server - The server nick was in
-  destserver - The other server where split occured.
+  destserver - The other server where split occurred.
   count - Number of splits in server
 
 Netsplitchannel->{}
diff --git a/docs/startup-HOWTO.html b/docs/startup-HOWTO.html
index 736f25e9..30caf657 100644
--- a/docs/startup-HOWTO.html
+++ b/docs/startup-HOWTO.html
@@ -493,7 +493,7 @@ scrollback buffer. Simplest usages are</p>
 
 <pre>
 /LASTLOG word     - print all lines with "word" in them
-/LASTLOG word 10  - print last 10 occurances of "word"
+/LASTLOG word 10  - print last 10 occurrences of "word"
 /LASTLOG -topics  - print all topic changes
 </pre>