[soc2010/query-refactor] Merged up to trunk r13556, resolved merge conflictsarchive/soc2010/query-refactorsoc2010/query-refactor

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/query-refactor@13565 bcc190cf-cafb-0310-a4f2-bffc1f526a37

4 files changed, 0 insertions, 134 deletions

diff --git a/docs/_templates/genindex.html b/docs/_templates/genindex.html
deleted file mode 100644
index 60c19efd45..0000000000
--- a/docs/_templates/genindex.html
+++ /dev/null
@@ -1,4 +0,0 @@
-{% extends "!genindex.html" %}
-
-{% block bodyclass %}{% endblock %}
-{% block sidebarwrapper %}{% endblock %}
\ No newline at end of file
diff --git a/docs/_templates/layout.html b/docs/_templates/layout.html
deleted file mode 100644
index 70e029c3ac..0000000000
--- a/docs/_templates/layout.html
+++ /dev/null
@@ -1,124 +0,0 @@
-{% extends "!layout.html" %}
-
-{%- macro secondnav() %}
-  {%- if prev %}
-    &laquo; <a href="{{ prev.link|e }}" title="{{ prev.title|e }}">previous</a> 
-    {{ reldelim2 }}
-  {%- endif %}
-  {%- if parents %}
-    <a href="{{ parents.0.link|e }}" title="{{ parents.0.title|e }}" accesskey="U">up</a> 
-  {%- else %}
-    <a title="{{ docstitle }}" href="{{ pathto('index') }}" accesskey="U">up</a> 
-  {%- endif %}
-  {%- if next %}
-  {{ reldelim2 }}
-    <a href="{{ next.link|e }}" title="{{ next.title|e }}">next</a> &raquo;
-  {%- endif %}
-{%- endmacro %}
-
-{% block extrahead %}
-{{ super() }}
-<script type="text/javascript" src="{{ pathto('templatebuiltins.js', 1) }}"></script>
-<script type="text/javascript">
-(function($) {
-    if (!django_template_builtins) {
-       // templatebuiltins.js missing, do nothing.
-       return;
-    }
-    $(document).ready(function() {
-        // Hyperlink Django template tags and filters
-        var base = "{{ pathto('ref/templates/builtins') }}";
-        if (base == "#") {
-            // Special case for builtins.html itself
-            base = "";
-        }
-        // Tags are keywords, class '.k'
-        $("div.highlight\\-html\\+django span.k").each(function(i, elem) {
-             var tagname = $(elem).text();
-             if ($.inArray(tagname, django_template_builtins.ttags) != -1) {
-                 var fragment = tagname.replace(/_/, '-');
-                 $(elem).html("<a href='" + base + "#" + fragment + "'>" + tagname + "</a>");
-             }
-        });
-        // Filters are functions, class '.nf'
-        $("div.highlight\\-html\\+django span.nf").each(function(i, elem) {
-             var filtername = $(elem).text();
-             if ($.inArray(filtername, django_template_builtins.tfilters) != -1) {
-                 var fragment = filtername.replace(/_/, '-');
-                 $(elem).html("<a href='" + base + "#" + fragment + "'>" + filtername + "</a>");
-             }
-        });
-    });
-})(jQuery);
-</script>
-{% endblock %}
-
-{% block document %}
-  <div id="custom-doc" class="{% block bodyclass %}{{ 'yui-t6' if pagename != 'index' else '' }}{% endblock %}">
-    <div id="hd">
-      <h1><a href="{{ pathto('index') }}">{{ docstitle }}</a></h1>
-      <div id="global-nav">
-        <a title="Home page" href="{{ pathto('index') }}">Home</a> {{ reldelim2 }}
-        <a title="Table of contents" href="{{ pathto('contents') }}">Table of contents</a> {{ reldelim2 }}
-        <a title="Global index" href="{{ pathto('genindex') }}">Index</a> {{ reldelim2 }}
-        <a title="Module index" href="{{ pathto('modindex') }}">Modules</a>
-      </div>
-      <div class="nav">{{ secondnav() }}</div>
-    </div>
-    
-    <div id="bd">
-      <div id="yui-main">
-        <div class="yui-b">
-          <div class="yui-g" id="{{ pagename|replace('/', '-') }}">
-            {% block body %}{% endblock %}
-          </div>         
-        </div>
-      </div>
-      {% block sidebarwrapper %}
-        {% if pagename != 'index' %}
-          <div class="yui-b" id="sidebar">
-            {{ sidebar() }}
-            {%- if last_updated %}
-              <h3>Last update:</h3>
-              <p class="topless">{{ last_updated }}</p>
-            {%- endif %}
-          </div> 
-        {% endif %}
-      {% endblock %}
-    </div>
-    
-    <div id="ft">
-      <div class="nav">{{ secondnav() }}</div>
-    </div>
-  </div>
-{% endblock %}
-
-{% block sidebarrel %}
-  <h3>Browse</h3>
-  <ul>
-    {% if prev %}
-      <li>Prev: <a href="{{ prev.link }}">{{ prev.title }}</a></li>
-    {% endif %}
-    {% if next %}
-      <li>Next: <a href="{{ next.link }}">{{ next.title }}</a></li>
-    {% endif %}
-  </ul>
-  <h3>You are here:</h3>
-  <ul>
-      <li>
-        <a href="{{ pathto('index') }}">{{ docstitle }}</a>
-        {% for p in parents %}
-          <ul><li><a href="{{ p.link }}">{{ p.title }}</a>
-        {% endfor %}
-        <ul><li>{{ title }}</li></ul>
-        {% for p in parents %}</li></ul>{% endfor %}
-      </li>
-  </ul>  
-{% endblock %}
-
-{# Empty some default blocks out #}
-{% block relbar1 %}{% endblock %}
-{% block relbar2 %}{% endblock %}
-{% block sidebar1 %}{% endblock %}
-{% block sidebar2 %}{% endblock %}
-{% block footer %}{% endblock %}
\ No newline at end of file
diff --git a/docs/_templates/modindex.html b/docs/_templates/modindex.html
deleted file mode 100644
index 96a1d2080a..0000000000
--- a/docs/_templates/modindex.html
+++ /dev/null
@@ -1,3 +0,0 @@
-{% extends "!modindex.html" %}
-{% block bodyclass %}{% endblock %}
-{% block sidebarwrapper %}{% endblock %}
\ No newline at end of file
diff --git a/docs/_templates/search.html b/docs/_templates/search.html
deleted file mode 100644
index 8bd6dbd332..0000000000
--- a/docs/_templates/search.html
+++ /dev/null
@@ -1,3 +0,0 @@
-{% extends "!search.html" %}
-{% block bodyclass %}{% endblock %}
-{% block sidebarwrapper %}{% endblock %}
\ No newline at end of file