diff --git a/docs/conf.py b/docs/conf.py
index e5884c597..3c87985c5 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -57,7 +57,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = 'Gramps'
-copyright = '2015, The Gramps Project'
+copyright = '2016, The Gramps Project'
 author = 'Donald N. Allingham'
 
 # The version info for the project you're documenting, acts as replacement for
@@ -147,7 +147,8 @@ html_theme = 'classic'
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+#html_static_path = ['_static']
+html_static_path = []
 
 # Add any extra paths that contain custom files (such as robots.txt or
 # .htaccess) here, relative to this directory. These files are copied
diff --git a/docs/coregui/gui_widgets.rst b/docs/coregui/gui_widgets.rst
index 425b5cec2..09f25fe99 100644
--- a/docs/coregui/gui_widgets.rst
+++ b/docs/coregui/gui_widgets.rst
@@ -401,10 +401,6 @@ Validated Combo Entry
 Validated Masked Entry
 *****************************
 .. automodule:: gramps.gui.widgets.validatedmaskedentry
-.. autoclass:: FadeOut
-   :members:
-   :undoc-members:
-   :show-inheritance:
 .. autoclass:: MaskedEntry
    :members:
    :undoc-members:
diff --git a/docs/date.rst b/docs/date.rst
index 8db5a22a0..123221cd7 100644
--- a/docs/date.rst
+++ b/docs/date.rst
@@ -257,7 +257,7 @@ DateHandler (Serbian)
    :members:
    :undoc-members:
    :show-inheritance:
-.. autoclass:: gramps.gen.datehandler._date_sr.DateDisplaySR_latin
+.. autoclass:: gramps.gen.datehandler._date_sr.DateDisplaySR_Latin
    :members:
    :undoc-members:
    :show-inheritance:
diff --git a/docs/gen/gen_lib.rst b/docs/gen/gen_lib.rst
index 6525f99f6..776cd37c5 100644
--- a/docs/gen/gen_lib.rst
+++ b/docs/gen/gen_lib.rst
@@ -218,7 +218,7 @@ Citation
 
 Media Object
 ====================================
-.. automodule:: gramps.gen.lib.mediaobj
+.. automodule:: gramps.gen.lib.media
 .. autoclass:: Media
    :members:
    :undoc-members:
@@ -565,15 +565,3 @@ UrlType
    :undoc-members:
    :show-inheritance:
 
-*****************************
-Privacy
-*****************************
-
-PrivateSourceNote
-=================
-
-.. automodule:: gramps.gen.lib.privsrcnote
-.. autoclass:: PrivateSourceNote
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/update_doc.py b/docs/update_doc.py
index 13a0eaf86..af7a1b21d 100644
--- a/docs/update_doc.py
+++ b/docs/update_doc.py
@@ -42,7 +42,7 @@ SPHINXBUILD   = 'sphinx-build'
 if sys.platform == 'win32':
     pythonCmd = os.path.join(sys.prefix, 'bin', 'python.exe')
     sphinxCmd = os.path.join(sys.prefix, 'bin', 'sphinx-build.exe')
-elif sys.platform in ['linux2', 'darwin', 'cygwin']:
+elif sys.platform in ['linux', 'linux2', 'darwin', 'cygwin']:
     pythonCmd = os.path.join(sys.prefix, 'bin', 'python')
     sphinxCmd = SPHINXBUILD
 else:
@@ -62,7 +62,7 @@ def tests():
         print ('Please, install python')
 
     try:
-        print("\n=================='Shpinx-build'=============================\n")
+        print("\n=================='sphinx-build'=============================\n")
         os.system('''%(program)s''' % {'program': sphinxCmd})
     except:
         print ('Please, install sphinx')