4 files changed, 8 insertions, 8 deletions
diff --git a/lib/Sema/AnalysisBasedWarnings.cpp b/lib/Sema/AnalysisBasedWarnings.cpp
index a3aee9afe0..2b7d4becd9 100644
--- a/lib/Sema/AnalysisBasedWarnings.cpp
+++ b/lib/Sema/AnalysisBasedWarnings.cpp
@@ -87,10 +87,10 @@ enum ControlFlowKind {
 /// CheckFallThrough - Check that we don't fall off the end of a
 /// Statement that should return a value.
 ///
-/// \returns AlwaysFallThrough iff we always fall off the end of the statement,
-/// MaybeFallThrough iff we might or might not fall off the end,
-/// NeverFallThroughOrReturn iff we never fall off the end of the statement or
-/// return.  We assume NeverFallThrough iff we never fall off the end of the
+/// \returns AlwaysFallThrough if we always fall off the end of the statement,
+/// MaybeFallThrough if we might or might not fall off the end,
+/// NeverFallThroughOrReturn if we never fall off the end of the statement or
+/// return.  We assume NeverFallThrough if we never fall off the end of the
 /// statement but we may return.  We assume that functions not marked noreturn
 /// will return.
 static ControlFlowKind CheckFallThrough(AnalysisDeclContext &AC) {
diff --git a/lib/Sema/SemaAccess.cpp b/lib/Sema/SemaAccess.cpp
index 58b1a51ae5..ddb5e4e367 100644
--- a/lib/Sema/SemaAccess.cpp
+++ b/lib/Sema/SemaAccess.cpp
@@ -918,7 +918,7 @@ static AccessResult HasAccess(Sema &S,
 ///     let AccessToBase = Merge(Access(B_i, B_{i+1}), ACAB(i+1)) in
 ///     if Accessible(B_i, AccessToBase) then public else AccessToBase
 ///
-/// B is an accessible base of N at R iff ACAB(1) = public.
+/// B is an accessible base of N at R if ACAB(1) = public.
 ///
 /// \param FinalAccess the access of the "final step", or AS_public if
 ///   there is no final step.
diff --git a/lib/Sema/SemaChecking.cpp b/lib/Sema/SemaChecking.cpp
index 7951a71e4e..0fa87483ba 100644
--- a/lib/Sema/SemaChecking.cpp
+++ b/lib/Sema/SemaChecking.cpp
@@ -5366,7 +5366,7 @@ namespace {
 /// Consider whether capturing the given variable can possibly lead to
 /// a retain cycle.
 static bool considerVariable(VarDecl *var, Expr *ref, RetainCycleOwner &owner) {
-  // In ARC, it's captured strongly iff the variable has __strong
+  // In ARC, it's captured strongly if the variable has __strong
   // lifetime.  In MRR, it's captured strongly if the variable is
   // __block and has an appropriate type.
   if (var->getType().getObjCLifetime() != Qualifiers::OCL_Strong)
diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp
index 01aaf8be32..17db68ed59 100644
--- a/lib/Sema/SemaDecl.cpp
+++ b/lib/Sema/SemaDecl.cpp
@@ -4799,7 +4799,7 @@ class DifferentNameValidatorCCC : public CorrectionCandidateCallback {
 /// or performing typo correction if there are no previous declarations with
 /// the same name.
 ///
-/// Returns a NamedDecl iff typo correction was performed and substituting in
+/// Returns a NamedDecl if typo correction was performed and substituting in
 /// the new declaration name does not cause new errors.
 static NamedDecl* DiagnoseInvalidRedeclaration(
     Sema &SemaRef, LookupResult &Previous, FunctionDecl *NewFD,
@@ -8237,7 +8237,7 @@ static unsigned getRedeclDiagFromTagKind(TagTypeKind Tag) {
 /// \brief Determine if tag kind is a class-key compatible with
 /// class for redeclaration (class, struct, or __interface).
 ///
-/// \returns true iff the tag kind is compatible.
+/// \returns true if the tag kind is compatible.
 static bool isClassCompatTagKind(TagTypeKind Tag)
 {
   return Tag == TTK_Struct || Tag == TTK_Class || Tag == TTK_Interface;