Merge branch 'master' of github.com:kentonv/capnproto

c++/configure.ac

@@ -28,7 +28,7 @@ AC_PROG_CXX
 AC_LANG([C++])
 AX_CXX_COMPILE_STDCXX_11
 ACX_PTHREAD
-AC_PROG_LIBTOOL
+LT_INIT
 
 AS_IF([test "$external_capnp" != "no"], [
 	AS_IF([test "x$CAPNP" = "x"], [CAPNP="capnp"], [with_capnp=yes])

doc/encoding.md

@@ -343,7 +343,7 @@ of malicious input:
 * A message with deeply-nested objects can cause a stack overflow in typical code which processes
   messages recursively.
 
-To defend against these attacks, every Cap'n Proto implementation should implemented the following
+To defend against these attacks, every Cap'n Proto implementation should implement the following
 restrictions by default:
 
 * As the application traverses the message, each time a pointer is dereferenced, a counter should

doc/faq.md

@@ -59,7 +59,7 @@ Proto message is negligible.
 
 This was a popular myth in security circles way back in the 80's and 90's, based on an incomplete
 understanding of what capabilities are and how to use them effectively.  Read
-[Capability Myths Demolished](http://srl.cs.jhu.edu/pubs/SRL2003-02.pdf).  (No really, read it;
+[Capability Myths Demolished](http://zesty.ca/capmyths/usenix.pdf).  (No really, read it;
 it's awesome.)
 
 ## Usage