*** empty log message ***

diff --git a/doc/rxvt.7.man.in b/doc/rxvt.7.man.in
index 7a3b499972c0ed4bf31b63d62f76d6b37ac75a96..335f93677d303c222dbfdfb71013bd9b962da02c 100644 (file)
--- a/doc/rxvt.7.man.in
+++ b/doc/rxvt.7.man.in
@@ -174,7 +174,7 @@ simple tabbed terminal. It is installed by default, so any of these should
 give you tabs:
 .PP
 .Vb 1
-\&   @@RXVT_NAME@@ -pe tabbed
+\&   @@URXVT_NAME@@ -pe tabbed
 .Ve
 .PP
 .Vb 1
@@ -192,7 +192,7 @@ the upcoming \f(CW\*(C`Gtk2::URxvt\*(C'\fR perl module, which features a tabbed
 .PP
 The version number is displayed with the usage (\-h). Also the escape
 sequence \f(CW\*(C`ESC [ 8 n\*(C'\fR sets the window title to the version number. When
-using the @@RXVT_NAME@@c client, the version displayed is that of the
+using the @@URXVT_NAME@@c client, the version displayed is that of the
 daemon.
 .PP
 \fIRxvt-unicode uses gobs of memory, how can I reduce that?\fR
@@ -211,10 +211,10 @@ kilobyte per line. A scrollback buffer of 10000 lines will then (if full)
 use 10 Megabytes of memory. With \f(CW\*(C`\-\-enable\-unicode3\*(C'\fR it gets worse, as
 rxvt-unicode then uses 8 bytes per screen cell.
 .PP
-\fIHow can I start @@RXVT_NAME@@d in a race-free way?\fR
-.IX Subsection "How can I start @@RXVT_NAME@@d in a race-free way?"
+\fIHow can I start @@URXVT_NAME@@d in a race-free way?\fR
+.IX Subsection "How can I start @@URXVT_NAME@@d in a race-free way?"
 .PP
-Try \f(CW\*(C`@@RXVT_NAME@@d \-f \-o\*(C'\fR, which tells @@RXVT_NAME@@d to open the
+Try \f(CW\*(C`@@URXVT_NAME@@d \-f \-o\*(C'\fR, which tells @@URXVT_NAME@@d to open the
 display, create the listening socket and then fork.
 .PP
 \fIHow do I distinguish wether I'm running rxvt-unicode or a regular xterm? I need this to decide about setting colors etc.\fR
@@ -362,7 +362,7 @@ descriptions for the programs mentioned and rxvt\-unicode. Really, do it!
 .PP
 .Vb 2
 \&   Esetroot wallpaper.jpg
-\&   @@RXVT_NAME@@ -ip -tint red -sh 40
+\&   @@URXVT_NAME@@ -ip -tint red -sh 40
 .Ve
 .PP
 That works. If you think it doesn't, you lack transparency and tinting
@@ -374,7 +374,7 @@ your picture with gimp or any other tool:
 .PP
 .Vb 2
 \&   convert wallpaper.jpg -blur 20x20 -modulate 30 background.xpm
-\&   @@RXVT_NAME@@ -pixmap background.xpm -pe automove-background
+\&   @@URXVT_NAME@@ -pixmap background.xpm -pe automove-background
 .Ve
 .PP
 That works. If you think it doesn't, you lack \s-1XPM\s0 and Perl support, or you
@@ -383,7 +383,7 @@ are unable to read.
 3. Use an \s-1ARGB\s0 visual:
 .PP
 .Vb 1
-\&   @@RXVT_NAME@@ -depth 32 -fg grey90 -bg rgba:0000/0000/4444/cccc
+\&   @@URXVT_NAME@@ -depth 32 -fg grey90 -bg rgba:0000/0000/4444/cccc
 .Ve
 .PP
 This requires \s-1XFT\s0 support, and the support of your X\-server. If that
@@ -621,7 +621,7 @@ In that case, select a font of your taste and add it to the font list,
 e.g.:
 .PP
 .Vb 1
-\&   @@RXVT_NAME@@ -fn basefont,font2,font3...
+\&   @@URXVT_NAME@@ -fn basefont,font2,font3...
 .Ve
 .PP
 When rxvt-unicode sees a character, it will first look at the base
@@ -665,7 +665,7 @@ rxvt-unicode from initialising perl, saving memory.
 .PP
 If you only want to disable specific features, you first have to
 identify which perl extension is responsible. For this, read the section
-\&\fB\s-1PREPACKAGED\s0 \s-1EXTENSIONS\s0\fR in the @@RXVT_NAME@@\fIperl\fR\|(3) manpage. For
+\&\fB\s-1PREPACKAGED\s0 \s-1EXTENSIONS\s0\fR in the @@URXVT_NAME@@\fIperl\fR\|(3) manpage. For
 example, to disable the \fBselection-popup\fR and \fBoption-popup\fR, specify
 this \fBperl-ext-common\fR resource:
 .PP
@@ -767,13 +767,13 @@ For starting a new rxvt\-unicode:
 .Vb 3
 \&   # use Backspace = ^H
 \&   $ stty erase ^H
-\&   $ @@RXVT_NAME@@
+\&   $ @@URXVT_NAME@@
 .Ve
 .PP
 .Vb 3
 \&   # use Backspace = ^?
 \&   $ stty erase ^?
-\&   $ @@RXVT_NAME@@
+\&   $ @@URXVT_NAME@@
 .Ve
 .PP
 Toggle with \f(CW\*(C`ESC [ 36 h\*(C'\fR / \f(CW\*(C`ESC [ 36 l\*(C'\fR.
@@ -816,7 +816,7 @@ There are some compile-time selections available via configure. Unless
 you have run \*(L"configure\*(R" with the \f(CW\*(C`\-\-disable\-resources\*(C'\fR option you can
 use the `keysym' resource to alter the keystrings associated with keysyms.
 .PP
-Here's an example for a URxvt session started using \f(CW\*(C`@@RXVT_NAME@@ \-name URxvt\*(C'\fR
+Here's an example for a URxvt session started using \f(CW\*(C`@@URXVT_NAME@@ \-name URxvt\*(C'\fR
 .PP
 .Vb 20
 \&   URxvt.keysym.Home:          \e033[1~
@@ -922,8 +922,8 @@ the rxvt terminfo file with the rxvt-unicode one.
 Most likely it's the empty definition for \f(CW\*(C`enacs=\*(C'\fR. Just replace it by
 \&\f(CW\*(C`enacs=\eE[0@\*(C'\fR and try again.
 .PP
-\fI\f(CI\*(C`bash\*(C'\fI's readline does not work correctly under @@RXVT_NAME@@.\fR
-.IX Subsection "bash's readline does not work correctly under @@RXVT_NAME@@."
+\fI\f(CI\*(C`bash\*(C'\fI's readline does not work correctly under @@URXVT_NAME@@.\fR
+.IX Subsection "bash's readline does not work correctly under @@URXVT_NAME@@."
 .PP
 See next entry.
 .PP

diff --git a/doc/rxvt.7.pod b/doc/rxvt.7.pod
index b959b19c49cb75d0347f9c41c79fc8caba13f4c8..6be01e31fa0d21f705678ddfbab4fd99f19f9bbe 100644 (file)
--- a/doc/rxvt.7.pod
+++ b/doc/rxvt.7.pod
@@ -21,7 +21,7 @@ all escape sequences, and other background information.
 The newest version of this document is also available on the World Wide Web at
 L<http://cvs.schmorp.de/browse/*checkout*/rxvt-unicode/doc/rxvt.7.html>.
 
-=head1 FREQUENTLY ASKED QUESTIONS
+=head1 RXVT-UNICODE/URXVT FREQUENTLY ASKED QUESTIONS
 
 
 =head2 Meta, Features & Commandline Issues
@@ -77,10 +77,10 @@ display, create the listening socket and then fork.
 
 =head3 How do I distinguish wether I'm running rxvt-unicode or a regular xterm? I need this to decide about setting colors etc.
 
-rxvt and rxvt-unicode always export the variable "COLORTERM", so you can
-check and see if that is set. Note that several programs, JED, slrn,
-Midnight Commander automatically check this variable to decide whether or
-not to use color.
+The original rxvt and rxvt-unicode always export the variable "COLORTERM",
+so you can check and see if that is set. Note that several programs, JED,
+slrn, Midnight Commander automatically check this variable to decide
+whether or not to use color.
 
 =head3 How do I set the correct, full IP address for the DISPLAY variable?
 
@@ -127,7 +127,7 @@ already in use in this mode.
    98398    1664      24   15695    1824 rxvt --disable-everything
   188985    9048   66616   18222    1788 urxvt --disable-everything
 
-When you C<--enable-everything> (which _is_ unfair, as this involves xft
+When you C<--enable-everything> (which I<is> unfair, as this involves xft
 and full locale/XIM support which are quite bloaty inside libX11 and my
 libc), the two diverge, but not unreasnobaly so.
 
@@ -689,7 +689,7 @@ resource to set it:
    URxvt.termName: rxvt
 
 If you don't plan to use B<rxvt> (quite common...) you could also replace
-the rxvt terminfo file with the rxvt-unicode one.
+the rxvt terminfo file with the rxvt-unicode one and use C<TERM=rxvt>.
 
 =head3 C<tic> outputs some error when compiling the terminfo entry.
 
@@ -1005,7 +1005,7 @@ At the time of this writing, cygwin didn't seem to support any multi-byte
 encodings (you might try C<LC_CTYPE=C-UTF-8>), so you are likely limited
 to 8-bit encodings.
 
-=head1 RXVT TECHNICAL REFERENCE
+=head1 RXVT-UNICODE TECHNICAL REFERENCE
 
 =head1 DESCRIPTION
 
@@ -1913,7 +1913,7 @@ button was pressed and are added together (X11 mouse report only):
        4       Shift
        8       Meta
        16      Control
-       32      Double Click I<(Rxvt extension)>
+       32      Double Click I<(rxvt extension)>
 
 =end table
 

diff --git a/doc/rxvt.7.txt b/doc/rxvt.7.txt
index dc06333994332e7130153a8151eab6101724d16c..69309cc4cae54b10361166599045d2a7b35cf15f 100644 (file)
--- a/doc/rxvt.7.txt
+++ b/doc/rxvt.7.txt
@@ -66,10 +66,10 @@ RXVT-UNICODE/URXVT FREQUENTLY ASKED QUESTIONS
     listening socket and then fork.
 
    How do I distinguish wether I'm running rxvt-unicode or a regular xterm? I need this to decide about setting colors etc.
-    rxvt and rxvt-unicode always export the variable "COLORTERM", so you can
-    check and see if that is set. Note that several programs, JED, slrn,
-    Midnight Commander automatically check this variable to decide whether
-    or not to use color.
+    The original rxvt and rxvt-unicode always export the variable
+    "COLORTERM", so you can check and see if that is set. Note that several
+    programs, JED, slrn, Midnight Commander automatically check this
+    variable to decide whether or not to use color.
 
    How do I set the correct, full IP address for the DISPLAY variable?
     If you've compiled rxvt-unicode with DISPLAY_IS_IP and have enabled
@@ -113,7 +113,7 @@ RXVT-UNICODE/URXVT FREQUENTLY ASKED QUESTIONS
        98398    1664      24   15695    1824 rxvt --disable-everything
       188985    9048   66616   18222    1788 urxvt --disable-everything
 
-    When you "--enable-everything" (which _is_ unfair, as this involves xft
+    When you "--enable-everything" (which *is* unfair, as this involves xft
     and full locale/XIM support which are quite bloaty inside libX11 and my
     libc), the two diverge, but not unreasnobaly so.
 
@@ -363,8 +363,7 @@ RXVT-UNICODE/URXVT FREQUENTLY ASKED QUESTIONS
        URxvt.color14:  #00FFFF
        URxvt.color15:  #FFFFFF
 
-    And here is a more complete set of non-standard colors described (not by
-    me) as "pretty girly".
+    And here is a more complete set of non-standard colors.
 
        URxvt.cursorColor:  #dc74d1
        URxvt.pointerColor: #dc74d1
@@ -385,8 +384,7 @@ RXVT-UNICODE/URXVT FREQUENTLY ASKED QUESTIONS
        URxvt.color7:       #e1dddd
        URxvt.color15:      #e1dddd
 
-   Why do some characters look so much different than others?
-    See next entry.
+    (They were described (not by me) as "pretty girly").
 
    How does rxvt-unicode choose fonts?
     Most fonts do not contain the full range of Unicode, which is fine.
@@ -644,7 +642,7 @@ RXVT-UNICODE/URXVT FREQUENTLY ASKED QUESTIONS
        URxvt.termName: rxvt
 
     If you don't plan to use rxvt (quite common...) you could also replace
-    the rxvt terminfo file with the rxvt-unicode one.
+    the rxvt terminfo file with the rxvt-unicode one and use "TERM=rxvt".
 
    "tic" outputs some error when compiling the terminfo entry.
     Most likely it's the empty definition for "enacs=". Just replace it by
@@ -936,7 +934,7 @@ RXVT-UNICODE/URXVT FREQUENTLY ASKED QUESTIONS
     multi-byte encodings (you might try "LC_CTYPE=C-UTF-8"), so you are
     likely limited to 8-bit encodings.
 
-RXVT TECHNICAL REFERENCE
+RXVT-UNICODE TECHNICAL REFERENCE
 DESCRIPTION
     The rest of this document describes various technical aspects of
     rxvt-unicode. First the description of supported command sequences,
@@ -1505,7 +1503,7 @@ Mouse Reporting
            4               Shift           
            8               Meta            
            16              Control         
-           32              Double Click (Rxvt extension) 
+           32              Double Click (rxvt extension) 
 
         Col = "<x> - SPACE"