From: root <root>
Date: Sat, 24 Dec 2005 12:55:17 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=c6517d5f2b579714122e8e87ebeb5b5a19ffe33c;p=dana%2Furxvt.git

*** empty log message ***
---

diff --git a/Changes b/Changes
index 2f9265a0..ffd8a39e 100644
--- a/Changes
+++ b/Changes
@@ -21,6 +21,7 @@ WISH: just for fun, do shade and tint with XRender.
         - bump max columns/rows to 10000 each.
         - bump max savelines to 10000000.
         - -pty-fd now passes the urxvtc fd to the urxvtd process.
+        - avoid linking against -lnsl/-lsocket/-lxpg4 unless neccessary.
         - major code cleanup (still not complete, though).
         - implement -hold option.
         - _major_ rewrite of internal buffer handling:
diff --git a/README.FAQ b/README.FAQ
index a3d87dd0..942356a1 100644
--- a/README.FAQ
+++ b/README.FAQ
@@ -1,7 +1,92 @@
 FREQUENTLY ASKED QUESTIONS
+    Isn't rxvt supposed to be small? Don't all those features bloat?
+        I often get asked about this, and I think, no, they didn't cause
+        extra bloat. If you compare a minimal rxvt and a minimal urxvt, you
+        can see that the urxvt binary is larger (due to some encoding tables
+        always being compiled in), but it actually uses less memory (RSS)
+        after startup. Even with "--disable-everything", this comparison is
+        a bit unfair, as many features unique to urxvt (locale, encoding
+        conversion, iso14755 etc.) are already in use in this mode.
+
+            text    data     bss     drs     rss filename
+           98398    1664      24   15695    1824 rxvt --disable-everything
+          188985    9048   66616   18222    1788 urxvt --disable-everything
+
+        When you "--enable-everything" (which _is_ unfair, as this involves
+        xft and full locale/XIM support which are quite bloaty inside libX11
+        and my libc), the two diverge, but not unreasnobaly so.
+
+            text    data     bss     drs     rss filename
+          163431    2152      24   20123    2060 rxvt --enable-everything
+         1035683   49680   66648   29096    3680 urxvt --enable-everything
+
+        The very large size of the text section is explained by the
+        east-asian encoding tables, which, if unused, take up disk space but
+        nothing else and can be compiled out unless you rely on X11 core
+        fonts that use those encodings. The BSS size comes from the 64k
+        emergency buffer that my c++ compiler allocates (but of course
+        doesn't use unless you are out of memory). Also, using an xft font
+        instead of a core font immediately adds a few megabytes of RSS. Xft
+        indeed is responsible for a lot of RSS even when not used.
+
+        Of course, due to every character using two or four bytes instead of
+        one, a large scrollback buffer will ultimately make rxvt-unicode use
+        more memory.
+
+        Compared to e.g. Eterm (5112k), aterm (3132k) and xterm (4680k),
+        this still fares rather well. And compared to some monsters like
+        gnome-terminal (21152k + extra 4204k in separate processes) or
+        konsole (22200k + extra 43180k in daemons that stay around after
+        exit, plus half aminute of startup time, including the hundreds of
+        warnings it spits out), it fares extremely well *g*.
+
+    Why C++, isn't that unportable/bloated/uncool?
+        Is this a question? :) It comes up very often. The simple answer is:
+        I had to write it, and C++ allowed me to write and maintain it in a
+        fraction of the time and effort (which is a scarce resource for me).
+        Put even shorter: It simply wouldn't exist without C++.
+
+        My personal stance on this is that C++ is less portable than C, but
+        in the case of rxvt-unicode this hardly matters, as its portability
+        limits are defined by things like X11, pseudo terminals, locale
+        support and unix domain sockets, which are all less portable than
+        C++ itself.
+
+        Regarding the bloat, see the above question: It's easy to write
+        programs in C that use gobs of memory, an certainly possible to
+        write programs in C++ that don't. C++ also often comes with large
+        libraries, but this is not necessarily the case with GCC. Here is
+        what rxvt links against on my system with a minimal config:
+
+           libX11.so.6 => /usr/X11R6/lib/libX11.so.6 (0x00002aaaaabc3000)
+           libc.so.6 => /lib/libc.so.6 (0x00002aaaaadde000)
+           libdl.so.2 => /lib/libdl.so.2 (0x00002aaaab01d000)
+           /lib64/ld-linux-x86-64.so.2 (0x00002aaaaaaab000)
+
+        And here is rxvt-unicode:
+
+           libX11.so.6 => /usr/X11R6/lib/libX11.so.6 (0x00002aaaaabc3000)
+           libgcc_s.so.1 => /lib/libgcc_s.so.1 (0x00002aaaaada2000)
+           libc.so.6 => /lib/libc.so.6 (0x00002aaaaaeb0000)     
+           libdl.so.2 => /lib/libdl.so.2 (0x00002aaaab0ee000)   
+           /lib64/ld-linux-x86-64.so.2 (0x00002aaaaaaab000)     
+
+        No large bloated libraries (of course, none were linked in
+        statically), except maybe libX11 :)
+
+    Does it support tabs, can I have a tabbed rxvt-unicode?
+        rxvt-unicode does not directly support tabs. It will work fine with
+        tabbing functionality of many window managers or similar tabbing
+        programs, and its embedding-features allow it to be embedded into
+        other programs, as witnessed by doc/rxvt-tabbed or the upcoming
+        "Gtk2::URxvt" perl module, which features a tabbed urxvt (murxvt)
+        terminal as an example embedding application.
+
     How do I know which rxvt-unicode version I'm using?
         The version number is displayed with the usage (-h). Also the escape
         sequence "ESC [ 8 n" sets the window title to the version number.
+        When using the urxvtc client, the version displayed is that of the
+        daemon.
 
     I am using Debian GNU/Linux and have a problem...
         The Debian GNU/Linux package of rxvt-unicode in sarge contains large
@@ -51,7 +136,7 @@ FREQUENTLY ASKED QUESTIONS
         Most likely it's the empty definition for "enacs=". Just replace it
         by "enacs=\E[0@" and try again.
 
-    "bash"'s readline does not work correctly under rxvt.
+    "bash"'s readline does not work correctly under urxvt.
     I need a termcap file entry.
         One reason you might want this is that some distributions or
         operating systems still compile some programs using the
@@ -172,7 +257,7 @@ FREQUENTLY ASKED QUESTIONS
         In that case, select a font of your taste and add it to the font
         list, e.g.:
 
-           rxvt -fn basefont,font2,font3...
+           urxvt -fn basefont,font2,font3...
 
         When rxvt-unicode sees a character, it will first look at the base
         font. If the base font does not contain the character, it will go to
@@ -467,7 +552,7 @@ FREQUENTLY ASKED QUESTIONS
         some editors prematurely may leave the mouse in mouse report mode.
         I've heard that tcsh may use mouse reporting unless it otherwise
         specified. A quick check is to see if cut/paste works when the Alt
-        or Shift keys are depressed. See rxvt(7)
+        or Shift keys are depressed. See urxvt(7)
 
     What's with this bold/blink stuff?
         If no bold colour is set via "colorBD:", bold will invert text using
@@ -532,9 +617,9 @@ FREQUENTLY ASKED QUESTIONS
            URxvt.color7:       #e1dddd
            URxvt.color15:      #e1dddd
 
-    How can I start rxvtd in a race-free way?
-        Try "rxvtd -f -o", which tells rxvtd to open the display, create the
-        listening socket and then fork.
+    How can I start urxvtd in a race-free way?
+        Try "urxvtd -f -o", which tells urxvtd to open the display, create
+        the listening socket and then fork.
 
     What's with the strange Backspace/Delete key behaviour?
         Assuming that the physical Backspace key corresponds to the
@@ -557,13 +642,13 @@ FREQUENTLY ASKED QUESTIONS
 
            # use Backspace = ^H
            $ stty erase ^H
-           $ rxvt
+           $ urxvt
 
            # use Backspace = ^?
            $ stty erase ^?
-           $ rxvt
+           $ urxvt
 
-        Toggle with "ESC [ 36 h" / "ESC [ 36 l" as documented in rxvt(7).
+        Toggle with "ESC [ 36 h" / "ESC [ 36 l" as documented in urxvt(7).
 
         For an existing rxvt-unicode:
 
@@ -599,7 +684,7 @@ FREQUENTLY ASKED QUESTIONS
         option you can use the `keysym' resource to alter the keystrings
         associated with keysyms.
 
-        Here's an example for a URxvt session started using "rxvt -name
+        Here's an example for a URxvt session started using "urxvt -name
         URxvt"
 
            URxvt.keysym.Home:          \033[1~
diff --git a/README.configure b/README.configure
index 788fbca1..79cb9c9c 100644
--- a/README.configure
+++ b/README.configure
@@ -200,7 +200,7 @@ CONFIGURE OPTIONS
           -embed, -pty-fd and -hold options
 
     --enable-iso14755 (default: on)
-        Enable extended ISO 14755 support (see rxvt(1), or doc/rxvt.1.txt).
+        Enable extended ISO 14755 support (see urxvt(1), or doc/rxvt.1.txt).
         Basic support (section 5.1) is enabled by "--enable-frills", while
         support for 5.2, 5.3 and 5.4 is enabled with this switch.
 
diff --git a/autoconf/configure.in b/autoconf/configure.in
index a2e96ea9..da11bd45 100644
--- a/autoconf/configure.in
+++ b/autoconf/configure.in
@@ -77,11 +77,11 @@ AC_AIX
 AC_ISC_POSIX
 
 dnl# FreeBSD needs to link libxpg4
-AC_CHECK_LIB(xpg4, setlocale, [LIBS="$LIBS -lxpg4"])
+AC_CHECK_FUNC(setlocale,     [], [AC_CHECK_LIB(xpg4,   setlocale,     [LIBS="$LIBS -lxpg4"])])
 
 dnl solaris needs to link libnsl and socket
-AC_CHECK_LIB(nsl, gethostbyname, [LIBS="$LIBS -lnsl"])
-AC_CHECK_LIB(socket, socket, [LIBS="$LIBS -lsocket"])
+AC_CHECK_FUNC(gethostbyname, [], [AC_CHECK_LIB(nsl,    gethostbyname, [LIBS="$LIBS -lnsl"])])
+AC_CHECK_FUNC(socket,        [], [AC_CHECK_LIB(socket, socket,        [LIBS="$LIBS -lsocket"])])
 
 dnl AC_ENABLE_SHARED(no)dnl#	libtool
 dnl AC_ENABLE_STATIC(yes)dnl#	libtool
diff --git a/configure b/configure
index c09fccd1..fa00e717 100755
--- a/configure
+++ b/configure
@@ -3614,7 +3614,99 @@ if test "$ac_cv_search_strerror" != no; then
 fi
 
 
-echo "$as_me:$LINENO: checking for setlocale in -lxpg4" >&5
+echo "$as_me:$LINENO: checking for setlocale" >&5
+echo $ECHO_N "checking for setlocale... $ECHO_C" >&6
+if test "${ac_cv_func_setlocale+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define setlocale to an innocuous variant, in case <limits.h> declares setlocale.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define setlocale innocuous_setlocale
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char setlocale (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef setlocale
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char setlocale ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_setlocale) || defined (__stub___setlocale)
+choke me
+#else
+char (*f) () = setlocale;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != setlocale;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_setlocale=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_func_setlocale=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_func_setlocale" >&5
+echo "${ECHO_T}$ac_cv_func_setlocale" >&6
+if test $ac_cv_func_setlocale = yes; then
+  :
+else
+  echo "$as_me:$LINENO: checking for setlocale in -lxpg4" >&5
 echo $ECHO_N "checking for setlocale in -lxpg4... $ECHO_C" >&6
 if test "${ac_cv_lib_xpg4_setlocale+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3681,8 +3773,102 @@ if test $ac_cv_lib_xpg4_setlocale = yes; then
   LIBS="$LIBS -lxpg4"
 fi
 
+fi
+
+
+echo "$as_me:$LINENO: checking for gethostbyname" >&5
+echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
+if test "${ac_cv_func_gethostbyname+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define gethostbyname to an innocuous variant, in case <limits.h> declares gethostbyname.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define gethostbyname innocuous_gethostbyname
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char gethostbyname (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef gethostbyname
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char gethostbyname ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_gethostbyname) || defined (__stub___gethostbyname)
+choke me
+#else
+char (*f) () = gethostbyname;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != gethostbyname;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_gethostbyname=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
+ac_cv_func_gethostbyname=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
+echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
+if test $ac_cv_func_gethostbyname = yes; then
+  :
+else
+  echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
 echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
 if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3749,7 +3935,101 @@ if test $ac_cv_lib_nsl_gethostbyname = yes; then
   LIBS="$LIBS -lnsl"
 fi
 
-echo "$as_me:$LINENO: checking for socket in -lsocket" >&5
+fi
+
+echo "$as_me:$LINENO: checking for socket" >&5
+echo $ECHO_N "checking for socket... $ECHO_C" >&6
+if test "${ac_cv_func_socket+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define socket to an innocuous variant, in case <limits.h> declares socket.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define socket innocuous_socket
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char socket (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef socket
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char socket ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_socket) || defined (__stub___socket)
+choke me
+#else
+char (*f) () = socket;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != socket;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_socket=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_func_socket=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_func_socket" >&5
+echo "${ECHO_T}$ac_cv_func_socket" >&6
+if test $ac_cv_func_socket = yes; then
+  :
+else
+  echo "$as_me:$LINENO: checking for socket in -lsocket" >&5
 echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6
 if test "${ac_cv_lib_socket_socket+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3816,6 +4096,8 @@ if test $ac_cv_lib_socket_socket = yes; then
   LIBS="$LIBS -lsocket"
 fi
 
+fi
+
 
 
 MALLOC_TYPE=S
diff --git a/doc/rxvt.7.html b/doc/rxvt.7.html
index ae573ae2..3f11938c 100644
--- a/doc/rxvt.7.html
+++ b/doc/rxvt.7.html
@@ -75,11 +75,120 @@ also available on the World Wide Web at
 <hr />
 <h1><a name="frequently_asked_questions">FREQUENTLY ASKED QUESTIONS</a></h1>
 <dl>
+<dt><strong><a name="item_isn_27t_rxvt_supposed_to_be_small_3f_don_27t_all_t">Isn't rxvt supposed to be small? Don't all those features bloat?</a></strong><br />
+</dt>
+<dd>
+I often get asked about this, and I think, no, they didn't cause extra
+bloat. If you compare a minimal rxvt and a minimal urxvt, you can see
+that the urxvt binary is larger (due to some encoding tables always being
+compiled in), but it actually uses less memory (RSS) after startup. Even
+with <code>--disable-everything</code>, this comparison is a bit unfair, as many
+features unique to urxvt (locale, encoding conversion, iso14755 etc.) are
+already in use in this mode.
+</dd>
+<dd>
+<pre>
+    text    data     bss     drs     rss filename
+   98398    1664      24   15695    1824 rxvt --disable-everything
+  188985    9048   66616   18222    1788 urxvt --disable-everything</pre>
+</dd>
+<dd>
+<p>When you <a href="#item__2d_2denable_2deverything"><code>--enable-everything</code></a> (which _is_ unfair, as this involves xft
+and full locale/XIM support which are quite bloaty inside libX11 and my
+libc), the two diverge, but not unreasnobaly so.</p>
+</dd>
+<dd>
+<pre>
+    text    data     bss     drs     rss filename
+  163431    2152      24   20123    2060 rxvt --enable-everything
+ 1035683   49680   66648   29096    3680 urxvt --enable-everything</pre>
+</dd>
+<dd>
+<p>The very large size of the text section is explained by the east-asian
+encoding tables, which, if unused, take up disk space but nothing else
+and can be compiled out unless you rely on X11 core fonts that use those
+encodings. The BSS size comes from the 64k emergency buffer that my c++
+compiler allocates (but of course doesn't use unless you are out of
+memory). Also, using an xft font instead of a core font immediately adds a
+few megabytes of RSS. Xft indeed is responsible for a lot of RSS even when
+not used.</p>
+</dd>
+<dd>
+<p>Of course, due to every character using two or four bytes instead of one,
+a large scrollback buffer will ultimately make rxvt-unicode use more
+memory.</p>
+</dd>
+<dd>
+<p>Compared to e.g. Eterm (5112k), aterm (3132k) and xterm (4680k), this
+still fares rather well. And compared to some monsters like gnome-terminal
+(21152k + extra 4204k in separate processes) or konsole (22200k + extra
+43180k in daemons that stay around after exit, plus half aminute of
+startup time, including the hundreds of warnings it spits out), it fares
+extremely well *g*.</p>
+</dd>
+<p></p>
+<dt><strong><a name="item_why_c_2b_2b_2c_isn_27t_that_unportable_2fbloated_2">Why C++, isn't that unportable/bloated/uncool?</a></strong><br />
+</dt>
+<dd>
+Is this a question? :) It comes up very often. The simple answer is: I had
+to write it, and C++ allowed me to write and maintain it in a fraction
+of the time and effort (which is a scarce resource for me). Put even
+shorter: It simply wouldn't exist without C++.
+</dd>
+<dd>
+<p>My personal stance on this is that C++ is less portable than C, but in
+the case of rxvt-unicode this hardly matters, as its portability limits
+are defined by things like X11, pseudo terminals, locale support and unix
+domain sockets, which are all less portable than C++ itself.</p>
+</dd>
+<dd>
+<p>Regarding the bloat, see the above question: It's easy to write programs
+in C that use gobs of memory, an certainly possible to write programs in
+C++ that don't. C++ also often comes with large libraries, but this is
+not necessarily the case with GCC. Here is what rxvt links against on my
+system with a minimal config:</p>
+</dd>
+<dd>
+<pre>
+   libX11.so.6 =&gt; /usr/X11R6/lib/libX11.so.6 (0x00002aaaaabc3000)
+   libc.so.6 =&gt; /lib/libc.so.6 (0x00002aaaaadde000)
+   libdl.so.2 =&gt; /lib/libdl.so.2 (0x00002aaaab01d000)
+   /lib64/ld-linux-x86-64.so.2 (0x00002aaaaaaab000)</pre>
+</dd>
+<dd>
+<p>And here is rxvt-unicode:</p>
+</dd>
+<dd>
+<pre>
+   libX11.so.6 =&gt; /usr/X11R6/lib/libX11.so.6 (0x00002aaaaabc3000)
+   libgcc_s.so.1 =&gt; /lib/libgcc_s.so.1 (0x00002aaaaada2000)
+   libc.so.6 =&gt; /lib/libc.so.6 (0x00002aaaaaeb0000)     
+   libdl.so.2 =&gt; /lib/libdl.so.2 (0x00002aaaab0ee000)   
+   /lib64/ld-linux-x86-64.so.2 (0x00002aaaaaaab000)</pre>
+</dd>
+<dd>
+<p>No large bloated libraries (of course, none were linked in statically),
+except maybe libX11 :)</p>
+</dd>
+<p></p>
+<dt><strong><a name="item_does_it_support_tabs_2c_can_i_have_a_tabbed_rxvt_2">Does it support tabs, can I have a tabbed rxvt-unicode?</a></strong><br />
+</dt>
+<dd>
+rxvt-unicode does not directly support tabs. It will work fine with
+tabbing functionality of many window managers or similar tabbing programs,
+and its embedding-features allow it to be embedded into other programs,
+as witnessed by <em>doc/rxvt-tabbed</em> or the upcoming <code>Gtk2::URxvt</code> perl
+module, which features a tabbed urxvt (murxvt) terminal as an example
+embedding application.
+</dd>
+<p></p>
 <dt><strong><a name="item_how_do_i_know_which_rxvt_2dunicode_version_i_27m_u">How do I know which rxvt-unicode version I'm using?</a></strong><br />
 </dt>
 <dd>
 The version number is displayed with the usage (-h). Also the escape
-sequence <code>ESC [ 8 n</code> sets the window title to the version number.
+sequence <code>ESC [ 8 n</code> sets the window title to the version number. When
+using the urxvtc client, the version displayed is that of the
+daemon.
 </dd>
 <p></p>
 <dt><strong><a name="item_i_am_using_debian_gnu_2flinux_and_have_a_problem_2">I am using Debian GNU/Linux and have a problem...</a></strong><br />
@@ -147,7 +256,7 @@ Most likely it's the empty definition for <code>enacs=</code>. Just replace it b
 <code>enacs=\E[0@</code> and try again.
 </dd>
 <p></p>
-<dt><strong><a name="item_bash_27s_readline_does_not_work_correctly_under_rx"><code>bash</code>'s readline does not work correctly under rxvt.</a></strong><br />
+<dt><strong><a name="item_bash_27s_readline_does_not_work_correctly_under_ur"><code>bash</code>'s readline does not work correctly under urxvt.</a></strong><br />
 </dt>
 <dt><strong><a name="item_i_need_a_termcap_file_entry_2e">I need a termcap file entry.</a></strong><br />
 </dt>
@@ -311,7 +420,7 @@ e.g.:</p>
 </dd>
 <dd>
 <pre>
-   rxvt -fn basefont,font2,font3...</pre>
+   urxvt -fn basefont,font2,font3...</pre>
 </dd>
 <dd>
 <p>When rxvt-unicode sees a character, it will first look at the base
@@ -695,7 +804,7 @@ Make sure that mouse reporting is actually turned off since killing
 some editors prematurely may leave the mouse in mouse report mode. I've
 heard that tcsh may use mouse reporting unless it otherwise specified. A
 quick check is to see if cut/paste works when the Alt or Shift keys are
-depressed. See <code>rxvt(7)</code>
+depressed. See <code>urxvt(7)</code>
 </dd>
 <p></p>
 <dt><strong><a name="item_what_27s_with_this_bold_2fblink_stuff_3f">What's with this bold/blink stuff?</a></strong><br />
@@ -779,10 +888,10 @@ me) as ``pretty girly''.</p>
    URxvt.color15:      #e1dddd</pre>
 </dd>
 <p></p>
-<dt><strong><a name="item_how_can_i_start_rxvtd_in_a_race_2dfree_way_3f">How can I start rxvtd in a race-free way?</a></strong><br />
+<dt><strong><a name="item_how_can_i_start_urxvtd_in_a_race_2dfree_way_3f">How can I start urxvtd in a race-free way?</a></strong><br />
 </dt>
 <dd>
-Try <code>rxvtd -f -o</code>, which tells rxvtd to open the
+Try <code>urxvtd -f -o</code>, which tells urxvtd to open the
 display, create the listening socket and then fork.
 </dd>
 <p></p>
@@ -813,16 +922,16 @@ be used (which may not be the same as your stty setting).</p>
 <pre>
    # use Backspace = ^H
    $ stty erase ^H
-   $ rxvt</pre>
+   $ urxvt</pre>
 </dd>
 <dd>
 <pre>
    # use Backspace = ^?
    $ stty erase ^?
-   $ rxvt</pre>
+   $ urxvt</pre>
 </dd>
 <dd>
-<p>Toggle with <code>ESC [ 36 h</code> / <code>ESC [ 36 l</code> as documented in rxvt(7).</p>
+<p>Toggle with <code>ESC [ 36 h</code> / <code>ESC [ 36 l</code> as documented in urxvt(7).</p>
 </dd>
 <dd>
 <p>For an existing rxvt-unicode:</p>
@@ -870,7 +979,7 @@ you have run ``configure'' with the <a href="#item__2d_2ddisable_2dresources"><c
 use the `keysym' resource to alter the keystrings associated with keysyms.
 </dd>
 <dd>
-<p>Here's an example for a URxvt session started using <code>rxvt -name URxvt</code></p>
+<p>Here's an example for a URxvt session started using <code>urxvt -name URxvt</code></p>
 </dd>
 <dd>
 <pre>
@@ -2835,7 +2944,7 @@ in combination with other switches) is:</p>
 <dt><strong><a name="item_iso14755">--enable-iso14755 (default: on)</a></strong><br />
 </dt>
 <dd>
-Enable extended ISO 14755 support (see rxvt(1), or
+Enable extended ISO 14755 support (see urxvt(1), or
 <em>doc/rxvt.1.txt</em>). Basic support (section 5.1) is enabled by
 <code>--enable-frills</code>, while support for 5.2, 5.3 and 5.4 is enabled with
 this switch.
diff --git a/doc/rxvt.7.man.in b/doc/rxvt.7.man.in
index de230bc1..21e398ed 100644
--- a/doc/rxvt.7.man.in
+++ b/doc/rxvt.7.man.in
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "rxvt 7"
-.TH rxvt 7 "2005-12-22" "6.0" "RXVT-UNICODE"
+.TH rxvt 7 "2005-12-24" "6.0" "RXVT-UNICODE"
 .SH "NAME"
 RXVT REFERENCE \- FAQ, command sequences and other background information
 .SH "SYNOPSIS"
@@ -158,10 +158,102 @@ also available on the World Wide Web at
 <http://cvs.schmorp.de/browse/*checkout*/rxvt\-unicode/doc/rxvt.7.html>.
 .SH "FREQUENTLY ASKED QUESTIONS"
 .IX Header "FREQUENTLY ASKED QUESTIONS"
+.IP "Isn't rxvt supposed to be small? Don't all those features bloat?" 4
+.IX Item "Isn't rxvt supposed to be small? Don't all those features bloat?"
+I often get asked about this, and I think, no, they didn't cause extra
+bloat. If you compare a minimal rxvt and a minimal urxvt, you can see
+that the urxvt binary is larger (due to some encoding tables always being
+compiled in), but it actually uses less memory (\s-1RSS\s0) after startup. Even
+with \f(CW\*(C`\-\-disable\-everything\*(C'\fR, this comparison is a bit unfair, as many
+features unique to urxvt (locale, encoding conversion, iso14755 etc.) are
+already in use in this mode.
+.Sp
+.Vb 3
+\&    text    data     bss     drs     rss filename
+\&   98398    1664      24   15695    1824 rxvt --disable-everything
+\&  188985    9048   66616   18222    1788 urxvt --disable-everything
+.Ve
+.Sp
+When you \f(CW\*(C`\-\-enable\-everything\*(C'\fR (which _is_ unfair, as this involves xft
+and full locale/XIM support which are quite bloaty inside libX11 and my
+libc), the two diverge, but not unreasnobaly so.
+.Sp
+.Vb 3
+\&    text    data     bss     drs     rss filename
+\&  163431    2152      24   20123    2060 rxvt --enable-everything
+\& 1035683   49680   66648   29096    3680 urxvt --enable-everything
+.Ve
+.Sp
+The very large size of the text section is explained by the east-asian
+encoding tables, which, if unused, take up disk space but nothing else
+and can be compiled out unless you rely on X11 core fonts that use those
+encodings. The \s-1BSS\s0 size comes from the 64k emergency buffer that my c++
+compiler allocates (but of course doesn't use unless you are out of
+memory). Also, using an xft font instead of a core font immediately adds a
+few megabytes of \s-1RSS\s0. Xft indeed is responsible for a lot of \s-1RSS\s0 even when
+not used.
+.Sp
+Of course, due to every character using two or four bytes instead of one,
+a large scrollback buffer will ultimately make rxvt-unicode use more
+memory.
+.Sp
+Compared to e.g. Eterm (5112k), aterm (3132k) and xterm (4680k), this
+still fares rather well. And compared to some monsters like gnome-terminal
+(21152k + extra 4204k in separate processes) or konsole (22200k + extra
+43180k in daemons that stay around after exit, plus half aminute of
+startup time, including the hundreds of warnings it spits out), it fares
+extremely well *g*.
+.IP "Why \*(C+, isn't that unportable/bloated/uncool?" 4
+.IX Item "Why , isn't that unportable/bloated/uncool?"
+Is this a question? :) It comes up very often. The simple answer is: I had
+to write it, and \*(C+ allowed me to write and maintain it in a fraction
+of the time and effort (which is a scarce resource for me). Put even
+shorter: It simply wouldn't exist without \*(C+.
+.Sp
+My personal stance on this is that \*(C+ is less portable than C, but in
+the case of rxvt-unicode this hardly matters, as its portability limits
+are defined by things like X11, pseudo terminals, locale support and unix
+domain sockets, which are all less portable than \*(C+ itself.
+.Sp
+Regarding the bloat, see the above question: It's easy to write programs
+in C that use gobs of memory, an certainly possible to write programs in
+\&\*(C+ that don't. \*(C+ also often comes with large libraries, but this is
+not necessarily the case with \s-1GCC\s0. Here is what rxvt links against on my
+system with a minimal config:
+.Sp
+.Vb 4
+\&   libX11.so.6 => /usr/X11R6/lib/libX11.so.6 (0x00002aaaaabc3000)
+\&   libc.so.6 => /lib/libc.so.6 (0x00002aaaaadde000)
+\&   libdl.so.2 => /lib/libdl.so.2 (0x00002aaaab01d000)
+\&   /lib64/ld-linux-x86-64.so.2 (0x00002aaaaaaab000)
+.Ve
+.Sp
+And here is rxvt\-unicode:
+.Sp
+.Vb 5
+\&   libX11.so.6 => /usr/X11R6/lib/libX11.so.6 (0x00002aaaaabc3000)
+\&   libgcc_s.so.1 => /lib/libgcc_s.so.1 (0x00002aaaaada2000)
+\&   libc.so.6 => /lib/libc.so.6 (0x00002aaaaaeb0000)     
+\&   libdl.so.2 => /lib/libdl.so.2 (0x00002aaaab0ee000)   
+\&   /lib64/ld-linux-x86-64.so.2 (0x00002aaaaaaab000)
+.Ve
+.Sp
+No large bloated libraries (of course, none were linked in statically),
+except maybe libX11 :)
+.IP "Does it support tabs, can I have a tabbed rxvt\-unicode?" 4
+.IX Item "Does it support tabs, can I have a tabbed rxvt-unicode?"
+rxvt-unicode does not directly support tabs. It will work fine with
+tabbing functionality of many window managers or similar tabbing programs,
+and its embedding-features allow it to be embedded into other programs,
+as witnessed by \fIdoc/rxvt\-tabbed\fR or the upcoming \f(CW\*(C`Gtk2::URxvt\*(C'\fR perl
+module, which features a tabbed urxvt (murxvt) terminal as an example
+embedding application.
 .IP "How do I know which rxvt-unicode version I'm using?" 4
 .IX Item "How do I know which rxvt-unicode version I'm using?"
 The version number is displayed with the usage (\-h). Also the escape
-sequence \f(CW\*(C`ESC [ 8 n\*(C'\fR sets the window title to the version number.
+sequence \f(CW\*(C`ESC [ 8 n\*(C'\fR sets the window title to the version number. When
+using the @@RXVT_NAME@@c client, the version displayed is that of the
+daemon.
 .IP "I am using Debian GNU/Linux and have a problem..." 4
 .IX Item "I am using Debian GNU/Linux and have a problem..."
 The Debian GNU/Linux package of rxvt-unicode in sarge contains large
diff --git a/doc/rxvt.7.pod b/doc/rxvt.7.pod
index b0acdace..2a7ee6e8 100644
--- a/doc/rxvt.7.pod
+++ b/doc/rxvt.7.pod
@@ -26,10 +26,97 @@ L<http://cvs.schmorp.de/browse/*checkout*/rxvt-unicode/doc/rxvt.7.html>.
 
 =over 4
 
+=item Isn't rxvt supposed to be small? Don't all those features bloat?
+
+I often get asked about this, and I think, no, they didn't cause extra
+bloat. If you compare a minimal rxvt and a minimal urxvt, you can see
+that the urxvt binary is larger (due to some encoding tables always being
+compiled in), but it actually uses less memory (RSS) after startup. Even
+with C<--disable-everything>, this comparison is a bit unfair, as many
+features unique to urxvt (locale, encoding conversion, iso14755 etc.) are
+already in use in this mode.
+
+    text    data     bss     drs     rss filename
+   98398    1664      24   15695    1824 rxvt --disable-everything
+  188985    9048   66616   18222    1788 urxvt --disable-everything
+
+When you C<--enable-everything> (which _is_ unfair, as this involves xft
+and full locale/XIM support which are quite bloaty inside libX11 and my
+libc), the two diverge, but not unreasnobaly so.
+
+    text    data     bss     drs     rss filename
+  163431    2152      24   20123    2060 rxvt --enable-everything
+ 1035683   49680   66648   29096    3680 urxvt --enable-everything
+
+The very large size of the text section is explained by the east-asian
+encoding tables, which, if unused, take up disk space but nothing else
+and can be compiled out unless you rely on X11 core fonts that use those
+encodings. The BSS size comes from the 64k emergency buffer that my c++
+compiler allocates (but of course doesn't use unless you are out of
+memory). Also, using an xft font instead of a core font immediately adds a
+few megabytes of RSS. Xft indeed is responsible for a lot of RSS even when
+not used.
+
+Of course, due to every character using two or four bytes instead of one,
+a large scrollback buffer will ultimately make rxvt-unicode use more
+memory.
+
+Compared to e.g. Eterm (5112k), aterm (3132k) and xterm (4680k), this
+still fares rather well. And compared to some monsters like gnome-terminal
+(21152k + extra 4204k in separate processes) or konsole (22200k + extra
+43180k in daemons that stay around after exit, plus half aminute of
+startup time, including the hundreds of warnings it spits out), it fares
+extremely well *g*.
+
+=item Why C++, isn't that unportable/bloated/uncool?
+
+Is this a question? :) It comes up very often. The simple answer is: I had
+to write it, and C++ allowed me to write and maintain it in a fraction
+of the time and effort (which is a scarce resource for me). Put even
+shorter: It simply wouldn't exist without C++.
+
+My personal stance on this is that C++ is less portable than C, but in
+the case of rxvt-unicode this hardly matters, as its portability limits
+are defined by things like X11, pseudo terminals, locale support and unix
+domain sockets, which are all less portable than C++ itself.
+
+Regarding the bloat, see the above question: It's easy to write programs
+in C that use gobs of memory, an certainly possible to write programs in
+C++ that don't. C++ also often comes with large libraries, but this is
+not necessarily the case with GCC. Here is what rxvt links against on my
+system with a minimal config:
+
+   libX11.so.6 => /usr/X11R6/lib/libX11.so.6 (0x00002aaaaabc3000)
+   libc.so.6 => /lib/libc.so.6 (0x00002aaaaadde000)
+   libdl.so.2 => /lib/libdl.so.2 (0x00002aaaab01d000)
+   /lib64/ld-linux-x86-64.so.2 (0x00002aaaaaaab000)
+
+And here is rxvt-unicode:
+
+   libX11.so.6 => /usr/X11R6/lib/libX11.so.6 (0x00002aaaaabc3000)
+   libgcc_s.so.1 => /lib/libgcc_s.so.1 (0x00002aaaaada2000)
+   libc.so.6 => /lib/libc.so.6 (0x00002aaaaaeb0000)     
+   libdl.so.2 => /lib/libdl.so.2 (0x00002aaaab0ee000)   
+   /lib64/ld-linux-x86-64.so.2 (0x00002aaaaaaab000)     
+
+No large bloated libraries (of course, none were linked in statically),
+except maybe libX11 :)
+
+=item Does it support tabs, can I have a tabbed rxvt-unicode?
+
+rxvt-unicode does not directly support tabs. It will work fine with
+tabbing functionality of many window managers or similar tabbing programs,
+and its embedding-features allow it to be embedded into other programs,
+as witnessed by F<doc/rxvt-tabbed> or the upcoming C<Gtk2::URxvt> perl
+module, which features a tabbed urxvt (murxvt) terminal as an example
+embedding application.
+
 =item How do I know which rxvt-unicode version I'm using?
 
 The version number is displayed with the usage (-h). Also the escape
-sequence C<ESC [ 8 n> sets the window title to the version number.
+sequence C<ESC [ 8 n> sets the window title to the version number. When
+using the @@RXVT_NAME@@c client, the version displayed is that of the
+daemon.
 
 =item I am using Debian GNU/Linux and have a problem...
 
diff --git a/doc/rxvt.7.txt b/doc/rxvt.7.txt
index a394eba2..e94e18e0 100644
--- a/doc/rxvt.7.txt
+++ b/doc/rxvt.7.txt
@@ -20,9 +20,94 @@ DESCRIPTION
     <http://cvs.schmorp.de/browse/*checkout*/rxvt-unicode/doc/rxvt.7.html>.
 
 FREQUENTLY ASKED QUESTIONS
+    Isn't rxvt supposed to be small? Don't all those features bloat?
+        I often get asked about this, and I think, no, they didn't cause
+        extra bloat. If you compare a minimal rxvt and a minimal urxvt, you
+        can see that the urxvt binary is larger (due to some encoding tables
+        always being compiled in), but it actually uses less memory (RSS)
+        after startup. Even with "--disable-everything", this comparison is
+        a bit unfair, as many features unique to urxvt (locale, encoding
+        conversion, iso14755 etc.) are already in use in this mode.
+
+            text    data     bss     drs     rss filename
+           98398    1664      24   15695    1824 rxvt --disable-everything
+          188985    9048   66616   18222    1788 urxvt --disable-everything
+
+        When you "--enable-everything" (which _is_ unfair, as this involves
+        xft and full locale/XIM support which are quite bloaty inside libX11
+        and my libc), the two diverge, but not unreasnobaly so.
+
+            text    data     bss     drs     rss filename
+          163431    2152      24   20123    2060 rxvt --enable-everything
+         1035683   49680   66648   29096    3680 urxvt --enable-everything
+
+        The very large size of the text section is explained by the
+        east-asian encoding tables, which, if unused, take up disk space but
+        nothing else and can be compiled out unless you rely on X11 core
+        fonts that use those encodings. The BSS size comes from the 64k
+        emergency buffer that my c++ compiler allocates (but of course
+        doesn't use unless you are out of memory). Also, using an xft font
+        instead of a core font immediately adds a few megabytes of RSS. Xft
+        indeed is responsible for a lot of RSS even when not used.
+
+        Of course, due to every character using two or four bytes instead of
+        one, a large scrollback buffer will ultimately make rxvt-unicode use
+        more memory.
+
+        Compared to e.g. Eterm (5112k), aterm (3132k) and xterm (4680k),
+        this still fares rather well. And compared to some monsters like
+        gnome-terminal (21152k + extra 4204k in separate processes) or
+        konsole (22200k + extra 43180k in daemons that stay around after
+        exit, plus half aminute of startup time, including the hundreds of
+        warnings it spits out), it fares extremely well *g*.
+
+    Why C++, isn't that unportable/bloated/uncool?
+        Is this a question? :) It comes up very often. The simple answer is:
+        I had to write it, and C++ allowed me to write and maintain it in a
+        fraction of the time and effort (which is a scarce resource for me).
+        Put even shorter: It simply wouldn't exist without C++.
+
+        My personal stance on this is that C++ is less portable than C, but
+        in the case of rxvt-unicode this hardly matters, as its portability
+        limits are defined by things like X11, pseudo terminals, locale
+        support and unix domain sockets, which are all less portable than
+        C++ itself.
+
+        Regarding the bloat, see the above question: It's easy to write
+        programs in C that use gobs of memory, an certainly possible to
+        write programs in C++ that don't. C++ also often comes with large
+        libraries, but this is not necessarily the case with GCC. Here is
+        what rxvt links against on my system with a minimal config:
+
+           libX11.so.6 => /usr/X11R6/lib/libX11.so.6 (0x00002aaaaabc3000)
+           libc.so.6 => /lib/libc.so.6 (0x00002aaaaadde000)
+           libdl.so.2 => /lib/libdl.so.2 (0x00002aaaab01d000)
+           /lib64/ld-linux-x86-64.so.2 (0x00002aaaaaaab000)
+
+        And here is rxvt-unicode:
+
+           libX11.so.6 => /usr/X11R6/lib/libX11.so.6 (0x00002aaaaabc3000)
+           libgcc_s.so.1 => /lib/libgcc_s.so.1 (0x00002aaaaada2000)
+           libc.so.6 => /lib/libc.so.6 (0x00002aaaaaeb0000)     
+           libdl.so.2 => /lib/libdl.so.2 (0x00002aaaab0ee000)   
+           /lib64/ld-linux-x86-64.so.2 (0x00002aaaaaaab000)     
+
+        No large bloated libraries (of course, none were linked in
+        statically), except maybe libX11 :)
+
+    Does it support tabs, can I have a tabbed rxvt-unicode?
+        rxvt-unicode does not directly support tabs. It will work fine with
+        tabbing functionality of many window managers or similar tabbing
+        programs, and its embedding-features allow it to be embedded into
+        other programs, as witnessed by doc/rxvt-tabbed or the upcoming
+        "Gtk2::URxvt" perl module, which features a tabbed urxvt (murxvt)
+        terminal as an example embedding application.
+
     How do I know which rxvt-unicode version I'm using?
         The version number is displayed with the usage (-h). Also the escape
         sequence "ESC [ 8 n" sets the window title to the version number.
+        When using the urxvtc client, the version displayed is that of the
+        daemon.
 
     I am using Debian GNU/Linux and have a problem...
         The Debian GNU/Linux package of rxvt-unicode in sarge contains large
@@ -72,7 +157,7 @@ FREQUENTLY ASKED QUESTIONS
         Most likely it's the empty definition for "enacs=". Just replace it
         by "enacs=\E[0@" and try again.
 
-    "bash"'s readline does not work correctly under rxvt.
+    "bash"'s readline does not work correctly under urxvt.
     I need a termcap file entry.
         One reason you might want this is that some distributions or
         operating systems still compile some programs using the
@@ -193,7 +278,7 @@ FREQUENTLY ASKED QUESTIONS
         In that case, select a font of your taste and add it to the font
         list, e.g.:
 
-           rxvt -fn basefont,font2,font3...
+           urxvt -fn basefont,font2,font3...
 
         When rxvt-unicode sees a character, it will first look at the base
         font. If the base font does not contain the character, it will go to
@@ -488,7 +573,7 @@ FREQUENTLY ASKED QUESTIONS
         some editors prematurely may leave the mouse in mouse report mode.
         I've heard that tcsh may use mouse reporting unless it otherwise
         specified. A quick check is to see if cut/paste works when the Alt
-        or Shift keys are depressed. See rxvt(7)
+        or Shift keys are depressed. See urxvt(7)
 
     What's with this bold/blink stuff?
         If no bold colour is set via "colorBD:", bold will invert text using
@@ -553,9 +638,9 @@ FREQUENTLY ASKED QUESTIONS
            URxvt.color7:       #e1dddd
            URxvt.color15:      #e1dddd
 
-    How can I start rxvtd in a race-free way?
-        Try "rxvtd -f -o", which tells rxvtd to open the display, create the
-        listening socket and then fork.
+    How can I start urxvtd in a race-free way?
+        Try "urxvtd -f -o", which tells urxvtd to open the display, create
+        the listening socket and then fork.
 
     What's with the strange Backspace/Delete key behaviour?
         Assuming that the physical Backspace key corresponds to the
@@ -578,13 +663,13 @@ FREQUENTLY ASKED QUESTIONS
 
            # use Backspace = ^H
            $ stty erase ^H
-           $ rxvt
+           $ urxvt
 
            # use Backspace = ^?
            $ stty erase ^?
-           $ rxvt
+           $ urxvt
 
-        Toggle with "ESC [ 36 h" / "ESC [ 36 l" as documented in rxvt(7).
+        Toggle with "ESC [ 36 h" / "ESC [ 36 l" as documented in urxvt(7).
 
         For an existing rxvt-unicode:
 
@@ -620,7 +705,7 @@ FREQUENTLY ASKED QUESTIONS
         option you can use the `keysym' resource to alter the keystrings
         associated with keysyms.
 
-        Here's an example for a URxvt session started using "rxvt -name
+        Here's an example for a URxvt session started using "urxvt -name
         URxvt"
 
            URxvt.keysym.Home:          \033[1~
@@ -1871,7 +1956,7 @@ CONFIGURE OPTIONS
           -embed, -pty-fd and -hold options
 
     --enable-iso14755 (default: on)
-        Enable extended ISO 14755 support (see rxvt(1), or doc/rxvt.1.txt).
+        Enable extended ISO 14755 support (see urxvt(1), or doc/rxvt.1.txt).
         Basic support (section 5.1) is enabled by "--enable-frills", while
         support for 5.2, 5.3 and 5.4 is enabled with this switch.