mongodb · bgrabar · Mar 5, 2013 · Mar 5, 2013 · Mar 13, 2013 · Mar 13, 2013
diff --git a/.gitignore b/.gitignore
@@ -10,4 +10,6 @@ build/*
 source/includes/hash.rst
 source/includes/install-curl-release*.rst
 source/includes/table-*.rst
+source/includes/manpage-options-auth-mongo.rst
+source/includes/manpage-options-ssl-settings.rst
 TAGS
diff --git a/bin/builder_data.py b/bin/builder_data.py
@@ -53,6 +53,7 @@
      ('$(public-branch-output)/reference/mongo-shell-reference', 'mongo-shell', 'redirect'),
      ('$(public-branch-output)/reference/method/getShardDistribution', 'db.collection.getShardDistribution', 'redirect'),
      ('$(public-branch-output)/reference/method/getDB', 'Mongo.getDB', 'redirect'),
+     ('$(public-branch-output)/reference/operator/within', 'geoWithin', 'redirect'),
      ('$(public-branch-output)/reference/method/getShardVersion', 'db.collection.getShardVersion', 'redirect'),
      ('$(public-branch-output)/reference/command/whatsMyUri', 'whatsmyuri', 'redirect'),
      ('$(public-branch-output)/reference/command/writeBackListen', 'writebacklisten', 'redirect'),

diff --git a/bin/fix-manpage-url b/bin/fix-manpage-url
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+countDirs () {
+    rval=`find source -type d | grep -v ".static" | grep -v "reference/" | wc -l`
+    echo $rval
+}
+
+preFlightTest () {
+    if [ `countDirs` -eq 12 ]; then
+        return 1
+    fi
+}
+
+if (preFlightTest); then 
+    echo "[error]: man page URL munging incorrect. Fix bin/makefile.manpages."
+    exit 1
+else
+    sed $1 's^(\\fB(/administration.*|/tutorial.*|/reference.*|/core.*|/replication.*|/sharding.*|/faq.*|/meta.*)\\fP)^http://docs.mongodb.org/manual\2^g' $2
+    echo [man]: fixed urls in $2 manpage.
+fi
diff --git a/bin/makefile-builder/releases.py b/bin/makefile-builder/releases.py
@@ -55,9 +55,9 @@ def makefile_restat(builder, dependency):
     m.append_var(variable='installation-guides', value=target, block='guide')
     m.target(target=target, dependency=dependency, block='guide')
 
-    if builder == 'source/tutorial/install-mongodb-subscriber-edition.txt': 
-	pass
-    else: 
+    if builder == 'source/tutorial/install-mongodb-subscriber-edition.txt':
+        pass
+    else:
         m.job('touch $@', block='guide')
 
     m.msg('[build]: touched $@ to ensure a clean build.', block='guide')

diff --git a/bin/makefile-builder/sphinx.py b/bin/makefile-builder/sphinx.py
@@ -51,7 +51,7 @@ def make_all_sphinx(sphinx):
           block='vars')
 
     m.section_break('sphinx prerequisites')
-    m.target('sphinx-prerequisites', 'setup installation-guides tables intersphinx', block='prereq')
+    m.target('sphinx-prerequisites', 'setup installation-guides tables intersphinx generate-manpages', block='prereq')
     m.msg('[build]: completed $@ buildstep.', block='prereq')
 
     m.section_break('sphinx targets', block='sphinx')

diff --git a/bin/makefile.manpages b/bin/makefile.manpages
@@ -0,0 +1,34 @@
+# man page support, uses sphinx `man` builder output.
+manpages := $(wildcard $(branch-output)/man/*.1)
+compressed-manpages := $(subst .1,.1.gz,$(manpages))
+manpages:$(manpages) $(branch-output)/manpages.tar.gz
+compressed-manpages:$(compressed-manpages)
+$(compressed-manpages):$(manpages)
+$(manpages):man
+	@bin/fix-manpage-url "$(SED_ARGS_FILE)" $@
+$(branch-output)/man/%.1.gz: $(branch-output)/man/%.1
+	@gzip $< -c > $@
+	@echo [man]: compressing $< -- $@
+$(branch-output)/manpages.tar.gz:man
+	@touch [email protected]
+	@$(TARBIN) -C $(branch-output)/ --transform=s/man/mongodb-manpages/ \
+		   -czvf $@ $(subst $(branch-output)/,,$(manpages)) >> [email protected]
+	@echo [man]: created $@ archive of all manpages
+
+$(rst-include)/manpage-options-auth-mongo.rst:$(rst-include)/manpage-options-auth.rst
+	@cp $< $@
+	@sed $(SED_ARGS_FILE) -e 's/fact-authentication-source-tool/fact-authentication-source-mongo/' $@
+	@-git update-index --assume-unchanged
+	@echo "[generator]: generated the '$@' file."
+manpage-auto += $(rst-include)/manpage-options-auth-mongo.rst
+
+$(rst-include)/manpage-options-ssl-settings.rst:$(rst-include)/manpage-options-ssl.rst
+	@cp $< $@
+	@sed $(SED_ARGS_FILE) -e 's/\.\. option:: --/.. setting:: /' \
+			      -e 's/setting:: (.*) .*/setting:: \1/' \
+			      -e 's/:option:`--/:setting:`/g' $@
+	@echo "[generator]: generated the '$@' file."
+manpage-auto += $(rst-include)/manpage-options-ssl-settings.rst
+
+generate-manpages:$(manpage-auto)
+.PHONY:$(manpages) $(manpage-auto) generate-manpages
diff --git a/conf.py b/conf.py
@@ -48,6 +48,7 @@
 rst_epilog = ('.. |branch| replace:: ``' + meta['branch'] + '``' + BREAK +
               '.. |copy| unicode:: U+000A9' + BREAK +
               '.. |year| replace:: ' + meta['date'] + BREAK +
+              '.. |ent-build| replace:: the MongoDB Subscriber Edition' + BREAK + 
               '.. |hardlink| replace:: http://docs.mongodb.org/' + meta['branch'])
 
 pygments_style = 'sphinx'
@@ -179,7 +180,7 @@
     ('reference/mongostat', 'mongostat', u'MongoDB', [u'MongoDB Documentation Project'], 1),
     ('reference/mongosniff', 'mongosniff', u'MongoDB', [u'MongoDB Documentation Project'], 1),
     ('reference/mongotop', 'mongotop', u'MongoDB', [u'MongoDB Documentation Project'], 1),
-    ('reference/configuration-options', 'mongodb-config', u'MongoDB', [u'MongoDB Documentation Project'], 1),
+    ('reference/mongoperf', 'mongoperf', u'MongoDB', [u'MongoDB Documentation Project'], 1),
 ]
 
 texinfo_documents = [

diff --git a/makefile b/makefile
@@ -35,6 +35,7 @@ include bin/makefile.clean
 include bin/makefile.content
 include bin/makefile.tables
 include bin/makefile.push
+include bin/makefile.manpages
 
 ############# Meta targets that control the build and publication process. #############
 publish-if-up-to-date:
@@ -109,22 +110,7 @@ $(branch-output)/latex/%.tex:
 
 ############# General purpose targets. Not used (directly) in the production build #############
 tags:
-	@etags -I --language=none --regex=@bin/etags.regexp `find source -name "*.txt"`
+	@etags -I --language=none --regex=@bin/etags.regexp `find source -name "*.txt" | grep -v "\.#"`
 	@echo "[dev]: etags generation complete."
 draft:draft-html
 draft-pdfs:draft-latex $(subst .tex,.pdf,$(wildcard $(branch-output)/draft-latex/*.tex))
-# man page support, uses sphinx `man` builder output.
-.PHONY:$(manpages)
-manpages := $(wildcard $(branch-output)/man/*.1)
-compressed-manpages := $(subst .1,.1.gz,$(manpages))
-manpages:$(compressed-manpages) $(branch-output)/manpages.tar.gz
-$(compressed-manpages):$(manpages)
-$(manpages):man
-$(branch-output)/man/%.1.gz: $(branch-output)/man/%.1
-	@gzip $< -c > $@
-	@echo [man]: compressing $< -- $@
-$(branch-output)/manpages.tar.gz:man
-	@touch [email protected]
-	@$(TARBIN) -C $(branch-output)/ --transform=s/man/mongodb-manpages/ \
-		   -czvf $@ $(subst $(branch-output)/,,$(manpages)) >> [email protected]
-	@echo [man]: created $@ archive of all manpages
diff --git a/source/administration/production-notes.txt b/source/administration/production-notes.txt
@@ -444,7 +444,7 @@ Additional Deployment Considerations
 - Check :doc:`ulimits </administration/ulimit/>` settings.
 
 - Use SSD if available and economical. Spinning disks can work well
-  but SSDs capcity for random I/O operations work well with the update
+  but SSDs capacity for random I/O operations work well with the update
   model of :program:`mongod`. See :ref:`production-nfs` for more info.
 
 - Ensure that clients keep reasonable pool sizes to avoid overloading

diff --git a/source/administration/replica-sets.txt b/source/administration/replica-sets.txt
@@ -128,12 +128,13 @@ This reconfigures the set, with the following priority settings:
 
 .. note::
 
-   The current :term:`primary` cannot be assigned a
-   :data:`~local.system.replset.members[n].priority` of 0.
-   If you want to prevent the current primary from being elected
-   primary again, you must demote it using
-   :method:`rs.stepDown()` and then set the appropriate priority
-   with the :method:`rs.reconfig()` method.
+   MongoDB does not permit the current :term:`primary` to have a
+   :data:`~local.system.replset.members[n].priority` of ``0``.  If you
+   want to prevent the current primary from becoming primary, first
+   use :method:`rs.stepDown()` to step down the current primary, and
+   then :ref:`reconfigure the replica set
+   <replica-set-reconfiguration-usage>` with :method:`rs.conf()` and
+   :method:`rs.reconfig()`.
 
 .. seealso:: :data:`~local.system.replset.members[n].priority` and
    :ref:`Replica Set Reconfiguration <replica-set-reconfiguration-usage>`.

diff --git a/source/administration/sharded-clusters.txt b/source/administration/sharded-clusters.txt
@@ -338,7 +338,7 @@ privileges:
 
   - Normal administrative privileges, which provide read-and-write
     access to the admin database and access to all administrative
-    commands, and which provide read-and-write accees to all other
+    commands, and which provide read-and-write access to all other
     databases on that shard.
 
   - Read-only administrative privileges, which provide read-only access

diff --git a/source/administration/snmp.txt b/source/administration/snmp.txt
@@ -202,7 +202,7 @@ You may also choose to specify a the path to the MIB file:
 
 .. code-block:: sh
 
-   nmpwalk -m /usr/share/snmp/mibs/MONGO-MIB -v 2c -c mongodb 127.0.0.1:1161 1.3.6.1.4.1.37601
+   snmpwalk -m /usr/share/snmp/mibs/MONGO-MIB -v 2c -c mongodb 127.0.0.1:1161 1.3.6.1.4.1.37601
 
 Use this command *only* to ensure that you can retrieve and validate
 SNMP data from MongoDB.