You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by an...@apache.org on 2016/10/02 16:29:37 UTC

[2/3] mesos git commit: Fixed usage of "can not" vs. "cannot" in stout.

Fixed usage of "can not" vs. "cannot" in stout.

For style reasons, the latter should usually be preferred to the former.

Review: https://reviews.apache.org/r/51057/


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/891a69c1
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/891a69c1
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/891a69c1

Branch: refs/heads/master
Commit: 891a69c1c7f317a86ca1383e5ce857b93007388d
Parents: d4492f3
Author: Neil Conway <ne...@gmail.com>
Authored: Sun Oct 2 08:59:14 2016 -0700
Committer: Anand Mazumdar <an...@apache.org>
Committed: Sun Oct 2 08:59:14 2016 -0700

----------------------------------------------------------------------
 3rdparty/stout/configure.ac            | 2 +-
 3rdparty/stout/include/stout/flags.hpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/891a69c1/3rdparty/stout/configure.ac
----------------------------------------------------------------------
diff --git a/3rdparty/stout/configure.ac b/3rdparty/stout/configure.ac
index 2236a2d..527188a 100644
--- a/3rdparty/stout/configure.ac
+++ b/3rdparty/stout/configure.ac
@@ -83,7 +83,7 @@ AC_ARG_ENABLE([debug],
 AC_ARG_ENABLE([install],
               AS_HELP_STRING([--enable-install],
                              [install stout]),
-              [AC_MSG_ERROR([stout can not currently be installed])])
+              [AC_MSG_ERROR([stout cannot currently be installed])])
 
 AC_ARG_ENABLE([optimize],
               AS_HELP_STRING([--enable-optimize],

http://git-wip-us.apache.org/repos/asf/mesos/blob/891a69c1/3rdparty/stout/include/stout/flags.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/include/stout/flags.hpp b/3rdparty/stout/include/stout/flags.hpp
index bc4684d..21257b7 100644
--- a/3rdparty/stout/include/stout/flags.hpp
+++ b/3rdparty/stout/include/stout/flags.hpp
@@ -64,12 +64,12 @@
 //
 // "Fail early, fail often":
 //
-// You can not add duplicate flags, this is checked for you at compile
+// You cannot add duplicate flags, this is checked for you at compile
 // time for composite flags (e.g., Flag<MyFlags1, MyFlags2>) and also
 // checked at runtime for any other flags added via inheritance or
 // Flags::add(...).
 //
-// Flags that can not be loaded (e.g., attempting to use the 'no-'
+// Flags that cannot be loaded (e.g., attempting to use the 'no-'
 // prefix for a flag that is not boolean) will print a message to
 // standard error and abort the process.