Merge branch 'master' into r1.3

* master:
  CDRIVER-1069 man pages not built from tarball
  typo in creating.page

Author: ajdavis

doc/Makefile.am

@@ -1,4 +1,3 @@
-EXTRA_DIST += $(wildcard doc/man/*.3) \
-              doc/mallard2man.py
+EXTRA_DIST += doc/mallard2man.py
 
 dist-hook: man html

doc/creating.page

@@ -25,7 +25,7 @@ BSON_APPEND_UTF8 (&b, "key", "value");]]></code></example>
 BSON_APPEND_INT32 (&b, "a", 1);
 BSON_APPEND_UTF8 (&b, "hello", "world");
 BSON_APPEND_BOOL (&b, "bool", true);]]></code></example>
-    <p>Notice that we ommitted the call to <code xref="bson_init">bson_init()</code>. By specifying <code>BSON_INITIALIZER</code> we can remove the need to initialize the structure to a base state.</p>
+    <p>Notice that we omitted the call to <code xref="bson_init">bson_init()</code>. By specifying <code>BSON_INITIALIZER</code> we can remove the need to initialize the structure to a base state.</p>
   </section>
 
   <section id="subdocs">

doc/man/Makefile.am

@@ -1,4 +1,5 @@
-BUILT_MAN_FILES = $(patsubst doc/%.page,doc/man/%.3,$(wildcard doc/*.page))
+MAN_FILES_TO_BUILD = $(patsubst doc/%.page,doc/man/%.3,$(wildcard doc/*.page))
+BUILT_MAN_FILES = $(wildcard doc/man/*.3)
 CLEANFILES += $(wildcard doc/man/*.3)
 
 dist_man_MANS = $(BUILT_MAN_FILES)
@@ -13,5 +14,5 @@ man3_MANS = $(BUILT_MAN_FILES)
 %.3: ../%.page
 	$(AM_V_GEN)./doc/mallard2man.py 3 $^
 
-man: $(BUILT_MAN_FILES)
-EXTRA_DIST += $(wildcard doc/man/*.3)
+man: $(MAN_FILES_TO_BUILD)
+EXTRA_DIST += $(MAN_FILES_TO_BUILD)