From e541d6db9019cb5d8a4916d88532d5cade34bb27 Mon Sep 17 00:00:00 2001
From: Yorik van Havre <yorik@uncreated.net>
Date: Sun, 18 Aug 2013 17:39:30 -0300
Subject: [PATCH] Added favicon to sphinx doc

---
 src/Doc/sphinx/Document.rst        |   5 ++++-
 src/Doc/sphinx/_static/favicon.ico | Bin 0 -> 1150 bytes
 src/Doc/sphinx/conf.py             |   9 +++++----
 3 files changed, 9 insertions(+), 5 deletions(-)
 create mode 100644 src/Doc/sphinx/_static/favicon.ico

diff --git a/src/Doc/sphinx/Document.rst b/src/Doc/sphinx/Document.rst
index 2b8a9d365..86f096883 100644
--- a/src/Doc/sphinx/Document.rst
+++ b/src/Doc/sphinx/Document.rst
@@ -1,9 +1,12 @@
 The FreeCAD Document
 ====================
 
+.. currentmodule:: FreeCAD
+
 .. toctree::
    :maxdepth: 4
 
-.. automodule:: DocumentObject
+.. autoclass:: ActiveDocument
+   :members:
 
 
diff --git a/src/Doc/sphinx/_static/favicon.ico b/src/Doc/sphinx/_static/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..dcefbc956de642e9572e379a00b50592901ec766
GIT binary patch
literal 1150
zcmc(cPe@cz6vof{GrjjlVI0wciYBp8Q_E^(-b`bNG~lEpWr+zgvnqyG?OF&ny2&6S
zA~7iG-y&KBq04Y3E}ESZEu$7KrDe3puXFC3t4?kPTy!7byXW0^e&0FwULu2^h6Ylj
zXcNUa>R`!I3(HV%4*1{y7)hey>7bpO%QG{fljqwBzCqC6|IT(Na3Beg<ExycNsooe
zxwMtB=#RvA4zY(xv-v0?WzetP9(EV==^bAFz3PkN-Gvz54m9I+I)bO&HpHjW%lj(6
z8*nl^e1fQH=~^3B3MZx3rsVSc<5`b`C+xACm00RK=L0@}(8I^cE_}M3!Bi?<m0LXG
zsru7#bsj&pkL=&+3;0N=1KGL|zRV8c<z#RkI<M5zi05Zqy@zdYtDX0M4)87k^?Bv9
zx-m11%{MpHxu=LO%K0x}X~j&NyUl4|>p1g%W&f^!(>IOZ>r+{LeRvh$9*yDi-9fAt
zd+}l9C>9gpJ-pchgc22=P5GYg>HD5e$FX+HSAEFZLZ>D7xTtH(Y#avcQ|xiJ45z=0
zaIOq5%W<kK+}85wu{|}b_!#picn^Gs-Y`&ioi)z!5cgEehyqqC*Y5?~ED*lT8f89L
zBkvVJ^#vFaR$~EX6RSCxYbn2<9O+Q$1<{;E^guL7RQg^K$8!$ReO@p1vp8Q%xWAOo
B@R<Mr

literal 0
HcmV?d00001

diff --git a/src/Doc/sphinx/conf.py b/src/Doc/sphinx/conf.py
index 838eb45bf..6146780a8 100644
--- a/src/Doc/sphinx/conf.py
+++ b/src/Doc/sphinx/conf.py
@@ -60,6 +60,7 @@ if commands.getstatusoutput("locate TemplatePyMod")[0] == 0:
 
 import FreeCAD, FreeCADGui
 FreeCADGui.showMainWindow() # this is needed for complete import of GUI modules
+doc = FreeCAD.newDocument("doc")
 
 # -- General configuration -----------------------------------------------------
 
@@ -84,16 +85,16 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'FreeCAD'
-copyright = u'2011, Jürgen Riegel, Werner Mayer, Yorik van Havre'
+copyright = u'2013, Jürgen Riegel, Werner Mayer, Yorik van Havre'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '0.13'
+version = '0.14'
 # The full version, including alpha/beta/rc tags.
-release = '0.13'
+release = '0.14'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -160,7 +161,7 @@ html_title = "FreeCAD API documentation"
 # The name of an image file (within the static path) to use as favicon of the
 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
 # pixels large.
-html_favicon = "../images/favicon.ico"
+html_favicon = "favicon.ico"
 
 # 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,