From e02e31c8b9d854cd62cbe9799228f6e08e882773 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Mon, 5 Dec 2011 22:04:08 -0600
Subject: Sync with latest script

---
 doc/man/man3/qstring.3qt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'doc/man/man3/qstring.3qt')

diff --git a/doc/man/man3/qstring.3qt b/doc/man/man3/qstring.3qt
index b5be1e27b..1e41f0af6 100644
--- a/doc/man/man3/qstring.3qt
+++ b/doc/man/man3/qstring.3qt
@@ -597,7 +597,7 @@ The QString class provides an abstraction of Unicode text and the classic C '&#9
 .PP
 QString uses implicit sharing, which makes it very efficient and easy to use.
 .PP
-In all of the QString methods that take \fCconst char *\fR parameters, the \fCconst char *\fR is interpreted as a classic C-style '&#92;0'-terminated ASCII string. It is legal for the \fCconst char *\fR parameter to be 0. If the \fCconst char *\fR is not '&#92;0'-terminated, the results are undefined. Functions that copy classic C strings into a QString will not copy the terminating '&#92;0' character. The QChar array of the QString (as returned by unicode()) is generally not terminated by a '&#92;0'. If you need to pass a QString to a function that retquires a C '&#92;0'-terminated string use latin1().
+In all of the QString methods that take \fCconst char *\fR parameters, the \fCconst char *\fR is interpreted as a classic C-style '&#92;0'-terminated ASCII string. It is legal for the \fCconst char *\fR parameter to be 0. If the \fCconst char *\fR is not '&#92;0'-terminated, the results are undefined. Functions that copy classic C strings into a QString will not copy the terminating '&#92;0' character. The QChar array of the QString (as returned by unicode()) is generally not terminated by a '&#92;0'. If you need to pass a QString to a function that requires a C '&#92;0'-terminated string use latin1().
 .PP
 A QString that has not been assigned to anything is \fInull\fR, i.e. both the length and data pointer is 0. A QString that references the empty string ("", a single '&#92;0' char) is \fIempty\fR. Both null and empty QStrings are legal parameters to the methods. Assigning \fC(const char *) 0\fR to QString gives a null QString. For convenience, QString::null is a null QString. When sorting, empty strings come first, followed by non-empty strings, followed by null strings. We recommend using \fCif ( !str.isNull() )\fR to check for a non-null string rather than \fCif ( !str )\fR; see operator!() for an explanation.
 .PP
@@ -947,7 +947,7 @@ Lexically compares this string with \fIs\fR and returns an integer less than, eq
 .SH "void QString::compose ()"
 \fBWarning:\fR This function is not supported in Qt 3.x. It is provided for experimental and illustrative purposes only. It is mainly of interest to those experimenting with Arabic and other composition-rich texts.
 .PP
-Applies possible ligatures to a QString. Useful when composition-rich text retquires rendering with glyph-poor fonts, but it also makes compositions such as QChar(0x0041) ('A') and QChar(0x0308) (Unicode accent diaresis), giving QChar(0x00c4) (German A Umlaut).
+Applies possible ligatures to a QString. Useful when composition-rich text requires rendering with glyph-poor fonts, but it also makes compositions such as QChar(0x0041) ('A') and QChar(0x0308) (Unicode accent diaresis), giving QChar(0x00c4) (German A Umlaut).
 .SH "QChar QString::constref ( uint i ) const"
 Returns the QChar at index \fIi\fR by value.
 .PP
-- 
cgit v1.2.1