natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-3.11' into trunk

This commit is contained in:
Mick Semb Wever 2021-04-07 17:53:03 +02:00
parent a1210aa28d 6edd7db751
commit 7ccb4a0e24
No known key found for this signature in database
GPG Key ID: E91335D77E3E87CB
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
doc/source/_templates/indexcontent.html
View File

@ -1,5 +1,12 @@
{% extends "defindex.html" %} {% extends "layout.html" %}
{% block tables %} {%- 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. <div id="wipwarning">This documentation is a work-in-progress.
<a href="{{ pathto("bugs") }}">Contributions</a> are welcome.</div> <a href="{{ pathto("bugs") }}">Contributions</a> are welcome.</div>

1
doc/source/_util/cql.py
View File

@ -43,7 +43,6 @@ from pygments.lexer import Lexer, RegexLexer, do_insertions, bygroups, words
from pygments.token import Punctuation, Whitespace, Error, \ from pygments.token import Punctuation, Whitespace, Error, \
Text, Comment, Operator, Keyword, Name, String, Number, Generic, Literal Text, Comment, Operator, Keyword, Name, String, Number, Generic, Literal
from pygments.lexers import get_lexer_by_name, ClassNotFound from pygments.lexers import get_lexer_by_name, ClassNotFound
from pygments.util import iteritems
__all__ = [ 'CQLLexer' ] __all__ = [ 'CQLLexer' ]