IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

#39: spurious <generator ...> was emitted in HTML output. This is due to a

Browse Source 
Jinja bug; the workaround is to just not use empty {% block %} tags.
This commit is contained in:
Georg Brandl 2008-11-16 10:31:31 +01:00
parent 516cc73450
commit b13735f75e
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -156,6 +156,9 @@ New features added
Bugs fixed Bugs fixed
---------- ----------
* Work around a bug in Jinja that caused "<generator ...>" to be
emitted in HTML output.
* Fix a problem with module links not being generated in LaTeX output. * Fix a problem with module links not being generated in LaTeX output.
* Fix the handling of images in different directories. * Fix the handling of images in different directories.

8
sphinx/templates/layout.html
View File

@ -20,7 +20,7 @@
{%- for parent in parents %} {%- for parent in parents %}
<li><a href="{{ parent.link|e }}" accesskey="U">{{ parent.title }}</a>{{ reldelim1 }}</li> <li><a href="{{ parent.link|e }}" accesskey="U">{{ parent.title }}</a>{{ reldelim1 }}</li>
{%- endfor %} {%- endfor %}
{%- block relbaritems %}{% endblock %} {%- block relbaritems %} {% endblock %}
</ul> </ul>
</div> </div>
{%- endmacro %} {%- endmacro %}
@ -143,13 +143,13 @@
<link rel="prev" title="{{ prev.title|striptags }}" href="{{ prev.link|e }}" /> <link rel="prev" title="{{ prev.title|striptags }}" href="{{ prev.link|e }}" />
{%- endif %} {%- endif %}
{%- endblock %} {%- endblock %}
{%- block extrahead %}{% endblock %} {%- block extrahead %} {% endblock %}
</head> </head>
<body> <body>
{%- block relbar1 %}{{ relbar() }}{% endblock %} {%- block relbar1 %}{{ relbar() }}{% endblock %}
{%- block sidebar1 %}{# possible location for sidebar #}{% endblock %} {%- block sidebar1 %} {# possible location for sidebar #} {% endblock %}
{%- block document %} {%- block document %}
<div class="document"> <div class="document">
@ -158,7 +158,7 @@
<div class="bodywrapper"> <div class="bodywrapper">
{%- endif %} {%- endif %}
<div class="body"> <div class="body">
{% block body %}{% endblock %} {% block body %} {% endblock %}
</div> </div>
{%- if builder != 'htmlhelp' %} {%- if builder != 'htmlhelp' %}
</div> </div>

2
sphinx/templates/opensearch.xml
View File

@ -6,5 +6,5 @@
<Url type="text/html" method="get" <Url type="text/html" method="get"
template="{{ use_opensearch }}/{{ pathto('search') }}?q={searchTerms}&amp;check_keywords=yes&amp;area=default"/> template="{{ use_opensearch }}/{{ pathto('search') }}?q={searchTerms}&amp;check_keywords=yes&amp;area=default"/>
<LongName>{{ docstitle }}</LongName> <LongName>{{ docstitle }}</LongName>
{% block extra %}{# Put e.g. an <Image> element here. #}{% endblock %} {% block extra %} {# Put e.g. an <Image> element here. #} {% endblock %}
</OpenSearchDescription> </OpenSearchDescription>