From 3d3bcb00dfbd8f7cc973371e075d0f931af6649c Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Wed, 24 Sep 2008 11:48:43 +0000
Subject: [PATCH] Rename rellinks to linktags.

---
 CHANGES                      |  3 +++
 doc/templating.rst           | 12 ++++++------
 sphinx/templates/layout.html |  7 +++----
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/CHANGES b/CHANGES
index 288f4d719..f16cf937a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -78,6 +78,9 @@ New features added
 * Added new events: ``env-updated``, ``missing-reference``,
   ``build-finished``.
 
+* The ``rellinks`` block in the layout template is now called
+  ``linktags`` to avoid confusion with the relbar links.
+
 
 Release 0.4.2 (Jul 29, 2008)
 ============================
diff --git a/doc/templating.rst b/doc/templating.rst
index bbb9effff..61a8a72b0 100644
--- a/doc/templating.rst
+++ b/doc/templating.rst
@@ -82,7 +82,7 @@ The following blocks exist in the ``layout`` template:
     idea not to change it unless you want to switch to HTML 5 or a different but
     compatible XHTML doctype.
 
-`rellinks`
+`linktags`
     This block adds a couple of ``<link>`` tags to the head section of the
     template.
 
@@ -102,11 +102,11 @@ The following blocks exist in the ``layout`` template:
 
 `rootrellink` / `relbaritems`
     Inside the relbar there are three sections: The `rootrellink`, the links
-    from the documentation and the `relbaritems`.  The `rootrellink` is a block
-    that by default contains a list item pointing to the master document by
-    default, the `relbaritems` is an empty block.  If you override them to add
-    extra links into the bar make sure that they are list items and end with the
-    :data:`reldelim1`.
+    from the documentation and the custom `relbaritems`.  The `rootrellink` is a
+    block that by default contains a list item pointing to the master document
+    by default, the `relbaritems` is an empty block.  If you override them to
+    add extra links into the bar make sure that they are list items and end with
+    the :data:`reldelim1`.
 
 `document`
     The contents of the document itself.
diff --git a/sphinx/templates/layout.html b/sphinx/templates/layout.html
index c6cc20df2..a5cb52883 100644
--- a/sphinx/templates/layout.html
+++ b/sphinx/templates/layout.html
@@ -15,7 +15,7 @@
           {%- if not loop.first %}{{ reldelim2 }}{% endif %}</li>
         {%- endfor %}
         {%- block rootrellink %}
-        <li><a href="{{ pathto('index') }}">{{ shorttitle }}</a>{{ reldelim1 }}</li>
+        <li><a href="{{ pathto(master_doc) }}">{{ shorttitle }}</a>{{ reldelim1 }}</li>
         {%- endblock %}
         {%- for parent in parents %}
           <li><a href="{{ parent.link|e }}" accesskey="U">{{ parent.title }}</a>{{ reldelim1 }}</li>
@@ -122,12 +122,11 @@
     <link rel="shortcut icon" href="{{ pathto('_static/' + favicon, 1) }}"/>
     {%- endif %}
     {%- endif %}
-{%- block rellinks %}
+{%- block linktags %}
     {%- if hasdoc('about') %}
     <link rel="author" title="{{ _('About these documents') }}" href="{{ pathto('about') }}" />
     {%- endif %}
-    <link rel="contents" title="{{ _('Global table of contents') }}" href="{{ pathto('contents') }}" />
-    <link rel="index" title="{{ _('Global index') }}" href="{{ pathto('genindex') }}" />
+    <link rel="index" title="{{ _('Index') }}" href="{{ pathto('genindex') }}" />
     <link rel="search" title="{{ _('Search') }}" href="{{ pathto('search') }}" />
     {%- if hasdoc('copyright') %}
     <link rel="copyright" title="{{ _('Copyright') }}" href="{{ pathto('copyright') }}" />