From a6e25627e9dc4d3225320c232802735b12af9055 Mon Sep 17 00:00:00 2001
From: tadam <tadam>
Date: Sun, 3 Jan 2010 02:39:32 +0000
Subject: [PATCH] Minor grammatical improvements to the documentation.

Applied (with some corrections) P. Vojta's patch to correct some of the
documentation.
---
 doc/ChangeLog          | 5 +++++
 doc/commands/Menu.xml  | 6 +++---
 doc/commands/Style.xml | 8 ++++----
 docs/ChangeLog         | 4 ++++
 docs/FAQ               | 8 ++++----
 5 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 9ef6a72ee..47f24fd9d 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-03  Thomas Adam   <thomas.adam22@gmail.com>
+	* commands/Style.xml:
+	* commands/Menu.xml:
+	Minor grammatical fixups (P. Vojta).
+
 2009-12-31  Thomas Adam   <thomas.adam22@gmail.com>
 	* commands/BugOpts.xml:
 	New option "QtDragnDropWorkaround" to BugOpts.
diff --git a/doc/commands/Menu.xml b/doc/commands/Menu.xml
index 499a2b802..095549db3 100644
--- a/doc/commands/Menu.xml
+++ b/doc/commands/Menu.xml
@@ -6,7 +6,7 @@
 %myents;
 ]>
 
-<!-- $Id: Menu.xml,v 1.5 2007/08/19 21:43:39 griph Exp $ -->
+<!-- $Id: Menu.xml,v 1.6 2010/01/03 02:39:32 tadam Exp $ -->
 
 <section id='Menu'>
 <title>Menu</title>
@@ -139,7 +139,7 @@ menu).</para>
 <replaceable>x</replaceable>
 and
 <replaceable>y</replaceable>
-specify how far the menu is moved from it's default position.  By
+specify how far the menu is moved from its default position.  By
 default, the numeric value given is interpreted as a percentage of
 the context rectangle's width (height), but with a trailing
 '<fvwmopt cmd="Menu" opt="m"/>'
@@ -226,7 +226,7 @@ do not want this you can add
 as an option.  This might happen for example if you want the menu
 always in the top right corner of the screen.</para>
 
-<para>Where do you want a menu to appear when you click on it's menu
+<para>Where do you want a menu to appear when you click on its menu
 item? The default is to place the title under the cursor, but if
 you want it where the position arguments say, use the
 <fvwmopt cmd="Menu" opt="SelectInPlace"/>
diff --git a/doc/commands/Style.xml b/doc/commands/Style.xml
index 289283e09..264b3572c 100644
--- a/doc/commands/Style.xml
+++ b/doc/commands/Style.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- $Id: Style.xml,v 1.12 2009/08/02 15:04:08 tadam Exp $ -->
+<!-- $Id: Style.xml,v 1.13 2010/01/03 02:39:32 tadam Exp $ -->
 <!DOCTYPE part PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
   "../docbook-xml/docbookx.dtd"
 [
@@ -1085,7 +1085,7 @@ reverts back to the default.</para>
 
 <para>
 <fvwmopt cmd="Style" opt="StickyIcon"/>
-makes the window sticky when its iconified.  It de-iconifies on
+makes the window sticky when it's iconified.  It de-iconifies on
 top the active desktop.
 <fvwmopt cmd="Style" opt="SlipperyIcon"/>
 reverts back to the default.
@@ -1122,7 +1122,7 @@ iconify windows and can be set with the
 style.</para>
 
 <para><fvwmopt cmd="Style" opt="StickyIcon"/>
-makes the window sticky when its iconified.  It de-iconifies on
+makes the window sticky when it's iconified.  It de-iconifies on
 top the active desktop.
 <fvwmopt cmd="Style" opt="SlipperyIcon"/>
 reverts back to the default.</para>
@@ -1653,7 +1653,7 @@ Style * ManualPlacementsHonorsStartsOnPageOff
 <para><fvwmopt cmd="Style" opt="NoUsePPosition"/>
 instructs fvwm to ignore the program specified position (PPosition
 hint) when adding new windows.  Using PPosition is required for
-some applications, but if you do not have one of those its a real
+some applications, but if you do not have one of those it's a real
 headache.  Many programs set PPosition to something obnoxious like
 0,0 (upper left corner).
 Note: <emphasis>!UsePPosition</emphasis>
diff --git a/docs/ChangeLog b/docs/ChangeLog
index 06b2ea6e8..8c4fb8ac2 100644
--- a/docs/ChangeLog
+++ b/docs/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-03  Thomas Adam   <thomas.adam22@gmail.com>
+	* FAQ:
+	Minor grammatical corrections (P. Vojta).
+
 2010-01-02  Thomas Adam   <thomas.adam22@gmail.com>
 	* todo-2.6:
 	Update to reflect development status.
diff --git a/docs/FAQ b/docs/FAQ
index 0c531ca48..82ab6bb62 100644
--- a/docs/FAQ
+++ b/docs/FAQ
@@ -1454,7 +1454,7 @@ A: Instead of Maximize use "Maximize 100 -30p" where 30 is the width
 
 A: Fvwm has some builtin idea of what the buttons do, and some
    applications can request that certain buttons not be shown.
-   For example, its normal for Fvwm to suppress the iconify button
+   For example, it's normal for Fvwm to suppress the iconify button
    (builtin button 4, the second button from the right) on a
    transient (dialog) window.
 
@@ -2290,7 +2290,7 @@ A: This problem might occur on other applications besides the one
      up like a normal X app where  the WM draws the borders.
      With MWWM=MWM, it works ok too except that for the main
      window,  no borders are drawn  by the WM and Rose draws
-     it's own  borders (I  have  fvwm respecting   MWM decor
+     its own  borders (I  have  fvwm respecting   MWM decor
      hints).  (This   is     correct  as mentioned by    the
      Knowledgebase pages above.)   I don't  recall what Rose
      looks like with dtwm, but I suspect it's quite close to
@@ -2500,7 +2500,7 @@ A: Under this heading we've had questions about FvwmForm being all
    allocate colors.
 
    Older hardware uses something called 8 bit color.  You can also
-   mis-configure newer hardware so that its only using 8 bit color.
+   mis-configure newer hardware so that it's only using 8 bit color.
    When you use 8 bit color, your display can only have 256 colors on
    it at once.
 
@@ -3201,7 +3201,7 @@ your applications request.
      + I Iconify
 
    You can use FvwmEvent to remove the Icons when each window is
-   returned to it's non Iconic state.
+   returned to its non Iconic state.
 
      DestroyFunc DeThumbnail
      AddToFunc DeThumbnail
-- 
2.11.4.GIT