--- rxvt-unicode/doc/rxvt.1.pod	2010/12/20 11:35:13	1.193
+++ rxvt-unicode/doc/rxvt.1.pod	2011/12/31 17:17:12	1.211
@@ -165,10 +165,10 @@
 =item B<-blr> I<HxV>
 
 Apply Gaussian Blur with the specified radii to the transparent
-background. If a single number is specified - both vertical and
+background. If a single number is specified, the 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;
+radii to 1 and the other to a large number creates interesting effects
+on some backgrounds. The maximum radius value is 128;
 resource I<blurRadius>.
 
 =item B<-icon> I<file>
@@ -185,10 +185,10 @@
 
 Window foreground colour; resource B<foreground>.
 
-=item B<-pixmap> I<file[;geom[:op1][:op2][...]]>
+=item B<-pixmap> I<file[;oplist]>
 
 Compile I<afterimage> or I<pixbuf>: Specify image file for the background and also
-optionally specify its scaling with a geometry string. Note you may need to
+optionally specify a list of operations to modify it. Note you may need to
 add quotes to avoid special shell interpretation of the C<;> in the
 command-line; for more details see resource B<backgroundPixmap>.
 
@@ -745,25 +745,67 @@
 The colour of the border around the text area and between the scrollbar
 and the text.
 
-=item B<backgroundPixmap:> I<file[;geom[:op1][:op2][...]]>
+=item B<backgroundPixmap:> I<file[;oplist]>
 
 Use the specified image file for the background and also
-optionally specify its scaling with a geometry string B<WxH+X+Y>,
-(default C<100x100+50+50>) in which B<"W" / "H"> specify the
-horizontal/vertical scale (percent), and B<"X" / "Y"> locate the image
-centre (percent).  A scale of 0 displays the image with tiling.
-The maximum permitted scale is 1000.
-Additional operations can be specified after colon B<:op1:op2...>.
+optionally specify a colon separated list of operations to modify it.
 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
+=over 4
+
+=item B<WxH+X+Y>
+
+sets scale and position. B<"W" / "H"> specify the horizontal/vertical
+scale (percent), and B<"X" / "Y"> locate the image centre (percent). A
+scale of 0 disables scaling. The maximum permitted scale is 1000.
+
+=item B<op=tile>
+
+enables tiling
+
+=item B<op=keep-aspect>
+
+maintain the image aspect ratio when scaling
+
+=item B<op=root-align>
+
+use the position of the terminal window relative to the root window as
+the image offset, simulating a root window background
+
+=back
+
+The default scale and position setting is C<100x100+50+50>.
+Alternatively, a predefined set of templates can be used to achieve
+the most common setups:
+
+=over 4
+
+=item B<style=tiled>
+
+the image is tiled with no scaling. Equivalent to 0x0+0+0:op=tile
+
+=item B<style=aspect-stretched>
+
+the image is scaled to fill the whole window maintaining the aspect
+ratio and centered. Equivalent to 100x100+50+50:op=keep-aspect
+
+=item B<style=stretched>
+
+the image is scaled to fill the whole window. Equivalent to 100x100
+
+=item B<style=centered>
+
+the image is centered with no scaling. Equivalent to 0x0+50+50
+
+=item B<style=root-tiled>
+
+the image is tiled with no scaling and using 'root' positioning.
+Equivalent to 0x0:op=tile:op=root-align
+
+=back
+
+If multiple templates are specified the last one wins. Note that a
+template overrides all the scale, position and operations settings.
 
 If used in conjunction with B<-tr> option, the specified pixmap will be
 blended over the transparent background using alpha-blending. If I<afterimage>
@@ -905,6 +947,10 @@
 Set scrollbar style to B<rxvt>, B<plain>, B<next> or B<xterm>. B<plain> is
 the author's favourite.
 
+=item B<thickness:> I<number>
+
+Set the scrollbar width in pixels.
+
 =item B<scrollBar:> I<boolean>
 
 B<True>: enable the scrollbar [default]; option B<-sb>. B<False>:
@@ -933,9 +979,10 @@
 
 =item B<scrollWithBuffer:> I<boolean>
 
-B<True>: scroll with scrollback buffer when tty receives new lines (and
-B<scrollTtyOutput> is False); option B<-sw>. B<False>: do not scroll
-with scrollback buffer when tty receives new lines; option B<+sw>.
+B<True>: scroll with scrollback buffer when tty receives new lines (i.e.
+try to show the same lines) and B<scrollTtyOutput> is False; option
+B<-sw>. B<False>: do not scroll with scrollback buffer when tty receives
+new lines; option B<+sw>.
 
 =item B<scrollTtyKeypress:> I<boolean>
 
@@ -1159,19 +1206,20 @@
 I<string> may contain escape values (C<\n>: newline, C<\000>: octal
 number), see RESOURCES in C<man 7 X> for further details.
 
-You can define a range of keysyms in one shot by providing a I<string>
+You can define a range of keysyms in one shot by
+loading the C<keysym-list> perl extension and providing a I<string>
 with pattern B<list/PREFIX/MIDDLE/SUFFIX>, where the delimiter `/'
 should be a character not used by the strings.
 
 Its usage can be demonstrated by an example:
 
-  URxvt.keysym.M-C-0x61:    list|\033<M-C-|abc|>
+  URxvt.keysym.M-C-0x61:    list|\033<|abc|>
 
 The above line is equivalent to the following three lines:
 
-  URxvt.keysym.Meta-Control-0x61:    \033<M-C-a>
-  URxvt.keysym.Meta-Control-0x62:    \033<M-C-b>
-  URxvt.keysym.Meta-Control-0x63:    \033<M-C-c>
+  URxvt.keysym.Meta-Control-0x61:    \033<a>
+  URxvt.keysym.Meta-Control-0x62:    \033<b>
+  URxvt.keysym.Meta-Control-0x63:    \033<c>
 
 If I<string> takes the form of C<command:STRING>, the specified B<STRING>
 is interpreted and executed as @@RXVT_NAME@@'s control sequence. For
@@ -1254,8 +1302,8 @@
 =item B<perl-lib>: I<path>
 
 Colon-separated list of additional directories that hold extension
-scripts. When looking for extensions specified by the C<perl> resource,
-@@RXVT_NAME@@ will first look in these directories and then in
+scripts. When looking for perl extensions, @@RXVT_NAME@@ will first
+look in these directories, then in $HOME/.urxvt/ext and lastly in
 F<@@RXVT_LIBDIR@@/urxvt/perl/>.
 
 See the @@RXVT_NAME@@perl(3) manpage.
@@ -1514,7 +1562,7 @@
 =head2 ALPHA CHANNEL SUPPORT
 
 If Xft support has been compiled in and as long as Xft/Xrender/X don't get
-their act together, rxvt-unicode will do it's own alpha channel management:
+their act together, rxvt-unicode will do its own alpha channel management:
 
 You can prefix any colour with an opaqueness percentage enclosed in
 brackets, i.e. C<[percent]>, where C<percent> is a decimal percentage
@@ -1611,7 +1659,7 @@
 The unix domain socket path used by @@RXVT_NAME@@c(1) and
 @@RXVT_NAME@@d(1).
 
-Default F<<< $HOME/.rxvt-unicode-I<< <nodename> >> >>>.
+Default F<<< $HOME/.urxvt/urxvtd-I<< <nodename> >> >>>.
 
 =item B<HOME>