Merge branch 'master' into irssiproxy

Conflicts:
	src/irc/proxy/listen.c

5 files changed, 39 insertions, 45 deletions

diff --git a/docs/help/in/connect.in b/docs/help/in/connect.in
index 3330966e..df50d1b9 100644
--- a/docs/help/in/connect.in
+++ b/docs/help/in/connect.in
@@ -15,6 +15,7 @@
     -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.
+    -ssl_ciphers:   SSL cipher suite preference lists.
     -noproxy:       Ignores the global proxy configuration.
     -network:       The network this connection belongs to.
     -host:          The hostname you would like to connect from.
diff --git a/docs/help/in/lastlog.in b/docs/help/in/lastlog.in
index 3815f5d2..e96e2ed5 100644
--- a/docs/help/in/lastlog.in
+++ b/docs/help/in/lastlog.in
@@ -14,6 +14,7 @@
     -clear:     Removes the previous results from the active window.
     -count:     Displays how many lines match.
     -case:      Performs a case-sensitive matching.
+    -date:      Prepends each row with the message's date
     -regexp:    The given text pattern is a regular expression.
     -word:      The text must match full words.
     -force:     Forces to display the lastlog, even if it exceeds 1000 lines.
@@ -34,7 +35,7 @@
 
     /LASTLOG holiday
     /LASTLOG 'is on vacation' 10
-    /LASTLOG -file -force ~/mike.log 'mike'
+    /LASTLOG -force -file ~/mike.log 'mike'
     /LASTLOG -hilight
     /LASTLOG -5 searchterm
 
diff --git a/docs/help/in/list.in b/docs/help/in/list.in
index 14858337..33f05e8b 100644
--- a/docs/help/in/list.in
+++ b/docs/help/in/list.in
@@ -7,8 +7,8 @@
 
     -yes:    Confirms that you want to receive a large amount of data.
 
-    The text a channel must match; if no argument is given, the list of all
-    channels will be displayed.
+    If the exact name of a channel is given, the only information about this
+    channel is requested; otherwise, a list of all channels will be displayed.
 
 %9Description:%9
 
@@ -19,7 +19,16 @@
 
     /LIST
     /LIST -yes
-    /LIST -yes *ubuntu*
+    /LIST #ubuntu
+    /LIST #*ubuntu*,>1
+
+%9Remarks:%9
+
+    Not all networks support server-side filtering and may provide a network
+    service instead; on IRCnet, you may use the ALIS service:
+
+    /QUOTE SQUERY ALIS :HELP
+    /MSG ALIS HELP
 
 %9See also:%9 QUOTE, STATS, WHOIS
 
diff --git a/docs/help/in/server.in b/docs/help/in/server.in
index f6706daf..e407b6a9 100644
--- a/docs/help/in/server.in
+++ b/docs/help/in/server.in
@@ -22,6 +22,7 @@
     -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.
+    -ssl_ciphers:      SSL cipher suite preference lists.
     -auto:             Automatically connects to the server on startup.
     -noauto:           Doesn't connect to the server on startup.
     -network:          The network the server belongs to.
diff --git a/docs/irssi.1 b/docs/irssi.1
index e86be7ca..f38b639e 100644
--- a/docs/irssi.1
+++ b/docs/irssi.1
@@ -1,12 +1,13 @@
-.TH Irssi 1 "September 2002" "Irssi IRC client"
+.TH Irssi 1 "June 2015" "Irssi IRC client"
 .SH NAME
 Irssi \- a modular IRC client for UNIX
 .SH SYNOPSIS
 .B irssi
-[-dv!?] [-c server] [-p port] [-n nickname] [-w password] [-h hostname]
+[--config=PATH] [--home=PATH] [-dv!?] [-c server] [-p port] [-n nickname]
+[-w password] [-h hostname]
 .SH DESCRIPTION
 .B Irssi
-is a modular Internet Relay Chat client. It is highly extensible and
+is a modular Internet Relay Chat client; it is highly extensible and
 very secure. Being a fullscreen, termcap based client with many
 features,
 .B Irssi
@@ -16,16 +17,15 @@ is easily extensible through scripts and modules.
 .BI "\-\-config="FILE
 use 
 .I FILE
-instead of ~/.irssi/config.
+instead of ~/.irssi/config
 .TP
 .BI "\-\-home="PATH
 .I PATH 
-specifies the home directory of Irssi.
-Default is 
+specifies the home directory of Irssi; default is 
 .BR ~/.irssi
 .TP
 .BI "\-c, \-\-connect="SERVER
-connects to 
+connect to 
 .I SERVER
 .TP
 .BI "\-w, \-\-password="PASSWORD
@@ -39,71 +39,53 @@ automatically connect to
 on server.
 .TP
 .BI "\-!, \-\-noconnect"
-disables autoconnecting.
+disable autoconnecting of servers
 .TP
 .BI "\-n, \-\-nick="NICKNAME
 specify 
 .I NICKNAME 
-as your nick.
+as your nick
 .TP
 .BI "\-h, \-\-hostname="HOSTNAME
 use
 .I HOSTNAME
-for your irc session.
+for your irc session
 .TP
 .BI "\-d, \-\-dummy"
-use dummy terminal mode.
+use dummy terminal mode
 .TP
 .BI "\-v, \-\-version"
-display the version of Irssi.
+display the version of Irssi
 .TP
 .BI "\-?, \-\-help"
-show a help message.
+show a help message
 .SH SEE ALSO
 .B Irssi
-has been supplied with a huge amount of documentation. Check /help or look
-at the files contained by /usr/share/doc/irssi*
+has a solid amount of documentation available; check /HELP or look online
+at http://www.irssi.org
 .SH FILES
 .TP
-.I /etc/irssi.conf
-Global configuration file
-.TP
 .I ~/.irssi/config
-Personal configuration file
+personal configuration file
 .TP
 .I ~/.irssi/config.autosave
-Automatic save of the personal config file when it was changed externally
+automatic save of the personal config file when it was changed externally
 .TP
 .I ~/.irssi/default.theme
-Default irssi theme
+default irssi theme
 .TP
 .I ~/.irssi/away.log
-Logged messages in away status
-.TP
-.I /usr/share/irssi/help/
-Directory including many help files
-.TP
-.I /usr/share/irssi/scripts/
-Global scripts directory
-.TP
-.I /usr/share/irssi/themes/
-Global themes directory
+logged messages in away status
 .TP
 .I ~/.irssi/scripts/
-Default scripts directory
+default scripts directory
 .TP
 .I ~/.irssi/scripts/autorun/
-Directory containing links to scripts that should be loaded
+directory containing links to scripts that should be loaded
 automatically on startup
 .TP
 .I ~/.irssi/startup
-File containing a list of commands to execute on startup
+file containing a list of commands to execute on startup
 .SH AUTHORS/CREDITS
 .B Irssi
-was written by Timo Sirainen
-.B <cras@irssi.org>
-.sp
-This manpage was written by Istvan Sebestyen
-.BR <stevee@alphanet.ch>
-and Stefan Tomanek
-.BR <stefan@pico.ruhr.de>
+was written by Timo Sirainen; this manpage was written by Istvan Sebestyen, Stefan Tomanek, Geert Hauwaerts.