Skip to content
Browse files

Merge branch 'release/0.4.1'

  • Loading branch information...
2 parents 53c5de7 + c663867 commit b18b857a2dc6a4592608b49ff2c5b68016ab5ac2 @jezdez jezdez committed
Showing with 25 additions and 33 deletions.
  1. +1 −0 MANIFEST.in
  2. +7 −7 README.rst
  3. +1 −1 appconf.py
  4. +5 −0 docs/changelog.rst
  5. +2 −2 docs/conf.py
  6. +7 −1 docs/index.rst
  7. +0 −20 docs/installation.rst
  8. +2 −2 docs/usage.rst
View
1 MANIFEST.in
@@ -1,3 +1,4 @@
include README.rst
include LICENSE
include AUTHORS
+recursive-include docs *
View
14 README.rst
@@ -37,20 +37,20 @@ an inner ``Meta`` class::
from appconf import AppConf
- class MyAppConf(AppConf):
+ class AcmeAppConf(AppConf):
SETTING_1 = "one"
SETTING_2 = (
"two",
)
- class Meta:
- prefix = 'acme'
+ class Meta:
+ prefix = 'acme'
The ``MyAppConf`` class will automatically look at Django's global settings
to determine if you've overridden it. For example, adding this to your site's
``settings.py`` would override ``SETTING_1`` of the above ``MyAppConf``::
- MYAPP_SETTING_1 = "uno"
+ ACME_SETTING_1 = "uno"
In case you want to use a different settings object instead of the default
``'django.conf.settings'``, set the ``holder`` attribute of the inner
@@ -64,6 +64,6 @@ In case you want to use a different settings object instead of the default
"two",
)
- class Meta:
- prefix = 'acme'
- holder = 'acme.conf.settings'
+ class Meta:
+ prefix = 'acme'
+ holder = 'acme.conf.settings'
View
2 appconf.py
@@ -1,7 +1,7 @@
import sys
# following PEP 386, versiontools will pick it up
-__version__ = (0, 4, 0, "final", 0)
+__version__ = (0, 4, 1, "final", 0)
class AppConfOptions(object):
View
5 docs/changelog.rst
@@ -1,6 +1,11 @@
Changelog
=========
+0.4.1 (2011-09-09)
+------------------
+
+* Fixed minor issue in installation documentation.
+
0.4 (2011-08-24)
----------------
View
4 docs/conf.py
@@ -50,7 +50,7 @@
# The short X.Y version.
version = '0.4'
# The full version, including alpha/beta/rc tags.
-release = '0.4'
+release = '0.4.1'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
@@ -120,7 +120,7 @@
# 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']
# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
# using the given strftime format.
View
8 docs/index.rst
@@ -1,12 +1,18 @@
.. include:: ../README.rst
+Installation
+============
+
+Install django-appconf with your favorite Python package manager, e.g.::
+
+ pip install django-appconf
+
Contents
========
.. toctree::
:maxdepth: 1
- installation
usage
reference
changelog
View
20 docs/installation.rst
@@ -1,20 +0,0 @@
-Installation
-============
-
-* Install django-appconf with your favorite Python package manager::
-
- pip install django-appconf
-
-* Add ``'appconf'`` to your ``INSTALLED_APPS`` setting::
-
- INSTALLED_APPS = (
- # other apps
- "appconf",
- )
-
-
-.. _staticfiles: http://docs.djangoproject.com/en/dev/ref/contrib/staticfiles/
-.. _django-staticfiles: http://pypi.python.org/pypi/django-staticfiles
-
-.. _dependencies:
-
View
4 docs/usage.rst
@@ -27,8 +27,8 @@ attribute of the inner ``Meta`` class to ``True``::
"two",
)
- class Meta:
- proxy = True
+ class Meta:
+ proxy = True
myapp_settings = MyAppConf()

0 comments on commit b18b857

Please sign in to comment.
Something went wrong with that request. Please try again.