From 8d4c290a47a1fee1bb37ceea85fd4d8e170fda19 Mon Sep 17 00:00:00 2001
From: root <root>
Date: Sat, 27 Oct 2007 12:09:01 +0000
Subject: [PATCH] *** empty log message ***

---
 Changes               |   2 +
 README.FAQ            |  22 ++--
 README.configure      |  28 ++---
 doc/rxvt.1.html       | 198 +++++++++++++++++------------------
 doc/rxvt.1.man.in     |  66 ++++++------
 doc/rxvt.1.txt        | 238 +++++++++++++++++++++---------------------
 doc/rxvt.7.html       |  86 +++++++--------
 doc/rxvt.7.man.in     | 190 ++++++++++++++++-----------------
 doc/rxvt.7.txt        |  76 +++++++-------
 doc/rxvtc.1.html      |  40 +++----
 doc/rxvtc.1.man.in    |  10 +-
 doc/rxvtc.1.txt       |  37 +++----
 doc/rxvtd.1.html      |  44 ++++----
 doc/rxvtd.1.man.in    |   4 +-
 doc/rxvtd.1.txt       |  43 ++++----
 doc/rxvtperl.3.html   |  30 +++---
 doc/rxvtperl.3.man.in |   4 +-
 doc/rxvtperl.3.txt    |  24 ++---
 src/Makefile.in       | 131 ++++++++++++-----------
 src/version.h         |   4 +-
 20 files changed, 633 insertions(+), 644 deletions(-)

diff --git a/Changes b/Changes
index 2d43c60c..64bc7e46 100644
--- a/Changes
+++ b/Changes
@@ -18,6 +18,7 @@ WISH: look into XAddConnectionWatch, does anybody need that?
 WISH: anyevent mouse notification / manage MotionMask better.
 DUMB: support tex fonts
 
+8.4  Sat Oct 27 14:02:13 CEST 2007
 	- overhaul of the transparency/pixmap code (sasha).
 	- fix possible race betwen visual bell and poweron.
           (reported by Martin von Gagern, gentoo?).
@@ -25,6 +26,7 @@ DUMB: support tex fonts
         - fixed some minor memleaks on incorrect usage or
           missing DISPLAY.
         - implement xterm 1002/1003 mouse tracking modes (exg).
+        - source code organisational cleanups (exg).
         - updated io_manager.
 
 8.3  Wed Aug  1 20:21:31 CEST 2007
diff --git a/README.FAQ b/README.FAQ
index 647e4be5..ddfb76ef 100644
--- a/README.FAQ
+++ b/README.FAQ
@@ -171,10 +171,10 @@ RXVT-UNICODE/URXVT FREQUENTLY ASKED QUESTIONS
 
   Rendering, Font & Look and Feel Issues
    I can't get transparency working, what am I doing wrong?
-    First of all, transparency isn't officially supported in rxvt-unicode,
-    so you are mostly on your own. Do not bug the author about it (but you
-    may bug everybody else). Also, if you can't get it working consider it a
-    rite of passage: ... and you failed.
+    First of all, please address all transparency related issues to Sasha
+    Vasko at sasha@aftercode.net and do not bug the author about it. Also,
+    if you can't get it working consider it a rite of passage: ... and you
+    failed.
 
     Here are four ways to get transparency. Do read the manpage and option
     descriptions for the programs mentioned and rxvt-unicode. Really, do it!
@@ -191,11 +191,11 @@ RXVT-UNICODE/URXVT FREQUENTLY ASKED QUESTIONS
     to use effects other than tinting and shading: Just shade/tint/whatever
     your picture with gimp or any other tool:
 
-       convert wallpaper.jpg -blur 20x20 -modulate 30 background.xpm
-       urxvt -pixmap background.xpm -pe automove-background
+       convert wallpaper.jpg -blur 20x20 -modulate 30 background.jpg
+       urxvt -pixmap background.jpg -pe automove-background
 
-    That works. If you think it doesn't, you lack XPM and Perl support, or
-    you are unable to read.
+    That works. If you think it doesn't, you lack AfterImage and Perl
+    support, or you are unable to read.
 
     3. Use an ARGB visual:
 
@@ -411,6 +411,12 @@ RXVT-UNICODE/URXVT FREQUENTLY ASKED QUESTIONS
     Until then, you might get away with switching fonts at runtime (see "Can
     I switch the fonts at runtime?" later in this document).
 
+   How can I make mplayer display video correctly?
+    We are working on it, in the meantime, as a workaround, use something
+    like:
+
+       urxvt -b 600 -geometry 20x1 -e sh -c 'mplayer -wid $WINDOWID file...'
+
   Keyboard, Mouse & User Interaction
    The new selection selects pieces that are too big, how can I select single words?
     If you want to select e.g. alphanumeric words, you can use the following
diff --git a/README.configure b/README.configure
index bf751c09..390f2588 100644
--- a/README.configure
+++ b/README.configure
@@ -1,9 +1,9 @@
 CONFIGURE OPTIONS
     General hint: if you get compile errors, then likely your configuration
     hasn't been tested well. Either try with "--enable-everything" or use
-    the default configuration (i.e. "--enable-xxx" or "--disable-xxx"). Of
-    course, you should always report when a combination doesn't work, so it
-    can be fixed. Marc Lehmann <rxvt@schmorp.de>.
+    the default configuration (i.e. no "--enable-xxx" or "--disable-xxx"
+    switches). Of course, you should always report when a combination
+    doesn't work, so it can be fixed. Marc Lehmann <rxvt@schmorp.de>.
 
     All
 
@@ -106,9 +106,6 @@ CONFIGURE OPTIONS
         at start of rxvt execution. This option requires --enable-utmp to
         also be specified.
 
-    --enable-xpm-background (default: on)
-        Add support for XPM background pixmaps.
-
     --enable-afterimage (default: on)
         Add support for libAfterImage to be used for transparency and
         background images. It adds support for many file formats including
@@ -120,7 +117,7 @@ CONFIGURE OPTIONS
         root background, as well as dynamic scaling and bluring of
         background images.
 
-        Note that with this option enabled, rxvt's memory footprint might
+        Note that with this option enabled, urxvt's memory footprint might
         increase by a few megabytes even if no extra features are used
         (mostly due to third-party libraries used by libAI). Memory
         footprint may somewhat be lowered if libAfterImage is configured
@@ -133,10 +130,6 @@ CONFIGURE OPTIONS
     --enable-fading (default: on)
         Add support for fading the text when focus is lost.
 
-    --enable-tinting (default: on)
-        Add support for tinting of transparent backgrounds (requires
-        "--enable-transparency").
-
     --enable-rxvt-scroll (default: on)
         Add support for the original rxvt scrollbar.
 
@@ -211,7 +204,7 @@ CONFIGURE OPTIONS
           verbose X error handling
 
     --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.
 
@@ -240,7 +233,7 @@ CONFIGURE OPTIONS
         Add support to have the pointer disappear when typing or inactive.
 
     --enable-perl (default: on)
-        Enable an embedded perl interpreter. See the rxvtperl(3) manpage
+        Enable an embedded perl interpreter. See the urxvtperl(3) manpage
         (doc/rxvtperl.txt) for more info on this feature, or the files in
         src/perl-ext/ for the extensions that are installed by default. The
         perl interpreter that is used can be specified via the "PERL"
@@ -266,12 +259,3 @@ CONFIGURE OPTIONS
     --with-x
         Use the X Window System (pretty much default, eh?).
 
-    --with-xpm-includes=DIR
-        Look for the XPM includes in DIR.
-
-    --with-xpm-library=DIR
-        Look for the XPM library in DIR.
-
-    --with-xpm
-        Not needed - define via --enable-xpm-background.
-
diff --git a/doc/rxvt.1.html b/doc/rxvt.1.html
index e34d7c2e..36dcf3e0 100644
--- a/doc/rxvt.1.html
+++ b/doc/rxvt.1.html
@@ -6,7 +6,7 @@
 	<meta name="description" content="Pod documentation for rxvt-unicode (ouR XVT, unicode)" />
 	<meta name="inputfile" content="&lt;standard input&gt;" />
 	<meta name="outputfile" content="&lt;standard output&gt;" />
-	<meta name="created" content="Wed Aug  1 20:30:03 2007" />
+	<meta name="created" content="Sat Oct 27 14:07:34 2007" />
 	<meta name="generator" content="Pod::Xhtml 1.57" />
 <link rel="stylesheet" href="http://res.tst.eu/pod.css"/></head>
 <body>
@@ -47,12 +47,12 @@
 </div>
 <h1 id="SYNOPSIS">SYNOPSIS</h1><p><a href="#TOP" class="toplink">Top</a></p>
 <div id="SYNOPSIS_CONTENT">
-<p><strong>rxvt</strong> [options] [-e command [ args ]]</p>
+<p><strong>urxvt</strong> [options] [-e command [ args ]]</p>
 
 </div>
 <h1 id="DESCRIPTION">DESCRIPTION</h1><p><a href="#TOP" class="toplink">Top</a></p>
 <div id="DESCRIPTION_CONTENT">
-<p><strong>rxvt-unicode</strong>, version <strong>8.3</strong>, is a colour vt102 terminal
+<p><strong>rxvt-unicode</strong>, version <strong>8.4</strong>, is a colour vt102 terminal
 emulator intended as an <i>xterm</i>(1) replacement for users who do not
 require features such as Tektronix 4014 emulation and toolkit-style
 configurability. As a result, <strong>rxvt-unicode</strong> uses much less swap space --
@@ -61,7 +61,7 @@ a significant advantage on a machine serving many X sessions.</p>
 </div>
 <h1 id="FREQUENTLY_ASKED_QUESTIONS">FREQUENTLY ASKED QUESTIONS</h1><p><a href="#TOP" class="toplink">Top</a></p>
 <div id="FREQUENTLY_ASKED_QUESTIONS_CONTENT">
-<p>See rxvt(7) (try <code>man 7 rxvt</code>) for a list of
+<p>See urxvt(7) (try <code>man 7 urxvt</code>) for a list of
 frequently asked questions and answer to them and some common
 problems. That document is also accessible on the World-Wide-Web at
 <a href="http://cvs.schmorp.de/browse/rxvt-unicode/doc/rxvt.7.html">http://cvs.schmorp.de/browse/rxvt-unicode/doc/rxvt.7.html</a>.</p>
@@ -74,7 +74,7 @@ internally. That means it can store and display most scripts in the
 world. Being a terminal emulator, however, some things are very difficult,
 especially cursive scripts such as arabic, vertically written scripts
 like mongolian or scripts requiring extremely complex combining rules,
-like tibetan or devenagari. Don't expect pretty output when using these
+like tibetan or devanagari. Don't expect pretty output when using these
 scripts. Most other scripts, latin, cyrillic, kanji, thai etc. should work
 fine, though. A somewhat difficult case are right-to-left scripts, such
 as hebrew: <strong>rxvt-unicode</strong> adopts the view that bidirectional algorithms
@@ -99,27 +99,27 @@ and nice on resources: for example, you can still configure rxvt-unicode
 without most of its features to get a lean binary. It also comes with
 a client/daemon pair that lets you open any number of terminal windows
 from within a single process, which makes startup time very fast and
-drastically reduces memory usage. See rxvtd(1) (daemon) and
-rxvtc(1) (client).</p>
+drastically reduces memory usage. See urxvtd(1) (daemon) and
+urxvtc(1) (client).</p>
 <p>It also makes technical information about escape sequences (which have
-been extended) more accessible: see rxvt(7) for technical
+been extended) more accessible: see urxvt(7) for technical
 reference documentation (escape sequences etc.).</p>
 
 </div>
 <h1 id="OPTIONS">OPTIONS</h1><p><a href="#TOP" class="toplink">Top</a></p>
 <div id="OPTIONS_CONTENT">
-<p>The <strong>rxvt</strong> options (mostly a subset of <i>xterm</i>'s) are listed
+<p>The <strong>urxvt</strong> options (mostly a subset of <i>xterm</i>'s) are listed
 below. In keeping with the smaller-is-better philosophy, options may be
 eliminated or default values chosen at compile-time, so options and
 defaults listed may not accurately reflect the version installed on
-your system. `rxvt -h' gives a list of major compile-time options on
+your system. `urxvt -h' gives a list of major compile-time options on
 the <i>Options</i> line. Option descriptions may be prefixed with which
 compile option each is dependent upon. e.g. `Compile <i>XIM</i>:' requires
-<i>XIM</i> on the <i>Options</i> line. Note: `rxvt -help' gives a list of all
+<i>XIM</i> on the <i>Options</i> line. Note: `urxvt -help' gives a list of all
 command-line options compiled into your version.</p>
-<p>Note that <strong>rxvt</strong> permits the resource name to be used as a
+<p>Note that <strong>urxvt</strong> permits the resource name to be used as a
 long-option (--/++ option) so the potential command-line options are
-far greater than those listed. For example: `rxvt --loginShell --color1
+far greater than those listed. For example: `urxvt --loginShell --color1
 Orange'.</p>
 <p>The following options are available:</p>
 <dl>
@@ -154,13 +154,15 @@ resource <strong>depth</strong>.</p>
 	<dd>
 		<p>Turn on/off skip scrolling (allow multiple screens per refresh); resource <strong>skipScroll</strong>.</p>
 	</dd>
-	<dt><strong>-ip</strong>|<strong>+ip</strong> | <strong>-tr</strong>|<strong>+tr</strong></dt>
+	<dt><strong>-tr</strong>|<strong>+tr</strong></dt>
 	<dd>
-		<p>Turn on/off inheriting parent window's pixmap. Alternative form is
-<strong>-tr</strong>; resource <strong>inheritPixmap</strong>.</p>
-		<p><i>Please note that transparency of any kind if completely unsupported by
-the author. Don't bug him with installation questions! Read the FAQ (man 7
-rxvt)!</i></p>
+		<p>Turn on/off illusion of a transparent window background. Obsolete form of it is
+<strong>-ip</strong> and it should not be used anymore; resource <strong>transparent</strong>.</p>
+		<p><i>Please note that old resource name of <strong>inheritPixmap</strong> is obsolete and should be 
+changed to <strong>transparent</strong>. Backwards compatibility support for <strong>inheritPixmap</strong> will 
+be phased out in future versions of rxvt!</i></p>
+		<p><i>Please address all transparency related issues to Sasha Vasko at 
+sasha@aftercode.net. Read the FAQ (man 7 urxvt)!</i></p>
 	</dd>
 	<dt><strong>-fade</strong> <i>number</i></dt>
 	<dd>
@@ -176,14 +178,14 @@ is opaque black. resource <strong>fadeColor</strong>.</p>
 	<dt><strong>-tint</strong> <i>colour</i></dt>
 	<dd>
 		<p>Tint the transparent background pixmap with the given colour when
-transparency is enabled with <strong>-tr</strong> or <strong>-ip</strong>. This only works for
+transparency is enabled with <strong>-tr</strong>. This only works for
 non-tiled backgrounds, currently. See also the <strong>-sh</strong> option that can be
 used to brighten or darken the image in addition to tinting it.
 Please note that certain tint colours can be applied on the server-side,
 thus yielding performance gain of two orders of magnitude. These colours are:
 blue, red, green, cyan, magenta, yellow, and those close to them; resource
 <i>tintColor</i>. Example:</p>
-<pre>   rxvt -tr -tint blue -sh 40
+<pre>   urxvt -tr -tint blue -sh 40
 
 </pre>
 	</dd>
@@ -201,7 +203,7 @@ transparency image, using method specified. Supported values are :
 <strong>add</strong>, <strong>alphablend</strong>, <strong>allanon</strong> - color values averaging, <strong>colorize</strong>,
 <strong>darken</strong>, <strong>diff</strong>, <strong>dissipate</strong>, <strong>hue</strong>, <strong>lighten</strong>, <strong>overlay</strong>,
 <strong>saturate</strong>, <strong>screen</strong>, <strong>sub</strong>, <strong>tint</strong>, <strong>value</strong>. The default is
-alpha-blending; resource <i>blendType</i>.</p>
+alpha-blending. Compile <i>afterimage</i>; resource <i>blendType</i>.</p>
 	</dd>
 	<dt><strong>-blr</strong> <i>HxV</i></dt>
 	<dd>
@@ -209,7 +211,8 @@ alpha-blending; resource <i>blendType</i>.</p>
 background image. If single number is specified - both vertical and
 horizontal radii are considered to be the same. Setting one of the
 radii to 1 and another to a large number creates interesting effects
-on some backgrounds. Maximum radius value is 128; resource <i>blurRadius</i>.</p>
+on some backgrounds. Maximum radius value is 128. Compile <i>afterimage</i>;
+resource <i>blurRadius</i>.</p>
 	</dd>
 	<dt><strong>-bg</strong> <i>colour</i></dt>
 	<dd>
@@ -253,12 +256,12 @@ font list is always appended to it. See resource <strong>font</strong> for more
 		<p>In short, to specify an X11 core font, just specify its name or prefix it
 with <code>x:</code>. To specify an XFT-font, you need to prefix it with <code>xft:</code>,
 e.g.:</p>
-<pre>   rxvt -fn &quot;xft:Bitstream Vera Sans Mono:pixelsize=15&quot;
-   rxvt -fn &quot;9x15bold,xft:Bitstream Vera Sans Mono&quot;
+<pre>   urxvt -fn &quot;xft:Bitstream Vera Sans Mono:pixelsize=15&quot;
+   urxvt -fn &quot;9x15bold,xft:Bitstream Vera Sans Mono&quot;
 
 </pre>
 		<p>See also the question &quot;How does rxvt-unicode choose fonts?&quot; in the FAQ
-section of rxvt(7).</p>
+section of urxvt(7).</p>
 	</dd>
 	<dt><strong>-fb</strong> <i>fontlist</i></dt>
 	<dd>
@@ -386,7 +389,7 @@ resource <strong>skipBuiltinGlyphs</strong>.</p>
 	<dd>
 		<p>Compile <i>frills</i>: Lines (pixel height) to insert between each row of
 the display. Useful to work around font rendering problems; resource
-<strong>linespace</strong>.</p>
+<strong>lineSpace</strong>.</p>
 	</dd>
 	<dt><strong>-tn</strong> <i>termname</i></dt>
 	<dd>
@@ -397,7 +400,7 @@ resource <strong>termName</strong>.</p>
 	</dd>
 	<dt><strong>-e</strong> <i>command [arguments]</i></dt>
 	<dd>
-		<p>Run the command with its command-line arguments in the <strong>rxvt</strong>
+		<p>Run the command with its command-line arguments in the <strong>urxvt</strong>
 window; also sets the window title and icon name to be the basename of
 the program being executed if neither <i>-title</i> (<i>-T</i>) nor <i>-n</i> are
 given on the command line. If this option is used, it must be the last
@@ -406,7 +409,7 @@ run the program specified by the <strong>SHELL</strong> environment variable or,
 failing that, <i>sh(1)</i>.</p>
 		<p>Please note that you must specify a program with arguments. If you want to
 run shell commands, you have to specify the shell, like this:</p>
-<pre>  rxvt -e sh -c &quot;shell commands&quot;
+<pre>  urxvt -e sh -c &quot;shell commands&quot;
 
 </pre>
 	</dd>
@@ -478,7 +481,7 @@ info.</p>
 	</dd>
 	<dt><strong>-hold</strong>|<strong>+hold</strong></dt>
 	<dd>
-		<p>Turn on/off hold window after exit support. If enabled, rxvt
+		<p>Turn on/off hold window after exit support. If enabled, urxvt
 will not immediately destroy its window when the program executed within
 it exits. Instead, it will wait till it is being killed or closed by the
 user; resource <strong>hold</strong>.</p>
@@ -489,14 +492,14 @@ user; resource <strong>hold</strong>.</p>
 	</dd>
 	<dt><strong>-embed</strong> <i>windowid</i></dt>
 	<dd>
-		<p>Tells rxvt to embed its windows into an already-existing window,
+		<p>Tells urxvt to embed its windows into an already-existing window,
 which enables applications to easily embed a terminal.</p>
-		<p>Right now, rxvt will first unmap/map the specified window, so it
-shouldn't be a top-level window. rxvt will also reconfigure it
+		<p>Right now, urxvt will first unmap/map the specified window, so it
+shouldn't be a top-level window. urxvt will also reconfigure it
 quite a bit, so don't expect it to keep some specific state. It's best to
-create an extra subwindow for rxvt and leave it alone.</p>
-		<p>The window will not be destroyed when rxvt exits.</p>
-		<p>It might be useful to know that rxvt will not close file
+create an extra subwindow for urxvt and leave it alone.</p>
+		<p>The window will not be destroyed when urxvt exits.</p>
+		<p>It might be useful to know that urxvt will not close file
 descriptors passed to it (except for stdin/out/err, of course), so you
 can use file descriptors to communicate with the programs within the
 terminal. This works regardless of whether the <code>-embed</code> option was used or
@@ -506,18 +509,18 @@ used (a longer example is in <cite>doc/embed</cite>):</p>
 <pre>   my $rxvt = new Gtk2::Socket;
    $rxvt-&gt;signal_connect_after (realize =&gt; sub {
       my $xid = $_[0]-&gt;window-&gt;get_xid;
-      system &quot;rxvt -embed $xid &amp;&quot;;
+      system &quot;urxvt -embed $xid &amp;&quot;;
    });
 
 </pre>
 	</dd>
 	<dt><strong>-pty-fd</strong> <i>file descriptor</i></dt>
 	<dd>
-		<p>Tells rxvt NOT to execute any commands or create a new pty/tty
+		<p>Tells urxvt NOT to execute any commands or create a new pty/tty
 pair but instead use the given file descriptor as the tty master. This is
-useful if you want to drive rxvt as a generic terminal emulator
+useful if you want to drive urxvt as a generic terminal emulator
 without having to run a program within it.</p>
-		<p>If this switch is given, rxvt will not create any utmp/wtmp
+		<p>If this switch is given, urxvt will not create any utmp/wtmp
 entries and will not tinker with pty/tty permissions - you have to do that
 yourself if you want that.</p>
 		<p>As an extremely special case, specifying <code>-1</code> will completely suppress
@@ -529,7 +532,7 @@ longer example is in <cite>doc/pty-fd</cite>):</p>
 
    my $pty = new IO::Pty;
    fcntl $pty, F_SETFD, 0; # clear close-on-exec
-   system &quot;rxvt -pty-fd &quot; . (fileno $pty) . &quot;&amp;&quot;;
+   system &quot;urxvt -pty-fd &quot; . (fileno $pty) . &quot;&amp;&quot;;
    close $pty;
 
    # now communicate with rxvt
@@ -548,11 +551,11 @@ this terminal instance. See resource <strong>perl-ext</strong> for details.</p>
 </div>
 <h1 id="RESOURCES_available_also_as_long_opt">RESOURCES (available also as long-options)</h1><p><a href="#TOP" class="toplink">Top</a></p>
 <div id="RESOURCES_available_also_as_long_opt-2">
-<p>Note: `rxvt --help' gives a list of all resources (long
+<p>Note: `urxvt --help' gives a list of all resources (long
 options) compiled into your version.</p>
 <p>You can set and change the resources using X11 tools like <strong>xrdb</strong>. Many
 distribution do also load settings from the <strong>~/.Xresources</strong> file when X
-starts. rxvt will consult the following files/resources in order,
+starts. urxvt will consult the following files/resources in order,
 with later settings overwriting earlier ones:</p>
 <pre>  1. system-wide app-defaults file, either locale-dependent OR global
   2. app-defaults file in $XAPPLRESDIR
@@ -561,15 +564,15 @@ with later settings overwriting earlier ones:</p>
   5. $XENVIRONMENT file OR $HOME/.Xdefaults-&lt;nodename&gt;
 
 </pre>
-<p>Note that when reading X resources, <strong>rxvt</strong> recognizes two class
+<p>Note that when reading X resources, <strong>urxvt</strong> recognizes two class
 names: <strong>Rxvt</strong> and <strong>URxvt</strong>. The class name <strong>Rxvt</strong> allows resources
-common to both <strong>rxvt</strong> and the original <i>rxvt</i> to be easily
+common to both <strong>urxvt</strong> and the original <i>rxvt</i> to be easily
 configured, while the class name <strong>URxvt</strong> allows resources unique to
-<strong>rxvt</strong>, to be shared between different <strong>rxvt</strong>
+<strong>urxvt</strong>, to be shared between different <strong>urxvt</strong>
 configurations. If no resources are specified, suitable defaults will
 be used. Command-line arguments can be used to override resource
 settings. The following resources are supported (you might want to
-check the rxvtperl(3) manpage for additional settings by perl
+check the urxvtperl(3) manpage for additional settings by perl
 extensions not documented here):</p>
 <dl>
 	<dt><strong>depth:</strong> <i>bitdepth</i></dt>
@@ -601,7 +604,7 @@ colours. The canonical names are as follows: 0=black, 1=red, 2=green,
 3=yellow, 4=blue, 5=magenta, 6=cyan, 7=white, but the actual colour
 names used are listed in the <strong>COLORS AND GRAPHICS</strong> section.</p>
 		<p>Colours higher than 15 cannot be set using resources (yet), but can be
-changed using an escape command (see rxvt(7)).</p>
+changed using an escape command (see urxvt(7)).</p>
 		<p>Colours 16-79 form a standard 4x4x4 colour cube (the same as xterm with
 88 colour support). Colours 80-87 are evenly spaces grey steps.</p>
 	</dd>
@@ -647,18 +650,18 @@ option <strong>-rv</strong>. <strong>False</strong>: regular screen colours [def
 	<dt><strong>jumpScroll:</strong> <i>boolean</i></dt>
 	<dd>
 		<p><strong>True</strong>: specify that jump scrolling should be used. When receiving lots
-of lines, rxvt will only scroll once a whole screen height of lines
+of lines, urxvt will only scroll once a whole screen height of lines
 has been read, resulting in fewer updates while still displaying every
 received line; option <strong>-j</strong>.</p>
-		<p><strong>False</strong>: specify that smooth scrolling should be used. rxvt will
+		<p><strong>False</strong>: specify that smooth scrolling should be used. urxvt will
 force a screen refresh on each new line it received; option <strong>+j</strong>.</p>
 	</dd>
 	<dt><strong>skipScroll:</strong> <i>boolean</i></dt>
 	<dd>
 		<p><strong>True</strong>: (the default) specify that skip scrolling should be used. When
-receiving lots of lines, rxvt will only scroll once in a while
+receiving lots of lines, urxvt will only scroll once in a while
 (around 60 times per second), resulting in far fewer updates. This can
-result in rxvt not ever displaying some of the lines it receives;
+result in urxvt not ever displaying some of the lines it receives;
 option <strong>-ss</strong>.</p>
 		<p><strong>False</strong>: specify that everything is to be displayed, even
 if the refresh is too fast for the human eye to read anything (or the
@@ -733,7 +736,7 @@ other blending type, specified with <strong>-blt &quot;type&quot;</strong> optio
 	</dd>
 	<dt><strong>path:</strong> <i>path</i></dt>
 	<dd>
-		<p>Specify the colon-delimited search path for finding XPM files.</p>
+		<p>Specify the colon-delimited search path for finding background image files.</p>
 	</dd>
 	<dt><strong>font:</strong> <i>fontlist</i></dt>
 	<dd>
@@ -929,7 +932,7 @@ option <strong>-sbg</strong>.</p>
 		<p>Specifies the terminal type name to be set in the <strong>TERM</strong> environment
 variable; option <strong>-tn</strong>.</p>
 	</dd>
-	<dt><strong>linespace:</strong> <i>number</i></dt>
+	<dt><strong>lineSpace:</strong> <i>number</i></dt>
 	<dd>
 		<p>Specifies number of lines (pixel height) to insert between each row of
 the display [default 0]; option <strong>-lsp</strong>.</p>
@@ -991,7 +994,7 @@ with the <strong>Execute</strong> key.</p>
 		<p>The characters used as delimiters for double-click word selection
 (whitespace delimiting is added automatically if resource is given).</p>
 		<p>When the perl selection extension is in use (the default if compiled
-in, see the rxvtperl(3) manpage), a suitable regex using these
+in, see the urxvtperl(3) manpage), a suitable regex using these
 characters will be created (if the resource exists, otherwise, no regex
 will be created). In this mode, characters outside ISO-8859-1 can be used.</p>
 		<p>When the selection extension is not used, only ISO-8859-1 characters can
@@ -1018,7 +1021,7 @@ another locale; option <strong>-imlocale</strong>.</p>
 		<p>Specify the font-set used for XIM styles <code>OverTheSpot</code> or
 <code>OffTheSpot</code>. It must be a standard X font set (XLFD patterns separated
 by commas), i.e. it's not in the same format as the other font lists used
-in rxvt. The default will be set-up to chose *any* suitable found
+in urxvt. The default will be set-up to chose *any* suitable found
 found, preferably one or two pixels differing in size to the base font.
 option <strong>-imfont</strong>.</p>
 	</dd>
@@ -1066,7 +1069,7 @@ instead scroll the screen up.</p>
 	</dd>
 	<dt><strong>hold</strong>: <i>boolean</i></dt>
 	<dd>
-		<p>Turn on/off hold window after exit support. If enabled, rxvt
+		<p>Turn on/off hold window after exit support. If enabled, urxvt
 will not immediately destroy its window when the program executed within
 it exits. Instead, it will wait till it is being killed or closed by the
 user.</p>
@@ -1089,16 +1092,8 @@ searching keysym macros from <strong>/usr/X11R6/include/X11/keysymdef.h</strong>
 omitting the prefix <strong>XK_</strong>. Alternatively you can specify <i>key</i> by its hex
 keysym value (<strong>0x0000 - 0xFFFF</strong>). Note that the lookup of <i>sym</i>s is not
 performed in an exact manner; however, the closest match is assured.</p>
-		<p><i>string</i> may contain escape values (<code>\a</code>: bell, <code>\b</code>: backspace,
-<code>\e</code>, <code>\E</code>: escape, <code>\n</code>: newline, <code>\r</code>: carriage return, <code>\t</code>: tab,
-<code>\000</code>: octal number) or verbatim control characters (<code>^?</code>: delete,
-<code>^@</code>: null, <code>^A</code> ...) and may be enclosed with double quotes so that it
-can start or end with whitespace. <strong>This feature is deprecated and will
-be removed</strong>.</p>
-		<p>Please note that you need to double the <code>\</code> in resource files, as
-Xlib itself does its own de-escaping (you can use <code>\033</code> instead of
-<code>\e</code> (and so on), which will work with both Xt and rxvt's own
-processing).</p>
+		<p><i>string</i> may contain escape values (<code>\n</code>: newline, <code>\000</code>: octal
+number), see RESOURCES in <code>man 7 X</code> for futher details.</p>
 		<p>You can define a range of keysyms in one shot by providing a <i>string</i>
 with pattern <strong>list/PREFIX/MIDDLE/SUFFIX</strong>, where the delimiter `/'
 should be a character not used by the strings.</p>
@@ -1113,16 +1108,16 @@ should be a character not used by the strings.</p>
 
 </pre>
 		<p>If <i>string</i> takes the form of <code>command:STRING</code>, the specified <strong>STRING</strong>
-is interpreted and executed as rxvt's control sequence. For
+is interpreted and executed as urxvt's control sequence. For
 example the following means &quot;change the current locale to <code>zh_CN.GBK</code>
 when Control-Meta-c is being pressed&quot;:</p>
 <pre>  URxvt.keysym.M-C-c: command:\033]701;zh_CN.GBK\007
 
 </pre>
 		<p>If <i>string</i> takes the form <code>perl:STRING</code>, then the specified <strong>STRING</strong>
-is passed to the <code>on_keyboard_command</code> perl handler. See the rxvtperl(3)
+is passed to the <code>on_keyboard_command</code> perl handler. See the urxvtperl(3)
 manpage. For example, the <cite>selection</cite> extension (activated via
-<code>rxvt -pe selection</code>) listens for <code>selection:rot13</code> events:</p>
+<code>urxvt -pe selection</code>) listens for <code>selection:rot13</code> events:</p>
 <pre>  URxvt.keysym.M-C-c: perl:selection:rot13
 
 </pre>
@@ -1133,7 +1128,7 @@ means that defining a key map for <code>a</code> will automatically provide
 definitions for <code>Meta-a</code>, <code>Shift-a</code> and so on, unless some of those are defined
 mappings themselves.</p>
 		<p>Unfortunately, this will override built-in key mappings. For example
-if you overwrite the <code>Insert</code> key you will disable rxvt's
+if you overwrite the <code>Insert</code> key you will disable urxvt's
 <code>Shift-Insert</code> mapping. To re-enable that, you can poke &quot;holes&quot; into the
 user-defined keymap using the <code>builtin:</code> replacement:</p>
 <pre>  URxvt.keysym.Insert: &lt;my insert key sequence&gt;
@@ -1150,7 +1145,7 @@ font-switching at runtime:</p>
   URxvt.keysym.M-C-2: command:\033]50;9x15bold\007
 
 </pre>
-		<p>Other things are possible, e.g. resizing (see rxvt(7) for more
+		<p>Other things are possible, e.g. resizing (see urxvt(7) for more
 info):</p>
 <pre>  URxvt.keysym.M-C-3: command:\033[8;25;80t
   URxvt.keysym.M-C-4: command:\033[8;48;110t
@@ -1182,26 +1177,26 @@ all instances, while <strong>perl-ext</strong> is used for specific instances.</
 	<dt><strong>perl-eval</strong>: <i>string</i></dt>
 	<dd>
 		<p>Perl code to be evaluated when all extensions have been registered. See
-the rxvtperl(3) manpage. Due to security reasons, this resource
+the urxvtperl(3) manpage. Due to security reasons, this resource
 will be ignored when running setuid/setgid.</p>
 	</dd>
 	<dt><strong>perl-lib</strong>: <i>path</i></dt>
 	<dd>
 		<p>Colon-separated list of additional directories that hold extension
 scripts. When looking for extensions specified by the <code>perl</code> resource,
-rxvt will first look in these directories and then in
-<cite>/opt/rxvt/lib/urxvt/perl/</cite>. Due to security reasons, this resource
+urxvt will first look in these directories and then in
+<cite>/usr/local/lib/urxvt/perl/</cite>. Due to security reasons, this resource
 will be ignored when running setuid/setgid.</p>
-		<p>See the rxvtperl(3) manpage.</p>
+		<p>See the urxvtperl(3) manpage.</p>
 	</dd>
 	<dt><strong>selection.pattern-<i>idx</i></strong>: <i>perl-regex</i></dt>
 	<dd>
-		<p>Additional selection patterns, see the rxvtperl(3) manpage for
+		<p>Additional selection patterns, see the urxvtperl(3) manpage for
 details.</p>
 	</dd>
 	<dt><strong>selection-autotransform.<i>idx</i></strong>: <i>perl-transform</i></dt>
 	<dd>
-		<p>Selection auto-transform patterns, see the rxvtperl(3) manpage
+		<p>Selection auto-transform patterns, see the urxvtperl(3) manpage
 for details.</p>
 	</dd>
 	<dt><strong>searchable-scrollback:</strong> <i>keysym</i></dt>
@@ -1232,9 +1227,9 @@ it almost invisible to window managers; option <strong>-override-redirect</stron
 </div>
 <h1 id="THE_SCROLLBAR">THE SCROLLBAR</h1><p><a href="#TOP" class="toplink">Top</a></p>
 <div id="THE_SCROLLBAR_CONTENT">
-<p>Lines of text that scroll off the top of the <strong>rxvt</strong> window
+<p>Lines of text that scroll off the top of the <strong>urxvt</strong> window
 (resource: <strong>saveLines</strong>) and can be scrolled back using the scrollbar
-or by keystrokes. The normal <strong>rxvt</strong> scrollbar has arrows and
+or by keystrokes. The normal <strong>urxvt</strong> scrollbar has arrows and
 its behaviour is fairly intuitive. The <strong>xterm-scrollbar</strong> is without
 arrows and its behaviour mimics that of <i>xterm</i></p>
 <p>Scroll down with <strong>Button1</strong> (<strong>xterm-scrollbar</strong>) or <strong>Shift-Next</strong>.
@@ -1275,7 +1270,7 @@ the selection.</p>
 	</dd>
 	<dt><strong>Pasting</strong>:</dt>
 	<dd>
-		<p>Pressing and releasing the Middle mouse button in an <strong>rxvt</strong>
+		<p>Pressing and releasing the Middle mouse button in an <strong>urxvt</strong>
 window causes the value of the PRIMARY selection (or CLIPBOARD with the
 <strong>Meta</strong> modifier) to be inserted as if it had been typed on the keyboard.</p>
 		<p>Pressing <strong>Shift-Insert</strong> causes the value of the PRIMARY selection to be
@@ -1360,23 +1355,23 @@ both scenario A and B of ISO 14755, including part 5.2.</p>
 </div>
 <h1 id="LOGIN_STAMP">LOGIN STAMP</h1><p><a href="#TOP" class="toplink">Top</a></p>
 <div id="LOGIN_STAMP_CONTENT">
-<p><strong>rxvt</strong> tries to write an entry into the <i>utmp</i>(5) file so that
+<p><strong>urxvt</strong> tries to write an entry into the <i>utmp</i>(5) file so that
 it can be seen via the <i>who(1)</i> command, and can accept messages.  To
-allow this feature, <strong>rxvt</strong> may need to be installed setuid root
+allow this feature, <strong>urxvt</strong> may need to be installed setuid root
 on some systems or setgid to root or to some other group on others.</p>
 
 </div>
 <h1 id="COLORS_AND_GRAPHICS">COLORS AND GRAPHICS</h1><p><a href="#TOP" class="toplink">Top</a></p>
 <div id="COLORS_AND_GRAPHICS_CONTENT">
 <p>In addition to the default foreground and background colours,
-<strong>rxvt</strong> can display up to 16 colours (8 ANSI colours plus
+<strong>urxvt</strong> can display up to 16 colours (8 ANSI colours plus
 high-intensity bold/blink versions of the same). Here is a list of the
 colours with their names.</p>
 <table><tr><td>color0</td><td>(black)</td><td>= Black</td></tr><tr><td>color1</td><td>(red)</td><td>= Red3</td></tr><tr><td>color2</td><td>(green)</td><td>= Green3</td></tr><tr><td>color3</td><td>(yellow)</td><td>= Yellow3</td></tr><tr><td>color4</td><td>(blue)</td><td>= Blue3</td></tr><tr><td>color5</td><td>(magenta)</td><td>= Magenta3</td></tr><tr><td>color6</td><td>(cyan)</td><td>= Cyan3</td></tr><tr><td>color7</td><td>(white)</td><td>= AntiqueWhite</td></tr><tr><td>color8</td><td>(bright black)</td><td>= Grey25</td></tr><tr><td>color9</td><td>(bright red)</td><td>= Red</td></tr><tr><td>color10</td><td>(bright green)</td><td>= Green</td></tr><tr><td>color11</td><td>(bright yellow)</td><td>= Yellow</td></tr><tr><td>color12</td><td>(bright blue)</td><td>= Blue</td></tr><tr><td>color13</td><td>(bright magenta)</td><td>= Magenta</td></tr><tr><td>color14</td><td>(bright cyan)</td><td>= Cyan</td></tr><tr><td>color15</td><td>(bright white)</td><td>= White</td></tr><tr><td>foreground</td><td></td><td>= Black</td></tr><tr><td>background</td><td></td><td>= White</td></tr></table><p>It is also possible to specify the colour values of <strong>foreground</strong>,
 <strong>background</strong>, <strong>cursorColor</strong>, <strong>cursorColor2</strong>, <strong>colorBD</strong>, <strong>colorUL</strong> as
 a number 0-15, as a convenient shorthand to reference the colour name of
 color0-color15.</p>
-<p>In addition to the colours defined above, rxvt offers an
+<p>In addition to the colours defined above, urxvt offers an
 additional 72 colours. The first 64 of those (with indices 16 to 79)
 consist of a 4*4*4 RGB colour cube (i.e. <i>index = r * 16 + g * 4 + b +
 16</i>), followed by 8 additional shades of gray (with indices 80 to 87).</p>
@@ -1388,7 +1383,7 @@ always swapping the foreground/background colours. This is in contrast to
 <i>xterm</i>(1) where the colours are only swapped if they have not otherwise
 been specified. For example,</p>
 <dl>
-	<dt><strong>rxvt -fg Black -bg White -rv</strong></dt>
+	<dt><strong>urxvt -fg Black -bg White -rv</strong></dt>
 	<dd>
 		<p>would yield White on Black, while on <i>xterm</i>(1) it would yield Black
 on White.</p>
@@ -1412,7 +1407,7 @@ your X-server uses ARGB pixel layout, as X is far from just supporting
 ARGB visuals out of the box, and rxvt-unicode just fudges around.</p>
 <p>For example, the following selects an almost completely transparent red
 background, and an almost opaque pink foreground:</p>
-<pre>   rxvt -depth 32 -bg rgba:0000/0000/0000/aaaa -fg &quot;[80]pink&quot;
+<pre>   urxvt -depth 32 -bg rgba:0000/0000/0000/aaaa -fg &quot;[80]pink&quot;
 
 </pre>
 <p><i>Please note that transparency of any kind if completely unsupported by
@@ -1421,7 +1416,7 @@ the author. Don't bug him with installation questions!</i></p>
 </div>
 <h1 id="ENVIRONMENT">ENVIRONMENT</h1><p><a href="#TOP" class="toplink">Top</a></p>
 <div id="ENVIRONMENT_CONTENT">
-<p><strong>rxvt</strong> sets and/or uses the following environment variables:</p>
+<p><strong>urxvt</strong> sets and/or uses the following environment variables:</p>
 <dl>
 	<dt><strong>TERM</strong></dt>
 	<dd>
@@ -1430,9 +1425,10 @@ resources or on the command line.</p>
 	</dd>
 	<dt><strong>COLORTERM</strong></dt>
 	<dd>
-		<p>Either <code>rxvt</code>, <code>rxvt-xpm</code>, depending on whether rxvt was
-compiled with XPM support, and optionally with the added extension
-<code>-mono</code> to indicate that rxvt-unicode runs on a monochrome screen.</p>
+		<p>Either <code>rxvt</code>, <code>rxvt-xpm</code>, depending on whether urxvt was
+compiled with background image support, and optionally with the added 
+extension <code>-mono</code> to indicate that rxvt-unicode runs on a monochrome 
+screen.</p>
 	</dd>
 	<dt><strong>COLORFGBG</strong></dt>
 	<dd>
@@ -1440,24 +1436,24 @@ compiled with XPM support, and optionally with the added extension
 the colour code used as default foreground/text colour (or the string
 <code>default</code> to indicate that the default-colour escape sequence is to be
 used), <code>bg</code> is the colour code used as default background colour (or the
-string <code>default</code>), and <code>xpm</code> is the string <code>default</code> if rxvt
-was compiled with XPM support. Libraries like <code>ncurses</code> and <code>slang</code> can
-(and do) use this information to optimize screen output.</p>
+string <code>default</code>), and <code>xpm</code> is the string <code>default</code> if urxvt
+was compiled with background image support. Libraries like <code>ncurses</code> 
+and <code>slang</code> can (and do) use this information to optimize screen output.</p>
 	</dd>
 	<dt><strong>WINDOWID</strong></dt>
 	<dd>
-		<p>Set to the (decimal) X Window ID of the rxvt window (the toplevel
+		<p>Set to the (decimal) X Window ID of the urxvt window (the toplevel
 window, which usually has subwindows for the scrollbar, the terminal
 window and so on).</p>
 	</dd>
 	<dt><strong>TERMINFO</strong></dt>
 	<dd>
-		<p>Set to the terminfo directory iff rxvt was configured with
+		<p>Set to the terminfo directory iff urxvt was configured with
 <code>--with-terminfo=PATH</code>.</p>
 	</dd>
 	<dt><strong>DISPLAY</strong></dt>
 	<dd>
-		<p>Used by rxvt to connect to the display and set to the correct
+		<p>Used by urxvt to connect to the display and set to the correct
 display in its child processes.</p>
 	</dd>
 	<dt><strong>SHELL</strong></dt>
@@ -1466,8 +1462,8 @@ display in its child processes.</p>
 	</dd>
 	<dt><strong>RXVT_SOCKET</strong></dt>
 	<dd>
-		<p>The unix domain socket path used by rxvtc(1) and
-rxvtd(1).</p>
+		<p>The unix domain socket path used by urxvtc(1) and
+urxvtd(1).</p>
 		<p>Default <cite>$HOME/.rxvt-unicode-<i>&lt;nodename</i></cite>.</p>
 	</dd>
 	<dt><strong>HOME</strong></dt>
@@ -1483,7 +1479,7 @@ daemon communications and to locate various resource files (such as
 	<dt><strong>XENVIRONMENT</strong></dt>
 	<dd>
 		<p>If set and accessible, gives the name of a X resource file to be loaded by
-rxvt.</p>
+urxvt.</p>
 	</dd>
 </dl>
 
@@ -1500,7 +1496,7 @@ rxvt.</p>
 </div>
 <h1 id="SEE_ALSO">SEE ALSO</h1><p><a href="#TOP" class="toplink">Top</a></p>
 <div id="SEE_ALSO_CONTENT">
-<p>rxvt(7), rxvtc(1), rxvtd(1), xterm(1), sh(1), resize(1), X(1), pty(4), tty(4), utmp(5)</p>
+<p>urxvt(7), urxvtc(1), urxvtd(1), xterm(1), sh(1), resize(1), X(1), pty(4), tty(4), utmp(5)</p>
 
 </div>
 <h1 id="CURRENT_PROJECT_COORDINATOR">CURRENT PROJECT COORDINATOR</h1><p><a href="#TOP" class="toplink">Top</a></p>
diff --git a/doc/rxvt.1.man.in b/doc/rxvt.1.man.in
index 5535a8c7..476c4202 100644
--- a/doc/rxvt.1.man.in
+++ b/doc/rxvt.1.man.in
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.3
+.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.35
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "@@RXVT_NAME@@ 1"
-.TH @@RXVT_NAME@@ 1 "2007-10-26" "8.3" "RXVT-UNICODE"
+.TH @@RXVT_NAME@@ 1 "2007-10-27" "8.4" "RXVT-UNICODE"
 .SH "NAME"
 rxvt\-unicode (ouR XVT, unicode) \- (a VT102 emulator for the X window system)
 .SH "SYNOPSIS"
@@ -264,7 +264,7 @@ blue, red, green, cyan, magenta, yellow, and those close to them; resource
 \&\fItintColor\fR. Example:
 .Sp
 .Vb 1
-\&   @@RXVT_NAME@@ \-tr \-tint blue \-sh 40
+\&   @@RXVT_NAME@@ -tr -tint blue -sh 40
 .Ve
 .IP "\fB\-sh\fR \fInumber\fR" 4
 .IX Item "-sh number"
@@ -326,8 +326,8 @@ with \f(CW\*(C`x:\*(C'\fR. To specify an XFT\-font, you need to prefix it with \
 e.g.:
 .Sp
 .Vb 2
-\&   @@RXVT_NAME@@ \-fn "xft:Bitstream Vera Sans Mono:pixelsize=15"
-\&   @@RXVT_NAME@@ \-fn "9x15bold,xft:Bitstream Vera Sans Mono"
+\&   @@RXVT_NAME@@ -fn "xft:Bitstream Vera Sans Mono:pixelsize=15"
+\&   @@RXVT_NAME@@ -fn "9x15bold,xft:Bitstream Vera Sans Mono"
 .Ve
 .Sp
 See also the question \*(L"How does rxvt-unicode choose fonts?\*(R" in the \s-1FAQ\s0
@@ -456,7 +456,7 @@ Please note that you must specify a program with arguments. If you want to
 run shell commands, you have to specify the shell, like this:
 .Sp
 .Vb 1
-\&  @@RXVT_NAME@@ \-e sh \-c "shell commands"
+\&  @@RXVT_NAME@@ -e sh -c "shell commands"
 .Ve
 .IP "\fB\-title\fR \fItext\fR" 4
 .IX Item "-title text"
@@ -544,9 +544,9 @@ used (a longer example is in \fIdoc/embed\fR):
 .Sp
 .Vb 5
 \&   my $rxvt = new Gtk2::Socket;
-\&   $rxvt\->signal_connect_after (realize => sub {
-\&      my $xid = $_[0]\->window\->get_xid;
-\&      system "@@RXVT_NAME@@ \-embed $xid &";
+\&   $rxvt->signal_connect_after (realize => sub {
+\&      my $xid = $_[0]->window->get_xid;
+\&      system "@@RXVT_NAME@@ -embed $xid &";
 \&   });
 .Ve
 .IP "\fB\-pty\-fd\fR \fIfile descriptor\fR" 4
@@ -573,14 +573,14 @@ longer example is in \fIdoc/pty\-fd\fR):
 .Sp
 .Vb 4
 \&   my $pty = new IO::Pty;
-\&   fcntl $pty, F_SETFD, 0; # clear close\-on\-exec
-\&   system "@@RXVT_NAME@@ \-pty\-fd " . (fileno $pty) . "&";
+\&   fcntl $pty, F_SETFD, 0; # clear close-on-exec
+\&   system "@@RXVT_NAME@@ -pty-fd " . (fileno $pty) . "&";
 \&   close $pty;
 .Ve
 .Sp
 .Vb 3
 \&   # now communicate with rxvt
-\&   my $slave = $pty\->slave;
+\&   my $slave = $pty->slave;
 \&   while (<$slave>) { print $slave "got <$_>\en" }
 .Ve
 .IP "\fB\-pe\fR \fIstring\fR" 4
@@ -598,11 +598,11 @@ starts. @@RXVT_NAME@@ will consult the following files/resources in order,
 with later settings overwriting earlier ones:
 .PP
 .Vb 5
-\&  1. system\-wide app\-defaults file, either locale\-dependent OR global
-\&  2. app\-defaults file in $XAPPLRESDIR
-\&  3. RESOURCE_MANAGER property on root\-window OR $HOME/.Xdefaults
+\&  1. system-wide app-defaults file, either locale-dependent OR global
+\&  2. app-defaults file in $XAPPLRESDIR
+\&  3. RESOURCE_MANAGER property on root-window OR $HOME/.Xdefaults
 \&  4. SCREEN_RESOURCES for the current screen
-\&  5. $XENVIRONMENT file OR $HOME/.Xdefaults\-<nodename>
+\&  5. $XENVIRONMENT file OR $HOME/.Xdefaults-<nodename>
 .Ve
 .PP
 Note that when reading X resources, \fB@@RXVT_NAME@@\fR recognizes two class
@@ -780,8 +780,8 @@ For example, this font resource
 .Sp
 .Vb 5
 \&   URxvt.font: 9x15bold,\e
-\&               \-misc\-fixed\-bold\-r\-normal\-\-15\-140\-75\-75\-c\-90\-iso10646\-1,\e
-\&               \-misc\-fixed\-medium\-r\-normal\-\-15\-140\-75\-75\-c\-90\-iso10646\-1, \e
+\&               -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso10646-1,\e
+\&               -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso10646-1, \e
 \&               [codeset=JISX0208]xft:Kochi Gothic:antialias=false, \e
 \&               xft:Code2000:antialias=false
 .Ve
@@ -884,7 +884,7 @@ The string will be interpreted as if typed into the shell as\-is.
 Example:
 .Sp
 .Vb 1
-\&   URxvt.print\-pipe: cat > $(TMPDIR=$HOME mktemp urxvt.XXXXXX)
+\&   URxvt.print-pipe: cat > $(TMPDIR=$HOME mktemp urxvt.XXXXXX)
 .Ve
 .Sp
 This creates a new file in your home directory with the screen contents
@@ -1102,15 +1102,15 @@ should be a character not used by the strings.
 Its usage can be demonstrated by an example:
 .Sp
 .Vb 1
-\&  URxvt.keysym.M\-C\-0x61:    list|\e033<M\-C\-|abc|>
+\&  URxvt.keysym.M-C-0x61:    list|\e033<M-C-|abc|>
 .Ve
 .Sp
 The above line is equivalent to the following three lines:
 .Sp
 .Vb 3
-\&  URxvt.keysym.Meta\-Control\-0x61:    \e033<M\-C\-a>
-\&  URxvt.keysym.Meta\-Control\-0x62:    \e033<M\-C\-b>
-\&  URxvt.keysym.Meta\-Control\-0x63:    \e033<M\-C\-c>
+\&  URxvt.keysym.Meta-Control-0x61:    \e033<M-C-a>
+\&  URxvt.keysym.Meta-Control-0x62:    \e033<M-C-b>
+\&  URxvt.keysym.Meta-Control-0x63:    \e033<M-C-c>
 .Ve
 .Sp
 If \fIstring\fR takes the form of \f(CW\*(C`command:STRING\*(C'\fR, the specified \fB\s-1STRING\s0\fR
@@ -1119,7 +1119,7 @@ example the following means "change the current locale to \f(CW\*(C`zh_CN.GBK\*(
 when Control-Meta-c is being pressed":
 .Sp
 .Vb 1
-\&  URxvt.keysym.M\-C\-c: command:\e033]701;zh_CN.GBK\e007
+\&  URxvt.keysym.M-C-c: command:\e033]701;zh_CN.GBK\e007
 .Ve
 .Sp
 If \fIstring\fR takes the form \f(CW\*(C`perl:STRING\*(C'\fR, then the specified \fB\s-1STRING\s0\fR
@@ -1128,7 +1128,7 @@ manpage. For example, the \fIselection\fR extension (activated via
 \&\f(CW\*(C`@@RXVT_NAME@@ \-pe selection\*(C'\fR) listens for \f(CW\*(C`selection:rot13\*(C'\fR events:
 .Sp
 .Vb 1
-\&  URxvt.keysym.M\-C\-c: perl:selection:rot13
+\&  URxvt.keysym.M-C-c: perl:selection:rot13
 .Ve
 .Sp
 Due the the large number of modifier combinations, a defined key mapping
@@ -1145,7 +1145,7 @@ user-defined keymap using the \f(CW\*(C`builtin:\*(C'\fR replacement:
 .Sp
 .Vb 2
 \&  URxvt.keysym.Insert: <my insert key sequence>
-\&  URxvt.keysym.S\-Insert: builtin:
+\&  URxvt.keysym.S-Insert: builtin:
 .Ve
 .Sp
 The first line defines a mapping for \f(CW\*(C`Insert\*(C'\fR and \fIany\fR combination
@@ -1157,16 +1157,16 @@ the fonts \f(CW\*(C`suxuseuro\*(C'\fR and \f(CW\*(C`9x15bold\*(C'\fR, so you can
 font-switching at runtime:
 .Sp
 .Vb 2
-\&  URxvt.keysym.M\-C\-1: command:\e033]50;suxuseuro\e007
-\&  URxvt.keysym.M\-C\-2: command:\e033]50;9x15bold\e007
+\&  URxvt.keysym.M-C-1: command:\e033]50;suxuseuro\e007
+\&  URxvt.keysym.M-C-2: command:\e033]50;9x15bold\e007
 .Ve
 .Sp
 Other things are possible, e.g. resizing (see @@RXVT_NAME@@(7) for more
 info):
 .Sp
 .Vb 2
-\&  URxvt.keysym.M\-C\-3: command:\e033[8;25;80t
-\&  URxvt.keysym.M\-C\-4: command:\e033[8;48;110t
+\&  URxvt.keysym.M-C-3: command:\e033[8;25;80t
+\&  URxvt.keysym.M-C-4: command:\e033[8;48;110t
 .Ve
 .IP "\fBperl-ext-common\fR: \fIstring\fR" 4
 .IX Item "perl-ext-common: string"
@@ -1298,8 +1298,8 @@ You can, however, switch fonts at runtime using escape sequences, e.g.:
 You can use keyboard shortcuts, too:
 .PP
 .Vb 2
-\&   URxvt.keysym.M\-C\-1: command:\e033]710;suxuseuro\e007\e033]711;suxuseuro\e007
-\&   URxvt.keysym.M\-C\-2: command:\e033]710;9x15bold\e007\e033]711;9x15bold\e007
+\&   URxvt.keysym.M-C-1: command:\e033]710;suxuseuro\e007\e033]711;suxuseuro\e007
+\&   URxvt.keysym.M-C-2: command:\e033]710;9x15bold\e007\e033]711;9x15bold\e007
 .Ve
 .PP
 rxvt-unicode will automatically re-apply these fonts to the output so far.
@@ -1436,7 +1436,7 @@ For example, the following selects an almost completely transparent red
 background, and an almost opaque pink foreground:
 .PP
 .Vb 1
-\&   @@RXVT_NAME@@ \-depth 32 \-bg rgba:0000/0000/0000/aaaa \-fg "[80]pink"
+\&   @@RXVT_NAME@@ -depth 32 -bg rgba:0000/0000/0000/aaaa -fg "[80]pink"
 .Ve
 .PP
 \&\fIPlease note that transparency of any kind if completely unsupported by
diff --git a/doc/rxvt.1.txt b/doc/rxvt.1.txt
index d365fbdf..f697cd7c 100644
--- a/doc/rxvt.1.txt
+++ b/doc/rxvt.1.txt
@@ -3,19 +3,19 @@ NAME
     system)
 
 SYNOPSIS
-    rxvt [options] [-e command [ args ]]
+    urxvt [options] [-e command [ args ]]
 
 DESCRIPTION
-    rxvt-unicode, version 8.3, is a colour vt102 terminal emulator intended
+    rxvt-unicode, version 8.4, is a colour vt102 terminal emulator intended
     as an *xterm*(1) replacement for users who do not require features such
     as Tektronix 4014 emulation and toolkit-style configurability. As a
     result, rxvt-unicode uses much less swap space -- a significant
     advantage on a machine serving many X sessions.
 
 FREQUENTLY ASKED QUESTIONS
-    See rxvt(7) (try "man 7 rxvt") for a list of frequently asked questions
-    and answer to them and some common problems. That document is also
-    accessible on the World-Wide-Web at
+    See urxvt(7) (try "man 7 urxvt") for a list of frequently asked
+    questions and answer to them and some common problems. That document is
+    also accessible on the World-Wide-Web at
     <http://cvs.schmorp.de/browse/rxvt-unicode/doc/rxvt.7.html>.
 
 RXVT-UNICODE VS. RXVT
@@ -24,7 +24,7 @@ RXVT-UNICODE VS. RXVT
     world. Being a terminal emulator, however, some things are very
     difficult, especially cursive scripts such as arabic, vertically written
     scripts like mongolian or scripts requiring extremely complex combining
-    rules, like tibetan or devenagari. Don't expect pretty output when using
+    rules, like tibetan or devanagari. Don't expect pretty output when using
     these scripts. Most other scripts, latin, cyrillic, kanji, thai etc.
     should work fine, though. A somewhat difficult case are right-to-left
     scripts, such as hebrew: rxvt-unicode adopts the view that bidirectional
@@ -54,27 +54,27 @@ RXVT-UNICODE VS. RXVT
     without most of its features to get a lean binary. It also comes with a
     client/daemon pair that lets you open any number of terminal windows
     from within a single process, which makes startup time very fast and
-    drastically reduces memory usage. See rxvtd(1) (daemon) and rxvtc(1)
+    drastically reduces memory usage. See urxvtd(1) (daemon) and urxvtc(1)
     (client).
 
     It also makes technical information about escape sequences (which have
-    been extended) more accessible: see rxvt(7) for technical reference
+    been extended) more accessible: see urxvt(7) for technical reference
     documentation (escape sequences etc.).
 
 OPTIONS
-    The rxvt options (mostly a subset of *xterm*'s) are listed below. In
+    The urxvt options (mostly a subset of *xterm*'s) are listed below. In
     keeping with the smaller-is-better philosophy, options may be eliminated
     or default values chosen at compile-time, so options and defaults listed
-    may not accurately reflect the version installed on your system. `rxvt
+    may not accurately reflect the version installed on your system. `urxvt
     -h' gives a list of major compile-time options on the *Options* line.
     Option descriptions may be prefixed with which compile option each is
     dependent upon. e.g. `Compile *XIM*:' requires *XIM* on the *Options*
-    line. Note: `rxvt -help' gives a list of all command-line options
+    line. Note: `urxvt -help' gives a list of all command-line options
     compiled into your version.
 
-    Note that rxvt permits the resource name to be used as a long-option
+    Note that urxvt permits the resource name to be used as a long-option
     (--/++ option) so the potential command-line options are far greater
-    than those listed. For example: `rxvt --loginShell --color1 Orange'.
+    than those listed. For example: `urxvt --loginShell --color1 Orange'.
 
     The following options are available:
 
@@ -104,13 +104,17 @@ OPTIONS
         Turn on/off skip scrolling (allow multiple screens per refresh);
         resource skipScroll.
 
-    -ip|+ip | -tr|+tr
-        Turn on/off inheriting parent window's pixmap. Alternative form is
-        -tr; resource inheritPixmap.
+    -tr|+tr
+        Turn on/off illusion of a transparent window background. Obsolete
+        form of it is -ip and it should not be used anymore; resource
+        transparent.
 
-        *Please note that transparency of any kind if completely unsupported
-        by the author. Don't bug him with installation questions! Read the
-        FAQ (man 7 rxvt)!*
+        *Please note that old resource name of inheritPixmap is obsolete and
+        should be changed to transparent. Backwards compatibility support
+        for inheritPixmap will be phased out in future versions of rxvt!*
+
+        *Please address all transparency related issues to Sasha Vasko at
+        sasha@aftercode.net. Read the FAQ (man 7 urxvt)!*
 
     -fade *number*
         Fade the text by the given percentage when focus is lost. Small
@@ -123,15 +127,15 @@ OPTIONS
 
     -tint *colour*
         Tint the transparent background pixmap with the given colour when
-        transparency is enabled with -tr or -ip. This only works for
-        non-tiled backgrounds, currently. See also the -sh option that can
-        be used to brighten or darken the image in addition to tinting it.
-        Please note that certain tint colours can be applied on the
-        server-side, thus yielding performance gain of two orders of
-        magnitude. These colours are: blue, red, green, cyan, magenta,
-        yellow, and those close to them; resource *tintColor*. Example:
+        transparency is enabled with -tr. This only works for non-tiled
+        backgrounds, currently. See also the -sh option that can be used to
+        brighten or darken the image in addition to tinting it. Please note
+        that certain tint colours can be applied on the server-side, thus
+        yielding performance gain of two orders of magnitude. These colours
+        are: blue, red, green, cyan, magenta, yellow, and those close to
+        them; resource *tintColor*. Example:
 
-           rxvt -tr -tint blue -sh 40
+           urxvt -tr -tint blue -sh 40
 
     -sh *number*
         Darken (0 .. 100) or lighten (-1 .. -100) the transparent background
@@ -143,15 +147,16 @@ OPTIONS
         transparency image, using method specified. Supported values are :
         add, alphablend, allanon - color values averaging, colorize, darken,
         diff, dissipate, hue, lighten, overlay, saturate, screen, sub, tint,
-        value. The default is alpha-blending; resource *blendType*.
+        value. The default is alpha-blending. Compile *afterimage*; resource
+        *blendType*.
 
     -blr *HxV*
         Apply Gaussian Blur with the specified radii to the transparent
         background image. If single number is specified - both vertical and
         horizontal radii are considered to be the same. Setting one of the
         radii to 1 and another to a large number creates interesting effects
-        on some backgrounds. Maximum radius value is 128; resource
-        *blurRadius*.
+        on some backgrounds. Maximum radius value is 128. Compile
+        *afterimage*; resource *blurRadius*.
 
     -bg *colour*
         Window background colour; resource background.
@@ -190,11 +195,11 @@ OPTIONS
         prefix it with "x:". To specify an XFT-font, you need to prefix it
         with "xft:", e.g.:
 
-           rxvt -fn "xft:Bitstream Vera Sans Mono:pixelsize=15"
-           rxvt -fn "9x15bold,xft:Bitstream Vera Sans Mono"
+           urxvt -fn "xft:Bitstream Vera Sans Mono:pixelsize=15"
+           urxvt -fn "9x15bold,xft:Bitstream Vera Sans Mono"
 
         See also the question "How does rxvt-unicode choose fonts?" in the
-        FAQ section of rxvt(7).
+        FAQ section of urxvt(7).
 
     -fb *fontlist*
         Compile *font-styles*: The bold font list to use when bold
@@ -299,7 +304,7 @@ OPTIONS
     -lsp *number*
         Compile *frills*: Lines (pixel height) to insert between each row of
         the display. Useful to work around font rendering problems; resource
-        linespace.
+        lineSpace.
 
     -tn *termname*
         This option specifies the name of the terminal type to be set in the
@@ -308,7 +313,7 @@ OPTIONS
         resource termName.
 
     -e *command [arguments]*
-        Run the command with its command-line arguments in the rxvt window;
+        Run the command with its command-line arguments in the urxvt window;
         also sets the window title and icon name to be the basename of the
         program being executed if neither *-title* (*-T*) nor *-n* are given
         on the command line. If this option is used, it must be the last on
@@ -320,7 +325,7 @@ OPTIONS
         want to run shell commands, you have to specify the shell, like
         this:
 
-          rxvt -e sh -c "shell commands"
+          urxvt -e sh -c "shell commands"
 
     -title *text*
         Window title (-T still respected); the default title is the basename
@@ -376,7 +381,7 @@ OPTIONS
         secondaryScroll.
 
     -hold|+hold
-        Turn on/off hold window after exit support. If enabled, rxvt will
+        Turn on/off hold window after exit support. If enabled, urxvt will
         not immediately destroy its window when the program executed within
         it exits. Instead, it will wait till it is being killed or closed by
         the user; resource hold.
@@ -385,21 +390,21 @@ OPTIONS
         Remap a key symbol. See resource keysym.
 
     -embed *windowid*
-        Tells rxvt to embed its windows into an already-existing window,
+        Tells urxvt to embed its windows into an already-existing window,
         which enables applications to easily embed a terminal.
 
-        Right now, rxvt will first unmap/map the specified window, so it
-        shouldn't be a top-level window. rxvt will also reconfigure it quite
-        a bit, so don't expect it to keep some specific state. It's best to
-        create an extra subwindow for rxvt and leave it alone.
+        Right now, urxvt will first unmap/map the specified window, so it
+        shouldn't be a top-level window. urxvt will also reconfigure it
+        quite a bit, so don't expect it to keep some specific state. It's
+        best to create an extra subwindow for urxvt and leave it alone.
 
-        The window will not be destroyed when rxvt exits.
+        The window will not be destroyed when urxvt exits.
 
-        It might be useful to know that rxvt will not close file descriptors
-        passed to it (except for stdin/out/err, of course), so you can use
-        file descriptors to communicate with the programs within the
-        terminal. This works regardless of whether the "-embed" option was
-        used or not.
+        It might be useful to know that urxvt will not close file
+        descriptors passed to it (except for stdin/out/err, of course), so
+        you can use file descriptors to communicate with the programs within
+        the terminal. This works regardless of whether the "-embed" option
+        was used or not.
 
         Here is a short Gtk2-perl snippet that illustrates how this option
         can be used (a longer example is in doc/embed):
@@ -407,16 +412,16 @@ OPTIONS
            my $rxvt = new Gtk2::Socket;
            $rxvt->signal_connect_after (realize => sub {
               my $xid = $_[0]->window->get_xid;
-              system "rxvt -embed $xid &";
+              system "urxvt -embed $xid &";
            });
 
     -pty-fd *file descriptor*
-        Tells rxvt NOT to execute any commands or create a new pty/tty pair
+        Tells urxvt NOT to execute any commands or create a new pty/tty pair
         but instead use the given file descriptor as the tty master. This is
-        useful if you want to drive rxvt as a generic terminal emulator
+        useful if you want to drive urxvt as a generic terminal emulator
         without having to run a program within it.
 
-        If this switch is given, rxvt will not create any utmp/wtmp entries
+        If this switch is given, urxvt will not create any utmp/wtmp entries
         and will not tinker with pty/tty permissions - you have to do that
         yourself if you want that.
 
@@ -431,7 +436,7 @@ OPTIONS
 
            my $pty = new IO::Pty;
            fcntl $pty, F_SETFD, 0; # clear close-on-exec
-           system "rxvt -pty-fd " . (fileno $pty) . "&";
+           system "urxvt -pty-fd " . (fileno $pty) . "&";
            close $pty;
 
            # now communicate with rxvt
@@ -443,12 +448,12 @@ OPTIONS
         use) in this terminal instance. See resource perl-ext for details.
 
 RESOURCES (available also as long-options)
-    Note: `rxvt --help' gives a list of all resources (long options)
+    Note: `urxvt --help' gives a list of all resources (long options)
     compiled into your version.
 
     You can set and change the resources using X11 tools like xrdb. Many
     distribution do also load settings from the ~/.Xresources file when X
-    starts. rxvt will consult the following files/resources in order, with
+    starts. urxvt will consult the following files/resources in order, with
     later settings overwriting earlier ones:
 
       1. system-wide app-defaults file, either locale-dependent OR global
@@ -457,15 +462,15 @@ RESOURCES (available also as long-options)
       4. SCREEN_RESOURCES for the current screen
       5. $XENVIRONMENT file OR $HOME/.Xdefaults-<nodename>
 
-    Note that when reading X resources, rxvt recognizes two class names:
-    Rxvt and URxvt. The class name Rxvt allows resources common to both rxvt
-    and the original *rxvt* to be easily configured, while the class name
-    URxvt allows resources unique to rxvt, to be shared between different
-    rxvt configurations. If no resources are specified, suitable defaults
-    will be used. Command-line arguments can be used to override resource
-    settings. The following resources are supported (you might want to check
-    the rxvtperl(3) manpage for additional settings by perl extensions not
-    documented here):
+    Note that when reading X resources, urxvt recognizes two class names:
+    Rxvt and URxvt. The class name Rxvt allows resources common to both
+    urxvt and the original *rxvt* to be easily configured, while the class
+    name URxvt allows resources unique to urxvt, to be shared between
+    different urxvt configurations. If no resources are specified, suitable
+    defaults will be used. Command-line arguments can be used to override
+    resource settings. The following resources are supported (you might want
+    to check the urxvtperl(3) manpage for additional settings by perl
+    extensions not documented here):
 
     depth: *bitdepth*
         Compile *xft*: Attempt to find a visual with the given bit depth;
@@ -493,7 +498,7 @@ RESOURCES (available also as long-options)
         section.
 
         Colours higher than 15 cannot be set using resources (yet), but can
-        be changed using an escape command (see rxvt(7)).
+        be changed using an escape command (see urxvt(7)).
 
         Colours 16-79 form a standard 4x4x4 colour cube (the same as xterm
         with 88 colour support). Colours 80-87 are evenly spaces grey steps.
@@ -533,18 +538,18 @@ RESOURCES (available also as long-options)
 
     jumpScroll: *boolean*
         True: specify that jump scrolling should be used. When receiving
-        lots of lines, rxvt will only scroll once a whole screen height of
+        lots of lines, urxvt will only scroll once a whole screen height of
         lines has been read, resulting in fewer updates while still
         displaying every received line; option -j.
 
-        False: specify that smooth scrolling should be used. rxvt will force
-        a screen refresh on each new line it received; option +j.
+        False: specify that smooth scrolling should be used. urxvt will
+        force a screen refresh on each new line it received; option +j.
 
     skipScroll: *boolean*
         True: (the default) specify that skip scrolling should be used. When
-        receiving lots of lines, rxvt will only scroll once in a while
+        receiving lots of lines, urxvt will only scroll once in a while
         (around 60 times per second), resulting in far fewer updates. This
-        can result in rxvt not ever displaying some of the lines it
+        can result in urxvt not ever displaying some of the lines it
         receives; option -ss.
 
         False: specify that everything is to be displayed, even if the
@@ -609,7 +614,8 @@ RESOURCES (available also as long-options)
         -blt "type" option. [default 0x0+50+50]
 
     path: *path*
-        Specify the colon-delimited search path for finding XPM files.
+        Specify the colon-delimited search path for finding background image
+        files.
 
     font: *fontlist*
         Select the fonts to be used. This is a comma separated list of font
@@ -794,7 +800,7 @@ RESOURCES (available also as long-options)
         Specifies the terminal type name to be set in the TERM environment
         variable; option -tn.
 
-    linespace: *number*
+    lineSpace: *number*
         Specifies number of lines (pixel height) to insert between each row
         of the display [default 0]; option -lsp.
 
@@ -846,7 +852,7 @@ RESOURCES (available also as long-options)
         (whitespace delimiting is added automatically if resource is given).
 
         When the perl selection extension is in use (the default if compiled
-        in, see the rxvtperl(3) manpage), a suitable regex using these
+        in, see the urxvtperl(3) manpage), a suitable regex using these
         characters will be created (if the resource exists, otherwise, no
         regex will be created). In this mode, characters outside ISO-8859-1
         can be used.
@@ -872,7 +878,7 @@ RESOURCES (available also as long-options)
         Specify the font-set used for XIM styles "OverTheSpot" or
         "OffTheSpot". It must be a standard X font set (XLFD patterns
         separated by commas), i.e. it's not in the same format as the other
-        font lists used in rxvt. The default will be set-up to chose *any*
+        font lists used in urxvt. The default will be set-up to chose *any*
         suitable found found, preferably one or two pixels differing in size
         to the base font. option -imfont.
 
@@ -914,7 +920,7 @@ RESOURCES (available also as long-options)
         instead scroll the screen up.
 
     hold: *boolean*
-        Turn on/off hold window after exit support. If enabled, rxvt will
+        Turn on/off hold window after exit support. If enabled, urxvt will
         not immediately destroy its window when the program executed within
         it exits. Instead, it will wait till it is being killed or closed by
         the user.
@@ -940,17 +946,8 @@ RESOURCES (available also as long-options)
         is not performed in an exact manner; however, the closest match is
         assured.
 
-        *string* may contain escape values ("\a": bell, "\b": backspace,
-        "\e", "\E": escape, "\n": newline, "\r": carriage return, "\t": tab,
-        "\000": octal number) or verbatim control characters ("^?": delete,
-        "^@": null, "^A" ...) and may be enclosed with double quotes so that
-        it can start or end with whitespace. This feature is deprecated and
-        will be removed.
-
-        Please note that you need to double the "\" in resource files, as
-        Xlib itself does its own de-escaping (you can use "\033" instead of
-        "\e" (and so on), which will work with both Xt and rxvt's own
-        processing).
+        *string* may contain escape values ("\n": newline, "\000": octal
+        number), see RESOURCES in "man 7 X" for futher details.
 
         You can define a range of keysyms in one shot by providing a
         *string* with pattern list/PREFIX/MIDDLE/SUFFIX, where the delimiter
@@ -967,7 +964,7 @@ RESOURCES (available also as long-options)
           URxvt.keysym.Meta-Control-0x63:    \033<M-C-c>
 
         If *string* takes the form of "command:STRING", the specified STRING
-        is interpreted and executed as rxvt's control sequence. For example
+        is interpreted and executed as urxvt's control sequence. For example
         the following means "change the current locale to "zh_CN.GBK" when
         Control-Meta-c is being pressed":
 
@@ -975,8 +972,9 @@ RESOURCES (available also as long-options)
 
         If *string* takes the form "perl:STRING", then the specified STRING
         is passed to the "on_keyboard_command" perl handler. See the
-        rxvtperl(3) manpage. For example, the selection extension (activated
-        via "rxvt -pe selection") listens for "selection:rot13" events:
+        urxvtperl(3) manpage. For example, the selection extension
+        (activated via "urxvt -pe selection") listens for "selection:rot13"
+        events:
 
           URxvt.keysym.M-C-c: perl:selection:rot13
 
@@ -988,7 +986,7 @@ RESOURCES (available also as long-options)
         unless some of those are defined mappings themselves.
 
         Unfortunately, this will override built-in key mappings. For example
-        if you overwrite the "Insert" key you will disable rxvt's
+        if you overwrite the "Insert" key you will disable urxvt's
         "Shift-Insert" mapping. To re-enable that, you can poke "holes" into
         the user-defined keymap using the "builtin:" replacement:
 
@@ -1006,7 +1004,7 @@ RESOURCES (available also as long-options)
           URxvt.keysym.M-C-1: command:\033]50;suxuseuro\007
           URxvt.keysym.M-C-2: command:\033]50;9x15bold\007
 
-        Other things are possible, e.g. resizing (see rxvt(7) for more
+        Other things are possible, e.g. resizing (see urxvt(7) for more
         info):
 
           URxvt.keysym.M-C-3: command:\033[8;25;80t
@@ -1040,24 +1038,24 @@ RESOURCES (available also as long-options)
 
     perl-eval: *string*
         Perl code to be evaluated when all extensions have been registered.
-        See the rxvtperl(3) manpage. Due to security reasons, this resource
+        See the urxvtperl(3) manpage. Due to security reasons, this resource
         will be ignored when running setuid/setgid.
 
     perl-lib: *path*
         Colon-separated list of additional directories that hold extension
         scripts. When looking for extensions specified by the "perl"
-        resource, rxvt will first look in these directories and then in
-        /opt/rxvt/lib/urxvt/perl/. Due to security reasons, this resource
+        resource, urxvt will first look in these directories and then in
+        /usr/local/lib/urxvt/perl/. Due to security reasons, this resource
         will be ignored when running setuid/setgid.
 
-        See the rxvtperl(3) manpage.
+        See the urxvtperl(3) manpage.
 
     selection.pattern-*idx*: *perl-regex*
-        Additional selection patterns, see the rxvtperl(3) manpage for
+        Additional selection patterns, see the urxvtperl(3) manpage for
         details.
 
     selection-autotransform.*idx*: *perl-transform*
-        Selection auto-transform patterns, see the rxvtperl(3) manpage for
+        Selection auto-transform patterns, see the urxvtperl(3) manpage for
         details.
 
     searchable-scrollback: *keysym*
@@ -1081,9 +1079,9 @@ RESOURCES (available also as long-options)
         Turn on/off ISO 14755 5.2 mode (default enabled).
 
 THE SCROLLBAR
-    Lines of text that scroll off the top of the rxvt window (resource:
+    Lines of text that scroll off the top of the urxvt window (resource:
     saveLines) and can be scrolled back using the scrollbar or by
-    keystrokes. The normal rxvt scrollbar has arrows and its behaviour is
+    keystrokes. The normal urxvt scrollbar has arrows and its behaviour is
     fairly intuitive. The xterm-scrollbar is without arrows and its
     behaviour mimics that of *xterm*
 
@@ -1120,7 +1118,7 @@ THE SELECTION: SELECTING AND PASTING TEXT
         removed from the selection.
 
     Pasting:
-        Pressing and releasing the Middle mouse button in an rxvt window
+        Pressing and releasing the Middle mouse button in an urxvt window
         causes the value of the PRIMARY selection (or CLIPBOARD with the
         Meta modifier) to be inserted as if it had been typed on the
         keyboard.
@@ -1204,13 +1202,13 @@ ISO 14755 SUPPORT
     both scenario A and B of ISO 14755, including part 5.2.
 
 LOGIN STAMP
-    rxvt tries to write an entry into the *utmp*(5) file so that it can be
+    urxvt tries to write an entry into the *utmp*(5) file so that it can be
     seen via the *who(1)* command, and can accept messages. To allow this
-    feature, rxvt may need to be installed setuid root on some systems or
+    feature, urxvt may need to be installed setuid root on some systems or
     setgid to root or to some other group on others.
 
 COLORS AND GRAPHICS
-    In addition to the default foreground and background colours, rxvt can
+    In addition to the default foreground and background colours, urxvt can
     display up to 16 colours (8 ANSI colours plus high-intensity bold/blink
     versions of the same). Here is a list of the colours with their names.
 
@@ -1238,7 +1236,7 @@ COLORS AND GRAPHICS
     0-15, as a convenient shorthand to reference the colour name of
     color0-color15.
 
-    In addition to the colours defined above, rxvt offers an additional 72
+    In addition to the colours defined above, urxvt offers an additional 72
     colours. The first 64 of those (with indices 16 to 79) consist of a
     4*4*4 RGB colour cube (i.e. *index = r * 16 + g * 4 + b + 16*), followed
     by 8 additional shades of gray (with indices 80 to 87).
@@ -1252,7 +1250,7 @@ COLORS AND GRAPHICS
     *xterm*(1) where the colours are only swapped if they have not otherwise
     been specified. For example,
 
-    rxvt -fg Black -bg White -rv
+    urxvt -fg Black -bg White -rv
         would yield White on Black, while on *xterm*(1) it would yield Black
         on White.
 
@@ -1274,22 +1272,23 @@ COLORS AND GRAPHICS
     For example, the following selects an almost completely transparent red
     background, and an almost opaque pink foreground:
 
-       rxvt -depth 32 -bg rgba:0000/0000/0000/aaaa -fg "[80]pink"
+       urxvt -depth 32 -bg rgba:0000/0000/0000/aaaa -fg "[80]pink"
 
     *Please note that transparency of any kind if completely unsupported by
     the author. Don't bug him with installation questions!*
 
 ENVIRONMENT
-    rxvt sets and/or uses the following environment variables:
+    urxvt sets and/or uses the following environment variables:
 
     TERM
         Normally set to "rxvt-unicode", unless overwritten at configure
         time, via resources or on the command line.
 
     COLORTERM
-        Either "rxvt", "rxvt-xpm", depending on whether rxvt was compiled
-        with XPM support, and optionally with the added extension "-mono" to
-        indicate that rxvt-unicode runs on a monochrome screen.
+        Either "rxvt", "rxvt-xpm", depending on whether urxvt was compiled
+        with background image support, and optionally with the added
+        extension "-mono" to indicate that rxvt-unicode runs on a monochrome
+        screen.
 
     COLORFGBG
         Set to a string of the form "fg;bg" or "fg;xpm;bg", where "fg" is
@@ -1297,27 +1296,28 @@ ENVIRONMENT
         string "default" to indicate that the default-colour escape sequence
         is to be used), "bg" is the colour code used as default background
         colour (or the string "default"), and "xpm" is the string "default"
-        if rxvt was compiled with XPM support. Libraries like "ncurses" and
-        "slang" can (and do) use this information to optimize screen output.
+        if urxvt was compiled with background image support. Libraries like
+        "ncurses" and "slang" can (and do) use this information to optimize
+        screen output.
 
     WINDOWID
-        Set to the (decimal) X Window ID of the rxvt window (the toplevel
+        Set to the (decimal) X Window ID of the urxvt window (the toplevel
         window, which usually has subwindows for the scrollbar, the terminal
         window and so on).
 
     TERMINFO
-        Set to the terminfo directory iff rxvt was configured with
+        Set to the terminfo directory iff urxvt was configured with
         "--with-terminfo=PATH".
 
     DISPLAY
-        Used by rxvt to connect to the display and set to the correct
+        Used by urxvt to connect to the display and set to the correct
         display in its child processes.
 
     SHELL
         The shell to be used for command execution, defaults to "/bin/sh".
 
     RXVT_SOCKET
-        The unix domain socket path used by rxvtc(1) and rxvtd(1).
+        The unix domain socket path used by urxvtc(1) and urxvtd(1).
 
         Default $HOME/.rxvt-unicode-*<nodename*.
 
@@ -1331,15 +1331,15 @@ ENVIRONMENT
 
     XENVIRONMENT
         If set and accessible, gives the name of a X resource file to be
-        loaded by rxvt.
+        loaded by urxvt.
 
 FILES
     /usr/lib/X11/rgb.txt
         Color names.
 
 SEE ALSO
-    rxvt(7), rxvtc(1), rxvtd(1), xterm(1), sh(1), resize(1), X(1), pty(4),
-    tty(4), utmp(5)
+    urxvt(7), urxvtc(1), urxvtd(1), xterm(1), sh(1), resize(1), X(1),
+    pty(4), tty(4), utmp(5)
 
 CURRENT PROJECT COORDINATOR
     Project Coordinator
diff --git a/doc/rxvt.7.html b/doc/rxvt.7.html
index 535d1089..b5118629 100644
--- a/doc/rxvt.7.html
+++ b/doc/rxvt.7.html
@@ -6,7 +6,7 @@
 	<meta name="description" content="Pod documentation for RXVT REFERENCE" />
 	<meta name="inputfile" content="&lt;standard input&gt;" />
 	<meta name="outputfile" content="&lt;standard output&gt;" />
-	<meta name="created" content="Wed Aug  1 20:30:03 2007" />
+	<meta name="created" content="Sat Oct 27 14:07:34 2007" />
 	<meta name="generator" content="Pod::Xhtml 1.57" />
 <link rel="stylesheet" href="http://res.tst.eu/pod.css"/></head>
 <body>
@@ -46,6 +46,7 @@
 <li><a href="#Why_do_some_characters_look_so_much_">Why do some characters look so much different than others?</a></li>
 <li><a href="#How_does_rxvt_unicode_choose_fonts">How does rxvt-unicode choose fonts?</a></li>
 <li><a href="#Why_do_some_chinese_characters_look_">Why do some chinese characters look so different than others?</a></li>
+<li><a href="#How_can_I_make_mplayer_display_video">How can I make mplayer display video correctly?</a></li>
 </ul>
 </li>
 <li><a href="#Keyboard_Mouse_amp_User_Interaction">Keyboard, Mouse &amp; User Interaction</a>
@@ -119,7 +120,7 @@
 <ul><li><a href="#XTerm_Operating_System_Commands">XTerm Operating System Commands</a></li>
 </ul>
 </li>
-<li><a href="#XPM">XPM</a></li>
+<li><a href="#BACKGROUND_IMAGE">BACKGROUND IMAGE</a></li>
 <li><a href="#Mouse">Mouse</a></li>
 <li><a href="#Mouse_Reporting">Mouse Reporting</a></li>
 <li><a href="#KeyCodes">KeyCodes</a></li>
@@ -365,10 +366,9 @@ except maybe libX11 :)</p>
 </div>
 <h3 id="I_can_t_get_transparency_working_wha">I can't get transparency working, what am I doing wrong?</h3>
 <div id="I_can_t_get_transparency_working_wha-2">
-<p>First of all, transparency isn't officially supported in rxvt-unicode, so
-you are mostly on your own. Do not bug the author about it (but you may
-bug everybody else). Also, if you can't get it working consider it a rite
-of passage: ... and you failed.</p>
+<p>First of all, please address all transparency related issues to Sasha Vasko at 
+sasha@aftercode.net and do not bug the author about it. Also, if you can't 
+get it working consider it a rite of passage: ... and you failed.</p>
 <p>Here are four ways to get transparency. <strong>Do</strong> read the manpage and option
 descriptions for the programs mentioned and rxvt-unicode. Really, do it!</p>
 <p>1. Use inheritPixmap:</p>
@@ -381,11 +381,11 @@ support, or you are unable to read.</p>
 <p>2. Use a simple pixmap and emulate pseudo-transparency. This enables you
 to use effects other than tinting and shading: Just shade/tint/whatever
 your picture with gimp or any other tool:</p>
-<pre>   convert wallpaper.jpg -blur 20x20 -modulate 30 background.xpm
-   urxvt -pixmap background.xpm -pe automove-background
+<pre>   convert wallpaper.jpg -blur 20x20 -modulate 30 background.jpg
+   urxvt -pixmap background.jpg -pe automove-background
 
 </pre>
-<p>That works. If you think it doesn't, you lack XPM and Perl support, or you
+<p>That works. If you think it doesn't, you lack AfterImage and Perl support, or you
 are unable to read.</p>
 <p>3. Use an ARGB visual:</p>
 <pre>   urxvt -depth 32 -fg grey90 -bg rgba:0000/0000/4444/cccc
@@ -607,6 +607,17 @@ fonts for the same character at the same time, but no interface for this
 has been designed yet).</p>
 <p>Until then, you might get away with switching fonts at runtime (see <a href="#Can_I_switch_the_fonts_at_runtime">Can I switch the fonts at runtime?</a> later in this document).</p>
 
+</div>
+<h3 id="How_can_I_make_mplayer_display_video">How can I make mplayer display video correctly?</h3>
+<div id="How_can_I_make_mplayer_display_video-2">
+<p>We are working on it, in the meantime, as a workaround, use something like:</p>
+<pre>   urxvt -b 600 -geometry 20x1 -e sh -c 'mplayer -wid $WINDOWID file...'
+
+
+
+
+</pre>
+
 </div>
 <h2 id="Keyboard_Mouse_amp_User_Interaction">Keyboard, Mouse &amp; User Interaction</h2>
 <div id="Keyboard_Mouse_amp_User_Interaction_">
@@ -808,9 +819,6 @@ required for your particular machine.</p>
 
 
 
-
-
-
 </div>
 <h2 id="Terminal_Configuration">Terminal Configuration</h2>
 <div id="Terminal_Configuration_CONTENT">
@@ -1758,7 +1766,9 @@ Option'')</p>
 <table><tr><td>h</td><td>Application Keypad (DECPAM) == ESC =</td></tr><tr><td>l</td><td>Normal Keypad (DECPNM) == ESC ></td></tr></table>				<dt><strong><code>Pm = 67</code></strong></dt>
 <table><tr><td>h</td><td>Backspace key sends BS (DECBKM)</td></tr><tr><td>l</td><td>Backspace key sends DEL</td></tr></table>				<dt><strong><code>Pm = 1000</code></strong> (X11 XTerm)</dt>
 <table><tr><td>h</td><td>Send Mouse X & Y on button press and release.</td></tr><tr><td>l</td><td>No mouse reporting.</td></tr></table>				<dt><strong><code>Pm = 1001</code></strong> (X11 XTerm) <i>unimplemented</i></dt>
-<table><tr><td>h</td><td>Use Hilite Mouse Tracking.</td></tr><tr><td>l</td><td>No mouse reporting.</td></tr></table>				<dt><strong><code>Pm = 1010</code></strong> (<strong>rxvt</strong>)</dt>
+<table><tr><td>h</td><td>Use Hilite Mouse Tracking.</td></tr><tr><td>l</td><td>No mouse reporting.</td></tr></table>				<dt><strong><code>Pm = 1002</code></strong> (X11 XTerm)</dt>
+<table><tr><td>h</td><td>Send Mouse X & Y on button press and release, and motion with a button pressed.</td></tr><tr><td>l</td><td>No mouse reporting.</td></tr></table>				<dt><strong><code>Pm = 1003</code></strong> (X11 XTerm)</dt>
+<table><tr><td>h</td><td>Send Mouse X & Y on button press and release, and motion.</td></tr><tr><td>l</td><td>No mouse reporting.</td></tr></table>				<dt><strong><code>Pm = 1010</code></strong> (<strong>rxvt</strong>)</dt>
 <table><tr><td>h</td><td>Don't scroll to bottom on TTY output</td></tr><tr><td>l</td><td>Scroll to bottom on TTY output</td></tr></table>				<dt><strong><code>Pm = 1011</code></strong> (<strong>rxvt</strong>)</dt>
 <table><tr><td>h</td><td>Scroll to bottom when a key is pressed</td></tr><tr><td>l</td><td>Don't scroll to bottom when a key is pressed</td></tr></table>				<dt><strong><code>Pm = 1021</code></strong> (<strong>rxvt</strong>)</dt>
 <table><tr><td>h</td><td>Bold/italic implies high intensity (see option -is)</td></tr><tr><td>l</td><td>Font styles have no effect on intensity (Compile styles)</td></tr></table>				<dt><strong><code>Pm = 1047</code></strong></dt>
@@ -1779,14 +1789,14 @@ Option'')</p>
 		<p>Set XTerm Parameters. 8-bit ST: 0x9c, 7-bit ST sequence: ESC \ (0x1b,
 0x5c), backwards compatible terminator BEL (0x07) is also accepted. any
 <strong>octet</strong> can be escaped by prefixing it with SYN (0x16, ^V).</p>
-<table><tr><td>Ps = 0</td><td>Change Icon Name and Window Title to Pt</td></tr><tr><td>Ps = 1</td><td>Change Icon Name to Pt</td></tr><tr><td>Ps = 2</td><td>Change Window Title to Pt</td></tr><tr><td>Ps = 3</td><td>If Pt starts with a ?, query the (STRING) property of the window and return it. If Pt contains a =, set the named property to the given value, else delete the specified property.</td></tr><tr><td>Ps = 4</td><td>Pt is a semi-colon separated sequence of one or more semi-colon separated number/name pairs, where number is an index to a colour and name is the name of a colour. Each pair causes the numbered colour to be changed to name. Numbers 0-7 corresponds to low-intensity (normal) colours and 8-15 corresponds to high-intensity colours. 0=black, 1=red, 2=green, 3=yellow, 4=blue, 5=magenta, 6=cyan, 7=white</td></tr><tr><td>Ps = 10</td><td>Change colour of text foreground to Pt (NB: may change in future)</td></tr><tr><td>Ps = 11</td><td>Change colour of text background to Pt (NB: may change in future)</td></tr><tr><td>Ps = 12</td><td>Change colour of text cursor foreground to Pt</td></tr><tr><td>Ps = 13</td><td>Change colour of mouse foreground to Pt</td></tr><tr><td>Ps = 17</td><td>Change colour of highlight characters to Pt</td></tr><tr><td>Ps = 18</td><td>Change colour of bold characters to Pt [deprecated, see 706]</td></tr><tr><td>Ps = 19</td><td>Change colour of underlined characters to Pt [deprecated, see 707]</td></tr><tr><td>Ps = 20</td><td>Change background pixmap parameters (see section XPM) (Compile XPM).</td></tr><tr><td>Ps = 39</td><td>Change default foreground colour to Pt.</td></tr><tr><td>Ps = 46</td><td>Change Log File to Pt unimplemented</td></tr><tr><td>Ps = 49</td><td>Change default background colour to Pt.</td></tr><tr><td>Ps = 50</td><td>Set fontset to Pt, with the following special values of Pt (rxvt) #+n change up n #-n change down n if n is missing of 0, a value of 1 is used empty change to font0 n change to font n</td></tr><tr><td>Ps = 55</td><td>Log all scrollback buffer and all of screen to Pt</td></tr><tr><td>Ps = 701</td><td>Change current locale to Pt, or, if Pt is ?, return the current locale (Compile frills).</td></tr><tr><td>Ps = 702</td><td>Request version if Pt is ?, returning rxvt-unicode, the resource name, the major and minor version numbers, e.g. ESC ] 702 ; rxvt-unicode ; urxvt ; 7 ; 4 ST.</td></tr><tr><td>Ps = 704</td><td>Change colour of italic characters to Pt</td></tr><tr><td>Ps = 705</td><td>Change background pixmap tint colour to Pt (Compile transparency).</td></tr><tr><td>Ps = 706</td><td>Change colour of bold characters to Pt</td></tr><tr><td>Ps = 707</td><td>Change colour of underlined characters to Pt</td></tr><tr><td>Ps = 710</td><td>Set normal fontset to Pt. Same as Ps = 50.</td></tr><tr><td>Ps = 711</td><td>Set bold fontset to Pt. Similar to Ps = 50 (Compile styles).</td></tr><tr><td>Ps = 712</td><td>Set italic fontset to Pt. Similar to Ps = 50 (Compile styles).</td></tr><tr><td>Ps = 713</td><td>Set bold-italic fontset to Pt. Similar to Ps = 50 (Compile styles).</td></tr><tr><td>Ps = 720</td><td>Move viewing window up by Pt lines, or clear scrollback buffer if Pt = 0 (Compile frills).</td></tr><tr><td>Ps = 721</td><td>Move viewing window down by Pt lines, or clear scrollback buffer if Pt = 0 (Compile frills).</td></tr><tr><td>Ps = 777</td><td>Call the perl extension with the given string, which should be of the form extension:parameters (Compile perl).</td></tr></table>	</dd>
+<table><tr><td>Ps = 0</td><td>Change Icon Name and Window Title to Pt</td></tr><tr><td>Ps = 1</td><td>Change Icon Name to Pt</td></tr><tr><td>Ps = 2</td><td>Change Window Title to Pt</td></tr><tr><td>Ps = 3</td><td>If Pt starts with a ?, query the (STRING) property of the window and return it. If Pt contains a =, set the named property to the given value, else delete the specified property.</td></tr><tr><td>Ps = 4</td><td>Pt is a semi-colon separated sequence of one or more semi-colon separated number/name pairs, where number is an index to a colour and name is the name of a colour. Each pair causes the numbered colour to be changed to name. Numbers 0-7 corresponds to low-intensity (normal) colours and 8-15 corresponds to high-intensity colours. 0=black, 1=red, 2=green, 3=yellow, 4=blue, 5=magenta, 6=cyan, 7=white</td></tr><tr><td>Ps = 10</td><td>Change colour of text foreground to Pt (NB: may change in future)</td></tr><tr><td>Ps = 11</td><td>Change colour of text background to Pt (NB: may change in future)</td></tr><tr><td>Ps = 12</td><td>Change colour of text cursor foreground to Pt</td></tr><tr><td>Ps = 13</td><td>Change colour of mouse foreground to Pt</td></tr><tr><td>Ps = 17</td><td>Change colour of highlight characters to Pt</td></tr><tr><td>Ps = 18</td><td>Change colour of bold characters to Pt [deprecated, see 706]</td></tr><tr><td>Ps = 19</td><td>Change colour of underlined characters to Pt [deprecated, see 707]</td></tr><tr><td>Ps = 20</td><td>Change background pixmap parameters (see section BACKGROUND IMAGE) (Compile AfterImage).</td></tr><tr><td>Ps = 39</td><td>Change default foreground colour to Pt.</td></tr><tr><td>Ps = 46</td><td>Change Log File to Pt unimplemented</td></tr><tr><td>Ps = 49</td><td>Change default background colour to Pt.</td></tr><tr><td>Ps = 50</td><td>Set fontset to Pt, with the following special values of Pt (rxvt) #+n change up n #-n change down n if n is missing of 0, a value of 1 is used empty change to font0 n change to font n</td></tr><tr><td>Ps = 55</td><td>Log all scrollback buffer and all of screen to Pt</td></tr><tr><td>Ps = 701</td><td>Change current locale to Pt, or, if Pt is ?, return the current locale (Compile frills).</td></tr><tr><td>Ps = 702</td><td>Request version if Pt is ?, returning rxvt-unicode, the resource name, the major and minor version numbers, e.g. ESC ] 702 ; rxvt-unicode ; urxvt ; 7 ; 4 ST.</td></tr><tr><td>Ps = 704</td><td>Change colour of italic characters to Pt</td></tr><tr><td>Ps = 705</td><td>Change background pixmap tint colour to Pt (Compile transparency).</td></tr><tr><td>Ps = 706</td><td>Change colour of bold characters to Pt</td></tr><tr><td>Ps = 707</td><td>Change colour of underlined characters to Pt</td></tr><tr><td>Ps = 710</td><td>Set normal fontset to Pt. Same as Ps = 50.</td></tr><tr><td>Ps = 711</td><td>Set bold fontset to Pt. Similar to Ps = 50 (Compile styles).</td></tr><tr><td>Ps = 712</td><td>Set italic fontset to Pt. Similar to Ps = 50 (Compile styles).</td></tr><tr><td>Ps = 713</td><td>Set bold-italic fontset to Pt. Similar to Ps = 50 (Compile styles).</td></tr><tr><td>Ps = 720</td><td>Move viewing window up by Pt lines, or clear scrollback buffer if Pt = 0 (Compile frills).</td></tr><tr><td>Ps = 721</td><td>Move viewing window down by Pt lines, or clear scrollback buffer if Pt = 0 (Compile frills).</td></tr><tr><td>Ps = 777</td><td>Call the perl extension with the given string, which should be of the form extension:parameters (Compile perl).</td></tr></table>	</dd>
 </dl>
 
 </div>
-<h1 id="XPM">XPM</h1><p><a href="#TOP" class="toplink">Top</a></p>
-<div id="XPM_CONTENT">
-<p>For the XPM XTerm escape sequence <strong><code>ESC ] 20 ; Pt ST</code></strong> then value
-of <strong><code>Pt</code></strong> can be the name of the background pixmap followed by a
+<h1 id="BACKGROUND_IMAGE">BACKGROUND IMAGE</h1><p><a href="#TOP" class="toplink">Top</a></p>
+<div id="BACKGROUND_IMAGE_CONTENT">
+<p>For the BACGROUND IMAGE XTerm escape sequence <strong><code>ESC ] 20 ; Pt ST</code></strong> then value
+of <strong><code>Pt</code></strong> can be the name of the background image file followed by a
 sequence of scaling/positioning commands separated by semi-colons. The
 scaling/positioning commands are as follows:</p>
 <dl>
@@ -1821,13 +1831,13 @@ scaling/positioning commands are as follows:</p>
 </dl>
 <p>For example:</p>
 <dl>
-	<dt><strong>\E]20;funky\a</strong></dt>
+	<dt><strong>\E]20;funky.jpg\a</strong></dt>
 	<dd>
-		<p>load <strong>funky.xpm</strong> as a tiled image</p>
+		<p>load <strong>funky.jpg</strong> as a tiled image</p>
 	</dd>
-	<dt><strong>\E]20;mona;100\a</strong></dt>
+	<dt><strong>\E]20;mona.jpg;100\a</strong></dt>
 	<dd>
-		<p>load <strong>mona.xpm</strong> with a scaling of 100%</p>
+		<p>load <strong>mona.jpg</strong> with a scaling of 100%</p>
 	</dd>
 	<dt><strong>\E]20;;200;?\a</strong></dt>
 	<dd>
@@ -1874,9 +1884,9 @@ your system.</p>
 <div id="CONFIGURE_OPTIONS_CONTENT">
 <p>General hint: if you get compile errors, then likely your configuration
 hasn't been tested well. Either try with <code>--enable-everything</code> or use
-the default configuration (i.e. <code>--enable-xxx</code> or <code>--disable-xxx</code>). Of
-course, you should always report when a combination doesn't work, so it
-can be fixed. Marc Lehmann &lt;rxvt@schmorp.de&gt;.</p>
+the default configuration (i.e. no <code>--enable-xxx</code> or <code>--disable-xxx</code>
+switches). Of course, you should always report when a combination doesn't
+work, so it can be fixed. Marc Lehmann &lt;rxvt@schmorp.de&gt;.</p>
 <p>All</p>
 <dl>
 	<dt>--enable-everything</dt>
@@ -1978,10 +1988,6 @@ option requires --enable-utmp to also be specified.</p>
 <cite>lastlogin</cite>) at start of rxvt execution.  This option requires
 --enable-utmp to also be specified.</p>
 	</dd>
-	<dt>--enable-xpm-background (default: on)</dt>
-	<dd>
-		<p>Add support for XPM background pixmaps.</p>
-	</dd>
 	<dt>--enable-afterimage (default: on)</dt>
 	<dd>
 		<p>Add support for libAfterImage to be used for transparency and background
@@ -1990,7 +1996,7 @@ SVG, TIFF, GIF, XPM, BMP, ICO, XCF, TGA and AfterStep image XML
 (<a href="http://www.afterstep.org/visualdoc.php?show=asimagexml">http://www.afterstep.org/visualdoc.php?show=asimagexml</a>).</p>
 		<p>This option also adds such eye candy as blending an image over the root
 background, as well as dynamic scaling and bluring of background images.</p>
-		<p>Note that with this option enabled, rxvt's memory footprint might
+		<p>Note that with this option enabled, urxvt's memory footprint might
 increase by a few megabytes even if no extra features are used (mostly due
 to third-party libraries used by libAI). Memory footprint may somewhat be
 lowered if libAfterImage is configured without support for SVG.</p>
@@ -2004,10 +2010,6 @@ transparency to the term.</p>
 	<dd>
 		<p>Add support for fading the text when focus is lost.</p>
 	</dd>
-	<dt>--enable-tinting (default: on)</dt>
-	<dd>
-		<p>Add support for tinting of transparent backgrounds (requires <code>--enable-transparency</code>).</p>
-	</dd>
 	<dt>--enable-rxvt-scroll (default: on)</dt>
 	<dd>
 		<p>Add support for the original rxvt scrollbar.</p>
@@ -2091,7 +2093,7 @@ in combination with other switches) is:</p>
 	</dd>
 	<dt>--enable-iso14755 (default: on)</dt>
 	<dd>
-		<p>Enable extended ISO 14755 support (see rxvt(1), or
+		<p>Enable extended ISO 14755 support (see urxvt(1), or
 <cite>doc/rxvt.1.txt</cite>). 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.</p>
@@ -2128,7 +2130,7 @@ the screen in a fixed position.</p>
 	</dd>
 	<dt>--enable-perl (default: on)</dt>
 	<dd>
-		<p>Enable an embedded perl interpreter. See the <strong>rxvtperl(3)</strong>
+		<p>Enable an embedded perl interpreter. See the <strong>urxvtperl(3)</strong>
 manpage (<cite>doc/rxvtperl.txt</cite>) for more info on this feature, or the
 files in <cite>src/perl-ext/</cite> for the extensions that are installed by
 default. The perl interpreter that is used can be specified via the
@@ -2160,18 +2162,6 @@ PATH.</p>
 	<dd>
 		<p>Use the X Window System (pretty much default, eh?).</p>
 	</dd>
-	<dt>--with-xpm-includes=DIR</dt>
-	<dd>
-		<p>Look for the XPM includes in DIR.</p>
-	</dd>
-	<dt>--with-xpm-library=DIR</dt>
-	<dd>
-		<p>Look for the XPM library in DIR.</p>
-	</dd>
-	<dt>--with-xpm</dt>
-	<dd>
-		<p>Not needed - define via --enable-xpm-background.</p>
-	</dd>
 </dl>
 
 </div>
diff --git a/doc/rxvt.7.man.in b/doc/rxvt.7.man.in
index 26464840..39b3862a 100644
--- a/doc/rxvt.7.man.in
+++ b/doc/rxvt.7.man.in
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.3
+.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.35
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "@@RXVT_NAME@@ 7"
-.TH @@RXVT_NAME@@ 7 "2007-10-26" "8.3" "RXVT-UNICODE"
+.TH @@RXVT_NAME@@ 7 "2007-10-27" "8.4" "RXVT-UNICODE"
 .SH "NAME"
 RXVT REFERENCE \- FAQ, command sequences and other background information
 .SH "SYNOPSIS"
@@ -140,8 +140,8 @@ RXVT REFERENCE \- FAQ, command sequences and other background information
 .Ve
 .PP
 .Vb 2
-\&   # change the locale and tell rxvt\-unicode about it
-\&   export LC_CTYPE=ja_JP.EUC\-JP; printf "\e33]701;$LC_CTYPE\e007"
+\&   # change the locale and tell rxvt-unicode about it
+\&   export LC_CTYPE=ja_JP.EUC-JP; printf "\e33]701;$LC_CTYPE\e007"
 .Ve
 .PP
 .Vb 2
@@ -174,11 +174,11 @@ simple tabbed terminal. It is installed by default, so any of these should
 give you tabs:
 .PP
 .Vb 1
-\&   @@URXVT_NAME@@ \-pe tabbed
+\&   @@URXVT_NAME@@ -pe tabbed
 .Ve
 .PP
 .Vb 1
-\&   URxvt.perl\-ext\-common: default,tabbed
+\&   URxvt.perl-ext-common: default,tabbed
 .Ve
 .PP
 It will also work fine with tabbing functionality of many window managers
@@ -226,8 +226,8 @@ If you want to start @@URXVT_NAME@@d automatically whenever you run
 .Vb 6
 \&   #!/bin/sh
 \&   @@URXVT_NAME@@c "$@"
-\&   if [ $? \-eq 2 ]; then
-\&      @@URXVT_NAME@@d \-q \-o \-f
+\&   if [ $? -eq 2 ]; then
+\&      @@URXVT_NAME@@d -q -o -f
 \&      @@URXVT_NAME@@c "$@"
 \&   fi
 .Ve
@@ -260,14 +260,14 @@ snippets:
 .PP
 .Vb 12
 \&   # Bourne/Korn/POSIX family of shells:
-\&   [ ${TERM:\-foo} = foo ] && TERM=xterm # assume an xterm if we don't know
-\&   if [ ${TERM:\-foo} = xterm ]; then
-\&      stty \-icanon \-echo min 0 time 15 # see if enhanced rxvt or not
-\&      echo \-n '^[Z'
+\&   [ ${TERM:-foo} = foo ] && TERM=xterm # assume an xterm if we don't know
+\&   if [ ${TERM:-foo} = xterm ]; then
+\&      stty -icanon -echo min 0 time 15 # see if enhanced rxvt or not
+\&      echo -n '^[Z'
 \&      read term_id
 \&      stty icanon echo
-\&      if [ ""${term_id} = '^[[?1;2C' \-a ${DISPLAY:\-foo} = foo ]; then
-\&         echo \-n '^[[7n'        # query the rxvt we are in for the DISPLAY string
+\&      if [ ""${term_id} = '^[[?1;2C' -a ${DISPLAY:-foo} = foo ]; then
+\&         echo -n '^[[7n'        # query the rxvt we are in for the DISPLAY string
 \&         read DISPLAY           # set it in our local shell
 \&      fi
 \&   fi
@@ -293,8 +293,8 @@ already in use in this mode.
 .PP
 .Vb 3
 \&    text    data     bss     drs     rss filename
-\&   98398    1664      24   15695    1824 rxvt \-\-disable\-everything
-\&  188985    9048   66616   18222    1788 urxvt \-\-disable\-everything
+\&   98398    1664      24   15695    1824 rxvt --disable-everything
+\&  188985    9048   66616   18222    1788 urxvt --disable-everything
 .Ve
 .PP
 When you \f(CW\*(C`\-\-enable\-everything\*(C'\fR (which \fIis\fR unfair, as this involves xft
@@ -303,8 +303,8 @@ libc), the two diverge, but not unreasonably so.
 .PP
 .Vb 3
 \&    text    data     bss     drs     rss filename
-\&  163431    2152      24   20123    2060 rxvt \-\-enable\-everything
-\& 1035683   49680   66648   29096    3680 urxvt \-\-enable\-everything
+\&  163431    2152      24   20123    2060 rxvt --enable-everything
+\& 1035683   49680   66648   29096    3680 urxvt --enable-everything
 .Ve
 .PP
 The very large size of the text section is explained by the east-asian
@@ -350,7 +350,7 @@ 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)
+\&   /lib64/ld-linux-x86-64.so.2 (0x00002aaaaaaab000)
 .Ve
 .PP
 And here is rxvt\-unicode:
@@ -360,7 +360,7 @@ And here is rxvt\-unicode:
 \&   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)
+\&   /lib64/ld-linux-x86-64.so.2 (0x00002aaaaaaab000)
 .Ve
 .PP
 No large bloated libraries (of course, none were linked in statically),
@@ -381,7 +381,7 @@ descriptions for the programs mentioned and rxvt\-unicode. Really, do it!
 .PP
 .Vb 2
 \&   Esetroot wallpaper.jpg
-\&   @@URXVT_NAME@@ \-ip \-tint red \-sh 40
+\&   @@URXVT_NAME@@ -ip -tint red -sh 40
 .Ve
 .PP
 That works. If you think it doesn't, you lack transparency and tinting
@@ -392,8 +392,8 @@ to use effects other than tinting and shading: Just shade/tint/whatever
 your picture with gimp or any other tool:
 .PP
 .Vb 2
-\&   convert wallpaper.jpg \-blur 20x20 \-modulate 30 background.jpg
-\&   @@URXVT_NAME@@ \-pixmap background.jpg \-pe automove\-background
+\&   convert wallpaper.jpg -blur 20x20 -modulate 30 background.jpg
+\&   @@URXVT_NAME@@ -pixmap background.jpg -pe automove-background
 .Ve
 .PP
 That works. If you think it doesn't, you lack AfterImage and Perl support, or you
@@ -402,7 +402,7 @@ are unable to read.
 3. Use an \s-1ARGB\s0 visual:
 .PP
 .Vb 1
-\&   @@URXVT_NAME@@ \-depth 32 \-fg grey90 \-bg rgba:0000/0000/4444/cccc
+\&   @@URXVT_NAME@@ -depth 32 -fg grey90 -bg rgba:0000/0000/4444/cccc
 .Ve
 .PP
 This requires \s-1XFT\s0 support, and the support of your X\-server. If that
@@ -414,8 +414,8 @@ doesn't mean that your \s-1WM\s0 has the required kludges in place.
 4. Use xcompmgr and let it do the job:
 .PP
 .Vb 2
-\&  xprop \-frame \-f _NET_WM_WINDOW_OPACITY 32c \e
-\&        \-set _NET_WM_WINDOW_OPACITY 0xc0000000
+\&  xprop -frame -f _NET_WM_WINDOW_OPACITY 32c \e
+\&        -set _NET_WM_WINDOW_OPACITY 0xc0000000
 .Ve
 .PP
 Then click on a window you want to make transparent. Replace \f(CW0xc0000000\fR
@@ -616,7 +616,7 @@ In that case, select a font of your taste and add it to the font list,
 e.g.:
 .PP
 .Vb 1
-\&   @@URXVT_NAME@@ \-fn basefont,font2,font3...
+\&   @@URXVT_NAME@@ -fn basefont,font2,font3...
 .Ve
 .PP
 When rxvt-unicode sees a character, it will first look at the base
@@ -659,7 +659,7 @@ Until then, you might get away with switching fonts at runtime (see \*(L"Can I s
 We are working on it, in the meantime, as a workaround, use something like:
 .PP
 .Vb 1
-\&   @@URXVT_NAME@@ \-b 600 \-geometry 20x1 \-e sh \-c 'mplayer \-wid $WINDOWID file...'
+\&   @@URXVT_NAME@@ -b 600 -geometry 20x1 -e sh -c 'mplayer -wid $WINDOWID file...'
 .Ve
 .Sh "Keyboard, Mouse & User Interaction"
 .IX Subsection "Keyboard, Mouse & User Interaction"
@@ -670,7 +670,7 @@ If you want to select e.g. alphanumeric words, you can use the following
 setting:
 .PP
 .Vb 1
-\&   URxvt.selection.pattern\-0: ([[:word:]]+)
+\&   URxvt.selection.pattern-0: ([[:word:]]+)
 .Ve
 .PP
 If you click more than twice, the selection will be extended
@@ -679,7 +679,7 @@ more and more.
 To get a selection that is very similar to the old code, try this pattern:
 .PP
 .Vb 1
-\&   URxvt.selection.pattern\-0: ([^"&'()*,;<=>?@[\e\e\e\e]^`{|})]+)
+\&   URxvt.selection.pattern-0: ([^"&'()*,;<=>?@[\e\e\e\e]^`{|})]+)
 .Ve
 .PP
 Please also note that the \fILeftClick Shift-LeftClik\fR combination also
@@ -699,7 +699,7 @@ example, to disable the \fBselection-popup\fR and \fBoption-popup\fR, specify
 this \fBperl-ext-common\fR resource:
 .PP
 .Vb 1
-\&   URxvt.perl\-ext\-common: default,\-selection\-popup,\-option\-popup
+\&   URxvt.perl-ext-common: default,-selection-popup,-option-popup
 .Ve
 .PP
 This will keep the default extensions, but disable the two popup
@@ -708,7 +708,7 @@ scrollback search mode is triggered by \fBM\-s\fR. You can move it to any
 other combination either by setting the \fBsearchable-scrollback\fR resource:
 .PP
 .Vb 1
-\&   URxvt.searchable\-scrollback: CM\-s
+\&   URxvt.searchable-scrollback: CM-s
 .Ve
 .PP
 \fIThe cursor moves when selecting text in the current input line, how do I switch this off?\fR
@@ -729,7 +729,7 @@ You can permanently switch this feature off by disabling the \f(CW\*(C`readline\
 extension:
 .PP
 .Vb 1
-\&   URxvt.perl\-ext\-common: default,\-readline
+\&   URxvt.perl-ext-common: default,-readline
 .Ve
 .PP
 \fIMy numerical keypad acts weird and generates differing output?\fR
@@ -812,13 +812,13 @@ For an existing rxvt\-unicode:
 .Vb 3
 \&   # use Backspace = ^H
 \&   $ stty erase ^H
-\&   $ echo \-n "^[[36h"
+\&   $ echo -n "^[[36h"
 .Ve
 .PP
 .Vb 3
 \&   # use Backspace = ^?
 \&   $ stty erase ^?
-\&   $ echo \-n "^[[36l"
+\&   $ echo -n "^[[36l"
 .Ve
 .PP
 This helps satisfy some of the Backspace discrepancies that occur, but
@@ -850,23 +850,23 @@ Here's an example for a URxvt session started using \f(CW\*(C`@@URXVT_NAME@@ \-n
 .Vb 20
 \&   URxvt.keysym.Home:          \e033[1~
 \&   URxvt.keysym.End:           \e033[4~
-\&   URxvt.keysym.C\-apostrophe:  \e033<C\-'>
-\&   URxvt.keysym.C\-slash:       \e033<C\-/>
-\&   URxvt.keysym.C\-semicolon:   \e033<C\-;>
-\&   URxvt.keysym.C\-grave:       \e033<C\-`>
-\&   URxvt.keysym.C\-comma:       \e033<C\-,>
-\&   URxvt.keysym.C\-period:      \e033<C\-.>
-\&   URxvt.keysym.C\-0x60:        \e033<C\-`>
-\&   URxvt.keysym.C\-Tab:         \e033<C\-Tab>
-\&   URxvt.keysym.C\-Return:      \e033<C\-Return>
-\&   URxvt.keysym.S\-Return:      \e033<S\-Return>
-\&   URxvt.keysym.S\-space:       \e033<S\-Space>
-\&   URxvt.keysym.M\-Up:          \e033<M\-Up>
-\&   URxvt.keysym.M\-Down:        \e033<M\-Down>
-\&   URxvt.keysym.M\-Left:        \e033<M\-Left>
-\&   URxvt.keysym.M\-Right:       \e033<M\-Right>
-\&   URxvt.keysym.M\-C\-0:         list \e033<M\-C\- 0123456789 >
-\&   URxvt.keysym.M\-C\-a:         list \e033<M\-C\- abcdefghijklmnopqrstuvwxyz >
+\&   URxvt.keysym.C-apostrophe:  \e033<C-'>
+\&   URxvt.keysym.C-slash:       \e033<C-/>
+\&   URxvt.keysym.C-semicolon:   \e033<C-;>
+\&   URxvt.keysym.C-grave:       \e033<C-`>
+\&   URxvt.keysym.C-comma:       \e033<C-,>
+\&   URxvt.keysym.C-period:      \e033<C-.>
+\&   URxvt.keysym.C-0x60:        \e033<C-`>
+\&   URxvt.keysym.C-Tab:         \e033<C-Tab>
+\&   URxvt.keysym.C-Return:      \e033<C-Return>
+\&   URxvt.keysym.S-Return:      \e033<S-Return>
+\&   URxvt.keysym.S-space:       \e033<S-Space>
+\&   URxvt.keysym.M-Up:          \e033<M-Up>
+\&   URxvt.keysym.M-Down:        \e033<M-Down>
+\&   URxvt.keysym.M-Left:        \e033<M-Left>
+\&   URxvt.keysym.M-Right:       \e033<M-Right>
+\&   URxvt.keysym.M-C-0:         list \e033<M-C- 0123456789 >
+\&   URxvt.keysym.M-C-a:         list \e033<M-C- abcdefghijklmnopqrstuvwxyz >
 \&   URxvt.keysym.F12:           command:\e033]701;zh_CN.GBK\e007
 .Ve
 .PP
@@ -902,13 +902,13 @@ not \fItypical\fR, but what's typical...
 .PP
 .Vb 2
 \&   URxvt.cutchars: "()*,<>[]{}|'
-\&   URxvt.print\-pipe: cat >/tmp/xxx
+\&   URxvt.print-pipe: cat >/tmp/xxx
 .Ve
 .PP
 These are just for testing stuff.
 .PP
 .Vb 2
-\&   URxvt.imLocale: ja_JP.UTF\-8
+\&   URxvt.imLocale: ja_JP.UTF-8
 \&   URxvt.preeditType: OnTheSpot,None
 .Ve
 .PP
@@ -918,12 +918,12 @@ type, which requires the \f(CW\*(C`xim\-onthespot\*(C'\fR perl extension but rew
 with correct-looking fonts.
 .PP
 .Vb 6
-\&   URxvt.perl\-lib: /root/lib/urxvt
-\&   URxvt.perl\-ext\-common: default,selection\-autotransform,selection\-pastebin,xim\-onthespot,remote\-clipboard
-\&   URxvt.selection.pattern\-0: ( at .*? line \e\ed+)
-\&   URxvt.selection.pattern\-1: ^(/[^:]+):\e 
-\&   URxvt.selection\-autotransform.0: s/^([^:[:space:]]+):(\e\ed+):?$/:e \e\eQ$1\e\eE\e\ex0d:$2\e\ex0d/
-\&   URxvt.selection\-autotransform.1: s/^ at (.*?) line (\e\ed+)$/:e \e\eQ$1\e\eE\e\ex0d:$2\e\ex0d/
+\&   URxvt.perl-lib: /root/lib/urxvt
+\&   URxvt.perl-ext-common: default,selection-autotransform,selection-pastebin,xim-onthespot,remote-clipboard
+\&   URxvt.selection.pattern-0: ( at .*? line \e\ed+)
+\&   URxvt.selection.pattern-1: ^(/[^:]+):\e 
+\&   URxvt.selection-autotransform.0: s/^([^:[:space:]]+):(\e\ed+):?$/:e \e\eQ$1\e\eE\e\ex0d:$2\e\ex0d/
+\&   URxvt.selection-autotransform.1: s/^ at (.*?) line (\e\ed+)$/:e \e\eQ$1\e\eE\e\ex0d:$2\e\ex0d/
 .Ve
 .PP
 This is my perl configuration. The first two set the perl library
@@ -1010,12 +1010,12 @@ I once thought this is a great idea.
 .PP
 .Vb 9
 \&   urxvt.font:             9x15bold,\e
-\&                           \-misc\-fixed\-bold\-r\-normal\-\-15\-140\-75\-75\-c\-90\-iso10646\-1,\e
-\&                           \-misc\-fixed\-medium\-r\-normal\-\-15\-140\-75\-75\-c\-90\-iso10646\-1, \e
+\&                           -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso10646-1,\e
+\&                           -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso10646-1, \e
 \&                           [codeset=JISX0208]xft:Kochi Gothic, \e
 \&                           xft:Bitstream Vera Sans Mono:autohint=true, \e
 \&                           xft:Code2000:antialias=false
-\&   urxvt.boldFont:         \-xos4\-terminus\-bold\-r\-normal\-\-14\-140\-72\-72\-c\-80\-iso8859\-15
+\&   urxvt.boldFont:         -xos4-terminus-bold-r-normal--14-140-72-72-c-80-iso8859-15
 \&   urxvt.italicFont:       xft:Bitstream Vera Sans Mono:italic:autohint=true
 \&   urxvt.boldItalicFont:   xft:Bitstream Vera Sans Mono:bold:italic:autohint=true
 .Ve
@@ -1047,8 +1047,8 @@ defaults:
 \&   IRC*font:               suxuseuro
 \&   IRC*boldFont:           suxuseuro
 \&   IRC*colorBD:            white
-\&   IRC*keysym.M\-C\-1:       command:\e033]710;suxuseuro\e007\e033]711;suxuseuro\e007
-\&   IRC*keysym.M\-C\-2:       command:\e033]710;9x15bold\e007\e033]711;9x15bold\e007
+\&   IRC*keysym.M-C-1:       command:\e033]710;suxuseuro\e007\e033]711;suxuseuro\e007
+\&   IRC*keysym.M-C-2:       command:\e033]710;9x15bold\e007\e033]711;9x15bold\e007
 .Ve
 .PP
 \&\f(CW\*(C`Alt\-Shift\-1\*(C'\fR and \f(CW\*(C`Alt\-Shift\-2\*(C'\fR switch between two different font
@@ -1061,11 +1061,11 @@ The above is all in my \f(CW\*(C`.Xdefaults\*(C'\fR (I don't use \f(CW\*(C`.Xres
 file for different hosts, for example, on ym main desktop, I use:
 .PP
 .Vb 5
-\&   URxvt.keysym.C\-M\-q: command:\e033[3;5;5t
-\&   URxvt.keysym.C\-M\-y: command:\e033[3;5;606t
-\&   URxvt.keysym.C\-M\-e: command:\e033[3;1605;5t
-\&   URxvt.keysym.C\-M\-c: command:\e033[3;1605;606t
-\&   URxvt.keysym.C\-M\-p: perl:test
+\&   URxvt.keysym.C-M-q: command:\e033[3;5;5t
+\&   URxvt.keysym.C-M-y: command:\e033[3;5;606t
+\&   URxvt.keysym.C-M-e: command:\e033[3;1605;5t
+\&   URxvt.keysym.C-M-c: command:\e033[3;1605;606t
+\&   URxvt.keysym.C-M-p: perl:test
 .Ve
 .PP
 The first for keysym definitions allow me to quickly bring some windows
@@ -1108,7 +1108,7 @@ be done like this (with ncurses' infocmp and works as user and admin):
 .PP
 .Vb 2
 \&   REMOTE=remotesystem.domain
-\&   infocmp rxvt\-unicode | ssh $REMOTE "mkdir \-p .terminfo && cat >/tmp/ti && tic /tmp/ti"
+\&   infocmp rxvt-unicode | ssh $REMOTE "mkdir -p .terminfo && cat >/tmp/ti && tic /tmp/ti"
 .Ve
 .PP
 \&... or by installing rxvt-unicode normally on the remote system,
@@ -1157,13 +1157,13 @@ You can also create a termcap entry by using terminfo's infocmp program
 like this:
 .PP
 .Vb 1
-\&   infocmp \-C rxvt\-unicode
+\&   infocmp -C rxvt-unicode
 .Ve
 .PP
 Or you could use this termcap entry, generated by the command above:
 .PP
 .Vb 20
-\&   rxvt\-unicode|rxvt\-unicode terminal (X Window System):\e
+\&   rxvt-unicode|rxvt-unicode terminal (X Window System):\e
 \&           :am:bw:eo:km:mi:ms:xn:xo:\e
 \&           :co#80:it#8:li#24:lm#0:\e
 \&           :AL=\eE[%dL:DC=\eE[%dP:DL=\eE[%dM:DO=\eE[%dB:IC=\eE[%d@:\e
@@ -1194,13 +1194,13 @@ file. Needless to say, \f(CW\*(C`rxvt\-unicode\*(C'\fR is not in its default fil
 with most other terminals supporting colour). Either add:
 .PP
 .Vb 1
-\&   TERM rxvt\-unicode
+\&   TERM rxvt-unicode
 .Ve
 .PP
 to \f(CW\*(C`/etc/DIR_COLORS\*(C'\fR or simply add:
 .PP
 .Vb 1
-\&   alias ls='ls \-\-color=auto'
+\&   alias ls='ls --color=auto'
 .Ve
 .PP
 to your \f(CW\*(C`.profile\*(C'\fR or \f(CW\*(C`.bashrc\*(C'\fR.
@@ -1329,8 +1329,8 @@ first switches to a locale supported by xjdic and back later:
 .PP
 .Vb 3
 \&   printf '\e33]701;%s\e007' ja_JP.SJIS
-\&   xjdic \-js
-\&   printf '\e33]701;%s\e007' de_DE.UTF\-8
+\&   xjdic -js
+\&   printf '\e33]701;%s\e007' de_DE.UTF-8
 .Ve
 .PP
 You can also use xterm's \f(CW\*(C`luit\*(C'\fR program, which usually works fine, except
@@ -1362,7 +1362,7 @@ When you want to use e.g. \fBkinput2\fR, it must be set to
 method servers are running with this command:
 .Sp
 .Vb 1
-\&   xprop \-root XIM_SERVERS
+\&   xprop -root XIM_SERVERS
 .Ve
 .IP "*" 4
 .PP
@@ -1373,7 +1373,7 @@ You can specify separate locales for the input method and the rest of the
 terminal, using the resource \f(CW\*(C`imlocale\*(C'\fR:
 .PP
 .Vb 1
-\&   URxvt.imlocale: ja_JP.EUC\-JP
+\&   URxvt.imlocale: ja_JP.EUC-JP
 .Ve
 .PP
 Now you can start your terminal with \f(CW\*(C`LC_CTYPE=ja_JP.UTF\-8\*(C'\fR and still
@@ -2635,29 +2635,29 @@ A non-exhaustive list of features enabled by \f(CW\*(C`\-\-enable\-frills\*(C'\f
 in combination with other switches) is:
 .Sp
 .Vb 17
-\&  MWM\-hints
-\&  EWMH\-hints (pid, utf8 names) and protocols (ping)
+\&  MWM-hints
+\&  EWMH-hints (pid, utf8 names) and protocols (ping)
 \&  urgency hint
-\&  seperate underline colour (\-underlineColor)
-\&  settable border widths and borderless switch (\-w, \-b, \-bl)
-\&  visual depth selection (\-depth)
-\&  settable extra linespacing /\-lsp)
-\&  iso\-14755 5.1 (basic) support
-\&  tripleclickwords (\-tcw)
-\&  settable insecure mode (\-insecure)
+\&  seperate underline colour (-underlineColor)
+\&  settable border widths and borderless switch (-w, -b, -bl)
+\&  visual depth selection (-depth)
+\&  settable extra linespacing /-lsp)
+\&  iso-14755 5.1 (basic) support
+\&  tripleclickwords (-tcw)
+\&  settable insecure mode (-insecure)
 \&  keysym remapping support
-\&  cursor blinking and underline cursor (\-cb, \-uc)
-\&  XEmbed support (\-embed)
-\&  user\-pty (\-pty\-fd)
-\&  hold on exit (\-hold)
-\&  skip builtin block graphics (\-sbg)
-\&  separate highlightcolor support (\-hc)
+\&  cursor blinking and underline cursor (-cb, -uc)
+\&  XEmbed support (-embed)
+\&  user-pty (-pty-fd)
+\&  hold on exit (-hold)
+\&  skip builtin block graphics (-sbg)
+\&  separate highlightcolor support (-hc)
 .Ve
 .Sp
 It also enables some non-essential features otherwise disabled, such as:
 .Sp
 .Vb 11
-\&  some round\-trip time optimisations
+\&  some round-trip time optimisations
 \&  nearest color allocation on pseudocolor screens
 \&  UTF8_STRING support for selection
 \&  sgr modes 90..97 and 100..107
diff --git a/doc/rxvt.7.txt b/doc/rxvt.7.txt
index 539e7ac1..f367facc 100644
--- a/doc/rxvt.7.txt
+++ b/doc/rxvt.7.txt
@@ -191,10 +191,10 @@ RXVT-UNICODE/URXVT FREQUENTLY ASKED QUESTIONS
 
   Rendering, Font & Look and Feel Issues
    I can't get transparency working, what am I doing wrong?
-    First of all, transparency isn't officially supported in rxvt-unicode,
-    so you are mostly on your own. Do not bug the author about it (but you
-    may bug everybody else). Also, if you can't get it working consider it a
-    rite of passage: ... and you failed.
+    First of all, please address all transparency related issues to Sasha
+    Vasko at sasha@aftercode.net and do not bug the author about it. Also,
+    if you can't get it working consider it a rite of passage: ... and you
+    failed.
 
     Here are four ways to get transparency. Do read the manpage and option
     descriptions for the programs mentioned and rxvt-unicode. Really, do it!
@@ -211,11 +211,11 @@ RXVT-UNICODE/URXVT FREQUENTLY ASKED QUESTIONS
     to use effects other than tinting and shading: Just shade/tint/whatever
     your picture with gimp or any other tool:
 
-       convert wallpaper.jpg -blur 20x20 -modulate 30 background.xpm
-       urxvt -pixmap background.xpm -pe automove-background
+       convert wallpaper.jpg -blur 20x20 -modulate 30 background.jpg
+       urxvt -pixmap background.jpg -pe automove-background
 
-    That works. If you think it doesn't, you lack XPM and Perl support, or
-    you are unable to read.
+    That works. If you think it doesn't, you lack AfterImage and Perl
+    support, or you are unable to read.
 
     3. Use an ARGB visual:
 
@@ -431,6 +431,12 @@ RXVT-UNICODE/URXVT FREQUENTLY ASKED QUESTIONS
     Until then, you might get away with switching fonts at runtime (see "Can
     I switch the fonts at runtime?" later in this document).
 
+   How can I make mplayer display video correctly?
+    We are working on it, in the meantime, as a workaround, use something
+    like:
+
+       urxvt -b 600 -geometry 20x1 -e sh -c 'mplayer -wid $WINDOWID file...'
+
   Keyboard, Mouse & User Interaction
    The new selection selects pieces that are too big, how can I select single words?
     If you want to select e.g. alphanumeric words, you can use the following
@@ -1569,6 +1575,14 @@ RXVT-UNICODE TECHNICAL REFERENCE
                h               Use Hilite Mouse Tracking. 
                l               No mouse reporting. 
 
+        "Pm = 1002" (X11 XTerm)
+               h               Send Mouse X & Y on button press and release, and motion with a button pressed. 
+               l               No mouse reporting. 
+
+        "Pm = 1003" (X11 XTerm)
+               h               Send Mouse X & Y on button press and release, and motion. 
+               l               No mouse reporting. 
+
         "Pm = 1010" (rxvt)
                h               Don't scroll to bottom on TTY output 
                l               Scroll to bottom on TTY output 
@@ -1614,7 +1628,7 @@ RXVT-UNICODE TECHNICAL REFERENCE
            Ps = 17         Change colour of highlight characters to Pt 
            Ps = 18         Change colour of bold characters to Pt [deprecated, see 706] 
            Ps = 19         Change colour of underlined characters to Pt [deprecated, see 707] 
-           Ps = 20         Change background pixmap parameters (see section XPM) (Compile XPM). 
+           Ps = 20         Change background pixmap parameters (see section BACKGROUND IMAGE) (Compile AfterImage). 
            Ps = 39         Change default foreground colour to Pt. 
            Ps = 46         Change Log File to Pt unimplemented 
            Ps = 49         Change default background colour to Pt. 
@@ -1634,10 +1648,10 @@ RXVT-UNICODE TECHNICAL REFERENCE
            Ps = 721        Move viewing window down by Pt lines, or clear scrollback buffer if Pt = 0 (Compile frills). 
            Ps = 777        Call the perl extension with the given string, which should be of the form extension:parameters (Compile perl). 
 
-XPM
-    For the XPM XTerm escape sequence "ESC ] 20 ; Pt ST" then value of "Pt"
-    can be the name of the background pixmap followed by a sequence of
-    scaling/positioning commands separated by semi-colons. The
+BACKGROUND IMAGE
+    For the BACGROUND IMAGE XTerm escape sequence "ESC ] 20 ; Pt ST" then
+    value of "Pt" can be the name of the background image file followed by a
+    sequence of scaling/positioning commands separated by semi-colons. The
     scaling/positioning commands are as follows:
 
     query scale/position
@@ -1673,11 +1687,11 @@ XPM
 
     For example:
 
-    \E]20;funky\a
-        load funky.xpm as a tiled image
+    \E]20;funky.jpg\a
+        load funky.jpg as a tiled image
 
-    \E]20;mona;100\a
-        load mona.xpm with a scaling of 100%
+    \E]20;mona.jpg;100\a
+        load mona.jpg with a scaling of 100%
 
     \E]20;;200;?\a
         rescale the current pixmap to 200% and display the image geometry in
@@ -1778,9 +1792,9 @@ Key Codes
 CONFIGURE OPTIONS
     General hint: if you get compile errors, then likely your configuration
     hasn't been tested well. Either try with "--enable-everything" or use
-    the default configuration (i.e. "--enable-xxx" or "--disable-xxx"). Of
-    course, you should always report when a combination doesn't work, so it
-    can be fixed. Marc Lehmann <rxvt@schmorp.de>.
+    the default configuration (i.e. no "--enable-xxx" or "--disable-xxx"
+    switches). Of course, you should always report when a combination
+    doesn't work, so it can be fixed. Marc Lehmann <rxvt@schmorp.de>.
 
     All
 
@@ -1883,9 +1897,6 @@ CONFIGURE OPTIONS
         at start of rxvt execution. This option requires --enable-utmp to
         also be specified.
 
-    --enable-xpm-background (default: on)
-        Add support for XPM background pixmaps.
-
     --enable-afterimage (default: on)
         Add support for libAfterImage to be used for transparency and
         background images. It adds support for many file formats including
@@ -1897,7 +1908,7 @@ CONFIGURE OPTIONS
         root background, as well as dynamic scaling and bluring of
         background images.
 
-        Note that with this option enabled, rxvt's memory footprint might
+        Note that with this option enabled, urxvt's memory footprint might
         increase by a few megabytes even if no extra features are used
         (mostly due to third-party libraries used by libAI). Memory
         footprint may somewhat be lowered if libAfterImage is configured
@@ -1910,10 +1921,6 @@ CONFIGURE OPTIONS
     --enable-fading (default: on)
         Add support for fading the text when focus is lost.
 
-    --enable-tinting (default: on)
-        Add support for tinting of transparent backgrounds (requires
-        "--enable-transparency").
-
     --enable-rxvt-scroll (default: on)
         Add support for the original rxvt scrollbar.
 
@@ -1988,7 +1995,7 @@ CONFIGURE OPTIONS
           verbose X error handling
 
     --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.
 
@@ -2017,7 +2024,7 @@ CONFIGURE OPTIONS
         Add support to have the pointer disappear when typing or inactive.
 
     --enable-perl (default: on)
-        Enable an embedded perl interpreter. See the rxvtperl(3) manpage
+        Enable an embedded perl interpreter. See the urxvtperl(3) manpage
         (doc/rxvtperl.txt) for more info on this feature, or the files in
         src/perl-ext/ for the extensions that are installed by default. The
         perl interpreter that is used can be specified via the "PERL"
@@ -2043,15 +2050,6 @@ CONFIGURE OPTIONS
     --with-x
         Use the X Window System (pretty much default, eh?).
 
-    --with-xpm-includes=DIR
-        Look for the XPM includes in DIR.
-
-    --with-xpm-library=DIR
-        Look for the XPM library in DIR.
-
-    --with-xpm
-        Not needed - define via --enable-xpm-background.
-
 AUTHORS
     Marc Lehmann <rxvt@schmorp.de> converted this document to pod and
     reworked it from the original Rxvt documentation, which was done by
diff --git a/doc/rxvtc.1.html b/doc/rxvtc.1.html
index 2198ed69..21148f8a 100644
--- a/doc/rxvtc.1.html
+++ b/doc/rxvtc.1.html
@@ -2,11 +2,11 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
-	<title>rxvtc</title>
-	<meta name="description" content="Pod documentation for rxvtc" />
+	<title>urxvtc</title>
+	<meta name="description" content="Pod documentation for urxvtc" />
 	<meta name="inputfile" content="&lt;standard input&gt;" />
 	<meta name="outputfile" content="&lt;standard output&gt;" />
-	<meta name="created" content="Mon Jun 25 00:30:33 2007" />
+	<meta name="created" content="Sat Oct 27 14:07:34 2007" />
 	<meta name="generator" content="Pod::Xhtml 1.57" />
 <link rel="stylesheet" href="http://res.tst.eu/pod.css"/></head>
 <body>
@@ -27,27 +27,27 @@
 
 <h1 id="NAME">NAME</h1><p><a href="#TOP" class="toplink">Top</a></p>
 <div id="NAME_CONTENT">
-<p>rxvtc - control the rxvtd daemon</p>
+<p>urxvtc - control the urxvtd daemon</p>
 
 </div>
 <h1 id="SYNOPSIS">SYNOPSIS</h1><p><a href="#TOP" class="toplink">Top</a></p>
 <div id="SYNOPSIS_CONTENT">
-<p><strong>rxvtc</strong> [same options as for rxvt]</p>
+<p><strong>urxvtc</strong> [same options as for urxvt]</p>
 
 </div>
 <h1 id="DESCRIPTION">DESCRIPTION</h1><p><a href="#TOP" class="toplink">Top</a></p>
 <div id="DESCRIPTION_CONTENT">
-<p>This manpage describes the <strong>rxvtc</strong> client program. It connects
-to the <strong>rxvtd</strong> daemon and requests a new terminal window. It
-takes the same arguments as the <strong>rxvt</strong> program. The environment
+<p>This manpage describes the <strong>urxvtc</strong> client program. It connects
+to the <strong>urxvtd</strong> daemon and requests a new terminal window. It
+takes the same arguments as the <strong>urxvt</strong> program. The environment
 will also be respected. Currently, it always returns immediately after
 contacting the daemon.</p>
 
 </div>
 <h1 id="OPTIONS">OPTIONS</h1><p><a href="#TOP" class="toplink">Top</a></p>
 <div id="OPTIONS_CONTENT">
-<p>All options that are valid for <strong>rxvt</strong> are valid for
-<strong>rxvtc</strong>, too. Please note that options are interpreted in the
+<p>All options that are valid for <strong>urxvt</strong> are valid for
+<strong>urxvtc</strong>, too. Please note that options are interpreted in the
 context of the daemon process. However, as current working directory,
 process environment and any file descriptor (e.g. for <code>-pty-fd</code>) are
 preserved, this rarely makes a difference.</p>
@@ -55,17 +55,17 @@ preserved, this rarely makes a difference.</p>
 </div>
 <h1 id="EXIT_STATUS">EXIT STATUS</h1><p><a href="#TOP" class="toplink">Top</a></p>
 <div id="EXIT_STATUS_CONTENT">
-<p>If everything went well, rxvtc returns with an exit status of <code>0</code>.
+<p>If everything went well, urxvtc returns with an exit status of <code>0</code>.
 If contacting the daemon fails, it exits with the exit status <code>2</code>. In all other error
 cases it returns with status <code>1</code>.</p>
 <p>This can be used to implement auto-starting behaviour, by checking for an
-exit status of <code>2</code>, running <code>rxvtd -f -q</code> and retrying the call
-to rxvtc, like this:</p>
+exit status of <code>2</code>, running <code>urxvtd -f -q</code> and retrying the call
+to urxvtc, like this:</p>
 <pre>   #!/bin/sh
-   rxvtc &quot;$@&quot;
+   urxvtc &quot;$@&quot;
    if [ $? -eq 2 ]; then
-      rxvtd -q -o -f
-      rxvtc &quot;$@&quot;
+      urxvtd -q -o -f
+      urxvtc &quot;$@&quot;
    fi
 
 </pre>
@@ -74,14 +74,14 @@ to rxvtc, like this:</p>
 <h1 id="ENVIRONMENT">ENVIRONMENT</h1><p><a href="#TOP" class="toplink">Top</a></p>
 <div id="ENVIRONMENT_CONTENT">
 <p>All environment variables of the current process will be made available
-to the new instance, and will be interpreted as if <strong>rxvt</strong> were
+to the new instance, and will be interpreted as if <strong>urxvt</strong> were
 started directly.</p>
 <dl>
 	<dt><strong>RXVT_SOCKET</strong></dt>
 	<dd>
-		<p>Both rxvtc and rxvtd use the environment variable
+		<p>Both urxvtc and urxvtd use the environment variable
 <cite>RXVT_SOCKET</cite> to create a listening socket and to contact the
-rxvtd, respectively. If the variable is missing,
+urxvtd, respectively. If the variable is missing,
 <cite>$HOME/.rxvt-unicode-<i>&lt;nodename&gt;</i></cite> is used.  The variable must
 specify the absolute path of the socket to create.</p>
 	</dd>
@@ -90,7 +90,7 @@ specify the absolute path of the socket to create.</p>
 </div>
 <h1 id="SEE_ALSO">SEE ALSO</h1><p><a href="#TOP" class="toplink">Top</a></p>
 <div id="SEE_ALSO_CONTENT">
-<p>rxvt(7), rxvtd(1)</p>
+<p>urxvt(7), urxvtd(1)</p>
 
 </div>
 </div></body>
diff --git a/doc/rxvtc.1.man.in b/doc/rxvtc.1.man.in
index 1abda749..f3a5cf7a 100644
--- a/doc/rxvtc.1.man.in
+++ b/doc/rxvtc.1.man.in
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.09 (Pod::Simple 3.04)
+.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.35
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "@@RXVT_NAME@@ 1"
-.TH @@RXVT_NAME@@ 1 "2006-08-07" "7.9" "RXVT-UNICODE"
+.TH @@RXVT_NAME@@ 1 "2007-10-27" "8.4" "RXVT-UNICODE"
 .SH "NAME"
 @@RXVT_NAME@@c \- control the @@RXVT_NAME@@d daemon
 .SH "SYNOPSIS"
@@ -162,8 +162,8 @@ to @@RXVT_NAME@@c, like this:
 .Vb 6
 \&   #!/bin/sh
 \&   @@RXVT_NAME@@c "$@"
-\&   if [ $? \-eq 2 ]; then
-\&      @@RXVT_NAME@@d \-q \-o \-f
+\&   if [ $? -eq 2 ]; then
+\&      @@RXVT_NAME@@d -q -o -f
 \&      @@RXVT_NAME@@c "$@"
 \&   fi
 .Ve
@@ -177,7 +177,7 @@ started directly.
 Both @@RXVT_NAME@@c and @@RXVT_NAME@@d use the environment variable
 \&\fI\s-1RXVT_SOCKET\s0\fR to create a listening socket and to contact the
 @@RXVT_NAME@@d, respectively. If the variable is missing,
-\&\fI\f(CI$HOME\fI/.rxvt\-unicode\-\fI<nodename>\fI\fR is used.  The variable must
+\&\fI$HOME/.rxvt\-unicode\-\fI<nodename>\fI\fR is used.  The variable must
 specify the absolute path of the socket to create.
 .SH "SEE ALSO"
 .IX Header "SEE ALSO"
diff --git a/doc/rxvtc.1.txt b/doc/rxvtc.1.txt
index 04103365..88ceb4bf 100644
--- a/doc/rxvtc.1.txt
+++ b/doc/rxvtc.1.txt
@@ -1,49 +1,50 @@
 NAME
-    rxvtc - control the rxvtd daemon
+    urxvtc - control the urxvtd daemon
 
 SYNOPSIS
-    rxvtc [same options as for rxvt]
+    urxvtc [same options as for urxvt]
 
 DESCRIPTION
-    This manpage describes the rxvtc client program. It connects to the
-    rxvtd daemon and requests a new terminal window. It takes the same
-    arguments as the rxvt program. The environment will also be respected.
+    This manpage describes the urxvtc client program. It connects to the
+    urxvtd daemon and requests a new terminal window. It takes the same
+    arguments as the urxvt program. The environment will also be respected.
     Currently, it always returns immediately after contacting the daemon.
 
 OPTIONS
-    All options that are valid for rxvt are valid for rxvtc, too. Please
+    All options that are valid for urxvt are valid for urxvtc, too. Please
     note that options are interpreted in the context of the daemon process.
     However, as current working directory, process environment and any file
     descriptor (e.g. for "-pty-fd") are preserved, this rarely makes a
     difference.
 
 EXIT STATUS
-    If everything went well, rxvtc returns with an exit status of 0. If
+    If everything went well, urxvtc returns with an exit status of 0. If
     contacting the daemon fails, it exits with the exit status 2. In all
     other error cases it returns with status 1.
 
     This can be used to implement auto-starting behaviour, by checking for
-    an exit status of 2, running "rxvtd -f -q" and retrying the call to
-    rxvtc, like this:
+    an exit status of 2, running "urxvtd -f -q" and retrying the call to
+    urxvtc, like this:
 
        #!/bin/sh
-       rxvtc "$@"
+       urxvtc "$@"
        if [ $? -eq 2 ]; then
-          rxvtd -q -o -f
-          rxvtc "$@"
+          urxvtd -q -o -f
+          urxvtc "$@"
        fi
 
 ENVIRONMENT
     All environment variables of the current process will be made available
-    to the new instance, and will be interpreted as if rxvt were started
+    to the new instance, and will be interpreted as if urxvt were started
     directly.
 
     RXVT_SOCKET
-        Both rxvtc and rxvtd use the environment variable RXVT_SOCKET to
-        create a listening socket and to contact the rxvtd, respectively. If
-        the variable is missing, $HOME/.rxvt-unicode-*<nodename>* is used.
-        The variable must specify the absolute path of the socket to create.
+        Both urxvtc and urxvtd use the environment variable RXVT_SOCKET to
+        create a listening socket and to contact the urxvtd, respectively.
+        If the variable is missing, $HOME/.rxvt-unicode-*<nodename>* is
+        used. The variable must specify the absolute path of the socket to
+        create.
 
 SEE ALSO
-    rxvt(7), rxvtd(1)
+    urxvt(7), urxvtd(1)
 
diff --git a/doc/rxvtd.1.html b/doc/rxvtd.1.html
index c5e6ab92..5ef0a4a1 100644
--- a/doc/rxvtd.1.html
+++ b/doc/rxvtd.1.html
@@ -2,11 +2,11 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
-	<title>rxvtd</title>
-	<meta name="description" content="Pod documentation for rxvtd" />
+	<title>urxvtd</title>
+	<meta name="description" content="Pod documentation for urxvtd" />
 	<meta name="inputfile" content="&lt;standard input&gt;" />
 	<meta name="outputfile" content="&lt;standard output&gt;" />
-	<meta name="created" content="Mon Jun 25 00:30:33 2007" />
+	<meta name="created" content="Sat Oct 27 14:07:34 2007" />
 	<meta name="generator" content="Pod::Xhtml 1.57" />
 <link rel="stylesheet" href="http://res.tst.eu/pod.css"/></head>
 <body>
@@ -27,54 +27,54 @@
 
 <h1 id="NAME">NAME</h1><p><a href="#TOP" class="toplink">Top</a></p>
 <div id="NAME_CONTENT">
-<p>rxvtd - rxvt terminal daemon</p>
+<p>urxvtd - urxvt terminal daemon</p>
 
 </div>
 <h1 id="SYNOPSIS">SYNOPSIS</h1><p><a href="#TOP" class="toplink">Top</a></p>
 <div id="SYNOPSIS_CONTENT">
-<p><strong>rxvtd</strong> [-q|--quiet] [-o|--opendisplay] [-f|--fork]</p>
-<p><strong>rxvtd</strong> -q -o -f    # for .xsession use</p>
+<p><strong>urxvtd</strong> [-q|--quiet] [-o|--opendisplay] [-f|--fork]</p>
+<p><strong>urxvtd</strong> -q -o -f    # for .xsession use</p>
 
 </div>
 <h1 id="DESCRIPTION">DESCRIPTION</h1><p><a href="#TOP" class="toplink">Top</a></p>
 <div id="DESCRIPTION_CONTENT">
-<p>This manpage describes the rxvtd daemon, which is the same vt102
-terminal emulator as rxvt, but runs as a daemon that can open
+<p>This manpage describes the urxvtd daemon, which is the same vt102
+terminal emulator as urxvt, but runs as a daemon that can open
 multiple terminal windows within the same process.</p>
 <p>You can run it from your X startup scripts, for example, although it is
 not dependent on a working DISPLAY and, in fact, can open windows on
 multiple X displays on the same time.</p>
-<p>Advantages of running a rxvt daemon include faster creation time
+<p>Advantages of running a urxvt daemon include faster creation time
 for terminal windows and a lot of saved memory.</p>
 <p>The disadvantage is a possible impact on stability - if the
 main program crashes, all processes in the terminal windows are
 terminated. For example, as there is no way to cleanly react to abnormal
 connection closes, <code>xkill</code> and server resets/restarts will kill the
-<strong>rxvtd</strong> instance including all windows it has opened.</p>
+<strong>urxvtd</strong> instance including all windows it has opened.</p>
 
 </div>
 <h1 id="OPTIONS">OPTIONS</h1><p><a href="#TOP" class="toplink">Top</a></p>
 <div id="OPTIONS_CONTENT">
-<p><strong>rxvtd</strong> currently understands a few options only. Bundling of
+<p><strong>urxvtd</strong> currently understands a few options only. Bundling of
 options is not yet supported.</p>
 <dl>
 	<dt><strong>-q</strong>, <strong>--quiet</strong></dt>
 	<dd>
-		<p>Normally, <strong>rxvtd</strong> outputs the message <code>rxvt-unicode daemon
+		<p>Normally, <strong>urxvtd</strong> outputs the message <code>rxvt-unicode daemon
 listening on &lt;path&gt;</code> after binding to its control socket. This option
 will suppress this message (errors and warnings will still be logged).</p>
 	</dd>
 	<dt><strong>-o</strong>, <strong>--opendisplay</strong></dt>
 	<dd>
-		<p>This forces <strong>rxvtd</strong> to open a connection to the current
+		<p>This forces <strong>urxvtd</strong> to open a connection to the current
 <code>$DISPLAY</code> and keep it open.</p>
-		<p>This is useful if you want to bind an instance of <strong>rxvtd</strong> to
+		<p>This is useful if you want to bind an instance of <strong>urxvtd</strong> to
 the lifetime of a specific display/server. If the server does a reset,
-<strong>rxvtd</strong> will be killed automatically.</p>
+<strong>urxvtd</strong> will be killed automatically.</p>
 	</dd>
 	<dt><strong>-f</strong>, <strong>--fork</strong></dt>
 	<dd>
-		<p>This makes <strong>rxvtd</strong> fork after it has bound itself to its control
+		<p>This makes <strong>urxvtd</strong> fork after it has bound itself to its control
 socket.</p>
 	</dd>
 </dl>
@@ -82,14 +82,14 @@ socket.</p>
 </div>
 <h1 id="EXAMPLES">EXAMPLES</h1><p><a href="#TOP" class="toplink">Top</a></p>
 <div id="EXAMPLES_CONTENT">
-<p>This is a useful invocation of <strong>rxvtd</strong> in a <cite>.xsession</cite>-style
+<p>This is a useful invocation of <strong>urxvtd</strong> in a <cite>.xsession</cite>-style
 script:</p>
-<pre>   rxvtd -q -f -o
+<pre>   urxvtd -q -f -o
 
 </pre>
 <p>This waits till the control socket is available, opens the current display
 and forks into the background. When you log-out, the server is reset and
-<strong>rxvtd</strong> is killed.</p>
+<strong>urxvtd</strong> is killed.</p>
 
 </div>
 <h1 id="ENVIRONMENT">ENVIRONMENT</h1><p><a href="#TOP" class="toplink">Top</a></p>
@@ -97,9 +97,9 @@ and forks into the background. When you log-out, the server is reset and
 <dl>
 	<dt><strong>RXVT_SOCKET</strong></dt>
 	<dd>
-		<p>Both <strong>rxvtc</strong> and <strong>rxvtd</strong> use the environment
+		<p>Both <strong>urxvtc</strong> and <strong>urxvtd</strong> use the environment
 variable <cite>RXVT_SOCKET</cite> to create a listening socket and to contact
-the rxvtd, respectively. If the variable is missing,
+the urxvtd, respectively. If the variable is missing,
 <cite>$HOME/.rxvt-unicode-<i>&lt;nodename&gt;</i></cite> is used. The variable must
 specify the absolute path of the socket to create.</p>
 	</dd>
@@ -113,7 +113,7 @@ valid X display name.</p>
 </div>
 <h1 id="SEE_ALSO">SEE ALSO</h1><p><a href="#TOP" class="toplink">Top</a></p>
 <div id="SEE_ALSO_CONTENT">
-<p>rxvt(7), rxvtc(1)
+<p>urxvt(7), urxvtc(1)
 </p>
 
 </div>
diff --git a/doc/rxvtd.1.man.in b/doc/rxvtd.1.man.in
index cadf8d54..3f724ef9 100644
--- a/doc/rxvtd.1.man.in
+++ b/doc/rxvtd.1.man.in
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.32
+.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.35
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "@@RXVT_NAME@@ 1"
-.TH @@RXVT_NAME@@ 1 "2007-06-02" "8.2" "RXVT-UNICODE"
+.TH @@RXVT_NAME@@ 1 "2007-10-27" "8.4" "RXVT-UNICODE"
 .SH "NAME"
 @@RXVT_NAME@@d \- @@RXVT_NAME@@ terminal daemon
 .SH "SYNOPSIS"
diff --git a/doc/rxvtd.1.txt b/doc/rxvtd.1.txt
index a35c1b3a..bbe2408f 100644
--- a/doc/rxvtd.1.txt
+++ b/doc/rxvtd.1.txt
@@ -1,70 +1,71 @@
 NAME
-    rxvtd - rxvt terminal daemon
+    urxvtd - urxvt terminal daemon
 
 SYNOPSIS
-    rxvtd [-q|--quiet] [-o|--opendisplay] [-f|--fork]
+    urxvtd [-q|--quiet] [-o|--opendisplay] [-f|--fork]
 
-    rxvtd -q -o -f # for .xsession use
+    urxvtd -q -o -f # for .xsession use
 
 DESCRIPTION
-    This manpage describes the rxvtd daemon, which is the same vt102
-    terminal emulator as rxvt, but runs as a daemon that can open multiple
+    This manpage describes the urxvtd daemon, which is the same vt102
+    terminal emulator as urxvt, but runs as a daemon that can open multiple
     terminal windows within the same process.
 
     You can run it from your X startup scripts, for example, although it is
     not dependent on a working DISPLAY and, in fact, can open windows on
     multiple X displays on the same time.
 
-    Advantages of running a rxvt daemon include faster creation time for
+    Advantages of running a urxvt daemon include faster creation time for
     terminal windows and a lot of saved memory.
 
     The disadvantage is a possible impact on stability - if the main program
     crashes, all processes in the terminal windows are terminated. For
     example, as there is no way to cleanly react to abnormal connection
-    closes, "xkill" and server resets/restarts will kill the rxvtd instance
+    closes, "xkill" and server resets/restarts will kill the urxvtd instance
     including all windows it has opened.
 
 OPTIONS
-    rxvtd currently understands a few options only. Bundling of options is
+    urxvtd currently understands a few options only. Bundling of options is
     not yet supported.
 
     -q, --quiet
-        Normally, rxvtd outputs the message "rxvt-unicode daemon listening
+        Normally, urxvtd outputs the message "rxvt-unicode daemon listening
         on <path>" after binding to its control socket. This option will
         suppress this message (errors and warnings will still be logged).
 
     -o, --opendisplay
-        This forces rxvtd to open a connection to the current $DISPLAY and
+        This forces urxvtd to open a connection to the current $DISPLAY and
         keep it open.
 
-        This is useful if you want to bind an instance of rxvtd to the
+        This is useful if you want to bind an instance of urxvtd to the
         lifetime of a specific display/server. If the server does a reset,
-        rxvtd will be killed automatically.
+        urxvtd will be killed automatically.
 
     -f, --fork
-        This makes rxvtd fork after it has bound itself to its control
+        This makes urxvtd fork after it has bound itself to its control
         socket.
 
 EXAMPLES
-    This is a useful invocation of rxvtd in a .xsession-style script:
+    This is a useful invocation of urxvtd in a .xsession-style script:
 
-       rxvtd -q -f -o
+       urxvtd -q -f -o
 
     This waits till the control socket is available, opens the current
     display and forks into the background. When you log-out, the server is
-    reset and rxvtd is killed.
+    reset and urxvtd is killed.
 
 ENVIRONMENT
     RXVT_SOCKET
-        Both rxvtc and rxvtd use the environment variable RXVT_SOCKET to
-        create a listening socket and to contact the rxvtd, respectively. If
-        the variable is missing, $HOME/.rxvt-unicode-*<nodename>* is used.
-        The variable must specify the absolute path of the socket to create.
+        Both urxvtc and urxvtd use the environment variable RXVT_SOCKET to
+        create a listening socket and to contact the urxvtd, respectively.
+        If the variable is missing, $HOME/.rxvt-unicode-*<nodename>* is
+        used. The variable must specify the absolute path of the socket to
+        create.
 
     DISPLAY
         Only used when the "--opendisplay" option is specified. Must contain
         a valid X display name.
 
 SEE ALSO
-    rxvt(7), rxvtc(1)
+    urxvt(7), urxvtc(1)
 
diff --git a/doc/rxvtperl.3.html b/doc/rxvtperl.3.html
index 6d2f845e..c92c689f 100644
--- a/doc/rxvtperl.3.html
+++ b/doc/rxvtperl.3.html
@@ -2,11 +2,11 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
-	<title>rxvtperl</title>
-	<meta name="description" content="Pod documentation for rxvtperl" />
+	<title>urxvtperl</title>
+	<meta name="description" content="Pod documentation for urxvtperl" />
 	<meta name="inputfile" content="&lt;standard input&gt;" />
 	<meta name="outputfile" content="&lt;standard output&gt;" />
-	<meta name="created" content="Wed Aug  1 20:30:04 2007" />
+	<meta name="created" content="Sat Oct 27 14:07:34 2007" />
 	<meta name="generator" content="Pod::Xhtml 1.57" />
 <link rel="stylesheet" href="http://res.tst.eu/pod.css"/></head>
 <body>
@@ -45,7 +45,7 @@
 
 <h1 id="NAME">NAME</h1><p><a href="#TOP" class="toplink">Top</a></p>
 <div id="NAME_CONTENT">
-<p>rxvtperl - rxvt-unicode's embedded perl interpreter</p>
+<p>urxvtperl - rxvt-unicode's embedded perl interpreter</p>
 
 </div>
 <h1 id="SYNOPSIS">SYNOPSIS</h1><p><a href="#TOP" class="toplink">Top</a></p>
@@ -57,9 +57,9 @@
       ()
    }
 
-   # start a rxvt using it:
+   # start a urxvt using it:
 
-   rxvt --perl-lib $HOME -pe grab_test
+   urxvt --perl-lib $HOME -pe grab_test
 
 </pre>
 
@@ -70,7 +70,7 @@
 the <code>perl</code> resource are loaded and associated with it.</p>
 <p>Scripts are compiled in a 'use strict' and 'use utf8' environment, and
 thus must be encoded as UTF-8.</p>
-<p>Each script will only ever be loaded once, even in rxvtd, where
+<p>Each script will only ever be loaded once, even in urxvtd, where
 scripts will be shared (but not enabled) for all terminals.</p>
 <p>You can disable the embedded perl interpreter by setting both &quot;perl-ext&quot;
 and &quot;perl-ext-common&quot; resources to the empty string.</p>
@@ -79,9 +79,9 @@ and &quot;perl-ext-common&quot; resources to the empty string.</p>
 <h1 id="PREPACKAGED_EXTENSIONS">PREPACKAGED EXTENSIONS</h1><p><a href="#TOP" class="toplink">Top</a></p>
 <div id="PREPACKAGED_EXTENSIONS_CONTENT">
 <p>This section describes the extensions delivered with this release. You can
-find them in <cite>/opt/rxvt/lib/urxvt/perl/</cite>.</p>
+find them in <cite>/usr/local/lib/urxvt/perl/</cite>.</p>
 <p>You can activate them like this:</p>
-<pre>  rxvt -pe &lt;extensionname&gt;
+<pre>  urxvt -pe &lt;extensionname&gt;
 
 </pre>
 <p>Or by adding them to the resource for extensions loaded by default:</p>
@@ -266,7 +266,7 @@ following four resources (shown with defaults):</p>
    URxvt.tabbed.tab-bg:    &lt;colour-index, default 1&gt;
 
 </pre>
-		<p>See <i>COLOR AND GRAPHICS</i> in the rxvt(1) manpage for valid
+		<p>See <i>COLOR AND GRAPHICS</i> in the urxvt(1) manpage for valid
 indices.</p>
 	</dd>
 	<dt>matcher</dt>
@@ -304,7 +304,7 @@ OnTheSpot editing in general, but it seems to work at leats for SCIM and
 kinput2.</p>
 		<p>You enable it by specifying this extension and a preedit style of
 <code>OnTheSpot</code>, i.e.:</p>
-<pre>   rxvt -pt OnTheSpot -pe xim-onthespot
+<pre>   urxvt -pt OnTheSpot -pe xim-onthespot
 
 </pre>
 	</dd>
@@ -329,7 +329,7 @@ extension will actually grab a physical key just for this function.</p>
 background pixmap offset to the window position, in effect creating the
 same effect as pseudo transparency with a custom pixmap. No scaling is
 supported in this mode. Example:</p>
-<pre>   rxvt -pixmap background.xpm -pe automove-background
+<pre>   urxvt -pixmap background.xpm -pe automove-background
 
 </pre>
 		<p><a href="http://wiki.archlinux.org/index.php/Perl_Background_Rotation/Extensions">http://wiki.archlinux.org/index.php/Perl_Background_Rotation/Extensions</a>
@@ -618,7 +618,7 @@ code is run after this hook, and takes precedence.</p>
 	<dd>
 		<p>Called whenever a user-configured event is being activated (e.g. via
 a <code>perl:string</code> action bound to a key, see description of the <strong>keysym</strong>
-resource in the rxvt(1) manpage).</p>
+resource in the urxvt(1) manpage).</p>
 		<p>The event is simply the action string. This interface is assumed to change
 slightly in the future.</p>
 	</dd>
@@ -845,7 +845,7 @@ refer to global data (which is race free).</p>
 	<dt>$term-&gt;destroy</dt>
 	<dd>
 		<p>Destroy the terminal object (close the window, free resources
-etc.). Please note that rxvt will not exit as long as any event
+etc.). Please note that urxvt will not exit as long as any event
 watchers (timers, io watchers) are still active.</p>
 	</dd>
 	<dt>$term-&gt;exec_async ($cmd[, @args])</dt>
@@ -917,7 +917,7 @@ the wrong resources.</p>
 	<dt>$success = $term-&gt;parse_keysym ($keysym_spec, $command_string)</dt>
 	<dd>
 		<p>Adds a keymap translation exactly as specified via a resource. See the
-<code>keysym</code> resource in the rxvt(1) manpage.</p>
+<code>keysym</code> resource in the urxvt(1) manpage.</p>
 	</dd>
 	<dt>$rend = $term-&gt;rstyle ([$new_rstyle])</dt>
 	<dd>
diff --git a/doc/rxvtperl.3.man.in b/doc/rxvtperl.3.man.in
index 2123c816..51fbca8d 100644
--- a/doc/rxvtperl.3.man.in
+++ b/doc/rxvtperl.3.man.in
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.32
+.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.35
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "@@RXVT_NAME@@ 3"
-.TH @@RXVT_NAME@@ 3 "2007-08-01" "8.3" "RXVT-UNICODE"
+.TH @@RXVT_NAME@@ 3 "2007-10-27" "8.4" "RXVT-UNICODE"
 .SH "NAME"
 @@RXVT_NAME@@perl \- rxvt\-unicode's embedded perl interpreter
 .SH "SYNOPSIS"
diff --git a/doc/rxvtperl.3.txt b/doc/rxvtperl.3.txt
index 3ddd92c3..ba8da80f 100644
--- a/doc/rxvtperl.3.txt
+++ b/doc/rxvtperl.3.txt
@@ -1,5 +1,5 @@
 NAME
-    rxvtperl - rxvt-unicode's embedded perl interpreter
+    urxvtperl - rxvt-unicode's embedded perl interpreter
 
 SYNOPSIS
        # create a file grab_test in $HOME:
@@ -9,9 +9,9 @@ SYNOPSIS
           ()
        }
 
-       # start a rxvt using it:
+       # start a urxvt using it:
 
-       rxvt --perl-lib $HOME -pe grab_test
+       urxvt --perl-lib $HOME -pe grab_test
 
 DESCRIPTION
     Every time a terminal object gets created, extension scripts specified
@@ -20,7 +20,7 @@ DESCRIPTION
     Scripts are compiled in a 'use strict' and 'use utf8' environment, and
     thus must be encoded as UTF-8.
 
-    Each script will only ever be loaded once, even in rxvtd, where scripts
+    Each script will only ever be loaded once, even in urxvtd, where scripts
     will be shared (but not enabled) for all terminals.
 
     You can disable the embedded perl interpreter by setting both "perl-ext"
@@ -28,11 +28,11 @@ DESCRIPTION
 
 PREPACKAGED EXTENSIONS
     This section describes the extensions delivered with this release. You
-    can find them in /opt/rxvt/lib/urxvt/perl/.
+    can find them in /usr/local/lib/urxvt/perl/.
 
     You can activate them like this:
 
-      rxvt -pe <extensionname>
+      urxvt -pe <extensionname>
 
     Or by adding them to the resource for extensions loaded by default:
 
@@ -222,7 +222,7 @@ PREPACKAGED EXTENSIONS
            URxvt.tabbed.tab-fg:    <colour-index, default 0>
            URxvt.tabbed.tab-bg:    <colour-index, default 1>
 
-        See *COLOR AND GRAPHICS* in the rxvt(1) manpage for valid indices.
+        See *COLOR AND GRAPHICS* in the urxvt(1) manpage for valid indices.
 
     matcher
         Uses per-line display filtering ("on_line_update") to underline text
@@ -263,7 +263,7 @@ PREPACKAGED EXTENSIONS
         You enable it by specifying this extension and a preedit style of
         "OnTheSpot", i.e.:
 
-           rxvt -pt OnTheSpot -pe xim-onthespot
+           urxvt -pt OnTheSpot -pe xim-onthespot
 
     kuake<hotkey>
         A very primitive quake-console-like extension. It was inspired by a
@@ -290,7 +290,7 @@ PREPACKAGED EXTENSIONS
         creating the same effect as pseudo transparency with a custom
         pixmap. No scaling is supported in this mode. Example:
 
-           rxvt -pixmap background.xpm -pe automove-background
+           urxvt -pixmap background.xpm -pe automove-background
 
         <http://wiki.archlinux.org/index.php/Perl_Background_Rotation/Extens
         ions> shows how this extension can be used to implement an
@@ -559,7 +559,7 @@ API DOCUMENTATION
     on_user_command $term, $string
         Called whenever a user-configured event is being activated (e.g. via
         a "perl:string" action bound to a key, see description of the keysym
-        resource in the rxvt(1) manpage).
+        resource in the urxvt(1) manpage).
 
         The event is simply the action string. This interface is assumed to
         change slightly in the future.
@@ -756,7 +756,7 @@ API DOCUMENTATION
 
     $term->destroy
         Destroy the terminal object (close the window, free resources etc.).
-        Please note that rxvt will not exit as long as any event watchers
+        Please note that urxvt will not exit as long as any event watchers
         (timers, io watchers) are still active.
 
     $term->exec_async ($cmd[, @args])
@@ -831,7 +831,7 @@ API DOCUMENTATION
 
     $success = $term->parse_keysym ($keysym_spec, $command_string)
         Adds a keymap translation exactly as specified via a resource. See
-        the "keysym" resource in the rxvt(1) manpage.
+        the "keysym" resource in the urxvt(1) manpage.
 
     $rend = $term->rstyle ([$new_rstyle])
         Return and optionally change the current rendition. Text that is
diff --git a/src/Makefile.in b/src/Makefile.in
index 36ba8e40..c8b1ddcf 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -140,10 +140,14 @@ depend:
 
 # DO NOT DELETE: nice dependency list follows
 
+background.o: ../config.h rxvt.h rxvtlib.h optinc.h feature.h encoding.h
+background.o: rxvtutil.h rxvtfont.h rxvttoolkit.h iom.h iom_conf.h
+background.o: libptytty.h callback.h salloc.h rxvtperl.h hookinc.h
+background.o: background.h rsinc.h
 command.o: ../config.h rxvt.h rxvtlib.h optinc.h feature.h encoding.h
 command.o: rxvtutil.h rxvtfont.h rxvttoolkit.h iom.h iom_conf.h libptytty.h
-command.o: callback.h salloc.h rxvtperl.h hookinc.h rsinc.h version.h
-command.o: command.h keyboard.h
+command.o: callback.h salloc.h rxvtperl.h hookinc.h background.h rsinc.h
+command.o: version.h command.h keyboard.h
 encoding.o: ../config.h encoding.h table/iso8859_1.h table/iso8859_15.h
 encoding.o: table/iso8859_2.h table/iso8859_3.h table/iso8859_4.h
 encoding.o: table/iso8859_5.h table/iso8859_6.h table/iso8859_7.h
@@ -162,83 +166,88 @@ encoding.o: table/compose.h table/category.h
 fdpass.o: ../config.h libptytty.h
 init.o: ../config.h rxvt.h rxvtlib.h optinc.h feature.h encoding.h rxvtutil.h
 init.o: rxvtfont.h rxvttoolkit.h iom.h iom_conf.h libptytty.h callback.h
-init.o: salloc.h rxvtperl.h hookinc.h rsinc.h init.h
+init.o: salloc.h rxvtperl.h hookinc.h background.h rsinc.h init.h
 iom.o: iom.h iom_conf.h rxvtutil.h libptytty.h callback.h
 keyboard.o: ../config.h rxvt.h rxvtlib.h optinc.h feature.h encoding.h
 keyboard.o: rxvtutil.h rxvtfont.h rxvttoolkit.h iom.h iom_conf.h libptytty.h
-keyboard.o: callback.h salloc.h rxvtperl.h hookinc.h rsinc.h keyboard.h
-keyboard.o: command.h
+keyboard.o: callback.h salloc.h rxvtperl.h hookinc.h background.h rsinc.h
+keyboard.o: keyboard.h command.h
 logging.o: ../config.h ptytty.h libptytty.h ptytty_conf.h rxvt.h rxvtlib.h
 logging.o: optinc.h feature.h encoding.h rxvtutil.h rxvtfont.h rxvttoolkit.h
-logging.o: iom.h iom_conf.h callback.h salloc.h rxvtperl.h hookinc.h rsinc.h
+logging.o: iom.h iom_conf.h callback.h salloc.h rxvtperl.h hookinc.h
+logging.o: background.h rsinc.h
 main.o: ../config.h rxvt.h rxvtlib.h optinc.h feature.h encoding.h rxvtutil.h
 main.o: rxvtfont.h rxvttoolkit.h iom.h iom_conf.h libptytty.h callback.h
-main.o: salloc.h rxvtperl.h hookinc.h rsinc.h keyboard.h
+main.o: salloc.h rxvtperl.h hookinc.h background.h rsinc.h keyboard.h
 misc.o: ../config.h rxvt.h rxvtlib.h optinc.h feature.h encoding.h rxvtutil.h
 misc.o: rxvtfont.h rxvttoolkit.h iom.h iom_conf.h libptytty.h callback.h
-misc.o: salloc.h rxvtperl.h hookinc.h rsinc.h
+misc.o: salloc.h rxvtperl.h hookinc.h background.h rsinc.h
 proxy.o: ../config.h ptytty.h libptytty.h ptytty_conf.h rxvt.h rxvtlib.h
 proxy.o: optinc.h feature.h encoding.h rxvtutil.h rxvtfont.h rxvttoolkit.h
-proxy.o: iom.h iom_conf.h callback.h salloc.h rxvtperl.h hookinc.h rsinc.h
+proxy.o: iom.h iom_conf.h callback.h salloc.h rxvtperl.h hookinc.h
+proxy.o: background.h rsinc.h
 ptytty.o: ../config.h ptytty.h libptytty.h ptytty_conf.h rxvt.h rxvtlib.h
 ptytty.o: optinc.h feature.h encoding.h rxvtutil.h rxvtfont.h rxvttoolkit.h
-ptytty.o: iom.h iom_conf.h callback.h salloc.h rxvtperl.h hookinc.h rsinc.h
+ptytty.o: iom.h iom_conf.h callback.h salloc.h rxvtperl.h hookinc.h
+ptytty.o: background.h rsinc.h
 rxvt.o: ../config.h rxvt.h rxvtlib.h optinc.h feature.h encoding.h rxvtutil.h
 rxvt.o: rxvtfont.h rxvttoolkit.h iom.h iom_conf.h libptytty.h callback.h
-rxvt.o: salloc.h rxvtperl.h hookinc.h rsinc.h
+rxvt.o: salloc.h rxvtperl.h hookinc.h background.h rsinc.h
 rxvtc.o: ../config.h rxvtdaemon.h rxvtutil.h libptytty.h rxvt.h rxvtlib.h
 rxvtc.o: optinc.h feature.h encoding.h rxvtfont.h rxvttoolkit.h iom.h
-rxvtc.o: iom_conf.h callback.h salloc.h rxvtperl.h hookinc.h rsinc.h
+rxvtc.o: iom_conf.h callback.h salloc.h rxvtperl.h hookinc.h background.h
+rxvtc.o: rsinc.h
 rxvtd.o: ../config.h rxvt.h rxvtlib.h optinc.h feature.h encoding.h
 rxvtd.o: rxvtutil.h rxvtfont.h rxvttoolkit.h iom.h iom_conf.h libptytty.h
-rxvtd.o: callback.h salloc.h rxvtperl.h hookinc.h rsinc.h rxvtdaemon.h
+rxvtd.o: callback.h salloc.h rxvtperl.h hookinc.h background.h rsinc.h
+rxvtd.o: rxvtdaemon.h
 rxvtdaemon.o: rxvtdaemon.h rxvtutil.h
 rxvtfont.o: ../config.h rxvt.h rxvtlib.h optinc.h feature.h encoding.h
 rxvtfont.o: rxvtutil.h rxvtfont.h rxvttoolkit.h iom.h iom_conf.h libptytty.h
-rxvtfont.o: callback.h salloc.h rxvtperl.h hookinc.h rsinc.h table/linedraw.h
-rxvtperl.o: ../config.h iom.h iom_conf.h rxvtutil.h libptytty.h callback.h
-rxvtperl.o: rxvt.h rxvtlib.h optinc.h feature.h encoding.h rxvtfont.h
-rxvtperl.o: rxvttoolkit.h salloc.h rxvtperl.h hookinc.h rsinc.h keyboard.h
-rxvtperl.o: perlxsi.c ./iom_perl.h
+rxvtfont.o: callback.h salloc.h rxvtperl.h hookinc.h background.h rsinc.h
+rxvtfont.o: table/linedraw.h
 rxvttoolkit.o: ../config.h rxvt.h rxvtlib.h optinc.h feature.h encoding.h
 rxvttoolkit.o: rxvtutil.h rxvtfont.h rxvttoolkit.h iom.h iom_conf.h
-rxvttoolkit.o: libptytty.h callback.h salloc.h rxvtperl.h hookinc.h rsinc.h
+rxvttoolkit.o: libptytty.h callback.h salloc.h rxvtperl.h hookinc.h
+rxvttoolkit.o: background.h rsinc.h
 rxvtutil.o: rxvtutil.h
 salloc.o: salloc.h
 screen.o: ../config.h rxvt.h rxvtlib.h optinc.h feature.h encoding.h
 screen.o: rxvtutil.h rxvtfont.h rxvttoolkit.h iom.h iom_conf.h libptytty.h
-screen.o: callback.h salloc.h rxvtperl.h hookinc.h rsinc.h salloc.C
+screen.o: callback.h salloc.h rxvtperl.h hookinc.h background.h rsinc.h
+screen.o: salloc.C
 scrollbar-next.o: ../config.h rxvt.h rxvtlib.h optinc.h feature.h encoding.h
 scrollbar-next.o: rxvtutil.h rxvtfont.h rxvttoolkit.h iom.h iom_conf.h
 scrollbar-next.o: libptytty.h callback.h salloc.h rxvtperl.h hookinc.h
-scrollbar-next.o: rsinc.h
+scrollbar-next.o: background.h rsinc.h
 scrollbar-plain.o: ../config.h rxvt.h rxvtlib.h optinc.h feature.h encoding.h
 scrollbar-plain.o: rxvtutil.h rxvtfont.h rxvttoolkit.h iom.h iom_conf.h
 scrollbar-plain.o: libptytty.h callback.h salloc.h rxvtperl.h hookinc.h
-scrollbar-plain.o: rsinc.h
+scrollbar-plain.o: background.h rsinc.h
 scrollbar-rxvt.o: ../config.h rxvt.h rxvtlib.h optinc.h feature.h encoding.h
 scrollbar-rxvt.o: rxvtutil.h rxvtfont.h rxvttoolkit.h iom.h iom_conf.h
 scrollbar-rxvt.o: libptytty.h callback.h salloc.h rxvtperl.h hookinc.h
-scrollbar-rxvt.o: rsinc.h
+scrollbar-rxvt.o: background.h rsinc.h
 scrollbar-xterm.o: ../config.h rxvt.h rxvtlib.h optinc.h feature.h encoding.h
 scrollbar-xterm.o: rxvtutil.h rxvtfont.h rxvttoolkit.h iom.h iom_conf.h
 scrollbar-xterm.o: libptytty.h callback.h salloc.h rxvtperl.h hookinc.h
-scrollbar-xterm.o: rsinc.h
+scrollbar-xterm.o: background.h rsinc.h
 scrollbar.o: ../config.h rxvt.h rxvtlib.h optinc.h feature.h encoding.h
 scrollbar.o: rxvtutil.h rxvtfont.h rxvttoolkit.h iom.h iom_conf.h libptytty.h
-scrollbar.o: callback.h salloc.h rxvtperl.h hookinc.h rsinc.h
+scrollbar.o: callback.h salloc.h rxvtperl.h hookinc.h background.h rsinc.h
 xdefaults.o: ../config.h rxvt.h rxvtlib.h optinc.h feature.h encoding.h
 xdefaults.o: rxvtutil.h rxvtfont.h rxvttoolkit.h iom.h iom_conf.h libptytty.h
-xdefaults.o: callback.h salloc.h rxvtperl.h hookinc.h rsinc.h version.h
-xdefaults.o: keyboard.h
-background.o: ../config.h rxvt.h rxvtlib.h optinc.h feature.h encoding.h rxvtutil.h
-background.o: rxvtfont.h rxvttoolkit.h iom.h iom_conf.h libptytty.h callback.h
-background.o: salloc.h rxvtperl.h hookinc.h rsinc.h background.h
+xdefaults.o: callback.h salloc.h rxvtperl.h hookinc.h background.h rsinc.h
+xdefaults.o: version.h keyboard.h
 
+background.lo: ../config.h rxvt.h rxvtlib.h optinc.h feature.h encoding.h
+background.lo: rxvtutil.h rxvtfont.h rxvttoolkit.h iom.h iom_conf.h
+background.lo: libptytty.h callback.h salloc.h rxvtperl.h hookinc.h
+background.lo: background.h rsinc.h
 command.lo: ../config.h rxvt.h rxvtlib.h optinc.h feature.h encoding.h
 command.lo: rxvtutil.h rxvtfont.h rxvttoolkit.h iom.h iom_conf.h libptytty.h
-command.lo: callback.h salloc.h rxvtperl.h hookinc.h rsinc.h version.h
-command.lo: command.h keyboard.h
+command.lo: callback.h salloc.h rxvtperl.h hookinc.h background.h rsinc.h
+command.lo: version.h command.h keyboard.h
 encoding.lo: ../config.h encoding.h table/iso8859_1.h table/iso8859_15.h
 encoding.lo: table/iso8859_2.h table/iso8859_3.h table/iso8859_4.h
 encoding.lo: table/iso8859_5.h table/iso8859_6.h table/iso8859_7.h
@@ -257,76 +266,78 @@ encoding.lo: table/compose.h table/category.h
 fdpass.lo: ../config.h libptytty.h
 init.lo: ../config.h rxvt.h rxvtlib.h optinc.h feature.h encoding.h
 init.lo: rxvtutil.h rxvtfont.h rxvttoolkit.h iom.h iom_conf.h libptytty.h
-init.lo: callback.h salloc.h rxvtperl.h hookinc.h rsinc.h init.h
+init.lo: callback.h salloc.h rxvtperl.h hookinc.h background.h rsinc.h init.h
 iom.lo: iom.h iom_conf.h rxvtutil.h libptytty.h callback.h
 keyboard.lo: ../config.h rxvt.h rxvtlib.h optinc.h feature.h encoding.h
 keyboard.lo: rxvtutil.h rxvtfont.h rxvttoolkit.h iom.h iom_conf.h libptytty.h
-keyboard.lo: callback.h salloc.h rxvtperl.h hookinc.h rsinc.h keyboard.h
-keyboard.lo: command.h
+keyboard.lo: callback.h salloc.h rxvtperl.h hookinc.h background.h rsinc.h
+keyboard.lo: keyboard.h command.h
 logging.lo: ../config.h ptytty.h libptytty.h ptytty_conf.h rxvt.h rxvtlib.h
 logging.lo: optinc.h feature.h encoding.h rxvtutil.h rxvtfont.h rxvttoolkit.h
-logging.lo: iom.h iom_conf.h callback.h salloc.h rxvtperl.h hookinc.h rsinc.h
+logging.lo: iom.h iom_conf.h callback.h salloc.h rxvtperl.h hookinc.h
+logging.lo: background.h rsinc.h
 main.lo: ../config.h rxvt.h rxvtlib.h optinc.h feature.h encoding.h
 main.lo: rxvtutil.h rxvtfont.h rxvttoolkit.h iom.h iom_conf.h libptytty.h
-main.lo: callback.h salloc.h rxvtperl.h hookinc.h rsinc.h keyboard.h
+main.lo: callback.h salloc.h rxvtperl.h hookinc.h background.h rsinc.h
+main.lo: keyboard.h
 misc.lo: ../config.h rxvt.h rxvtlib.h optinc.h feature.h encoding.h
 misc.lo: rxvtutil.h rxvtfont.h rxvttoolkit.h iom.h iom_conf.h libptytty.h
-misc.lo: callback.h salloc.h rxvtperl.h hookinc.h rsinc.h
+misc.lo: callback.h salloc.h rxvtperl.h hookinc.h background.h rsinc.h
 proxy.lo: ../config.h ptytty.h libptytty.h ptytty_conf.h rxvt.h rxvtlib.h
 proxy.lo: optinc.h feature.h encoding.h rxvtutil.h rxvtfont.h rxvttoolkit.h
-proxy.lo: iom.h iom_conf.h callback.h salloc.h rxvtperl.h hookinc.h rsinc.h
+proxy.lo: iom.h iom_conf.h callback.h salloc.h rxvtperl.h hookinc.h
+proxy.lo: background.h rsinc.h
 ptytty.lo: ../config.h ptytty.h libptytty.h ptytty_conf.h rxvt.h rxvtlib.h
 ptytty.lo: optinc.h feature.h encoding.h rxvtutil.h rxvtfont.h rxvttoolkit.h
-ptytty.lo: iom.h iom_conf.h callback.h salloc.h rxvtperl.h hookinc.h rsinc.h
+ptytty.lo: iom.h iom_conf.h callback.h salloc.h rxvtperl.h hookinc.h
+ptytty.lo: background.h rsinc.h
 rxvt.lo: ../config.h rxvt.h rxvtlib.h optinc.h feature.h encoding.h
 rxvt.lo: rxvtutil.h rxvtfont.h rxvttoolkit.h iom.h iom_conf.h libptytty.h
-rxvt.lo: callback.h salloc.h rxvtperl.h hookinc.h rsinc.h
+rxvt.lo: callback.h salloc.h rxvtperl.h hookinc.h background.h rsinc.h
 rxvtc.lo: ../config.h rxvtdaemon.h rxvtutil.h libptytty.h rxvt.h rxvtlib.h
 rxvtc.lo: optinc.h feature.h encoding.h rxvtfont.h rxvttoolkit.h iom.h
-rxvtc.lo: iom_conf.h callback.h salloc.h rxvtperl.h hookinc.h rsinc.h
+rxvtc.lo: iom_conf.h callback.h salloc.h rxvtperl.h hookinc.h background.h
+rxvtc.lo: rsinc.h
 rxvtd.lo: ../config.h rxvt.h rxvtlib.h optinc.h feature.h encoding.h
 rxvtd.lo: rxvtutil.h rxvtfont.h rxvttoolkit.h iom.h iom_conf.h libptytty.h
-rxvtd.lo: callback.h salloc.h rxvtperl.h hookinc.h rsinc.h rxvtdaemon.h
+rxvtd.lo: callback.h salloc.h rxvtperl.h hookinc.h background.h rsinc.h
+rxvtd.lo: rxvtdaemon.h
 rxvtdaemon.lo: rxvtdaemon.h rxvtutil.h
 rxvtfont.lo: ../config.h rxvt.h rxvtlib.h optinc.h feature.h encoding.h
 rxvtfont.lo: rxvtutil.h rxvtfont.h rxvttoolkit.h iom.h iom_conf.h libptytty.h
-rxvtfont.lo: callback.h salloc.h rxvtperl.h hookinc.h rsinc.h
+rxvtfont.lo: callback.h salloc.h rxvtperl.h hookinc.h background.h rsinc.h
 rxvtfont.lo: table/linedraw.h
-rxvtperl.lo: ../config.h iom.h iom_conf.h rxvtutil.h libptytty.h callback.h
-rxvtperl.lo: rxvt.h rxvtlib.h optinc.h feature.h encoding.h rxvtfont.h
-rxvtperl.lo: rxvttoolkit.h salloc.h rxvtperl.h hookinc.h rsinc.h keyboard.h
-rxvtperl.lo: perlxsi.c ./iom_perl.h
 rxvttoolkit.lo: ../config.h rxvt.h rxvtlib.h optinc.h feature.h encoding.h
 rxvttoolkit.lo: rxvtutil.h rxvtfont.h rxvttoolkit.h iom.h iom_conf.h
-rxvttoolkit.lo: libptytty.h callback.h salloc.h rxvtperl.h hookinc.h rsinc.h
+rxvttoolkit.lo: libptytty.h callback.h salloc.h rxvtperl.h hookinc.h
+rxvttoolkit.lo: background.h rsinc.h
 rxvtutil.lo: rxvtutil.h
 salloc.lo: salloc.h
 screen.lo: ../config.h rxvt.h rxvtlib.h optinc.h feature.h encoding.h
 screen.lo: rxvtutil.h rxvtfont.h rxvttoolkit.h iom.h iom_conf.h libptytty.h
-screen.lo: callback.h salloc.h rxvtperl.h hookinc.h rsinc.h salloc.C
+screen.lo: callback.h salloc.h rxvtperl.h hookinc.h background.h rsinc.h
+screen.lo: salloc.C
 scrollbar-next.lo: ../config.h rxvt.h rxvtlib.h optinc.h feature.h encoding.h
 scrollbar-next.lo: rxvtutil.h rxvtfont.h rxvttoolkit.h iom.h iom_conf.h
 scrollbar-next.lo: libptytty.h callback.h salloc.h rxvtperl.h hookinc.h
-scrollbar-next.lo: rsinc.h
+scrollbar-next.lo: background.h rsinc.h
 scrollbar-plain.lo: ../config.h rxvt.h rxvtlib.h optinc.h feature.h
 scrollbar-plain.lo: encoding.h rxvtutil.h rxvtfont.h rxvttoolkit.h iom.h
 scrollbar-plain.lo: iom_conf.h libptytty.h callback.h salloc.h rxvtperl.h
-scrollbar-plain.lo: hookinc.h rsinc.h
+scrollbar-plain.lo: hookinc.h background.h rsinc.h
 scrollbar-rxvt.lo: ../config.h rxvt.h rxvtlib.h optinc.h feature.h encoding.h
 scrollbar-rxvt.lo: rxvtutil.h rxvtfont.h rxvttoolkit.h iom.h iom_conf.h
 scrollbar-rxvt.lo: libptytty.h callback.h salloc.h rxvtperl.h hookinc.h
-scrollbar-rxvt.lo: rsinc.h
+scrollbar-rxvt.lo: background.h rsinc.h
 scrollbar-xterm.lo: ../config.h rxvt.h rxvtlib.h optinc.h feature.h
 scrollbar-xterm.lo: encoding.h rxvtutil.h rxvtfont.h rxvttoolkit.h iom.h
 scrollbar-xterm.lo: iom_conf.h libptytty.h callback.h salloc.h rxvtperl.h
-scrollbar-xterm.lo: hookinc.h rsinc.h
+scrollbar-xterm.lo: hookinc.h background.h rsinc.h
 scrollbar.lo: ../config.h rxvt.h rxvtlib.h optinc.h feature.h encoding.h
 scrollbar.lo: rxvtutil.h rxvtfont.h rxvttoolkit.h iom.h iom_conf.h
-scrollbar.lo: libptytty.h callback.h salloc.h rxvtperl.h hookinc.h rsinc.h
+scrollbar.lo: libptytty.h callback.h salloc.h rxvtperl.h hookinc.h
+scrollbar.lo: background.h rsinc.h
 xdefaults.lo: ../config.h rxvt.h rxvtlib.h optinc.h feature.h encoding.h
 xdefaults.lo: rxvtutil.h rxvtfont.h rxvttoolkit.h iom.h iom_conf.h
-xdefaults.lo: libptytty.h callback.h salloc.h rxvtperl.h hookinc.h rsinc.h
-xdefaults.lo: version.h keyboard.h
-background.lo: ../config.h rxvt.h rxvtlib.h optinc.h feature.h encoding.h rxvtutil.h
-background.lo: rxvtfont.h rxvttoolkit.h iom.h iom_conf.h libptytty.h callback.h
-background.lo: salloc.h rxvtperl.h hookinc.h rsinc.h background.h
+xdefaults.lo: libptytty.h callback.h salloc.h rxvtperl.h hookinc.h
+xdefaults.lo: background.h rsinc.h version.h keyboard.h
diff --git a/src/version.h b/src/version.h
index f7658c42..8d68ad67 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1,3 +1,3 @@
 // VERSION _must_ be \d.\d+
-#define VERSION "8.3"
-#define DATE	"2007-08-01"
+#define VERSION "8.4"
+#define DATE	"2007-10-27"
-- 
2.34.1