repo: rxvt-unicode-sixel
action: commit
revision: 
path_from: 
revision_from: b1914e4cf6b3f62c9b2795cf8bee7993893ce40c:
path_to: 
revision_to: 
git.thebackupbox.net
rxvt-unicode-sixel
git clone git://git.thebackupbox.net/rxvt-unicode-sixel
commit b1914e4cf6b3f62c9b2795cf8bee7993893ce40c
Author: Marc Lehmann 
Date:   Mon Jan 16 15:07:27 2006 +0000

    *** empty log message ***

diff --git a/MANIFEST b/MANIFEST
index bb5ef0ae8572bd9be8e826462015864f4793e3bd..
index ..6ed3c212c758657dda27d2a0d74f52b6d83cd417 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -16,17 +16,10 @@ doc/rxvt-tabbed
 doc/pty-fd
 doc/etc/rxvt-unicode.terminfo
 doc/etc/rxvt-unicode.termcap
-doc/menu/example.menu
-doc/menu/jedmenu.sl
-doc/menu/menu
-doc/menu/rxvt.menu
-doc/menu/rxvt.zh-menu
-doc/menu/terminal.menu
 doc/solaris9.patch

 doc/.cvsignore
 doc/Makefile.in
-doc/README.menu
 doc/README.xvt
 doc/changes.txt
 doc/podtbl
diff --git a/README.FAQ b/README.FAQ
index 657dfd91b465aa0d0945e0ca2175c691abf64b88..
index ..7622ccc211207be0257d5a6cd7958cf40dec636f 100644
--- a/README.FAQ
+++ b/README.FAQ
@@ -582,7 +582,7 @@ FREQUENTLY ASKED QUESTIONS
         You can specify separate locales for the input method and the rest
         of the terminal, using the resource "imlocale":

-           URxvt*imlocale: ja_JP.EUC-JP
+           URxvt.imlocale: ja_JP.EUC-JP

         Now you can start your terminal with "LC_CTYPE=ja_JP.UTF-8" and
         still use your input method. Please note, however, that you will not
diff --git a/doc/README.menu b/doc/README.menu
deleted file mode 100644
index 2aabf254ffb76fbfbbf483242b6316727552b800..0000000000000000000000000000000000000000
--- a/doc/README.menu
+++ /dev/null
@@ -1,55 +0,0 @@
-A few examples of constructing menubars for rxvt.  Used in conjuction
-with the reference material (rxvtRef.html/txt), it should be possible to
-piece together some useful menus without too much time.
-
-C-shell users be warned.
-Some of the menu items contain bsh/ksh constructs like ${EDITOR:-vi}\r
-which will cause your shell to gag.
-----------------------------------------------------------------------
-
-example.menu:
-	simple menus for Pico and the Shell
-
-jedmenu.sl:
-	(almost) self-contained SLang code for loading up a menubar
-	for the Jed editor.  It doesn't need terminal.menu,
-	but looks a bit better with it.
-
-	Note for JED users:
-	    since rxvt provides an escape sequence to override the
-	    normal XTerm interpretation of Shift-Insert/Prev/Next,
-	    "wmark.sl" (MS-windows-style shift marking) works really
-	    well and is a nice bonus for those forced to switch
-	    to/from MS-windows
-
-terminal.menu
-	common rxvt terminal functions used by the other menus
-
-menu:
-	a small shell script to reduce the pain of typing
-	echo "ESC]10; ... BEL" for every menubar command.
-	It also contains a sample "default" menu at the bottom.
-
-rxvt.menu:
-	A nice script that allows a convenient way to have different
-	menubars used for rlogin|telnet to a machine.
-	Of course to get it to work, you'll need to add your own
-	machine names (and remove mine).
-
-	The script is set up so that "rxvt" will be called if the first
-	argument to the script does not contain "rxvt".
-	So
-		rxvt.menu [options]
-	is the same as
-		rxvt.menu rxvt [options]
-
-	To always have this script act as the front-end for rxvt:
-	  1) install the rxvt binary somewhere not in your path
-	  2) set the `exe' in menu.script to point to this binary
-	     eg,
-		exe="/usr/local/X11/rxvt-2.21/rxvt"
-		# default program to execute
-	  3) have rxvt.menu linked somewhere in your path as `rxvt'
-	  4) add all the various machines/menus combinations to
-	     rxvt.menu, or else make a separate database and change
-	     the `menu' variable in rxvt.menu to suit.
diff --git a/doc/rxvt.1.html b/doc/rxvt.1.html
index 7a55f4a5c3e3ca7ab216d72b58d19bb7142e4d30..
index ..4a36485c1b9684510c2f26e08d42f5041d67c760 100644
--- a/doc/rxvt.1.html
+++ b/doc/rxvt.1.html
@@ -43,7 +43,7 @@
 


SYNOPSIS

-

urxvt [options] [-e command [ args ]]

+

rxvt [options] [-e command [ args ]]


@@ -57,7 +57,7 @@ a significant advantage on a machine serving many X sessions.


FREQUENTLY ASKED QUESTIONS

-

See urxvt(7) (try man 7 urxvt) for a list of +

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 http://cvs.schmorp.de/browse/*checkout*/rxvt-unicode/doc/rxvt.7.html.

@@ -95,27 +95,27 @@ and nice on resources: for example, you can still configure rxvt-unicode without most of it's 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) (client).

+drastically reduces memory usage. See rxvtd(1) (daemon) and +rxvtc(1) (client).

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


OPTIONS

-

The urxvt options (mostly a subset of xterm's) are listed +

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 -h' gives a list of major compile-time options 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 +XIM on the 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 +

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 +far greater than those listed. For example: `rxvt --loginShell --color1 Orange'.

The following options are available:

@@ -184,7 +184,7 @@ used to brighten or darken the image in addition to tinting it; resource
-   urxvt -tr -tint blue -sh 40
+ rxvt -tr -tint blue -sh 40

-sh
@@ -257,12 +257,12 @@ 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).

+section of rxvt(7).

-fb fontlist
@@ -446,7 +446,7 @@ resource termName.
-e command [arguments]
-Run the command with its command-line arguments in the urxvt +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 @@ -460,7 +460,7 @@ 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
@@ -555,7 +555,7 @@ Turn on/off secondary screen scroll (default enabled); resource
-hold|+hold
-Turn on/off hold window after exit support. If enabled, urxvt +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. @@ -570,20 +570,20 @@ Remap a key symbol. See resource keysym.
-embed windowid
-Tells urxvt to embed it's windows into an already-existing window, +Tells rxvt to embed it's 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 +

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 urxvt and leave it alone.

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

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 wether the -embed option was used or @@ -598,20 +598,20 @@ used (a longer example is in doc/embed):

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 +Tells rxvt NOT to execute any commands or create a new pty/tty pair but instead use the given filehandle 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 +

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.

@@ -632,7 +632,7 @@ longer example is in doc/pty-fd):

    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;
@@ -653,11 +653,11 @@ 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 +

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, +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
@@ -665,15 +665,15 @@ with later settings overwriting earlier ones:

3. RESOURCE_MANAGER property on root-window OR $HOME/.Xdefaults 4. SCREEN_RESOURCES for the current screen 5. $XENVIRONMENT file OR $HOME/.Xdefaults-<nodename>
-

Note that when reading X resources, urxvt recognizes two class +

Note that when reading X resources, rxvt recognizes two class names: Rxvt and URxvt. The class name Rxvt allows resources -common to both urxvt and the original rxvt to be easily +common to both rxvt and the original rxvt to be easily configured, while the class name URxvt allows resources unique to -urxvt, to be shared between different urxvt +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 urxvtperl(3) manpage for additional settings by perl +check the rxvtperl(3) manpage for additional settings by perl extensions not documented here):

geometry: geom
@@ -709,7 +709,7 @@ names used are listed in the COLORS AND GRAPHICS section.

Colours higher than 15 cannot be set using resources (yet), but can be -changed using an escape command (see urxvt(7)).

+changed using an escape command (see rxvt(7)).

Colours 16-79 form a standard 4x4x4 colour cube (the same as xterm with @@ -847,20 +847,10 @@ be magnified beyond 10 times its original size. The maximum permitted scale is 1000. [default 0x0+50+50]

-
menu: file[;tag]
-
-
-Read in the specified menu file (note the `.menu' extension is -optional) and also optionally specify a starting tag to find. See the -reference documentation for details on the syntax for the menuBar. -
-

path: path
-Specify the colon-delimited search path for finding files (XPM and -menus), in addition to the paths specified by the RXVTPATH and -PATH environment variables. +Specify the colon-delimited search path for finding XPM files.

font: fontlist
@@ -887,7 +877,7 @@ fonts.

-   URxvt*font: 9x15bold,\
+   URxvt.font: 9x15bold,\
                -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso10646-1,\
                -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso10646-1, \
                [codeset=JISX0208]xft:Kochi Gothic:antialias=false, \
@@ -1027,7 +1017,7 @@ Specify a command pipe for vt100 printer [default lpr(1)]. Use
 
-   URxvt*print-pipe: cat > $(TMPDIR=$HOME mktemp urxvt.XXXXXX)
+ URxvt.print-pipe: cat > $(TMPDIR=$HOME mktemp urxvt.XXXXXX)

This creates a new file in your home directory with the screen contents @@ -1247,7 +1237,7 @@ another locale; option -imlocale. 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* suitable found +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.

@@ -1274,8 +1264,7 @@ sequences enabled by default, which doesn't make it safer, though).

You can enable them by setting this boolean resource or specifying -insecure as an option. At the moment, this enables display-answer, -locale, findfont, icon label and window title requests as well as dynamic -menubar dispatch.

+locale, findfont, icon label and window title requests.

modifier: modifier
@@ -1312,7 +1301,7 @@ instead scroll the screen up.
hold: bool
-Turn on/off hold window after exit support. If enabled, urxvt +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. @@ -1354,7 +1343,7 @@ can start or end with whitespace.

Please note that you need to double the \ in resource files, as Xlib itself does it's own de-escaping (you can use \033 instead of -\e (and so on), which will work with both Xt and urxvt's own +\e (and so on), which will work with both Xt and rxvt's own processing).

@@ -1380,7 +1369,7 @@ should be a character not used by the strings.

If string takes the form of command:STRING, the specified STRING -is interpreted and executed as urxvt's control sequence. For +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'':

@@ -1390,9 +1379,9 @@ when Control-Meta-c is being pressed'':

If string takes the form perl:STRING, then the specified STRING -is passed to the on_keyboard_command perl handler. See the urxvtperl(3) +is passed to the on_keyboard_command perl handler. See the rxvtperl(3) manpage. For example, the selection extension (activated via -urxvt -pe selection) listens for selection:rot13 events:

+rxvt -pe selection) listens for selection:rot13 events:

@@ -1408,7 +1397,7 @@ 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:

@@ -1433,7 +1422,7 @@ font-switching at runtime:

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

@@ -1479,7 +1468,7 @@ all instances, while perl-ext is used for specific instances.
Perl code to be evaluated when all extensions have been registered. See -the urxvtperl(3) manpage. Due to security reasons, this resource +the rxvtperl(3) manpage. Due to security reasons, this resource will be ignored when running setuid/setgid.

@@ -1488,25 +1477,25 @@ will be ignored when running setuid/setgid.
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 +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 +Selection auto-transform patterns, see the rxvtperl(3) manpage for details.

@@ -1534,9 +1523,9 @@ Sets the WM_TRANSIENT_FOR property to the given window iw.


THE SCROLLBAR

-

Lines of text that scroll off the top of the urxvt window +

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 +or by 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

Scroll down with Button1 (xterm-scrollbar) or Shift-Next. @@ -1583,7 +1572,7 @@ the selection.

Pressing and releasing the Middle mouse button (or Shift-Insert) in -an urxvt window causes the current text selection to be +an rxvt window causes the current text selection to be inserted as if it had been typed on the keyboard.

@@ -1593,10 +1582,13 @@ inserted as if it had been typed on the keyboard.

CHANGING FONTS

Changing fonts (or font sizes, respectively) via the keypad is not yet supported in rxvt-unicode. Bug me if you need this.

-

You can, however, switch fonts at runtime using escape sequences (and -therefore using the menubar), e.g.:

+

You can, however, switch fonts at runtime using escape sequences, e.g.:

    printf '\e]710;%s\007' "9x15bold,xft:Kochi Gothic"
+

You can use keyboard shortcuts, too:

+
+   URxvt.keysym.M-C-1: command:\033]710;suxuseuro\007\033]711;suxuseuro\007
+   URxvt.keysym.M-C-2: command:\033]710;9x15bold\007\033]711;9x15bold\007

rxvt-unicode will automatically re-apply these fonts to the output so far.

@@ -1659,16 +1651,16 @@ 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 +

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 +allow this 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 display up to 16 colours (8 ANSI colours plus +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 rgb.txt names.

@@ -1699,7 +1691,7 @@ always swapping the foreground/background colours. This is in contrast to 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 @@ -1710,7 +1702,7 @@ on White.


ENVIRONMENT

-

urxvt sets and/or uses the following environment variables:

+

rxvt sets and/or uses the following environment variables:

TERM
@@ -1722,7 +1714,7 @@ resources or on the commandline.
COLORTERM
-Either rxvt, rxvt-xpm, depending on wether urxvt was +Either rxvt, rxvt-xpm, depending on wether rxvt was compiled with XPM support, and optionally with the added extension -mono to indicate that rxvt-unicode runs on a monochrome screen.
@@ -1734,7 +1726,7 @@ Set to a string of the form fg;bg or fg;xpm;bg, where the colour code used as default foreground/text colour (or the 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 +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.
@@ -1742,7 +1734,7 @@ was compiled with XPM support. Libraries like ncurses and sla
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).
@@ -1750,14 +1742,14 @@ 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 it's child processes.

@@ -1770,7 +1762,7 @@ The shell to be used for command execution, defaults to /bin/sh.
RXVTPATH
-The path where urxvt looks for support files such as menu and xpm +The path where rxvt looks for support files such as menu and xpm files.

@@ -1783,8 +1775,8 @@ Used in the same way as RXVTPATH.
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-<nodename >>>.

@@ -1808,7 +1800,7 @@ Directory where various X resource files are being located.
If set and accessible, gives the name of a X resource file to be loaded by -urxvt. +rxvt.

@@ -1826,7 +1818,7 @@ Color names.


SEE ALSO

-

urxvt(7), urxvtc(1), urxvtd(1), xterm(1), sh(1), resize(1), X(1), pty(4), tty(4), utmp(5)

+

rxvt(7), rxvtc(1), rxvtd(1), xterm(1), sh(1), resize(1), X(1), pty(4), tty(4), utmp(5)


diff --git a/doc/rxvt.1.man.in b/doc/rxvt.1.man.in
index a06263328f9e5f9135d36fd2bfbe20a9ef93a891..
index ..a71c9fe0dd8b375a27a6ef7080db82a456192870 100644
--- a/doc/rxvt.1.man.in
+++ b/doc/rxvt.1.man.in
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "rxvt 1"
-.TH rxvt 1 "2006-01-13" "7.0" "RXVT-UNICODE"
+.TH rxvt 1 "2006-01-16" "7.0" "RXVT-UNICODE"
 .SH "NAME"
 rxvt\-unicode (ouR XVT, unicode) \- (a VT102 emulator for the X window system)
 .SH "SYNOPSIS"
@@ -684,16 +684,9 @@ 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. [default 0x0+50+50]
-.IP "\fBmenu:\fR \fIfile[;tag]\fR" 4
-.IX Item "menu: file[;tag]"
-Read in the specified menu file (note the `.menu' extension is
-optional) and also optionally specify a starting tag to find. See the
-reference documentation for details on the syntax for the menuBar.
 .IP "\fBpath:\fR \fIpath\fR" 4
 .IX Item "path: path"
-Specify the colon-delimited search path for finding files (\s-1XPM\s0 and
-menus), in addition to the paths specified by the \fB\s-1RXVTPATH\s0\fR and
-\&\fB\s-1PATH\s0\fR environment variables.
+Specify the colon-delimited search path for finding \s-1XPM\s0 files.
 .IP "\fBfont:\fR \fIfontlist\fR" 4
 .IX Item "font: fontlist"
 Select the fonts to be used. This is a comma separated list of font names
@@ -713,7 +706,7 @@ fonts.
 For example, this font resource
 .Sp
 .Vb 5
-\&   URxvt*font: 9x15bold,\e
+\&   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
 \&               [codeset=JISX0208]xft:Kochi Gothic:antialias=false, \e
@@ -813,7 +806,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
@@ -965,8 +958,7 @@ sequences enabled by default, which doesn't make it safer, though).
 .Sp
 You can enable them by setting this boolean resource or specifying
 \&\fB\-insecure\fR as an option. At the moment, this enables display\-answer,
-locale, findfont, icon label and window title requests as well as dynamic
-menubar dispatch.
+locale, findfont, icon label and window title requests.
 .IP "\fBmodifier:\fR \fImodifier\fR" 4
 .IX Item "modifier: modifier"
 Set the key to be interpreted as the Meta key to: \fBalt\fR, \fBmeta\fR,
@@ -1209,13 +1201,19 @@ inserted as if it had been typed on the keyboard.
 Changing fonts (or font sizes, respectively) via the keypad is not yet
 supported in rxvt\-unicode. Bug me if you need this.
 .PP
-You can, however, switch fonts at runtime using escape sequences (and
-therefore using the menubar), e.g.:
+You can, however, switch fonts at runtime using escape sequences, e.g.:
 .PP
 .Vb 1
 \&   printf '\ee]710;%s\e007' "9x15bold,xft:Kochi Gothic"
 .Ve
 .PP
+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
+.Ve
+.PP
 rxvt-unicode will automatically re-apply these fonts to the output so far.
 .SH "ISO 14755 SUPPORT"
 .IX Header "ISO 14755 SUPPORT"
diff --git a/doc/rxvt.1.pod b/doc/rxvt.1.pod
index fd62a869d64d759c6db8577d68150c45c88dd8d8..
index ..a989585a20340e3fd4e5c3c47de0e3195c4a2542 100644
--- a/doc/rxvt.1.pod
+++ b/doc/rxvt.1.pod
@@ -629,17 +629,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. [default 0x0+50+50]

-=item B I
-
-Read in the specified menu file (note the `.menu' extension is
-optional) and also optionally specify a starting tag to find. See the
-reference documentation for details on the syntax for the menuBar.
-
 =item B I

-Specify the colon-delimited search path for finding files (XPM and
-menus), in addition to the paths specified by the B and
-B environment variables.
+Specify the colon-delimited search path for finding XPM files.

 =item B I

@@ -659,7 +651,7 @@ fonts.

 For example, this font resource

-   URxvt*font: 9x15bold,\
+   URxvt.font: 9x15bold,\
                -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso10646-1,\
                -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso10646-1, \
                [codeset=JISX0208]xft:Kochi Gothic:antialias=false, \
@@ -766,7 +758,7 @@ The string will be interpreted as if typed into the shell as-is.

 Example:

-   URxvt*print-pipe: cat > $(TMPDIR=$HOME mktemp urxvt.XXXXXX)
+   URxvt.print-pipe: cat > $(TMPDIR=$HOME mktemp urxvt.XXXXXX)

 This creates a new file in your home directory with the screen contents
 everytime you hit C.
@@ -948,8 +940,7 @@ sequences enabled by default, which doesn't make it safer, though).

 You can enable them by setting this boolean resource or specifying
 B<-insecure> as an option. At the moment, this enables display-answer,
-locale, findfont, icon label and window title requests as well as dynamic
-menubar dispatch.
+locale, findfont, icon label and window title requests.

 =item B I

@@ -1202,11 +1193,15 @@ inserted as if it had been typed on the keyboard.
 Changing fonts (or font sizes, respectively) via the keypad is not yet
 supported in rxvt-unicode. Bug me if you need this.

-You can, however, switch fonts at runtime using escape sequences (and
-therefore using the menubar), e.g.:
+You can, however, switch fonts at runtime using escape sequences, e.g.:

    printf '\e]710;%s\007' "9x15bold,xft:Kochi Gothic"

+You can use keyboard shortcuts, too:
+
+   URxvt.keysym.M-C-1: command:\033]710;suxuseuro\007\033]711;suxuseuro\007
+   URxvt.keysym.M-C-2: command:\033]710;9x15bold\007\033]711;9x15bold\007
+
 rxvt-unicode will automatically re-apply these fonts to the output so far.

 =head1 ISO 14755 SUPPORT
diff --git a/doc/rxvt.1.txt b/doc/rxvt.1.txt
index 763e9ad382f399ab7b484c4185d061f9f3fc611d..
index ..9982958df1146fec39cea4e58636ab4dc4fe1cf5 100644
--- 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 7.0, 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 it's 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) easier accessible: see urxvt(7) for technical reference
+    been extended) easier 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:

@@ -115,7 +115,7 @@ OPTIONS
         be used to brighten or darken the image in addition to tinting it;
         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 image in addition to tinting it (i.e. -tint must be
@@ -158,11 +158,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
@@ -272,7 +272,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
@@ -284,7 +284,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
@@ -339,7 +339,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.
@@ -348,21 +348,21 @@ OPTIONS
         Remap a key symbol. See resource keysym.

     -embed *windowid*
-        Tells urxvt to embed it's windows into an already-existing window,
+        Tells rxvt to embed it's 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 wether 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 wether 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):
@@ -370,16 +370,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 filehandle 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.

@@ -394,7 +394,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
@@ -406,12 +406,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
@@ -420,15 +420,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):

     geometry: *geom*
         Create the window with the specified X window geometry [default
@@ -452,7 +452,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,16 +538,8 @@ RESOURCES (available also as long-options)
         will be magnified beyond 10 times its original size. The maximum
         permitted scale is 1000. [default 0x0+50+50]

-    menu: *file[;tag]*
-        Read in the specified menu file (note the `.menu' extension is
-        optional) and also optionally specify a starting tag to find. See
-        the reference documentation for details on the syntax for the
-        menuBar.
-
     path: *path*
-        Specify the colon-delimited search path for finding files (XPM and
-        menus), in addition to the paths specified by the RXVTPATH and PATH
-        environment variables.
+        Specify the colon-delimited search path for finding XPM files.

     font: *fontlist*
         Select the fonts to be used. This is a comma separated list of font
@@ -568,7 +560,7 @@ RESOURCES (available also as long-options)

         For example, this font resource

-           URxvt*font: 9x15bold,\
+           URxvt.font: 9x15bold,\
                        -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso10646-1,\
                        -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso10646-1, \
                        [codeset=JISX0208]xft:Kochi Gothic:antialias=false, \
@@ -664,7 +656,7 @@ RESOURCES (available also as long-options)

         Example:

-           URxvt*print-pipe: cat > $(TMPDIR=$HOME mktemp urxvt.XXXXXX)
+           URxvt.print-pipe: cat > $(TMPDIR=$HOME mktemp urxvt.XXXXXX)

         This creates a new file in your home directory with the screen
         contents everytime you hit "Print".
@@ -796,7 +788,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.

@@ -817,8 +809,7 @@ RESOURCES (available also as long-options)

         You can enable them by setting this boolean resource or specifying
         -insecure as an option. At the moment, this enables display-answer,
-        locale, findfont, icon label and window title requests as well as
-        dynamic menubar dispatch.
+        locale, findfont, icon label and window title requests.

     modifier: *modifier*
         Set the key to be interpreted as the Meta key to: alt, meta, hyper,
@@ -839,7 +830,7 @@ RESOURCES (available also as long-options)
         instead scroll the screen up.

     hold: *bool*
-        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.
@@ -873,7 +864,7 @@ RESOURCES (available also as long-options)

         Please note that you need to double the "\" in resource files, as
         Xlib itself does it's own de-escaping (you can use "\033" instead of
-        "\e" (and so on), which will work with both Xt and urxvt's own
+        "\e" (and so on), which will work with both Xt and rxvt's own
         processing).

         You can define a range of keysyms in one shot by providing a
@@ -891,7 +882,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":

@@ -899,9 +890,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

@@ -913,7 +903,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:

@@ -931,7 +921,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
@@ -965,24 +955,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*
@@ -997,9 +987,9 @@ RESOURCES (available also as long-options)
         Sets the WM_TRANSIENT_FOR property to the given window iw.

 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*

@@ -1037,18 +1027,22 @@ TEXT SELECTION AND INSERTION

     Insertion:
         Pressing and releasing the Middle mouse button (or Shift-Insert) in
-        an urxvt window causes the current text selection to be inserted as
+        an rxvt window causes the current text selection to be inserted as
         if it had been typed on the keyboard.

 CHANGING FONTS
     Changing fonts (or font sizes, respectively) via the keypad is not yet
     supported in rxvt-unicode. Bug me if you need this.

-    You can, however, switch fonts at runtime using escape sequences (and
-    therefore using the menubar), e.g.:
+    You can, however, switch fonts at runtime using escape sequences, e.g.:

        printf '\e]710;%s\007' "9x15bold,xft:Kochi Gothic"

+    You can use keyboard shortcuts, too:
+
+       URxvt.keysym.M-C-1: command:\033]710;suxuseuro\007\033]711;suxuseuro\007
+       URxvt.keysym.M-C-2: command:\033]710;9x15bold\007\033]711;9x15bold\007
+
     rxvt-unicode will automatically re-apply these fonts to the output so
     far.

@@ -1112,13 +1106,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 rgb.txt
     names.
@@ -1152,19 +1146,19 @@ 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.

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

     COLORTERM
-        Either "rxvt", "rxvt-xpm", depending on wether urxvt was compiled
+        Either "rxvt", "rxvt-xpm", depending on wether rxvt was compiled
         with XPM support, and optionally with the added extension "-mono" to
         indicate that rxvt-unicode runs on a monochrome screen.

@@ -1174,34 +1168,34 @@ 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 XPM support. Libraries like "ncurses" and
+        if rxvt was compiled with XPM 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 it's child processes.

     SHELL
         The shell to be used for command execution, defaults to "/bin/sh".

     RXVTPATH
-        The path where urxvt looks for support files such as menu and xpm
+        The path where rxvt looks for support files such as menu and xpm
         files.

     PATH
         Used in the same way as "RXVTPATH".

     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-*


--- a/doc/rxvt.7.html
+++ b/doc/rxvt.7.html
@@ -827,7 +827,7 @@ terminal, using the resource imlocale:
 
 
-   URxvt*imlocale: ja_JP.EUC-JP
+ URxvt.imlocale: ja_JP.EUC-JP

Now you can start your terminal with LC_CTYPE=ja_JP.UTF-8 and still diff --git a/doc/rxvt.7.man.in b/doc/rxvt.7.man.in

index 778ac620fda69c185463c506a9d55aff6ba38202..
index ..4465bce57f1fc0165875784df833de09bd982550 100644
--- a/doc/rxvt.7.man.in
+++ b/doc/rxvt.7.man.in
@@ -777,7 +777,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:
 .Sp
 .Vb 1
-\&   URxvt*imlocale: ja_JP.EUC-JP
+\&   URxvt.imlocale: ja_JP.EUC-JP
 .Ve
 .Sp
 Now you can start your terminal with \f(CW\*(C`LC_CTYPE=ja_JP.UTF\-8\*(C'\fR and still
diff --git a/doc/rxvt.7.pod b/doc/rxvt.7.pod
index a1cb4e24bb495e6ba482544b13f4d60ca79dd59f..
index ..f3a8f0d8cd5d17cf1d1ad1ae7d6b238e98bc3415 100644
--- a/doc/rxvt.7.pod
+++ b/doc/rxvt.7.pod
@@ -618,7 +618,7 @@ enable freetype autohinting, i.e. like this:
 You can specify separate locales for the input method and the rest of the
 terminal, using the resource C:

-   URxvt*imlocale: ja_JP.EUC-JP
+   URxvt.imlocale: ja_JP.EUC-JP

 Now you can start your terminal with C and still
 use your input method. Please note, however, that you will not be able to
diff --git a/doc/rxvt.7.txt b/doc/rxvt.7.txt
index 32c0363bc1674d30b27bbb36e6d51f237e8df918..
index ..c7657d12fb8b06fb22956e4a922edf54671b18a8 100644
--- a/doc/rxvt.7.txt
+++ b/doc/rxvt.7.txt
@@ -603,7 +603,7 @@ FREQUENTLY ASKED QUESTIONS
         You can specify separate locales for the input method and the rest
         of the terminal, using the resource "imlocale":

-           URxvt*imlocale: ja_JP.EUC-JP
+           URxvt.imlocale: ja_JP.EUC-JP

         Now you can start your terminal with "LC_CTYPE=ja_JP.UTF-8" and
         still use your input method. Please note, however, that you will not
diff --git a/doc/rxvtperl.3.man.in b/doc/rxvtperl.3.man.in
index d1a5f46106edd8643bbe9c6d5a69bb973a98c33d..
index ..78488f4dde64fdefcc6bb72e553590395ebef677 100644
--- a/doc/rxvtperl.3.man.in
+++ b/doc/rxvtperl.3.man.in
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "rxvt 3"
-.TH rxvt 3 "2006-01-15" "7.0" "RXVT-UNICODE"
+.TH rxvt 3 "2006-01-16" "7.0" "RXVT-UNICODE"
 .SH "NAME"
 @@RXVT_NAME@@perl \- rxvt\-unicode's embedded perl interpreter
 .SH "SYNOPSIS"

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