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 cassandra-4.0

This commit is contained in:
Mick Semb Wever 2021-06-25 12:59:21 +02:00
parent 26e21bb576 b3cdc131ab
commit 6fc0715fe0
No known key found for this signature in database
GPG Key ID: E91335D77E3E87CB
4 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,10 +1,10 @@
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
{% extends "layout.html" %}
{# Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
@ -12,9 +12,7 @@
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
{% extends "layout.html" %}
limitations under the License. #}
{%- block htmltitle -%}
<title>{{ html_title }}</title>
{%- endblock -%}

7
doc/source/_theme/cassandra_theme/defindex.html
View File

@ -1,4 +1,5 @@
<!--
---
{#
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
@ -12,9 +13,7 @@
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitatins under the License.
-->
---
limitatins under the License. #}
layout: doclandingpage
title: "Documentation"
is_homepage: false

7
doc/source/_theme/cassandra_theme/layout.html
View File

@ -1,4 +1,5 @@
<!--
---
{#
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
@ -12,9 +13,7 @@
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
---
limitations under the License. #}
layout: docpage
{% block title %}
title: "Documentation"

6
doc/source/_theme/cassandra_theme/search.html
View File

@ -1,5 +1,4 @@
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
{# Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
@ -12,8 +11,7 @@
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
limitations under the License. #}
{%- extends "layout.html" %}
{% block title %}
title: "{{_('Search')}}"