Typo and documentation fixes

5 files changed, 23 insertions, 19 deletions

diff --git a/NEWS b/NEWS
index 100f6d8..ac3a634 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,11 @@
 Version 0.19.5 - unreleased
 
 * xgettext now has a feature to perform syntax checks on msgid, which
-  could enforce common styles of translatable strings.  They can be
-  enabled with --check option or special "xgettext: " comment in the
-  source code.  By default, no syntax checks are enabled.
+  could enforce common styles of translatable strings, such as to
+  prefer Unicode characters to the corresponding ASCII characters.
+  They can be enabled with --check option or special "xgettext: "
+  comment in the source code.  By default, no syntax checks are
+  enabled.
 
 * msgfilter and msgexec now have an option --newline, which appends a
   newline character to filter input and trims it from the filter
diff --git a/gettext-tools/doc/gettext.texi b/gettext-tools/doc/gettext.texi
index ea0ae2b..215c53e 100644
--- a/gettext-tools/doc/gettext.texi
+++ b/gettext-tools/doc/gettext.texi
@@ -9326,8 +9326,10 @@ must occur as well, except possibly one of them.
 KUIT (KDE User Interface Text) is compatible with KDE 4 format strings,
 while it also allows programmers to add semantic information to a format
 string, through XML markup tags.  For example, if the first format
-directive is a filename, programmers could indicate that with
-@samp{<filename>%1</filename>}.  KUIT format strings are described in
+directive in a string is a filename, programmers could indicate that
+with a @samp{filename} tag, like @samp{<filename>%1</filename>}.
+
+KUIT format strings are described in
 @uref{http://api.kde.org/frameworks-api/frameworks5-apidocs/ki18n/html/prg_guide.html#kuit_markup}.
 
 @node boost-format, lua-format, kde-kuit-format, Translators for other Languages
diff --git a/gettext-tools/src/format-kde-kuit.c b/gettext-tools/src/format-kde-kuit.c
index 9584659..914c95b 100644
--- a/gettext-tools/src/format-kde-kuit.c
+++ b/gettext-tools/src/format-kde-kuit.c
@@ -1,4 +1,4 @@
-/* KUIT (KDE UI Text) format strings.
+/* KUIT (KDE User Interface Text) format strings.
    Copyright (C) 2015 Free Software Foundation, Inc.
    Written by Daiki Ueno <ueno@gnu.org>, 2015.
 
@@ -38,9 +38,9 @@
 /* KUIT (KDE User Interface Text) is an XML-like markup which augments
    translatable strings with semantic information:
    http://api.kde.org/frameworks-api/frameworks5-apidocs/ki18n/html/prg_guide.html#kuit_markup
-   KUIT can be seen as a fragment of well-formed XML, except that it
-   still allows '&' as a Qt accelerator marker and '%' as a format
-   directive.  */
+   KUIT can be seen as a fragment of a well-formed XML document,
+   except that it allows '&' as a Qt accelerator marker and '%' as a
+   format directive.  */
 
 struct spec
 {
diff --git a/gettext-tools/src/quote.h b/gettext-tools/src/quote.h
index 727b322..df8cde2 100644
--- a/gettext-tools/src/quote.h
+++ b/gettext-tools/src/quote.h
@@ -1,4 +1,4 @@
-/* Scan quoted string segments from a string.
+/* Handle quoted segments of a string.
    Copyright (C) 2014-2015 Free Software Foundation, Inc.
    Written by Daiki Ueno <ueno@gnu.org>, 2015.
 
@@ -15,8 +15,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef _SCAN_QUOTE_H
-#define _SCAN_QUOTE_H
+#ifndef _QUOTE_H
+#define _QUOTE_H
 
 #include <stdbool.h>
 
@@ -35,8 +35,8 @@ scan_quoted (const char *input, size_t length,
   const char *p, *start, *end;
   bool seen_opening;
 
-  /* START shall point to the beginning of a quoted string, END points
-     to the end of the entire input string.  */
+  /* START shall point to the beginning of a quoted segment, END
+     points to the end of the entire input string.  */
   start = input;
   end = &input[length - 1];
   
@@ -139,4 +139,4 @@ scan_quoted (const char *input, size_t length,
 #endif
 
 
-#endif /* _SCAN_QUOTE_H */
+#endif /* _QUOTE_H */
diff --git a/gettext-tools/src/sentence.c b/gettext-tools/src/sentence.c
index a5ae35e..30ae223 100644
--- a/gettext-tools/src/sentence.c
+++ b/gettext-tools/src/sentence.c
@@ -39,10 +39,10 @@ int sentence_end_required_spaces = 1;
          \($\|[ \u00a0]$\|\t\|[ \u00a0]\{REQUIRED_SPACES\}\)
 
    Since we are lacking a regular expression routine capable of
-   Unicode (though gnulib-lib/lib/regex.c provides locale-dependent
-   version, we would rather avoid depending on wchar_t), apply a
-   manually constructed DFA, which consists of 8 states where 4 of
-   them are a terminal.  */
+   Unicode (though gnulib-lib/lib/regex.c provides a locale-dependent
+   version, we would rather avoid depending on it), apply a manually
+   constructed DFA, which consists of 8 states where 4 of them are a
+   terminal.  */
 const char *
 sentence_end (const char *string, ucs4_t *ending_charp)
 {