bk commit - mysqldoc@docsrva tree (Mike.Hillyer:1.2647)

[mhillyer]

Below is the list of changes that have just been committed into a local
mysqldoc repository of root. When root does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.2647 05/05/10 07:14:28 Mike.Hillyer@stripped +1 -0
  Merge bk://mysqldoc@stripped
  into www.openwin.org:/home/mysqldoc/mysqldoc

  Docs/manual.texi
    1.2835 05/05/10 07:14:26 Mike.Hillyer@stripped +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	Mike.Hillyer
# Host:	www.openwin.org
# Root:	/home/mysqldoc/mysqldoc/RESYNC

--- 1.2834/Docs/manual.texi	2005-05-10 05:10:46 -06:00
+++ 1.2835/Docs/manual.texi	2005-05-10 07:14:26 -06:00
@@ -5781,7 +5781,7 @@
 The MySQL Configuration Wizard installs the MySQL server as a service by
 default, using the service name @code{MySQL}. If you do
 not wish to install the service, un-check the box next to the
-@code{Install As Windows Service} option. You can changed
+@code{Install As Windows Service} option. You can change
 the service name by picking a new service name from the drop-down box
 provided or by typing a new service name into the drop-down box.
 
@@ -5845,7 +5845,7 @@
 @code{Write configuration file} task.
 
 If you chose to create a service for the MySQL server the
-MySQL Configuration Wizard creates ans starts the service. If you are
+MySQL Configuration Wizard creates and starts the service. If you are
 re-configuring an existing service, the MySQL Configuration Wizard restarts
 the service to apply your configuration changes.