--- 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-29" "8.3" "RXVT-UNICODE"
+.TH @@RXVT_NAME@@ 1 "2007-11-19" "8.4" "RXVT-UNICODE"
 .SH "NAME"
 rxvt\-unicode (ouR XVT, unicode) \- (a VT102 emulator for the X window system)
 .SH "SYNOPSIS"
@@ -237,11 +237,11 @@ Turn on/off skip scrolling (allow multiple screens per refresh); resource \fBski
 Turn on/off illusion of a transparent window background. Obsolete form of it is
 \&\fB\-ip\fR and it should not be used anymore; resource \fBtransparent\fR.
 .Sp
-\&\fIPlease note that old resource name of \f(BIinheritPixmap\fI is obsolete and should be 
-changed to \f(BItransparent\fI. Backwards compatibility support for \f(BIinheritPixmap\fI will 
+\&\fIPlease note that old resource name of \f(BIinheritPixmap\fI is obsolete and should be
+changed to \f(BItransparent\fI. Backwards compatibility support for \f(BIinheritPixmap\fI will
 be phased out in future versions of rxvt!\fR
 .Sp
-\&\fIPlease address all transparency related issues to Sasha Vasko at 
+\&\fIPlease address all transparency related issues to Sasha Vasko at
 sasha@aftercode.net. Read the \s-1FAQ\s0 (man 7 @@RXVT_NAME@@)!\fR
 .IP "\fB\-fade\fR \fInumber\fR" 4
 .IX Item "-fade number"
@@ -260,12 +260,12 @@ non-tiled backgrounds, currently. See also the \fB\-sh\fR 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. Also 
-pure black and pure white colors essentialy mean no tinting; resource
+blue, red, green, cyan, magenta, yellow, and those close to them. Also
+pure black and pure white colors essentially mean no tinting; 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"
@@ -295,9 +295,9 @@ Window background colour; resource \fBbackground\fR.
 .IP "\fB\-fg\fR \fIcolour\fR" 4
 .IX Item "-fg colour"
 Window foreground colour; resource \fBforeground\fR.
-.IP "\fB\-pixmap\fR \fIfile[;geom]\fR" 4
-.IX Item "-pixmap file[;geom]"
-Compile \fIafterimage\fR: Specify image file for the background and also 
+.IP "\fB\-pixmap\fR \fIfile[;geom[:op1][:op2][...]]\fR" 4
+.IX Item "-pixmap file[;geom[:op1][:op2][...]]"
+Compile \fIafterimage\fR: Specify image file for the background and also
 optionally specify its scaling with a geometry string. Note you may need to
 add quotes to avoid special shell interpretation of the \f(CW\*(C`;\*(C'\fR in the
 command\-line; for more details see resource \fBbackgroundPixmap\fR.
@@ -327,8 +327,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
@@ -457,7 +457,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"
@@ -545,9 +545,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
@@ -574,14 +574,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
@@ -599,11 +599,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\-
+\&  5. $XENVIRONMENT file OR $HOME/.Xdefaults-
 .Ve
 .PP
 Note that when reading X resources, \fB@@RXVT_NAME@@\fR recognizes two class
@@ -729,7 +729,7 @@ in addition to tinting it; option \fB\-sh\fR.
 Specify background blending type; option \fB\-blt\fR.
 .IP "\fBblurRadius:\fR \fInumber\fR" 4
 .IX Item "blurRadius: number"
-Apply Gaussian Blurr with the specified radius to the transparent 
+Apply Gaussian Blurr with the specified radius to the transparent
 background image; option \fB\-blr\fR.
 .IP "\fBscrollColor:\fR \fIcolour\fR" 4
 .IX Item "scrollColor: colour"
@@ -742,22 +742,33 @@ Use the specified colour for the scrollbar's trough area [default
 .IX Item "borderColor: colour"
 The colour of the border around the text area and between the scrollbar
 and the text.
-.IP "\fBbackgroundPixmap:\fR \fIfile[;geom]\fR" 4
-.IX Item "backgroundPixmap: file[;geom]"
-Use the specified image file for the background and also optionally 
-specify its scaling with a geometry string \fBWxH+X+Y\fR, 
-in which \fB\*(L"W\*(R" / \*(L"H\*(R"\fR specify the horizontal/vertical scale (percent), 
-and \fB\*(L"X\*(R" / \*(L"Y\*(R"\fR locate the image centre (percent). 
-A scale of 0 displays the image with tiling. A scale of 1 displays the 
-image without any scaling. A scale of 2 to 9 specifies an integer 
-number of images in that direction. No image will be magnified beyond 
-10 times its original size. The maximum permitted scale is 1000. 
-Special string of \fB\*(L"auto\*(R"\fR used as a geometry will cause image to be 
-automatically scaled to match window size.
-If used in conjunction with \fB\-tr\fR option \- specified pixmap will be 
-blended over transparency image using either alpha\-blending, or any 
+.IP "\fBbackgroundPixmap:\fR \fIfile[;geom[:op1][:op2][...]]\fR" 4
+.IX Item "backgroundPixmap: file[;geom[:op1][:op2][...]]"
+Use the specified image file for the background and also
+optionally specify its scaling with a geometry string \fBWxH+X+Y\fR,
+(default \f(CW\*(C`0x0+50+50\*(C'\fR) in which \fB\*(L"W\*(R" / \*(L"H\*(R"\fR specify the
+horizontal/vertical scale (percent), and \fB\*(L"X\*(R" / \*(L"Y\*(R"\fR locate the image
+centre (percent).  A scale of 0 displays the image with tiling. A scale
+of 1 displays the image without any scaling. A scale of 2 to 9 specifies
+an integer number of images in that direction. No image will be magnified
+beyond 10 times its original size. The maximum permitted scale is 1000.
+Additional operations can be specified after colon \fB:op1:op2...\fR.
+Supported operations are:
+.Sp
+.Vb 8
+\&  tile        force background image to be tiled and not scaled. Equivalent to 0x0,
+\&  propscale   will scale image keeping proportions, 
+\&  auto        will scale image to match window size. Equivalent to 100x100;
+\&  hscale      will scale image horizontally to the window size; 
+\&  vscale      will scale image vertically to the window size;
+\&  scale       will scale image to match window size;
+\&  root        will tile image as if it was a root window background, auto-adjusting
+\&              whenever terminal window moves.
+.Ve
+.Sp
+If used in conjunction with \fB\-tr\fR option, the specified pixmap will be
+blended over transparency image using either alpha\-blending, or any
 other blending type, specified with \fB\-blt \*(L"type\*(R"\fR option.
-[default 0x0+50+50]
 .IP "\fBpath:\fR \fIpath\fR" 4
 .IX Item "path: path"
 Specify the colon-delimited search path for finding background image files.
@@ -781,8 +792,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
@@ -885,7 +896,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
@@ -1007,7 +1018,7 @@ will be created). In this mode, characters outside \s-1ISO\-8859\-1\s0 can be us
 When the selection extension is not used, only \s-1ISO\-8859\-1\s0 characters can
 be used. If not specified, the built-in default is used:
 .Sp
-\&\fB\s-1BACKSLASH\s0 `"'&()*,;<=>?@[]{|}\fR
+\&\fB\s-1BACKSLASH\s0 `"'&()*,;<=>?@[]^{|}\fR
 .IP "\fBpreeditType:\fR \fIstyle\fR" 4
 .IX Item "preeditType: style"
 \&\fBOverTheSpot\fR, \fBOffTheSpot\fR, \fBRoot\fR; option \fB\-pt\fR.
@@ -1103,15 +1114,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
+\&  URxvt.keysym.M-C-0x61:    list|\e033
 .Ve
 .Sp
 The above line is equivalent to the following three lines:
 .Sp
 .Vb 3
-\&  URxvt.keysym.Meta\-Control\-0x61:    \e033
-\&  URxvt.keysym.Meta\-Control\-0x62:    \e033
-\&  URxvt.keysym.Meta\-Control\-0x63:    \e033
+\&  URxvt.keysym.Meta-Control-0x61:    \e033
+\&  URxvt.keysym.Meta-Control-0x62:    \e033
+\&  URxvt.keysym.Meta-Control-0x63:    \e033
 .Ve
 .Sp
 If \fIstring\fR takes the form of \f(CW\*(C`command:STRING\*(C'\fR, the specified \fB\s-1STRING\s0\fR
@@ -1120,7 +1131,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
@@ -1129,7 +1140,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
@@ -1146,7 +1157,7 @@ user-defined keymap using the \f(CW\*(C`builtin:\*(C'\fR replacement:
 .Sp
 .Vb 2
 \&  URxvt.keysym.Insert: 
-\&  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
@@ -1158,16 +1169,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"
@@ -1299,8 +1310,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.
@@ -1437,7 +1448,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
@@ -1452,8 +1463,8 @@ resources or on the command line.
 .IP "\fB\s-1COLORTERM\s0\fR" 4
 .IX Item "COLORTERM"
 Either \f(CW\*(C`rxvt\*(C'\fR, \f(CW\*(C`rxvt\-xpm\*(C'\fR, depending on whether @@RXVT_NAME@@ was
-compiled with background image support, and optionally with the added 
-extension \f(CW\*(C`\-mono\*(C'\fR to indicate that rxvt-unicode runs on a monochrome 
+compiled with background image support, and optionally with the added
+extension \f(CW\*(C`\-mono\*(C'\fR to indicate that rxvt-unicode runs on a monochrome
 screen.
 .IP "\fB\s-1COLORFGBG\s0\fR" 4
 .IX Item "COLORFGBG"
@@ -1462,7 +1473,7 @@ the colour code used as default foreground/text colour (or the string
 \&\f(CW\*(C`default\*(C'\fR to indicate that the default-colour escape sequence is to be
 used), \f(CW\*(C`bg\*(C'\fR is the colour code used as default background colour (or the
 string \f(CW\*(C`default\*(C'\fR), and \f(CW\*(C`xpm\*(C'\fR is the string \f(CW\*(C`default\*(C'\fR if @@RXVT_NAME@@
-was compiled with background image support. Libraries like \f(CW\*(C`ncurses\*(C'\fR 
+was compiled with background image support. Libraries like \f(CW\*(C`ncurses\*(C'\fR
 and \f(CW\*(C`slang\*(C'\fR can (and do) use this information to optimize screen output.
 .IP "\fB\s-1WINDOWID\s0\fR" 4
 .IX Item "WINDOWID"
diff --git a/doc/rxvt.1.txt b/doc/rxvt.1.txt

--- a/doc/rxvt.1.txt
+++ b/doc/rxvt.1.txt
@@ -3,7 +3,7 @@ NAME
     system)

 SYNOPSIS
-    urxvt [options] [-e command [ args ]]
+    rxvt [options] [-e command [ args ]]

 DESCRIPTION
     rxvt-unicode, version 8.4, is a colour vt102 terminal emulator intended
@@ -13,9 +13,9 @@ DESCRIPTION
     advantage on a machine serving many X sessions.

 FREQUENTLY ASKED QUESTIONS
-    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
+    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
     .

 RXVT-UNICODE VS. RXVT
@@ -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 urxvtd(1) (daemon) and urxvtc(1)
+    drastically reduces memory usage. See rxvtd(1) (daemon) and rxvtc(1)
     (client).

     It also makes technical information about escape sequences (which have
-    been extended) more accessible: see urxvt(7) for technical reference
+    been extended) more accessible: see rxvt(7) for technical reference
     documentation (escape sequences etc.).

 OPTIONS
-    The urxvt options (mostly a subset of *xterm*'s) are listed below. In
+    The rxvt 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. `urxvt
+    may not accurately reflect the version installed on your system. `rxvt
     -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: `urxvt -help' gives a list of all command-line options
+    line. Note: `rxvt -help' gives a list of all command-line options
     compiled into your version.

-    Note that urxvt permits the resource name to be used as a long-option
+    Note that rxvt 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: `urxvt --loginShell --color1 Orange'.
+    than those listed. For example: `rxvt --loginShell --color1 Orange'.

     The following options are available:

@@ -114,7 +114,7 @@ OPTIONS
         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)!*
+        sasha@aftercode.net. Read the FAQ (man 7 rxvt)!*

     -fade *number*
         Fade the text by the given percentage when focus is lost. Small
@@ -133,12 +133,13 @@ OPTIONS
         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:
+        them. Also pure black and pure white colors essentially mean no
+        tinting; resource *tintColor*. Example:

-           urxvt -tr -tint blue -sh 40
+           rxvt -tr -tint blue -sh 40

     -sh *number*
-        Darken (0 .. 100) or lighten (-1 .. -100) the transparent background
+        Darken (0 .. 100) or lighten (100 .. 200) the transparent background
         image in addition to (or instead of) tinting it; resource *shading*.

     -blt *string*
@@ -164,7 +165,7 @@ OPTIONS
     -fg *colour*
         Window foreground colour; resource foreground.

-    -pixmap *file[;geom]*
+    -pixmap *file[;geom[:op1][:op2][...]]*
         Compile *afterimage*: Specify image file for the background and also
         optionally specify its scaling with a geometry string. Note you may
         need to add quotes to avoid special shell interpretation of the ";"
@@ -195,11 +196,11 @@ OPTIONS
         prefix it with "x:". To specify an XFT-font, you need to prefix it
         with "xft:", e.g.:

-           urxvt -fn "xft:Bitstream Vera Sans Mono:pixelsize=15"
-           urxvt -fn "9x15bold,xft:Bitstream Vera Sans Mono"
+           rxvt -fn "xft:Bitstream Vera Sans Mono:pixelsize=15"
+           rxvt -fn "9x15bold,xft:Bitstream Vera Sans Mono"

         See also the question "How does rxvt-unicode choose fonts?" in the
-        FAQ section of urxvt(7).
+        FAQ section of rxvt(7).

     -fb *fontlist*
         Compile *font-styles*: The bold font list to use when bold
@@ -313,7 +314,7 @@ OPTIONS
         resource termName.

     -e *command [arguments]*
-        Run the command with its command-line arguments in the urxvt window;
+        Run the command with its command-line arguments in the rxvt 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
@@ -325,7 +326,7 @@ OPTIONS
         want to run shell commands, you have to specify the shell, like
         this:

-          urxvt -e sh -c "shell commands"
+          rxvt -e sh -c "shell commands"

     -title *text*
         Window title (-T still respected); the default title is the basename
@@ -381,7 +382,7 @@ OPTIONS
         secondaryScroll.

     -hold|+hold
-        Turn on/off hold window after exit support. If enabled, urxvt will
+        Turn on/off hold window after exit support. If enabled, rxvt 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.
@@ -390,21 +391,21 @@ OPTIONS
         Remap a key symbol. See resource keysym.

     -embed *windowid*
-        Tells urxvt to embed its windows into an already-existing window,
+        Tells rxvt to embed its windows into an already-existing window,
         which enables applications to easily embed a terminal.

-        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.
+        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.

-        The window will not be destroyed when urxvt exits.
+        The window will not be destroyed when rxvt exits.

-        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.
+        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.

         Here is a short Gtk2-perl snippet that illustrates how this option
         can be used (a longer example is in doc/embed):
@@ -412,16 +413,16 @@ OPTIONS
            my $rxvt = new Gtk2::Socket;
            $rxvt->signal_connect_after (realize => sub {
               my $xid = $_[0]->window->get_xid;
-              system "urxvt -embed $xid &";
+              system "rxvt -embed $xid &";
            });

     -pty-fd *file descriptor*
-        Tells urxvt NOT to execute any commands or create a new pty/tty pair
+        Tells rxvt 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 urxvt as a generic terminal emulator
+        useful if you want to drive rxvt as a generic terminal emulator
         without having to run a program within it.

-        If this switch is given, urxvt will not create any utmp/wtmp entries
+        If this switch is given, rxvt 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.

@@ -436,7 +437,7 @@ OPTIONS

            my $pty = new IO::Pty;
            fcntl $pty, F_SETFD, 0; # clear close-on-exec
-           system "urxvt -pty-fd " . (fileno $pty) . "&";
+           system "rxvt -pty-fd " . (fileno $pty) . "&";
            close $pty;

            # now communicate with rxvt
@@ -448,12 +449,12 @@ OPTIONS
         use) in this terminal instance. See resource perl-ext for details.

 RESOURCES (available also as long-options)
-    Note: `urxvt --help' gives a list of all resources (long options)
+    Note: `rxvt --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. urxvt will consult the following files/resources in order, with
+    starts. rxvt 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
@@ -462,15 +463,15 @@ RESOURCES (available also as long-options)
       4. SCREEN_RESOURCES for the current screen
       5. $XENVIRONMENT file OR $HOME/.Xdefaults-

-    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):
+    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):

     depth: *bitdepth*
         Compile *xft*: Attempt to find a visual with the given bit depth;
@@ -498,7 +499,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 urxvt(7)).
+        be changed using an escape command (see rxvt(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.
@@ -538,18 +539,18 @@ RESOURCES (available also as long-options)

     jumpScroll: *boolean*
         True: specify that jump scrolling should be used. When receiving
-        lots of lines, urxvt will only scroll once a whole screen height of
+        lots of lines, rxvt 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. urxvt will
-        force a screen refresh on each new line it received; option +j.
+        False: specify that smooth scrolling should be used. rxvt 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, urxvt will only scroll once in a while
+        receiving lots of lines, rxvt will only scroll once in a while
         (around 60 times per second), resulting in far fewer updates. This
-        can result in urxvt not ever displaying some of the lines it
+        can result in rxvt not ever displaying some of the lines it
         receives; option -ss.

         False: specify that everything is to be displayed, even if the
@@ -598,20 +599,30 @@ RESOURCES (available also as long-options)
         The colour of the border around the text area and between the
         scrollbar and the text.

-    backgroundPixmap: *file[;geom]*
+    backgroundPixmap: *file[;geom[:op1][:op2][...]]*
         Use the specified image file for the background and also optionally
-        specify its scaling with a geometry string WxH+X+Y, in which "W" /
-        "H" specify the horizontal/vertical scale (percent), and "X" / "Y"
-        locate the image centre (percent). A scale of 0 displays the image
-        with tiling. A scale of 1 displays the image without any scaling. A
-        scale of 2 to 9 specifies an integer number of images in that
-        direction. No image will be magnified beyond 10 times its original
-        size. The maximum permitted scale is 1000. Special string of "auto"
-        used as a geometry will cause image to be automatically scaled to
-        match window size. If used in conjunction with -tr option -
-        specified pixmap will be blended over transparency image using
-        either alpha-blending, or any other blending type, specified with
-        -blt "type" option. [default 0x0+50+50]
+        specify its scaling with a geometry string WxH+X+Y, (default
+        "0x0+50+50") in which "W" / "H" specify the horizontal/vertical
+        scale (percent), and "X" / "Y" locate the image centre (percent). A
+        scale of 0 displays the image with tiling. A scale of 1 displays the
+        image without any scaling. A scale of 2 to 9 specifies an integer
+        number of images in that direction. No image will be magnified
+        beyond 10 times its original size. The maximum permitted scale is
+        1000. Additional operations can be specified after colon
+        :op1:op2.... Supported operations are:
+
+          tile        force background image to be tiled and not scaled. Equivalent to 0x0,
+          propscale   will scale image keeping proportions, 
+          auto        will scale image to match window size. Equivalent to 100x100;
+          hscale      will scale image horizontally to the window size; 
+          vscale      will scale image vertically to the window size;
+          scale       will scale image to match window size;
+          root        will tile image as if it was a root window background, auto-adjusting
+                      whenever terminal window moves. 
+
+        If used in conjunction with -tr option, the specified pixmap will be
+        blended over transparency image using either alpha-blending, or any
+        other blending type, specified with -blt "type" option.

     path: *path*
         Specify the colon-delimited search path for finding background image
@@ -852,7 +863,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 urxvtperl(3) manpage), a suitable regex using these
+        in, see the rxvtperl(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.
@@ -860,7 +871,7 @@ RESOURCES (available also as long-options)
         When the selection extension is not used, only ISO-8859-1 characters
         can be used. If not specified, the built-in default is used:

-        BACKSLASH `"'&()*,;<=>?@[]{|}
+        BACKSLASH `"'&()*,;<=>?@[]^{|}

     preeditType: *style*
         OverTheSpot, OffTheSpot, Root; option -pt.
@@ -878,7 +889,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 urxvt. The default will be set-up to chose *any*
+        font lists used in rxvt. 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.

@@ -920,7 +931,7 @@ RESOURCES (available also as long-options)
         instead scroll the screen up.

     hold: *boolean*
-        Turn on/off hold window after exit support. If enabled, urxvt will
+        Turn on/off hold window after exit support. If enabled, rxvt 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.
@@ -964,7 +975,7 @@ RESOURCES (available also as long-options)
           URxvt.keysym.Meta-Control-0x63:    \033

         If *string* takes the form of "command:STRING", the specified STRING
-        is interpreted and executed as urxvt's control sequence. For example
+        is interpreted and executed as rxvt's control sequence. For example
         the following means "change the current locale to "zh_CN.GBK" when
         Control-Meta-c is being pressed":

@@ -972,9 +983,8 @@ 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
-        urxvtperl(3) manpage. For example, the selection extension
-        (activated via "urxvt -pe selection") listens for "selection:rot13"
-        events:
+        rxvtperl(3) manpage. For example, the selection extension (activated
+        via "rxvt -pe selection") listens for "selection:rot13" events:

           URxvt.keysym.M-C-c: perl:selection:rot13

@@ -986,7 +996,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 urxvt's
+        if you overwrite the "Insert" key you will disable rxvt's
         "Shift-Insert" mapping. To re-enable that, you can poke "holes" into
         the user-defined keymap using the "builtin:" replacement:

@@ -1004,7 +1014,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 urxvt(7) for more
+        Other things are possible, e.g. resizing (see rxvt(7) for more
         info):

           URxvt.keysym.M-C-3: command:\033[8;25;80t
@@ -1038,24 +1048,24 @@ RESOURCES (available also as long-options)

     perl-eval: *string*
         Perl code to be evaluated when all extensions have been registered.
-        See the urxvtperl(3) manpage. Due to security reasons, this resource
+        See the rxvtperl(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, urxvt will first look in these directories and then in
-        /usr/local/lib/urxvt/perl/. Due to security reasons, this resource
+        resource, rxvt will first look in these directories and then in
+        /opt/rxvt/lib/urxvt/perl/. Due to security reasons, this resource
         will be ignored when running setuid/setgid.

-        See the urxvtperl(3) manpage.
+        See the rxvtperl(3) manpage.

     selection.pattern-*idx*: *perl-regex*
-        Additional selection patterns, see the urxvtperl(3) manpage for
+        Additional selection patterns, see the rxvtperl(3) manpage for
         details.

     selection-autotransform.*idx*: *perl-transform*
-        Selection auto-transform patterns, see the urxvtperl(3) manpage for
+        Selection auto-transform patterns, see the rxvtperl(3) manpage for
         details.

     searchable-scrollback: *keysym*
@@ -1079,9 +1089,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 urxvt window (resource:
+    Lines of text that scroll off the top of the rxvt window (resource:
     saveLines) and can be scrolled back using the scrollbar or by
-    keystrokes. The normal urxvt scrollbar has arrows and its behaviour is
+    keystrokes. The normal rxvt scrollbar has arrows and its behaviour is
     fairly intuitive. The xterm-scrollbar is without arrows and its
     behaviour mimics that of *xterm*

@@ -1118,7 +1128,7 @@ THE SELECTION: SELECTING AND PASTING TEXT
         removed from the selection.

     Pasting:
-        Pressing and releasing the Middle mouse button in an urxvt window
+        Pressing and releasing the Middle mouse button in an rxvt 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.
@@ -1202,13 +1212,13 @@ ISO 14755 SUPPORT
     both scenario A and B of ISO 14755, including part 5.2.

 LOGIN STAMP
-    urxvt tries to write an entry into the *utmp*(5) file so that it can be
+    rxvt 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, urxvt may need to be installed setuid root on some systems or
+    feature, rxvt 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, urxvt can
+    In addition to the default foreground and background colours, rxvt 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.

@@ -1236,7 +1246,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, urxvt offers an additional 72
+    In addition to the colours defined above, rxvt 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).
@@ -1250,7 +1260,7 @@ COLORS AND GRAPHICS
     *xterm*(1) where the colours are only swapped if they have not otherwise
     been specified. For example,

-    urxvt -fg Black -bg White -rv
+    rxvt -fg Black -bg White -rv
         would yield White on Black, while on *xterm*(1) it would yield Black
         on White.

@@ -1272,20 +1282,20 @@ COLORS AND GRAPHICS
     For example, the following selects an almost completely transparent red
     background, and an almost opaque pink foreground:

-       urxvt -depth 32 -bg rgba:0000/0000/0000/aaaa -fg "[80]pink"
+       rxvt -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
-    urxvt sets and/or uses the following environment variables:
+    rxvt 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 urxvt was compiled
+        Either "rxvt", "rxvt-xpm", depending on whether rxvt was compiled
         with background image support, and optionally with the added
         extension "-mono" to indicate that rxvt-unicode runs on a monochrome
         screen.
@@ -1296,28 +1306,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 urxvt was compiled with background image support. Libraries like
+        if rxvt 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 urxvt window (the toplevel
+        Set to the (decimal) X Window ID of the rxvt window (the toplevel
         window, which usually has subwindows for the scrollbar, the terminal
         window and so on).

     TERMINFO
-        Set to the terminfo directory iff urxvt was configured with
+        Set to the terminfo directory iff rxvt was configured with
         "--with-terminfo=PATH".

     DISPLAY
-        Used by urxvt to connect to the display and set to the correct
+        Used by rxvt 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 urxvtc(1) and urxvtd(1).
+        The unix domain socket path used by rxvtc(1) and rxvtd(1).

         Default $HOME/.rxvt-unicode-*
index b5118629237a6b4443c9c1a14deb6dffe464c6f3..
index ..be7aaacc1fe11b48ce4e09281c109ea083e4234c 100644
--- a/doc/rxvt.7.html
+++ b/doc/rxvt.7.html
@@ -6,7 +6,7 @@
 	
 	
 	
-	
+	
 	
 
 
@@ -347,9 +347,9 @@ system with a minimal config:

 
And here is rxvt-unicode:
 
   libX11.so.6 => /usr/X11R6/lib/libX11.so.6 (0x00002aaaaabc3000)
    libgcc_s.so.1 => /lib/libgcc_s.so.1 (0x00002aaaaada2000)
-   libc.so.6 => /lib/libc.so.6 (0x00002aaaaaeb0000)     
-   libdl.so.2 => /lib/libdl.so.2 (0x00002aaaab0ee000)   
-   /lib64/ld-linux-x86-64.so.2 (0x00002aaaaaaab000)     
+   libc.so.6 => /lib/libc.so.6 (0x00002aaaaaeb0000)
+   libdl.so.2 => /lib/libdl.so.2 (0x00002aaaab0ee000)
+   /lib64/ld-linux-x86-64.so.2 (0x00002aaaaaaab000)

 
 
No large bloated libraries (of course, none were linked in statically),
@@ -366,14 +366,14 @@ except maybe libX11 :)
 
 
I can't get transparency working, what am I doing wrong?
 

-
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 
+
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!
-
1. Use inheritPixmap:
+
1. Use transparent mode:
 
   Esetroot wallpaper.jpg
-   urxvt -ip -tint red -sh 40
+   urxvt -tr -tint red -sh 40

 
 
That works. If you think it doesn't, you lack transparency and tinting
@@ -382,10 +382,10 @@ support, or you are unable to read.
 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.jpg
-   urxvt -pixmap background.jpg -pe automove-background
+   urxvt -pixmap "background.jpg;:root"

 
-
That works. If you think it doesn't, you lack AfterImage and Perl support, or you
+
That works. If you think it doesn't, you lack AfterImage support, or you
 are unable to read.
 
3. Use an ARGB visual:
 
   urxvt -depth 32 -fg grey90 -bg rgba:0000/0000/4444/cccc
@@ -764,7 +764,7 @@ To avoid confusion between the Backspace and Delete keys, the Delete
 key has been assigned an escape sequence to match the vt100 for Execute
 (ESC [ 3 ~) and is in the supplied termcap/terminfo.

 
Some other Backspace problems:
-
some editors use termcap/terminfo, 
+
some editors use termcap/terminfo,
 some editors (vim I'm told) expect Backspace = ^H,
 GNU Emacs (and Emacs-like editors) use ^H for help.
 
Perhaps someday this will all be resolved in a consistent manner.
@@ -1996,15 +1996,14 @@ SVG, TIFF, GIF, XPM, BMP, ICO, XCF, TGA and AfterStep image XML
 (http://www.afterstep.org/visualdoc.php?show=asimagexml).

 		
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.
-		
Note that with this option enabled, urxvt's memory footprint might
+		
Note that with this option enabled, rxvt'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.
 	
 	
--enable-transparency (default: on)
 	

-		
Add support for inheriting parent backgrounds thus giving a fake
-transparency to the term.
+		
Add support for backgrounds, creating illusion of transparency in the term.
 	
 	
--enable-fading (default: on)
 	

@@ -2093,7 +2092,7 @@ in combination with other switches) is:

 	
 	
--enable-iso14755 (default: on)
 	

-		
Enable extended ISO 14755 support (see urxvt(1), or
+		
Enable extended ISO 14755 support (see rxvt(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.
@@ -2130,7 +2129,7 @@ the screen in a fixed position.

 	
 	
--enable-perl (default: on)
 	

-		
Enable an embedded perl interpreter. See the urxvtperl(3)
+		
Enable an embedded perl interpreter. See the rxvtperl(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
diff --git a/doc/rxvt.7.man.in b/doc/rxvt.7.man.in

index 39b3862a74b582d3296d9bd40022e72aca15d380..
index ..eac942c3774c63aabcd2be981e67239bf7d16af6 100644
--- a/doc/rxvt.7.man.in
+++ b/doc/rxvt.7.man.in
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "@@RXVT_NAME@@ 7"
-.TH @@RXVT_NAME@@ 7 "2007-10-27" "8.4" "RXVT-UNICODE"
+.TH @@RXVT_NAME@@ 7 "2007-11-19" "8.4" "RXVT-UNICODE"
 .SH "NAME"
 RXVT REFERENCE \- FAQ, command sequences and other background information
 .SH "SYNOPSIS"
@@ -358,8 +358,8 @@ And here is rxvt\-unicode:
 .Vb 5
 \&   libX11.so.6 => /usr/X11R6/lib/libX11.so.6 (0x00002aaaaabc3000)
 \&   libgcc_s.so.1 => /lib/libgcc_s.so.1 (0x00002aaaaada2000)
-\&   libc.so.6 => /lib/libc.so.6 (0x00002aaaaaeb0000)     
-\&   libdl.so.2 => /lib/libdl.so.2 (0x00002aaaab0ee000)   
+\&   libc.so.6 => /lib/libc.so.6 (0x00002aaaaaeb0000)
+\&   libdl.so.2 => /lib/libdl.so.2 (0x00002aaaab0ee000)
 \&   /lib64/ld-linux-x86-64.so.2 (0x00002aaaaaaab000)
 .Ve
 .PP
@@ -370,18 +370,18 @@ except maybe libX11 :)
 \fII can't get transparency working, what am I doing wrong?\fR
 .IX Subsection "I can't get transparency working, what am I doing wrong?"
 .PP
-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 
+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.
 .PP
 Here are four ways to get transparency. \fBDo\fR read the manpage and option
 descriptions for the programs mentioned and rxvt\-unicode. Really, do it!
 .PP
-1. Use inheritPixmap:
+1. Use transparent mode:
 .PP
 .Vb 2
 \&   Esetroot wallpaper.jpg
-\&   @@URXVT_NAME@@ -ip -tint red -sh 40
+\&   @@URXVT_NAME@@ -tr -tint red -sh 40
 .Ve
 .PP
 That works. If you think it doesn't, you lack transparency and tinting
@@ -393,10 +393,10 @@ 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
+\&   @@URXVT_NAME@@ -pixmap "background.jpg;:root"
 .Ve
 .PP
-That works. If you think it doesn't, you lack AfterImage and Perl support, or you
+That works. If you think it doesn't, you lack AfterImage support, or you
 are unable to read.
 .PP
 3. Use an \s-1ARGB\s0 visual:
@@ -832,7 +832,7 @@ key has been assigned an escape sequence to match the vt100 for Execute
 .PP
 Some other Backspace problems:
 .PP
-some editors use termcap/terminfo, 
+some editors use termcap/terminfo,
 some editors (vim I'm told) expect Backspace = ^H,
 \&\s-1GNU\s0 Emacs (and Emacs-like editors) use ^H for help.
 .PP
@@ -2589,8 +2589,7 @@ to third-party libraries used by libAI). Memory footprint may somewhat be
 lowered if libAfterImage is configured without support for \s-1SVG\s0.
 .IP "\-\-enable\-transparency (default: on)" 4
 .IX Item "--enable-transparency (default: on)"
-Add support for inheriting parent backgrounds thus giving a fake
-transparency to the term.
+Add support for backgrounds, creating illusion of transparency in the term.
 .IP "\-\-enable\-fading (default: on)" 4
 .IX Item "--enable-fading (default: on)"
 Add support for fading the text when focus is lost.
diff --git a/doc/rxvt.7.txt b/doc/rxvt.7.txt

index f367facc55fbac55e802aa4800203837126d05c8..
index ..7629ead33c68e806358b5436fd5db732dd7b889d 100644
--- a/doc/rxvt.7.txt
+++ b/doc/rxvt.7.txt
@@ -182,9 +182,9 @@ RXVT-UNICODE/URXVT FREQUENTLY ASKED QUESTIONS

        libX11.so.6 => /usr/X11R6/lib/libX11.so.6 (0x00002aaaaabc3000)
        libgcc_s.so.1 => /lib/libgcc_s.so.1 (0x00002aaaaada2000)
-       libc.so.6 => /lib/libc.so.6 (0x00002aaaaaeb0000)     
-       libdl.so.2 => /lib/libdl.so.2 (0x00002aaaab0ee000)   
-       /lib64/ld-linux-x86-64.so.2 (0x00002aaaaaaab000)     
+       libc.so.6 => /lib/libc.so.6 (0x00002aaaaaeb0000)
+       libdl.so.2 => /lib/libdl.so.2 (0x00002aaaab0ee000)
+       /lib64/ld-linux-x86-64.so.2 (0x00002aaaaaaab000)

     No large bloated libraries (of course, none were linked in statically),
     except maybe libX11 :)
@@ -199,10 +199,10 @@ RXVT-UNICODE/URXVT FREQUENTLY ASKED QUESTIONS
     Here are four ways to get transparency. Do read the manpage and option
     descriptions for the programs mentioned and rxvt-unicode. Really, do it!

-    1. Use inheritPixmap:
+    1. Use transparent mode:

        Esetroot wallpaper.jpg
-       urxvt -ip -tint red -sh 40
+       urxvt -tr -tint red -sh 40

     That works. If you think it doesn't, you lack transparency and tinting
     support, or you are unable to read.
@@ -212,10 +212,10 @@ RXVT-UNICODE/URXVT FREQUENTLY ASKED QUESTIONS
     your picture with gimp or any other tool:

        convert wallpaper.jpg -blur 20x20 -modulate 30 background.jpg
-       urxvt -pixmap background.jpg -pe automove-background
+       urxvt -pixmap "background.jpg;:root"

-    That works. If you think it doesn't, you lack AfterImage and Perl
-    support, or you are unable to read.
+    That works. If you think it doesn't, you lack AfterImage support, or you
+    are unable to read.

     3. Use an ARGB visual:

@@ -1908,15 +1908,15 @@ CONFIGURE OPTIONS
         root background, as well as dynamic scaling and bluring of
         background images.

-        Note that with this option enabled, urxvt's memory footprint might
+        Note that with this option enabled, rxvt'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.

     --enable-transparency (default: on)
-        Add support for inheriting parent backgrounds thus giving a fake
-        transparency to the term.
+        Add support for backgrounds, creating illusion of transparency in
+        the term.

     --enable-fading (default: on)
         Add support for fading the text when focus is lost.
@@ -1995,7 +1995,7 @@ CONFIGURE OPTIONS
           verbose X error handling

     --enable-iso14755 (default: on)
-        Enable extended ISO 14755 support (see urxvt(1), or doc/rxvt.1.txt).
+        Enable extended ISO 14755 support (see rxvt(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.

@@ -2024,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 urxvtperl(3) manpage
+        Enable an embedded perl interpreter. See the rxvtperl(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"
diff --git a/doc/rxvtperl.3.html b/doc/rxvtperl.3.html

index c92c689f9460d647abee4369ab6304bfbed04cdd..
index ..e9bbd03ecb99b80cdaa14f2f5bd58f1886754f41 100644
--- a/doc/rxvtperl.3.html
+++ b/doc/rxvtperl.3.html
@@ -2,11 +2,11 @@
 
 
 
-	
-	
+	
+	
 	
 	
-	
+	
 	
 
 
@@ -45,7 +45,7 @@

 
NAME
Top
 

-
urxvtperl - rxvt-unicode's embedded perl interpreter
+
rxvtperl - rxvt-unicode's embedded perl interpreter

 
 
SYNOPSIS
Top
@@ -57,9 +57,9 @@
       ()
    }

-   # start a urxvt using it:
+   # start a rxvt using it:

-   urxvt --perl-lib $HOME -pe grab_test
+   rxvt --perl-lib $HOME -pe grab_test

 

@@ -70,7 +70,7 @@
 the perl resource are loaded and associated with it.

 
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 urxvtd, where
+
Each script will only ever be loaded once, even in rxvtd, where
 scripts will be shared (but not enabled) for all terminals.
 
You can disable the embedded perl interpreter by setting both "perl-ext"
 and "perl-ext-common" resources to the empty string.
@@ -79,13 +79,13 @@ and "perl-ext-common" resources to the empty string.

 
PREPACKAGED EXTENSIONS
Top
 

 
This section describes the extensions delivered with this release. You can
-find them in /usr/local/lib/urxvt/perl/.
+find them in /opt/rxvt/lib/urxvt/perl/.

 
You can activate them like this:
-
  urxvt -pe <extensionname>
+
  rxvt -pe <extensionname>

 
 
Or by adding them to the resource for extensions loaded by default:
-
  URxvt.perl-ext-common: default,automove-background,selection-autotransform
+
  URxvt.perl-ext-common: default,selection-autotransform

 
 

@@ -142,7 +142,7 @@ runtime.

 		
Other extensions can extend this popup menu by pushing a code reference
 onto @{ $term-{option_popup_hook} }>, which gets called whenever the
 popup is being displayed.
-		
It's sole argument is the popup menu, which can be modified.  It should
+		
Its sole argument is the popup menu, which can be modified.  It should
 either return nothing or a string, the initial boolean value and a code
 reference. The string will be used as button text and the code reference
 will be called when the toggle changes, with the new boolean value as
@@ -163,7 +163,7 @@ evaluation, web-browser starting etc.), depending on content.
 		
Other extensions can extend this popup menu by pushing a code reference
 onto @{ $term-{selection_popup_hook} }>, which gets called whenever the
 popup is being displayed.
-		
It's sole argument is the popup menu, which can be modified. The selection
+		
Its sole argument is the popup menu, which can be modified. The selection
 is in $_, which can be used to decide whether to add something or not.
 It should either return nothing or a string and a code reference. The
 string will be used as button text and the code reference will be called
@@ -172,7 +172,7 @@ when the button gets activated and should transform $_.
 the selection to bs, but only if the selection currently contains any
 as:

 
   push @{ $self->{term}{selection_popup_hook} }, sub {
-      /a/ ? ("a to be" => sub { s/a/b/g }
+      /a/ ? ("a to b" => sub { s/a/b/g }
           : ()
    };

@@ -266,7 +266,7 @@ following four resources (shown with defaults):

    URxvt.tabbed.tab-bg:    <colour-index, default 1>

 
-		
See COLOR AND GRAPHICS in the urxvt(1) manpage for valid
+		
See COLOR AND GRAPHICS in the rxvt(1) manpage for valid
 indices.
 	
 	
matcher
@@ -300,11 +300,11 @@ Simply bind a keysym to "perl:matcher" as seen in the example below.
 		
This (experimental) perl extension implements OnTheSpot editing. It does
 not work perfectly, and some input methods don't seem to work well with
-OnTheSpot editing in general, but it seems to work at leats for SCIM and
+OnTheSpot editing in general, but it seems to work at least for SCIM and
 kinput2.
 		
You enable it by specifying this extension and a preedit style of
 OnTheSpot, i.e.:
-
   urxvt -pt OnTheSpot -pe xim-onthespot
+
   rxvt -pt OnTheSpot -pe xim-onthespot

 
 	
@@ -316,25 +316,12 @@ user presses a global accelerator key (by default F10), the termina
 will show or hide itself. Another press of the accelerator key will hide
 or show it again.

 		
Initially, the window will not be shown when using this extension.
-		
This is useful if you need a single terminal thats not using any desktop
+		
This is useful if you need a single terminal that is not using any desktop
 space most of the time but is quickly available at the press of a key.
 		
The accelerator key is grabbed regardless of any modifiers, so this
 extension will actually grab a physical key just for this function.
 		
If you want a quake-like animation, tell your window manager to do so
 (fvwm can do it).
-	
-	
automove-background
-	

-		
This is basically a very small extension that dynamically changes the
-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:
-
   urxvt -pixmap background.xpm -pe automove-background
-
-
-		
http://wiki.archlinux.org/index.php/Perl_Background_Rotation/Extensions
-shows how this extension can be used to implement an automatically blurred
-transparent background.
 	
 	
block-graphics-to-ascii
 	

@@ -349,7 +336,7 @@ similar-looking ascii character.

 	
remote-clipboard
 	

 		
Somewhat of a misnomer, this extension adds two menu entries to the
-selection popup that allows one ti run external commands to store the
+selection popup that allows one to run external commands to store the
 selection somewhere and fetch it again.
 		
We use it to implement a "distributed selection mechanism", which just
 means that one command uploads the file to a remote server, and another
@@ -618,7 +605,7 @@ code is run after this hook, and takes precedence.
 	

 		
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 urxvt(1) manpage).
+resource in the rxvt(1) manpage).

 		
The event is simply the action string. This interface is assumed to change
 slightly in the future.
 	
@@ -845,7 +832,7 @@ refer to global data (which is race free).

 	
$term->destroy
 	

 		
Destroy the terminal object (close the window, free resources
-etc.). Please note that urxvt will not exit as long as any event
+etc.). Please note that rxvt will not exit as long as any event
 watchers (timers, io watchers) are still active.
 	
 	
$term->exec_async ($cmd[, @args])
@@ -917,7 +904,7 @@ the wrong resources.

 	
$success = $term->parse_keysym ($keysym_spec, $command_string)
 	

 		
Adds a keymap translation exactly as specified via a resource. See the
-keysym resource in the urxvt(1) manpage.
+keysym resource in the rxvt(1) manpage.

 	
 	
$rend = $term->rstyle ([$new_rstyle])
 	

@@ -1332,7 +1319,7 @@ fractional number of seconds since the epoch. Example:

                     ->cb (sub {
                        $term->{overlay}->set (0, 0,
                           sprintf "%2d:%02d:%02d", (localtime urxvt::NOW)[2,1,0]);
-                    });                                                                                                                                      
+                    });

 
 

@@ -1385,7 +1372,7 @@ is automatically rescheduled at the given intervals.

   $term->{iow} = urxvt::iow
                  ->new
                  ->fd (fileno $term->{socket})
-                 ->events (urxvt::EVENT_READ)
+                 ->events (urxvt::EV_READ)
                  ->start
                  ->cb (sub {
                    my ($iow, $revents) = @_;
@@ -1415,8 +1402,8 @@ is a bitset as described in the events method.

 	
$iow = $iow->events ($eventmask)
 	

 		
Set the event mask to watch. The only allowed values are
-urxvt::EVENT_READ and urxvt::EVENT_WRITE, which might be ORed
-together, or urxvt::EVENT_NONE.
+urxvt::EV_READ and urxvt::EV_WRITE, which might be ORed
+together, or urxvt::EV_NONE.

 	
 	
$iow = $iow->start
 	

@@ -1466,7 +1453,7 @@ process exits, after which they stop automatically.

                     ->cb (sub {
                        my ($pw, $exit_status) = @_;
                        ...
-                    });                                                                                                                                      
+                    });

 
 

diff --git a/doc/rxvtperl.3.man.in b/doc/rxvtperl.3.man.in

index 51fbca8d7676af5a71ea13039688aec8294fee60..
index ..c87e0fe3c5838a8f6e12863b54937be216769f65 100644
--- a/doc/rxvtperl.3.man.in
+++ b/doc/rxvtperl.3.man.in
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "@@RXVT_NAME@@ 3"
-.TH @@RXVT_NAME@@ 3 "2007-10-27" "8.4" "RXVT-UNICODE"
+.TH @@RXVT_NAME@@ 3 "2007-11-19" "8.4" "RXVT-UNICODE"
 .SH "NAME"
 @@RXVT_NAME@@perl \- rxvt\-unicode's embedded perl interpreter
 .SH "SYNOPSIS"
@@ -179,7 +179,7 @@ You can activate them like this:
 Or by adding them to the resource for extensions loaded by default:
 .PP
 .Vb 1
-\&  URxvt.perl-ext-common: default,automove-background,selection-autotransform
+\&  URxvt.perl-ext-common: default,selection-autotransform
 .Ve
 .IP "selection (enabled by default)" 4
 .IX Item "selection (enabled by default)"
@@ -244,7 +244,7 @@ Other extensions can extend this popup menu by pushing a code reference
 onto \f(CW\*(C`@{ $term\-\*(C'\fR{option_popup_hook} }>, which gets called whenever the
 popup is being displayed.
 .Sp
-It's sole argument is the popup menu, which can be modified.  It should
+Its sole argument is the popup menu, which can be modified.  It should
 either return nothing or a string, the initial boolean value and a code
 reference. The string will be used as button text and the code reference
 will be called when the toggle changes, with the new boolean value as
@@ -268,7 +268,7 @@ Other extensions can extend this popup menu by pushing a code reference
 onto \f(CW\*(C`@{ $term\-\*(C'\fR{selection_popup_hook} }>, which gets called whenever the
 popup is being displayed.
 .Sp
-It's sole argument is the popup menu, which can be modified. The selection
+Its sole argument is the popup menu, which can be modified. The selection
 is in \f(CW$_\fR, which can be used to decide whether to add something or not.
 It should either return nothing or a string and a code reference. The
 string will be used as button text and the code reference will be called
@@ -280,7 +280,7 @@ the selection to \f(CW\*(C`b\*(C'\fRs, but only if the selection currently conta
 .Sp
 .Vb 4
 \&   push @{ $self->{term}{selection_popup_hook} }, sub {
-\&      /a/ ? ("a to be" => sub { s/a/b/g }
+\&      /a/ ? ("a to b" => sub { s/a/b/g }
 \&          : ()
 \&   };
 .Ve
@@ -430,7 +430,7 @@ Example configuration:
 .IX Item "xim-onthespot"
 This (experimental) perl extension implements OnTheSpot editing. It does
 not work perfectly, and some input methods don't seem to work well with
-OnTheSpot editing in general, but it seems to work at leats for \s-1SCIM\s0 and
+OnTheSpot editing in general, but it seems to work at least for \s-1SCIM\s0 and
 kinput2.
 .Sp
 You enable it by specifying this extension and a preedit style of
@@ -449,7 +449,7 @@ or show it again.
 .Sp
 Initially, the window will not be shown when using this extension.
 .Sp
-This is useful if you need a single terminal thats not using any desktop
+This is useful if you need a single terminal that is not using any desktop
 space most of the time but is quickly available at the press of a key.
 .Sp
 The accelerator key is grabbed regardless of any modifiers, so this
@@ -457,20 +457,6 @@ extension will actually grab a physical key just for this function.
 .Sp
 If you want a quake-like animation, tell your window manager to do so
 (fvwm can do it).
-.IP "automove-background" 4
-.IX Item "automove-background"
-This is basically a very small extension that dynamically changes the
-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:
-.Sp
-.Vb 1
-\&   @@RXVT_NAME@@ -pixmap background.xpm -pe automove-background
-.Ve
-.Sp
-
-shows how this extension can be used to implement an automatically blurred
-transparent background.
 .IP "block-graphics-to-ascii" 4
 .IX Item "block-graphics-to-ascii"
 A not very useful example of filtering all text output to the terminal
@@ -482,7 +468,7 @@ Displays a digital clock using the built-in overlay.
 .IP "remote-clipboard" 4
 .IX Item "remote-clipboard"
 Somewhat of a misnomer, this extension adds two menu entries to the
-selection popup that allows one ti run external commands to store the
+selection popup that allows one to run external commands to store the
 selection somewhere and fetch it again.
 .Sp
 We use it to implement a \*(L"distributed selection mechanism\*(R", which just
@@ -1608,7 +1594,7 @@ This class implements io watchers/events. Example:
 \&  $term->{iow} = urxvt::iow
 \&                 ->new
 \&                 ->fd (fileno $term->{socket})
-\&                 ->events (urxvt::EVENT_READ)
+\&                 ->events (urxvt::EV_READ)
 \&                 ->start
 \&                 ->cb (sub {
 \&                   my ($iow, $revents) = @_;
@@ -1633,8 +1619,8 @@ Set the file descriptor (not handle) to watch.
 .el .IP "$iow = \f(CW$iow\fR\->events ($eventmask)" 4
 .IX Item "$iow = $iow->events ($eventmask)"
 Set the event mask to watch. The only allowed values are
-\&\f(CW\*(C`urxvt::EVENT_READ\*(C'\fR and \f(CW\*(C`urxvt::EVENT_WRITE\*(C'\fR, which might be ORed
-together, or \f(CW\*(C`urxvt::EVENT_NONE\*(C'\fR.
+\&\f(CW\*(C`urxvt::EV_READ\*(C'\fR and \f(CW\*(C`urxvt::EV_WRITE\*(C'\fR, which might be ORed
+together, or \f(CW\*(C`urxvt::EV_NONE\*(C'\fR.
 .ie n .IP "$iow = $iow\->start" 4
 .el .IP "$iow = \f(CW$iow\fR\->start" 4
 .IX Item "$iow = $iow->start"
diff --git a/doc/rxvtperl.3.txt b/doc/rxvtperl.3.txt

index ba8da80fa0841ffe3424a519deadb5f20df2d292..
index ..9db61955d12e3bad91283d25b82f05f5f16300b7 100644
--- a/doc/rxvtperl.3.txt
+++ b/doc/rxvtperl.3.txt
@@ -1,5 +1,5 @@
 NAME
-    urxvtperl - rxvt-unicode's embedded perl interpreter
+    rxvtperl - rxvt-unicode's embedded perl interpreter

 SYNOPSIS
        # create a file grab_test in $HOME:
@@ -9,9 +9,9 @@ SYNOPSIS
           ()
        }

-       # start a urxvt using it:
+       # start a rxvt using it:

-       urxvt --perl-lib $HOME -pe grab_test
+       rxvt --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 urxvtd, where scripts
+    Each script will only ever be loaded once, even in rxvtd, where scripts
     will be shared (but not enabled) for all terminals.

     You can disable the embedded perl interpreter by setting both "perl-ext"
@@ -28,15 +28,15 @@ DESCRIPTION

 PREPACKAGED EXTENSIONS
     This section describes the extensions delivered with this release. You
-    can find them in /usr/local/lib/urxvt/perl/.
+    can find them in /opt/rxvt/lib/urxvt/perl/.

     You can activate them like this:

-      urxvt -pe 
+      rxvt -pe 

     Or by adding them to the resource for extensions loaded by default:

-      URxvt.perl-ext-common: default,automove-background,selection-autotransform
+      URxvt.perl-ext-common: default,selection-autotransform

     selection (enabled by default)
         (More) intelligent selection. This extension tries to be more
@@ -88,7 +88,7 @@ PREPACKAGED EXTENSIONS
         reference onto "@{ $term-"{option_popup_hook} }>, which gets called
         whenever the popup is being displayed.

-        It's sole argument is the popup menu, which can be modified. It
+        Its sole argument is the popup menu, which can be modified. It
         should either return nothing or a string, the initial boolean value
         and a code reference. The string will be used as button text and the
         code reference will be called when the toggle changes, with the new
@@ -111,7 +111,7 @@ PREPACKAGED EXTENSIONS
         reference onto "@{ $term-"{selection_popup_hook} }>, which gets
         called whenever the popup is being displayed.

-        It's sole argument is the popup menu, which can be modified. The
+        Its sole argument is the popup menu, which can be modified. The
         selection is in $_, which can be used to decide whether to add
         something or not. It should either return nothing or a string and a
         code reference. The string will be used as button text and the code
@@ -123,7 +123,7 @@ PREPACKAGED EXTENSIONS
         any "a"s:

            push @{ $self->{term}{selection_popup_hook} }, sub {
-              /a/ ? ("a to be" => sub { s/a/b/g }
+              /a/ ? ("a to b" => sub { s/a/b/g }
                   : ()
            };

@@ -222,7 +222,7 @@ PREPACKAGED EXTENSIONS
            URxvt.tabbed.tab-fg:    
            URxvt.tabbed.tab-bg:    

-        See *COLOR AND GRAPHICS* in the urxvt(1) manpage for valid indices.
+        See *COLOR AND GRAPHICS* in the rxvt(1) manpage for valid indices.

     matcher
         Uses per-line display filtering ("on_line_update") to underline text
@@ -258,12 +258,12 @@ PREPACKAGED EXTENSIONS
         This (experimental) perl extension implements OnTheSpot editing. It
         does not work perfectly, and some input methods don't seem to work
         well with OnTheSpot editing in general, but it seems to work at
-        leats for SCIM and kinput2.
+        least for SCIM and kinput2.

         You enable it by specifying this extension and a preedit style of
         "OnTheSpot", i.e.:

-           urxvt -pt OnTheSpot -pe xim-onthespot
+           rxvt -pt OnTheSpot -pe xim-onthespot

     kuake
         A very primitive quake-console-like extension. It was inspired by a
@@ -274,7 +274,7 @@ PREPACKAGED EXTENSIONS

         Initially, the window will not be shown when using this extension.

-        This is useful if you need a single terminal thats not using any
+        This is useful if you need a single terminal that is not using any
         desktop space most of the time but is quickly available at the press
         of a key.

@@ -284,18 +284,6 @@ PREPACKAGED EXTENSIONS
         If you want a quake-like animation, tell your window manager to do
         so (fvwm can do it).

-    automove-background
-        This is basically a very small extension that dynamically changes
-        the 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:
-
-           urxvt -pixmap background.xpm -pe automove-background
-
-         shows how this extension can be used to implement an
-        automatically blurred transparent background.
-
     block-graphics-to-ascii
         A not very useful example of filtering all text output to the
         terminal by replacing all line-drawing characters (U+2500 .. U+259F)
@@ -306,7 +294,7 @@ PREPACKAGED EXTENSIONS

     remote-clipboard
         Somewhat of a misnomer, this extension adds two menu entries to the
-        selection popup that allows one ti run external commands to store
+        selection popup that allows one to run external commands to store
         the selection somewhere and fetch it again.

         We use it to implement a "distributed selection mechanism", which
@@ -559,7 +547,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 urxvt(1) manpage).
+        resource in the rxvt(1) manpage).

         The event is simply the action string. This interface is assumed to
         change slightly in the future.
@@ -756,7 +744,7 @@ API DOCUMENTATION

     $term->destroy
         Destroy the terminal object (close the window, free resources etc.).
-        Please note that urxvt will not exit as long as any event watchers
+        Please note that rxvt will not exit as long as any event watchers
         (timers, io watchers) are still active.

     $term->exec_async ($cmd[, @args])
@@ -831,7 +819,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 urxvt(1) manpage.
+        the "keysym" resource in the rxvt(1) manpage.

     $rend = $term->rstyle ([$new_rstyle])
         Return and optionally change the current rendition. Text that is
@@ -1194,7 +1182,7 @@ API DOCUMENTATION
                         ->cb (sub {
                            $term->{overlay}->set (0, 0,
                               sprintf "%2d:%02d:%02d", (localtime urxvt::NOW)[2,1,0]);
-                        });                                                                                                                                      
+                        });

     $timer = new urxvt::timer
         Create a new timer object in started state. It is scheduled to fire
@@ -1233,7 +1221,7 @@ API DOCUMENTATION
       $term->{iow} = urxvt::iow
                      ->new
                      ->fd (fileno $term->{socket})
-                     ->events (urxvt::EVENT_READ)
+                     ->events (urxvt::EV_READ)
                      ->start
                      ->cb (sub {
                        my ($iow, $revents) = @_;
@@ -1254,8 +1242,8 @@ API DOCUMENTATION

     $iow = $iow->events ($eventmask)
         Set the event mask to watch. The only allowed values are
-        "urxvt::EVENT_READ" and "urxvt::EVENT_WRITE", which might be ORed
-        together, or "urxvt::EVENT_NONE".
+        "urxvt::EV_READ" and "urxvt::EV_WRITE", which might be ORed
+        together, or "urxvt::EV_NONE".

     $iow = $iow->start
         Start watching for requested events on the given handle.
@@ -1292,7 +1280,7 @@ API DOCUMENTATION
                         ->cb (sub {
                            my ($pw, $exit_status) = @_;
                            ...
-                        });                                                                                                                                      
+                        });

     $pw = new urxvt::pw
         Create a new process watcher in stopped state.
diff --git a/src/Makefile.in b/src/Makefile.in

index 0bffd5c5b90d5f7ecb602886b335730394781506..
index ..7c7999193ba97414eec7d9c3b6e1c06d35b7ad32 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -204,10 +204,6 @@ rxvtfont.o: ../config.h rxvt.h rxvtlib.h optinc.h feature.h encoding.h
 rxvtfont.o: rxvtutil.h rxvtfont.h rxvttoolkit.h ev_cpp.h callback.h salloc.h
 rxvtfont.o: libptytty.h rxvtperl.h hookinc.h background.h rsinc.h
 rxvtfont.o: table/linedraw.h
-rxvtperl.o: ../config.h rxvt.h rxvtlib.h optinc.h feature.h encoding.h
-rxvtperl.o: rxvtutil.h rxvtfont.h rxvttoolkit.h ev_cpp.h callback.h salloc.h
-rxvtperl.o: libptytty.h rxvtperl.h hookinc.h background.h rsinc.h keyboard.h
-rxvtperl.o: perlxsi.c ./iom_perl.h
 rxvttoolkit.o: ../config.h rxvt.h rxvtlib.h optinc.h feature.h encoding.h
 rxvttoolkit.o: rxvtutil.h rxvtfont.h rxvttoolkit.h ev_cpp.h callback.h
 rxvttoolkit.o: salloc.h libptytty.h rxvtperl.h hookinc.h background.h rsinc.h
@@ -303,10 +299,6 @@ rxvtfont.lo: ../config.h rxvt.h rxvtlib.h optinc.h feature.h encoding.h
 rxvtfont.lo: rxvtutil.h rxvtfont.h rxvttoolkit.h ev_cpp.h callback.h salloc.h
 rxvtfont.lo: libptytty.h rxvtperl.h hookinc.h background.h rsinc.h
 rxvtfont.lo: table/linedraw.h
-rxvtperl.lo: ../config.h rxvt.h rxvtlib.h optinc.h feature.h encoding.h
-rxvtperl.lo: rxvtutil.h rxvtfont.h rxvttoolkit.h ev_cpp.h callback.h salloc.h
-rxvtperl.lo: libptytty.h rxvtperl.h hookinc.h background.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 ev_cpp.h callback.h
 rxvttoolkit.lo: salloc.h libptytty.h rxvtperl.h hookinc.h background.h

-----END OF PAGE-----