Renamed wagtail.wagtailsites to wagtail.sites

Conflicts:
	docs/advanced_topics/settings.rst
	docs/getting_started/integrating_into_django.rst
	wagtail/project_template/project_name/settings/base.py
	wagtail/sites/views.py
	wagtail/tests/settings.py

.tx/config

@@ -62,8 +62,8 @@ source_lang = en
 type = PO
 
 [wagtail.wagtailsites]
-file_filter = wagtail/wagtailsites/locale/<lang>/LC_MESSAGES/django.po
-source_file = wagtail/wagtailsites/locale/en/LC_MESSAGES/django.po
+file_filter = wagtail/sites/locale/<lang>/LC_MESSAGES/django.po
+source_file = wagtail/sites/locale/en/LC_MESSAGES/django.po
 source_lang = en
 type = PO
 

docs/advanced_topics/settings.rst

@@ -63,7 +63,7 @@ Apps (``settings.py``)
     'wagtail.wagtailforms',
     'wagtail.wagtailredirects',
     'wagtail.embeds',
-    'wagtail.wagtailsites',
+    'wagtail.sites',
     'wagtail.wagtailusers',
     'wagtail.wagtailsnippets',
     'wagtail.documents',
@@ -505,7 +505,7 @@ These two files should reside in your project directory (``myproject/myproject/`
       'wagtail.wagtailforms',
       'wagtail.wagtailredirects',
       'wagtail.embeds',
-      'wagtail.wagtailsites',
+      'wagtail.sites',
       'wagtail.wagtailusers',
       'wagtail.wagtailsnippets',
       'wagtail.documents',

docs/getting_started/integrating_into_django.rst

@@ -23,7 +23,7 @@ In your settings file, add the following apps to ``INSTALLED_APPS``:
     'wagtail.wagtailforms',
     'wagtail.wagtailredirects',
     'wagtail.embeds',
-    'wagtail.wagtailsites',
+    'wagtail.sites',
     'wagtail.wagtailusers',
     'wagtail.wagtailsnippets',
     'wagtail.documents',

wagtail/project_template/project_name/settings/base.py

@@ -32,7 +32,7 @@ INSTALLED_APPS = [
     'wagtail.wagtailforms',
     'wagtail.wagtailredirects',
     'wagtail.embeds',
-    'wagtail.wagtailsites',
+    'wagtail.sites',
     'wagtail.wagtailusers',
     'wagtail.wagtailsnippets',
     'wagtail.documents',

wagtail/sites/views.py

@@ -6,7 +6,7 @@ from wagtail.admin.views import generic
 from wagtail.admin.viewsets.model import ModelViewSet
 from wagtail.core.models import Site
 from wagtail.core.permissions import site_permission_policy
-from wagtail.wagtailsites.forms import SiteForm
+from wagtail.sites.forms import SiteForm
 
 
 class IndexView(generic.IndexView):

wagtail/tests/settings.py

@@ -122,7 +122,7 @@ INSTALLED_APPS = (
     'wagtail.search',
     'wagtail.embeds',
     'wagtail.images',
-    'wagtail.wagtailsites',
+    'wagtail.sites',
     'wagtail.wagtailusers',
     'wagtail.wagtailsnippets',
     'wagtail.documents',