[Xen-changelog] [xen master] Fix typo in m4/xenstored.m4

[patchbot@xxxxxxx]

commit b8f77ff99b61a96fc6d3c33705d70daa4f7ca604
Author:     Olaf Hering <olaf@xxxxxxxxx>
AuthorDate: Thu Oct 9 18:44:43 2014 +0200
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Tue Oct 14 10:23:45 2014 +0100

    Fix typo in m4/xenstored.m4
    
    Signed-off-by: Olaf Hering <olaf@xxxxxxxxx>
    Cc: Ian Campbell <ian.campbell@xxxxxxxxxx>
    Cc: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
    Cc: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
    Cc: Wei Liu <wei.liu2@xxxxxxxxxx>
    Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
    [ijc -- ran autogen.sh as requested]
---
 m4/xenstored.m4 |    2 +-
 tools/configure |   12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/m4/xenstored.m4 b/m4/xenstored.m4
index b268fc2..9c31a7f 100644
--- a/m4/xenstored.m4
+++ b/m4/xenstored.m4
@@ -20,7 +20,7 @@ AC_ARG_WITH([xenstored],
                [This lets you choose which xenstore daemon you want, you have
                two options: the original xenstored written in C (xenstored)
                or the newer and robust one written in Ocaml (oxenstored).
-               The oxenstored daemon is the default but will but can only
+               The oxenstored daemon is the default but can only
                be used if you have ocaml library / build dependencies solved,
                if you have not specified a preference and do not have ocaml
                dependencies resolved we'll enable the C xenstored for you. If
diff --git a/tools/configure b/tools/configure
index db73fba..2c76cb1 100755
--- a/tools/configure
+++ b/tools/configure
@@ -1503,12 +1503,12 @@ Optional Packages:
                           you have two options: the original xenstored written
                           in C (xenstored) or the newer and robust one written
                           in Ocaml (oxenstored). The oxenstored daemon is the
-                          default but will but can only be used if you have
-                          ocaml library / build dependencies solved, if you
-                          have not specified a preference and do not have
-                          ocaml dependencies resolved we'll enable the C
-                          xenstored for you. If you ask for oxenstored we'll
-                          complain until you resolve those dependencies
+                          default but can only be used if you have ocaml
+                          library / build dependencies solved, if you have not
+                          specified a preference and do not have ocaml
+                          dependencies resolved we'll enable the C xenstored
+                          for you. If you ask for oxenstored we'll complain
+                          until you resolve those dependencies
   --with-systemd          set directory for systemd service files
   --with-systemd-modules-load          set directory for systemd modules load 
files
 
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog