diff options
| -rw-r--r-- | README.md | 13 | ||||
| -rw-r--r-- | docs/index.md | 13 | ||||
| -rw-r--r-- | docs/topics/release-notes.md | 16 | ||||
| -rw-r--r-- | rest_framework/runtests/settings.py | 1 |
4 files changed, 9 insertions, 34 deletions
@@ -60,18 +60,7 @@ Add `'rest_framework'` to your `INSTALLED_APPS` setting. 'rest_framework', ) -## Browseable API requirements - -If you're intending to use the browseable API you'll also want to also ensure you include `'django.contrib.staticfiles'` in your `INSTALLED_APPS` setting. - - INSTALLED_APPS = ( - ... - 'django.contrib.staticfiles', - 'rest_framework', - ) - -You'll proabably also want to add REST framework's login and logout views. -Add the following to your root `urls.py` file. +If you're intending to use the browseable API you'll probably also want to add REST framework's login and logout views. Add the following to your root `urls.py` file. urlpatterns = patterns('', ... diff --git a/docs/index.md b/docs/index.md index 5d90e9e5..69d972d0 100644 --- a/docs/index.md +++ b/docs/index.md @@ -59,18 +59,7 @@ Add `'rest_framework'` to your `INSTALLED_APPS` setting. 'rest_framework', ) -### Browseable API requirements - -If you're intending to use the browseable API you'll also want to also ensure you include `'django.contrib.staticfiles'` in your `INSTALLED_APPS` setting. - - INSTALLED_APPS = ( - ... - 'django.contrib.staticfiles', - 'rest_framework', - ) - -You'll proabably also want to add REST framework's login and logout views. -Add the following to your root `urls.py` file. +If you're intending to use the browseable API you'll probably also want to add REST framework's login and logout views. Add the following to your root `urls.py` file. urlpatterns = patterns('', ... diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index 1934292c..0a17f1a6 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -10,20 +10,18 @@ Minor version numbers (0.0.x) are used for changes that are API compatible. You Medium version numbers (0.x.0) may include minor API changes. You should read the release notes carefully before upgrading between medium point releases. -## 2.2.x series +Major version numbers (x.0.0) are reserved for project milestones. No major point releases are currently planned. -### 2.2.0 +--- -**Date**: 27th Dec 2012 +## 2.1.x series -* Support configurable `STATICFILES_STORAGE` storage. -* Bugfix: Related fields now respect the required flag, and may be required=False. +### 2.1.13 -**API-incompatible changes**: From 2.2.0 Onwards you must make sure to include `'django.contrib.staticfiles'` in your `INSTALLED_APPS`. This is in line with Django's 1.4's recommended usage of [the `'staticfiles'` template tag][staticfiles14] instead of Django 1.3's recommended usage of [the `'static'` template tag][staticfiles13]. +**Date**: 28th Dec 2012 ---- - -## 2.1.x series +* Support configurable `STATICFILES_STORAGE` storage. +* Bugfix: Related fields now respect the required flag, and may be required=False. ### 2.1.12 diff --git a/rest_framework/runtests/settings.py b/rest_framework/runtests/settings.py index 90fbaa98..dd5d9dc3 100644 --- a/rest_framework/runtests/settings.py +++ b/rest_framework/runtests/settings.py @@ -91,7 +91,6 @@ INSTALLED_APPS = ( 'django.contrib.sessions', 'django.contrib.sites', 'django.contrib.messages', - 'django.contrib.staticfiles', # Uncomment the next line to enable the admin: # 'django.contrib.admin', # Uncomment the next line to enable admin documentation: |