diff --git a/docs/analyzer/IPA.txt b/docs/analyzer/IPA.txt
index 01e73ce..14da71e 100644
--- a/docs/analyzer/IPA.txt
+++ b/docs/analyzer/IPA.txt
@@ -66,23 +66,23 @@ Currently, template functions are considered for inlining by default.
 The motivation behind this option is that very generic code can be a source
 of false positives, either by considering paths that the caller considers
 impossible (by some unstated precondition), or by inlining some but not all
 of a deep implementation of a function.
 
 ### c++-stdlib-inlining ###
 
 This option controls whether functions from the C++ standard library, including
 methods of the container classes in the Standard Template Library, should be
 considered for inlining.
 
-    -analyzer-config c++-template-inlining=[true | false]
+    -analyzer-config c++-stdlib-inlining=[true | false]
 
 Currently, C++ standard library functions are considered for inlining by 
 default.
 
 The standard library functions and the STL in particular are used ubiquitously
 enough that our tolerance for false positives is even lower here. A false
 positive due to poor modeling of the STL leads to a poor user experience, since
 most users would not be comfortable adding assertions to system headers in order
 to silence analyzer warnings.
 
 ### c++-container-inlining ###
diff --git a/include/clang/AST/Expr.h b/include/clang/AST/Expr.h
index 28b81fb..55c9de2 100644
--- a/include/clang/AST/Expr.h
+++ b/include/clang/AST/Expr.h
@@ -1414,23 +1414,23 @@ public:
   SourceLocation getLocEnd() const LLVM_READONLY { return Val->getLocEnd(); }
 
   static bool classof(const Stmt *T) {
     return T->getStmtClass() == ImaginaryLiteralClass;
   }
 
   // Iterators
   child_range children() { return child_range(&Val, &Val+1); }
 };
 
 /// StringLiteral - This represents a string literal expression, e.g. "foo"
-/// or L"bar" (wide strings).  The actual string is returned by getStrData()
+/// or L"bar" (wide strings).  The actual string is returned by getBytes()
 /// is NOT null-terminated, and the length of the string is determined by
 /// calling getByteLength().  The C type for a string is always a
 /// ConstantArrayType.  In C++, the char type is const qualified, in C it is
 /// not.
 ///
 /// Note that strings in C can be formed by concatenation of multiple string
 /// literal pptokens in translation phase #6.  This keeps track of the locations
 /// of each of these pieces.
 ///
 /// Strings in C can also be truncated and extended by assigning into arrays,
 /// e.g. with constructs like:
diff --git a/lib/StaticAnalyzer/Checkers/IdempotentOperationChecker.cpp b/lib/StaticAnalyzer/Checkers/IdempotentOperationChecker.cpp
index d756c62..4997f8d 100644
--- a/lib/StaticAnalyzer/Checkers/IdempotentOperationChecker.cpp
+++ b/lib/StaticAnalyzer/Checkers/IdempotentOperationChecker.cpp
@@ -17,24 +17,24 @@
 //|Operator | x op x | x op 1 | 1 op x | x op 0 | 0 op x | x op ~0 | ~0 op x |
 //+--------------------------------------------------------------------------+
 //  +, +=   |        |        |        |   x    |   x    |         |
 //  -, -=   |        |        |        |   x    |   -x   |         |
 //  *, *=   |        |   x    |   x    |   0    |   0    |         |
 //  /, /=   |   1    |   x    |        |  N/A   |   0    |         |
 //  &, &=   |   x    |        |        |   0    |   0    |   x     |    x
 //  |, |=   |   x    |        |        |   x    |   x    |   ~0    |    ~0
 //  ^, ^=   |   0    |        |        |   x    |   x    |         |
 //  <<, <<= |        |        |        |   x    |   0    |         |
 //  >>, >>= |        |        |        |   x    |   0    |         |
-//  ||      |   1    |   1    |   1    |   x    |   x    |   1     |    1
-//  &&      |   1    |   x    |   x    |   0    |   0    |   x     |    x
+//  ||      |   x    |   1    |   1    |   x    |   x    |   1     |    1
+//  &&      |   x    |   x    |   x    |   0    |   0    |   x     |    x
 //  =       |   x    |        |        |        |        |         |
 //  ==      |   1    |        |        |        |        |         |
 //  >=      |   1    |        |        |        |        |         |
 //  <=      |   1    |        |        |        |        |         |
 //  >       |   0    |        |        |        |        |         |
 //  <       |   0    |        |        |        |        |         |
 //  !=      |   0    |        |        |        |        |         |
 //===----------------------------------------------------------------------===//
 //
 // Things TODO:
 // - Improved error messages