--- rxvt-unicode/doc/rxvt.1.pod	2010/12/20 11:35:13	1.193
+++ rxvt-unicode/doc/rxvt.1.pod	2011/08/11 08:37:17	1.202
@@ -751,19 +751,36 @@
 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.
+centre (percent).  A scale of 0 disables scaling.
 The maximum permitted scale is 1000.
 Additional operations can be specified after colon B<: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
+  op=tile     enables tiling
+  op=pscale   enables proportional scaling
+  op=root     use the position of the terminal window relative to the root
+              window as the image offset, simulating a root window background
+
+Alternatively, a predefined set of templates can be used to achieve
+the most common setups:
+
+  style=tiled              the image is tiled with no scaling
+  style=aspect-stretched   the image is scaled to fill the whole window maintaining
+                           the aspect ratio and centered 
+  style=stretched          the image is scaled to fill the whole window
+  style=centered           the image is centered with no scaling
+  style=root-tiled         the image is tiled with no scaling and using 'op=root' positioning
+
+If multiple templates are specified the last one wins. Note that a
+template overrides all the scale, position and operations settings.
+Indeed, the templates can be specified in terms of low level settings
+as follows:
+
+  style=tiled              0x0+0+0:op=tile
+  style=aspect-stretched   +50+50:op=pscale
+  style=stretched          100x100
+  style=centered           0x0+50+50
+  style=root-tiled         0x0:op=tile:op=root
 
 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 +922,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 +954,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>
 
@@ -1165,13 +1187,13 @@
 
 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