updated

git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1092 dbcabf3a-b0e7-0310-adc4-f8d773084564

2 files changed, 33 insertions, 33 deletions

diff --git a/docs/manual.txt b/docs/manual.txt
index 89f12f98..29385247 100644
--- a/docs/manual.txt
+++ b/docs/manual.txt
@@ -131,16 +131,6 @@
 	NEWS file was getting *SO* large, I thought that I had to put all
 	these features down somewhere so people (and me!) would find them.
 
-	Besides of just telling about Irssi's features and how to use them,
-	this file also contains some not so well known IRC features, some
-	of my own experiences, opinions, etc. So even if you're an
-	experienced IRCer, you might still want to browse through this file.
-
-	NOTE: my experiences are mostly IRCnet related, and Irssi is pretty
-	much IRCnet specific too, since it's the most commonly used IRC
-	network here in Finland. IRCnet has tens of servers here where as
-	other IRC networks have maybe one or two or mostly none.
-
 
  1. Installation
 
@@ -148,21 +138,25 @@
 
 	configure script accepts these parameters:
 
-	--with-servertest       Build test irc server which you can use to
-	                        try crash irc clients
-	--with-socks            Build with socks library
-	--with-mysql=dir        Build with mysql plugin
-	--without-gtk           Build without GTK frontend
-	--without-textui        Build without text frontend
-	--without-bot           Build without irssibot
-	--without-gnome         Build without GNOME libraries
-	--without-gnome-panel   Build without GNOME panel
-	--without-imlib         Build without Imlib library (you can use only
-	                        .xpm files as backgrounds)
-	--enable-memdebug       Enable memory debugging, great for finding
-	                        memory leaks
-	--enable-gtk-hebrew     Enable Hebrew support - see README-HEBREW
-	--disable-perl          Disable Perl support
+	--enable-ipv6      Enable IPv6 support
+	--disable-curses-windows  Don't use curses windows. Use this if
+	                   screen drawing seems too slow for some reason.
+			   This option may not work properly with all
+			   curseses (solaris8).
+	--enable-memdebug  Enable memory debugging, great for finding
+	                   memory leaks
+
+	--enable-perl=static  Build Perl support statically to irssi binary
+	                   (default is to build a module)
+	--enable-perl-path=dir  Specify installation dir for Perl libraries
+	--disable-perl     Disable Perl support
+
+	--with-socks       Build with socks library
+	--with-bot         Build irssi-bot
+	--with-proxy       Build irssi-proxy module
+	--without-textui   Build without text frontend
+	--with-servertest  Build test irc server which you can use to try
+	                   crash irc clients
 
 	In short:
 
@@ -170,6 +164,7 @@
 	make
 	make install
 
+
  1.2 Command line parameters
 
 	--connect -c <server>	Connect to server at startup
@@ -177,7 +172,6 @@
 	--noconnect -!		Don't autoconnect to any servers at startup
 	--nick -n		Specify what nick to use
 	--hostname -h		Specify what host name to use
-	--no-applet		Don't start GNOME panel applet
 
 
  2. Message levels
@@ -193,8 +187,7 @@
 	NOTICES         - Notices
 	SNOTES          - Server notices
 	CTCPS           - CTCP messages
-	ACTIONS         - Actions (/me) - both private and public
-	                  (which is a bit problematic..)
+	ACTIONS         - Actions (/me) - usually ORed with PUBLIC or MSGS
 	JOINS           - Someone joins a channel
 	PARTS           - Someone parts a channel
 	QUITS           - Someone quits IRC
@@ -205,12 +198,19 @@
 	INVITES         - Invite is received
 	NICKS           - Someone changes nick
 	DCC             - DCC related messages
-        DCCMSGS		- DCC chat messages
+	DCCMSGS         - DCC chat messages
 	CLIENTNOTICES   - Irssi's notices
 	CLIENTERRORS    - Irssi's error messages
 	CLIENTCRAP      - Some other messages from Irssi
-	HILIGHT         - Hilighted text
-	NOHILIGHT       - Don't use hilighting for this message
+
+	And a few special ones that could be included with the
+	levels above:
+
+	HILIGHT         - Text is highlighted
+	NOHILIGHT       - Don't check highlighting for this message
+	NO_ACT          - Don't trigger channel activity when printing
+	                  this message
+	NEVER           - Never ignore or log this message
 
 
  3. Flood protection
diff --git a/docs/perl.txt b/docs/perl.txt
index cb51aafc..53029141 100644
--- a/docs/perl.txt
+++ b/docs/perl.txt
@@ -83,8 +83,8 @@ Here's all the levels that irssi supports currently:
 
 And a few special ones that could be included with the levels above:
 
-  HILIGHT - message is highlighted
-  NOHILIGHT - don't check highlighting from message
+  HILIGHT - text is highlighted
+  NOHILIGHT - don't check highlighting for this message
   NO_ACT - don't trigger channel activity when printing this message
   NEVER - never ignore or log this message (not a good idea usually)