This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/cassandra-3.11 by this push:
new 6edd7db Eliminate gen-doc template warning and unused (problematic)
import
6edd7db is described below
commit 6edd7db751bb571887c84cb2f92e8226e8dd7017
Author: Angelo Polo <[email protected]>
AuthorDate: Thu Oct 8 15:20:15 2020 +0200
Eliminate gen-doc template warning and unused (problematic) import
gen-doc is now python3 compatible
patch by Angelo Polo; reviewed by Ekaterina Dimitrova, Mick Semb Wever for
CASSANDRA-16206
---
doc/source/_templates/indexcontent.html | 13 ++++++++++---
doc/source/_util/cql.py | 1 -
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/doc/source/_templates/indexcontent.html
b/doc/source/_templates/indexcontent.html
index 5d4b485..a95191c 100644
--- a/doc/source/_templates/indexcontent.html
+++ b/doc/source/_templates/indexcontent.html
@@ -1,6 +1,13 @@
-{% extends "defindex.html" %}
-{% block tables %}
-<div id="wipwarning">This documentation is currently a work-in-progress and
contains a number of TODO sections.
+{% extends "layout.html" %}
+{%- block htmltitle -%}
+<title>{{ html_title }}</title>
+{%- endblock -%}
+{% block body %}
+ <h1>{{ docstitle|e }}</h1>
+ <p>
+ {% trans %}Welcome! This is the documentation for Apache Cassandra {{
version }}.{% endtrans %}
+ </p>
+<div id="wipwarning">This documentation is a work-in-progress.
<a href="{{ pathto("bugs") }}">Contributions</a> are welcome.</div>
<h3>Main documentation</h3>
diff --git a/doc/source/_util/cql.py b/doc/source/_util/cql.py
index 673fbcf..023700b 100644
--- a/doc/source/_util/cql.py
+++ b/doc/source/_util/cql.py
@@ -43,7 +43,6 @@ from pygments.lexer import Lexer, RegexLexer, do_insertions,
bygroups, words
from pygments.token import Punctuation, Whitespace, Error, \
Text, Comment, Operator, Keyword, Name, String, Number, Generic, Literal
from pygments.lexers import get_lexer_by_name, ClassNotFound
-from pygments.util import iteritems
__all__ = [ 'CQLLexer' ]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
