aurora git commit: Fix typo in the user guide about Task Updates

[js...@apache.org]

Repository: aurora
Updated Branches:
  refs/heads/master a80260eaf -> e0fef5abf


Fix typo in the user guide about Task Updates

Testing Done:
Fix a minor typo in the user guide and add a missing "and"

Reviewed at https://reviews.apache.org/r/42321/


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

Branch: refs/heads/master
Commit: e0fef5abf7d8acc6f38f1f6e2b0f231c3d6bc4a4
Parents: a80260e
Author: Anant Vyas <vy...@gmail.com>
Authored: Thu Jan 14 14:25:10 2016 -0700
Committer: John Sirois <js...@apache.org>
Committed: Thu Jan 14 14:25:10 2016 -0700

----------------------------------------------------------------------
 docs/user-guide.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/aurora/blob/e0fef5ab/docs/user-guide.md
----------------------------------------------------------------------
diff --git a/docs/user-guide.md b/docs/user-guide.md
index 1a78d30..df63468 100644
--- a/docs/user-guide.md
+++ b/docs/user-guide.md
@@ -170,7 +170,7 @@ and performing these operations:
   then that instance is killed.
 - If an instance is not present in the scheduler but is present in
   the new config, then the instance is created.
-- If an instance is present in both the scheduler the new config, then
+- If an instance is present in both the scheduler and the new config, then
   the client diffs both task configs. If it detects any changes, it
   performs an instance update by killing the old config instance and adds
   the new config instance.