diff options
Diffstat (limited to 'doc')
-rw-r--r-- | doc/development/plugins.txt | 4 | ||||
-rw-r--r-- | doc/releases/1.4.0pre2.txt | 3 | ||||
-rw-r--r-- | doc/server/plugins/generators/examples/jinja2/extends.txt | 5 | ||||
-rw-r--r-- | doc/server/plugins/generators/examples/jinja2/include.txt | 5 |
4 files changed, 11 insertions, 6 deletions
diff --git a/doc/development/plugins.txt b/doc/development/plugins.txt index 5993c4e29..d292c9dd7 100644 --- a/doc/development/plugins.txt +++ b/doc/development/plugins.txt @@ -171,12 +171,12 @@ perf``. This data can be invaluable for locating bottlenecks or other performance issues. The simplest way to track statistics is to use the -:func:`Bcfg2.Server.Plugin.helpers.track_statistics` decorator to +:func:`Bcfg2.Server.Statistics.track_statistics` decorator to decorate functions that you would like to track execution times for: .. code-block:: python - from Bcfg2.Server.Plugin import track_statistics + from Bcfg2.Server.Statistics import track_statistics @track_statistics() def do_something(self, ...): diff --git a/doc/releases/1.4.0pre2.txt b/doc/releases/1.4.0pre2.txt index 7bbed5603..572748f73 100644 --- a/doc/releases/1.4.0pre2.txt +++ b/doc/releases/1.4.0pre2.txt @@ -17,6 +17,8 @@ and as such is not likely suitable for general production deployment. That said, please help us test the release in non- and preproduction environments. +* NagiosGen: Add bundles to configuration + backwards-incompatible user-facing changes ------------------------------------------ @@ -35,3 +37,4 @@ Special thanks to the following contributors for this release * Alexander Sulfrain * Matt Kemp + * Jeremie Banier diff --git a/doc/server/plugins/generators/examples/jinja2/extends.txt b/doc/server/plugins/generators/examples/jinja2/extends.txt index a0eeb5c03..3c6dd06ab 100644 --- a/doc/server/plugins/generators/examples/jinja2/extends.txt +++ b/doc/server/plugins/generators/examples/jinja2/extends.txt @@ -1,8 +1,9 @@ .. -*- mode: rst -*- +.. vim: ft=rst -========================= +=========================== Extending Jinja2 Templates -========================= +=========================== Jinja2 templates can use the {% extends %} directive to inherit file fragments which might be common to many configuration files. diff --git a/doc/server/plugins/generators/examples/jinja2/include.txt b/doc/server/plugins/generators/examples/jinja2/include.txt index 49be7c277..466ea6b97 100644 --- a/doc/server/plugins/generators/examples/jinja2/include.txt +++ b/doc/server/plugins/generators/examples/jinja2/include.txt @@ -1,8 +1,9 @@ .. -*- mode: rst -*- +.. vim: ft=rst -========================= +=========================== Including Jinja2 Templates -========================= +=========================== Jinja2 templates can use the {% include %} directive to include file fragments which might be common to many configuration files. |