Integrate mainline

[p5sagit/p5-mst-13.2.git] / pod / perlop.pod

diff --git a/pod/perlop.pod b/pod/perlop.pod
index 464ba99..9d67cfe 100644 (file)
--- a/pod/perlop.pod
+++ b/pod/perlop.pod
@@ -645,7 +645,7 @@ any pair of delimiters you choose.
     Customary  Generic        Meaning       Interpolates
        ''       q{}          Literal             no
        ""      qq{}          Literal             yes
-               qu{}          Literal             yes, Unicode
+               qu{}          Literal             yes (UTF-8, see below)
        ``      qx{}          Command             yes (unless '' is delimiter)
                qw{}         Word list            no
        //       m{}       Pattern match          yes (unless '' is delimiter)
@@ -1041,14 +1041,18 @@ produces warnings if the STRING contains the "," or the "#" character.
 
 =item qu/STRING/
 
-Like L<qq> but generates Unicode for characters whose code points are
-greater than 128, or 0x80.  Such characters can be generated using
-the \xHH (for characters 0x80...0xff, or 128..255) and \x{HHH...}
-notations (for characters 0x100..., or greater than 256).
+Like L<qq> but explicitly generates UTF-8 from the \0ooo, \xHH, and
+\x{HH} constructs if the code point is in the 0x80..0xff range (and
+of course for the 0x100.. range).
 
-(In qq/STRING/, or "", both the \xHH and the \x{HHH...} generate
-bytes for the 0x80..0xff range (these bytes are host-dependent),
-and the \x{HHH...} can be used to generate Unicode.)
+Normally you do not need to use this because whether characters are
+internally encoded in UTF-8 should be transparent, and you can just
+just use qq, also known as "".
+
+(In qq/STRING/ the \0ooo, \xHH, and the \x{HHH...} constructs
+generate bytes for the 0x80..0xff range.  For the whole 0x00..0xff
+range the generated bytes are host-dependent: in ISO 8859-1 they will
+be ISO 8859-1, in EBCDIC they will EBCDIC, and so on.)
 
 =item qx/STRING/