Rearrange includes at docs+changelog and move description templates (ClickHouse#10472)

* temp commit

* rearrange includes

Author: blinkov

CHANGELOG.md

@@ -1,9 +1,3 @@
----
-toc_folder_title: Changelog
-toc_priority: 74
-toc_title: '2020'
----
-
 ## ClickHouse release v20.3
 
 ### ClickHouse release v20.3.7.46, 2020-04-17

docs/README.md

@@ -193,10 +193,10 @@ When writing docs, you can use prepared templates. Copy the code of a template a
 
 Templates:
 
-- [Function](dscr-templates/template-function.md)
-- [Setting](dscr-templates/template-setting.md)
-- [Table engine](dscr-templates/template-table-engine.md)
-- [System table](dscr-templates/template-system-table.md)
+- [Function](_description_templates/template-function.md)
+- [Setting](_description_templates/template-setting.md)
+- [Table engine](_description_templates/template-table-engine.md)
+- [System table](_description_templates/template-system-table.md)
 
 
 <a name="how-to-build-docs"/>

docs/dscr-templates/template-function.md renamed to docs/_description_templates/template-function.md

@@ -0,0 +1 @@
+../../../CHANGELOG.md

docs/dscr-templates/template-setting.md renamed to docs/_description_templates/template-setting.md

@@ -58,5 +58,5 @@ LIMIT 10
 ```
 
 ``` text
-{% include "operations/performance/sampling_query_profiler_example_result.txt" %}
+{% include "examples/sampling_query_profiler_result.txt" %}
 ```

docs/dscr-templates/template-system-table.md renamed to docs/_description_templates/template-system-table.md

@@ -0,0 +1,7 @@
+---
+toc_folder_title: Changelog
+toc_priority: 74
+toc_title: '2020'
+---
+
+{% include 'content/changelog.md' %}

docs/dscr-templates/template-table-engine.md renamed to docs/_description_templates/template-table-engine.md

@@ -60,5 +60,5 @@ LIMIT 10
 ```
 
 ``` text
-{% include "operations/performance/sampling_query_profiler_example_result.txt" %}
+{% include "examples/sampling_query_profiler_result.txt" %}
 ```

docs/_includes/content/changelog.md

@@ -61,5 +61,5 @@ LIMIT 10
 ```
 
 ``` text
-{% include "operations/performance/sampling_query_profiler_example_result.txt" %}
+{% include "examples/sampling_query_profiler_result.txt" %}
 ```

docs/en/operations/performance/sampling_query_profiler_example_result.txt renamed to docs/_includes/examples/sampling_query_profiler_result.txt

@@ -60,5 +60,5 @@ LIMIT 10
 ```
 
 ``` text
-{% include "operations/performance/sampling_query_profiler_example_result.txt" %}
+{% include "examples/sampling_query_profiler_result.txt" %}
 ```

docs/en/operations/optimizing_performance/sampling_query_profiler.md

@@ -60,5 +60,5 @@ LIMIT 10
 ```
 
 ``` text
-{% include "operations/performance/sampling_query_profiler_example_result.txt" %}
+{% include "examples/sampling_query_profiler_result.txt" %}
 ```

docs/en/whats_new/changelog/index.md

@@ -148,11 +148,12 @@ def build_for_lang(lang, args):
                 'stable_releases': args.stable_releases,
                 'version_prefix': args.version_prefix,
                 'single_page': False,
-                'rev':       args.rev,
+                'rev': args.rev,
                 'rev_short': args.rev_short,
-                'rev_url':   args.rev_url,
-                'events':    args.events,
-                'languages': languages
+                'rev_url': args.rev_url,
+                'events': args.events,
+                'languages': languages,
+                'includes_dir':  os.path.join(os.path.dirname(__file__), '..', '_includes')
             }
         )
 

docs/en/whats_new/changelog/index.md

@@ -4,6 +4,7 @@
 
 import os
 
+import jinja2
 import markdown.inlinepatterns
 import markdown.extensions
 import markdown.util
@@ -85,6 +86,10 @@ def on_config(self, config):
         super(PatchedMacrosPlugin, self).on_config(config)
         self.env.comment_start_string = '{##'
         self.env.comment_end_string = '##}'
+        self.env.loader = jinja2.FileSystemLoader([
+            os.path.join(config.data['site_dir']),
+            os.path.join(config.data['extra']['includes_dir'])
+        ])
 
     def on_env(self, env, config, files):
         env.add_extension('jinja2.ext.i18n')

docs/es/operations/optimizing_performance/sampling_query_profiler.md

@@ -60,5 +60,5 @@ LIMIT 10
 ```
 
 ``` text
-{% include "operations/performance/sampling_query_profiler_example_result.txt" %}
+{% include "examples/sampling_query_profiler_result.txt" %}
 ```

docs/es/operations/performance/sampling_query_profiler_example_result.txt

@@ -60,5 +60,5 @@ LIMIT 10
 ```
 
 ``` text
-{% include "operations/performance/sampling_query_profiler_example_result.txt" %}
+{% include "examples/sampling_query_profiler_result.txt" %}
 ```