From 78494401c5c45d16d632bb2fa9629678e47a98bc Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Wed, 8 Jan 2014 15:22:41 +0000
Subject: Use www.django-rest-framework.org for docs instead of
 django-rest-framework.org due to issues with naked domains

---
 docs/404.html                   | 104 ++++++++++++++++++++--------------------
 docs/api-guide/relations.md     |   2 +-
 docs/index.md                   |   2 +-
 docs/topics/2.2-announcement.md |   2 +-
 4 files changed, 55 insertions(+), 55 deletions(-)

(limited to 'docs')
diff --git a/docs/404.html b/docs/404.html
index 4938da6e..864247e7 100644
--- a/docs/404.html
+++ b/docs/404.html
@@ -3,17 +3,17 @@
 <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <meta charset="utf-8">
     <title>Django REST framework - 404 - Page not found</title>
-    <link href="http://django-rest-framework.org/img/favicon.ico" rel="icon" type="image/x-icon">
-    <link rel="canonical" href="http://django-rest-framework.org/404"/>
+    <link href="http://www.django-rest-framework.org/img/favicon.ico" rel="icon" type="image/x-icon">
+    <link rel="canonical" href="http://www.django-rest-framework.org/404"/>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="Django, API, REST, 404 - Page not found">
     <meta name="author" content="Tom Christie">
 
     <!-- Le styles -->
-    <link href="http://django-rest-framework.org/css/prettify.css" rel="stylesheet">
-    <link href="http://django-rest-framework.org/css/bootstrap.css" rel="stylesheet">
-    <link href="http://django-rest-framework.org/css/bootstrap-responsive.css" rel="stylesheet">
-    <link href="http://django-rest-framework.org/css/default.css" rel="stylesheet">
+    <link href="http://www.django-rest-framework.org/css/prettify.css" rel="stylesheet">
+    <link href="http://www.django-rest-framework.org/css/bootstrap.css" rel="stylesheet">
+    <link href="http://www.django-rest-framework.org/css/bootstrap-responsive.css" rel="stylesheet">
+    <link href="http://www.django-rest-framework.org/css/default.css" rel="stylesheet">
 
     <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
     <!--[if lt IE 9]>
@@ -50,63 +50,63 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </a>
-          <a class="brand" href="http://django-rest-framework.org">Django REST framework</a>
+          <a class="brand" href="http://www.django-rest-framework.org">Django REST framework</a>
           <div class="nav-collapse collapse">
             <ul class="nav">
-              <li><a href="http://django-rest-framework.org">Home</a></li>
+              <li><a href="http://www.django-rest-framework.org">Home</a></li>
               <li class="dropdown">
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown">Tutorial <b class="caret"></b></a>
                 <ul class="dropdown-menu">
-                  <li><a href="http://django-rest-framework.org/tutorial/quickstart">Quickstart</a></li>
-                  <li><a href="http://django-rest-framework.org/tutorial/1-serialization">1 - Serialization</a></li>
-                  <li><a href="http://django-rest-framework.org/tutorial/2-requests-and-responses">2 - Requests and responses</a></li>
-                  <li><a href="http://django-rest-framework.org/tutorial/3-class-based-views">3 - Class based views</a></li>
-                  <li><a href="http://django-rest-framework.org/tutorial/4-authentication-and-permissions">4 - Authentication and permissions</a></li>
-                  <li><a href="http://django-rest-framework.org/tutorial/5-relationships-and-hyperlinked-apis">5 - Relationships and hyperlinked APIs</a></li>
-                  <li><a href="http://django-rest-framework.org/tutorial/6-viewsets-and-routers">6 - Viewsets and routers</a></li>
+                  <li><a href="http://www.django-rest-framework.org/tutorial/quickstart">Quickstart</a></li>
+                  <li><a href="http://www.django-rest-framework.org/tutorial/1-serialization">1 - Serialization</a></li>
+                  <li><a href="http://www.django-rest-framework.org/tutorial/2-requests-and-responses">2 - Requests and responses</a></li>
+                  <li><a href="http://www.django-rest-framework.org/tutorial/3-class-based-views">3 - Class based views</a></li>
+                  <li><a href="http://www.django-rest-framework.org/tutorial/4-authentication-and-permissions">4 - Authentication and permissions</a></li>
+                  <li><a href="http://www.django-rest-framework.org/tutorial/5-relationships-and-hyperlinked-apis">5 - Relationships and hyperlinked APIs</a></li>
+                  <li><a href="http://www.django-rest-framework.org/tutorial/6-viewsets-and-routers">6 - Viewsets and routers</a></li>
                 </ul>
               </li>
               <li class="dropdown">
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown">API Guide <b class="caret"></b></a>
                 <ul class="dropdown-menu">
-                  <li><a href="http://django-rest-framework.org/api-guide/requests">Requests</a></li>
-                  <li><a href="http://django-rest-framework.org/api-guide/responses">Responses</a></li>
-                  <li><a href="http://django-rest-framework.org/api-guide/views">Views</a></li>
-                  <li><a href="http://django-rest-framework.org/api-guide/generic-views">Generic views</a></li>
-                  <li><a href="http://django-rest-framework.org/api-guide/viewsets">Viewsets</a></li>
-                  <li><a href="http://django-rest-framework.org/api-guide/routers">Routers</a></li>
-                  <li><a href="http://django-rest-framework.org/api-guide/parsers">Parsers</a></li>
-                  <li><a href="http://django-rest-framework.org/api-guide/renderers">Renderers</a></li>
-                  <li><a href="http://django-rest-framework.org/api-guide/serializers">Serializers</a></li>
-                  <li><a href="http://django-rest-framework.org/api-guide/fields">Serializer fields</a></li>
-                  <li><a href="http://django-rest-framework.org/api-guide/relations">Serializer relations</a></li>
-                  <li><a href="http://django-rest-framework.org/api-guide/authentication">Authentication</a></li>
-                  <li><a href="http://django-rest-framework.org/api-guide/permissions">Permissions</a></li>
-                  <li><a href="http://django-rest-framework.org/api-guide/throttling">Throttling</a></li>
-                  <li><a href="http://django-rest-framework.org/api-guide/filtering">Filtering</a></li>
-                  <li><a href="http://django-rest-framework.org/api-guide/pagination">Pagination</a></li>
-                  <li><a href="http://django-rest-framework.org/api-guide/content-negotiation">Content negotiation</a></li>
-                  <li><a href="http://django-rest-framework.org/api-guide/format-suffixes">Format suffixes</a></li>
-                  <li><a href="http://django-rest-framework.org/api-guide/reverse">Returning URLs</a></li>
-                  <li><a href="http://django-rest-framework.org/api-guide/exceptions">Exceptions</a></li>
-                  <li><a href="http://django-rest-framework.org/api-guide/status-codes">Status codes</a></li>
-                  <li><a href="http://django-rest-framework.org/api-guide/testing">Testing</a></li>
-                  <li><a href="http://django-rest-framework.org/api-guide/settings">Settings</a></li>
+                  <li><a href="http://www.django-rest-framework.org/api-guide/requests">Requests</a></li>
+                  <li><a href="http://www.django-rest-framework.org/api-guide/responses">Responses</a></li>
+                  <li><a href="http://www.django-rest-framework.org/api-guide/views">Views</a></li>
+                  <li><a href="http://www.django-rest-framework.org/api-guide/generic-views">Generic views</a></li>
+                  <li><a href="http://www.django-rest-framework.org/api-guide/viewsets">Viewsets</a></li>
+                  <li><a href="http://www.django-rest-framework.org/api-guide/routers">Routers</a></li>
+                  <li><a href="http://www.django-rest-framework.org/api-guide/parsers">Parsers</a></li>
+                  <li><a href="http://www.django-rest-framework.org/api-guide/renderers">Renderers</a></li>
+                  <li><a href="http://www.django-rest-framework.org/api-guide/serializers">Serializers</a></li>
+                  <li><a href="http://www.django-rest-framework.org/api-guide/fields">Serializer fields</a></li>
+                  <li><a href="http://www.django-rest-framework.org/api-guide/relations">Serializer relations</a></li>
+                  <li><a href="http://www.django-rest-framework.org/api-guide/authentication">Authentication</a></li>
+                  <li><a href="http://www.django-rest-framework.org/api-guide/permissions">Permissions</a></li>
+                  <li><a href="http://www.django-rest-framework.org/api-guide/throttling">Throttling</a></li>
+                  <li><a href="http://www.django-rest-framework.org/api-guide/filtering">Filtering</a></li>
+                  <li><a href="http://www.django-rest-framework.org/api-guide/pagination">Pagination</a></li>
+                  <li><a href="http://www.django-rest-framework.org/api-guide/content-negotiation">Content negotiation</a></li>
+                  <li><a href="http://www.django-rest-framework.org/api-guide/format-suffixes">Format suffixes</a></li>
+                  <li><a href="http://www.django-rest-framework.org/api-guide/reverse">Returning URLs</a></li>
+                  <li><a href="http://www.django-rest-framework.org/api-guide/exceptions">Exceptions</a></li>
+                  <li><a href="http://www.django-rest-framework.org/api-guide/status-codes">Status codes</a></li>
+                  <li><a href="http://www.django-rest-framework.org/api-guide/testing">Testing</a></li>
+                  <li><a href="http://www.django-rest-framework.org/api-guide/settings">Settings</a></li>
                 </ul>
               </li>
               <li class="dropdown">
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown">Topics <b class="caret"></b></a>
                 <ul class="dropdown-menu">
-                  <li><a href="http://django-rest-framework.org/topics/documenting-your-api">Documenting your API</a></li>
-                  <li><a href="http://django-rest-framework.org/topics/ajax-csrf-cors">AJAX, CSRF & CORS</a></li>
-                  <li><a href="http://django-rest-framework.org/topics/browser-enhancements">Browser enhancements</a></li>
-                  <li><a href="http://django-rest-framework.org/topics/browsable-api">The Browsable API</a></li>
-                  <li><a href="http://django-rest-framework.org/topics/rest-hypermedia-hateoas">REST, Hypermedia & HATEOAS</a></li>
-                  <li><a href="http://django-rest-framework.org/topics/rest-framework-2-announcement">2.0 Announcement</a></li>
-                  <li><a href="http://django-rest-framework.org/topics/2.2-announcement">2.2 Announcement</a></li>
-                  <li><a href="http://django-rest-framework.org/topics/2.3-announcement">2.3 Announcement</a></li>
-                  <li><a href="http://django-rest-framework.org/topics/release-notes">Release Notes</a></li>
-                  <li><a href="http://django-rest-framework.org/topics/credits">Credits</a></li>
+                  <li><a href="http://www.django-rest-framework.org/topics/documenting-your-api">Documenting your API</a></li>
+                  <li><a href="http://www.django-rest-framework.org/topics/ajax-csrf-cors">AJAX, CSRF & CORS</a></li>
+                  <li><a href="http://www.django-rest-framework.org/topics/browser-enhancements">Browser enhancements</a></li>
+                  <li><a href="http://www.django-rest-framework.org/topics/browsable-api">The Browsable API</a></li>
+                  <li><a href="http://www.django-rest-framework.org/topics/rest-hypermedia-hateoas">REST, Hypermedia & HATEOAS</a></li>
+                  <li><a href="http://www.django-rest-framework.org/topics/rest-framework-2-announcement">2.0 Announcement</a></li>
+                  <li><a href="http://www.django-rest-framework.org/topics/2.2-announcement">2.2 Announcement</a></li>
+                  <li><a href="http://www.django-rest-framework.org/topics/2.3-announcement">2.3 Announcement</a></li>
+                  <li><a href="http://www.django-rest-framework.org/topics/release-notes">Release Notes</a></li>
+                  <li><a href="http://www.django-rest-framework.org/topics/credits">Credits</a></li>
                 </ul>
               </li>
             </ul>
@@ -160,7 +160,7 @@
           <div id="main-content" class="span12">
             <h1 id="404-page-not-found" style="text-align: center">404</h1>
             <p style="text-align: center"><strong>Page not found</strong></p>
-            <p style="text-align: center">Try the <a href="http://django-rest-framework.org/">homepage</a>, or <a href="#searchModal" data-toggle="modal">search the documentation</a>.</p>
+            <p style="text-align: center">Try the <a href="http://www.django-rest-framework.org/">homepage</a>, or <a href="#searchModal" data-toggle="modal">search the documentation</a>.</p>
           </div><!--/span-->
         </div><!--/row-->
       </div><!--/.fluid-container-->
@@ -176,9 +176,9 @@
     <!-- Le javascript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
-    <script src="http://django-rest-framework.org/js/jquery-1.8.1-min.js"></script>
-    <script src="http://django-rest-framework.org/js/prettify-1.0.js"></script>
-    <script src="http://django-rest-framework.org/js/bootstrap-2.1.1-min.js"></script>
+    <script src="http://www.django-rest-framework.org/js/jquery-1.8.1-min.js"></script>
+    <script src="http://www.django-rest-framework.org/js/prettify-1.0.js"></script>
+    <script src="http://www.django-rest-framework.org/js/bootstrap-2.1.1-min.js"></script>
     <script>
       //$('.side-nav').scrollspy()
       var shiftWindow = function() { scrollBy(0, -50) };
diff --git a/docs/api-guide/relations.md b/docs/api-guide/relations.md
index 4bee75af..cc4f5585 100644
--- a/docs/api-guide/relations.md
+++ b/docs/api-guide/relations.md
@@ -454,7 +454,7 @@ The [drf-nested-routers package][drf-nested-routers] provides routers and relati
 
 [cite]: http://lwn.net/Articles/193245/
 [reverse-relationships]: https://docs.djangoproject.com/en/dev/topics/db/queries/#following-relationships-backward
-[routers]: http://django-rest-framework.org/api-guide/routers#defaultrouter
+[routers]: http://www.django-rest-framework.org/api-guide/routers#defaultrouter
 [generic-relations]: https://docs.djangoproject.com/en/dev/ref/contrib/contenttypes/#id1
 [2.2-announcement]: ../topics/2.2-announcement.md
 [drf-nested-routers]: https://github.com/alanjds/drf-nested-routers
diff --git a/docs/index.md b/docs/index.md
index 15eaf8d6..b5c3339a 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -1,7 +1,7 @@
 <p class="badges" height=20px>
 <iframe src="http://ghbtns.com/github-btn.html?user=tomchristie&amp;repo=django-rest-framework&amp;type=watch&amp;count=true" class="github-star-button" allowtransparency="true" frameborder="0" scrolling="0" width="110px" height="20px"></iframe>
 
-<a href="https://twitter.com/share" class="twitter-share-button" data-url="django-rest-framework.org" data-text="Checking out the totally awesome Django REST framework! http://django-rest-framework.org" data-count="none"></a>
+<a href="https://twitter.com/share" class="twitter-share-button" data-url="django-rest-framework.org" data-text="Checking out the totally awesome Django REST framework! http://www.django-rest-framework.org" data-count="none"></a>
 <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="http://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
 
 <img src="https://secure.travis-ci.org/tomchristie/django-rest-framework.png?branch=master" class="travis-build-image">
diff --git a/docs/topics/2.2-announcement.md b/docs/topics/2.2-announcement.md
index 0f980e1c..a997c782 100644
--- a/docs/topics/2.2-announcement.md
+++ b/docs/topics/2.2-announcement.md
@@ -151,7 +151,7 @@ From version 2.2 onwards, serializers with hyperlinked relationships *always* re
 [porting-python-3]: https://docs.djangoproject.com/en/dev/topics/python3/
 [python-compat]: https://docs.djangoproject.com/en/dev/releases/1.5/#python-compatibility
 [django-deprecation-policy]: https://docs.djangoproject.com/en/dev/internals/release-process/#internal-release-deprecation-policy
-[credits]: http://django-rest-framework.org/topics/credits
+[credits]: http://www.django-rest-framework.org/topics/credits
 [mailing-list]: https://groups.google.com/forum/?fromgroups#!forum/django-rest-framework
 [django-rest-framework-docs]: https://github.com/marcgibbons/django-rest-framework-docs
 [marcgibbons]: https://github.com/marcgibbons/
-- 
cgit v1.2.3

