CDRIVER-1979 simpler config, copyrights

Author: ajdavis

doc/Makefile.am

@@ -1,10 +1,8 @@
 EXTRA_DIST += $(wildcard doc/*.rst)
 
-# TODO: remove libbson-objects.inv once libbson's Sphinx docs are on mongoc.org
 EXTRA_DIST += \
   doc/conf.py \
   doc/githubpages.py \
-  doc/libbson-objects.inv \
   doc/mongoc/__init__.py \
   doc/mongoc-theme/globaltoc.html \
   doc/mongoc-theme/layout.html \

doc/conf.py

@@ -7,17 +7,14 @@
 
 extensions = [
     'mongoc',
-    'githubpages',
     'taglist',
     'sphinx.ext.intersphinx',
 ]
 
 intersphinx_mapping = {
-    # TODO: update to mongoc.org once libbson 1.6.0 is released, replace
-    # 'libbson-objects.inv' here with None and delete the file. Remove from
-    # doc/Makefile.am too.
-    'bson': ('https://s3.amazonaws.com/mciuploads/libbson/docs/latest/',
-             'libbson-objects.inv'),
+    # TODO: update to http://mongoc.org/libbson/%(version)s once libbson 1.6.0
+    # is released.
+    'bson': ('http://mongoc.org/libbson/current', None),
 }
 
 # General information about the project.