Merge branch 'master' into docs

README.rst

@@ -7,9 +7,9 @@ Flask-Admin
 Introduction
 ------------
 
-Flask-Admin is a batteries-included, simple-to-use Flask extension that lets you add admin interfaces to Flask
-applications. It is inspired by the *django-admin* package, but implemented in such a way that the developer has total control
-of the look, feel and functionality of the resulting application.
+Flask-Admin is a batteries-included, simple-to-use `Flask <http://flask.pocoo.org/>`_ extension that lets you
+add admin interfaces to Flask applications. It is inspired by the *django-admin* package, but implemented in such
+a way that the developer has total control of the look, feel and functionality of the resulting application.
 
 Out-of-the-box, Flask-Admin plays nicely with various ORM's, including
 

doc/_themes/flask/theme.conf

@@ -4,7 +4,7 @@ stylesheet = flasky.css
 pygments_style = flask_theme_support.FlaskyStyle
 
 [options]
-index_logo =
-index_logo_height = 120px
+index_logo = 'flask-admin.png'
+index_logo_height = 140px
 touch_icon =
 github_fork = 'mrjoes/flask-admin'

doc/conf.py

@@ -115,12 +115,12 @@ html_theme_path = ['_themes']
 
 # The name of an image file (relative to this directory) to place at the top
 # of the sidebar.
-#html_logo = None
+#html_logo = '_static/flask.png'
 
 # 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 = None
+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,
@@ -129,7 +129,7 @@ html_static_path = ['_static']
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
-#html_last_updated_fmt = '%b %d, %Y'
+html_last_updated_fmt = '%b %d, %Y'
 
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.

doc/index.rst

 Flask-Admin
 ===========
 
-Flask-Admin is simple and extensible administrative interface framework for `Flask <http://flask.pocoo.org/>`_.
+Flask-Admin is a batteries-included, simple-to-use `Flask <http://flask.pocoo.org/>`_ extension that lets you
+add admin interfaces to Flask applications. It is inspired by the *django-admin* package, but implemented in such
+a way that the developer has total control of the look, feel and functionality of the resulting application.
+
+Browse through the documentation below to learn more about what you can do with Flask-Admin. Or head over to
+`our GitHub repository <http://github.com/mrjoes/flask-admin>`_ to find out how you can contribute to the project.
 
 .. toctree::
    :maxdepth: 2