From 8400f8065151f0e3e0d45094913332321c0f00b1 Mon Sep 17 00:00:00 2001 From: fancsali Date: Sat, 9 May 2020 19:51:31 +0200 Subject: [PATCH 1/2] Fix example commands for type testing --- docs/src/cdist-best-practice.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/src/cdist-best-practice.rst b/docs/src/cdist-best-practice.rst index 39ec453e..f7677276 100644 --- a/docs/src/cdist-best-practice.rst +++ b/docs/src/cdist-best-practice.rst @@ -200,15 +200,15 @@ of cdist: .. code-block:: sh # Singleton type without parameter - echo __ungleich_munin_server | cdist --initial-manifest - munin.panter.ch + echo __ungleich_munin_server | cdist config --initial-manifest - munin.panter.ch # Singleton type with parameter echo __ungleich_munin_node --allow 1.2.3.4 | \ - cdist --initial-manifest - rails-19.panter.ch + cdist config --initial-manifest - rails-19.panter.ch # Normal type echo __file /tmp/stdintest --mode 0644 | \ - cdist --initial-manifest - cdist-dev-01.ungleich.ch + cdist config --initial-manifest - cdist-dev-01.ungleich.ch Other content in cdist repository From 7c6428343d588cc6e583ccd1500525573cf54b55 Mon Sep 17 00:00:00 2001 From: fancsali Date: Sun, 17 May 2020 20:01:47 +0200 Subject: [PATCH 2/2] Fix small typo --- docs/src/cdist-stages.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/src/cdist-stages.rst b/docs/src/cdist-stages.rst index 751ba9c7..d12bd142 100644 --- a/docs/src/cdist-stages.rst +++ b/docs/src/cdist-stages.rst @@ -17,7 +17,7 @@ manifests and types. Stage 2: run the initial manifest --------------------------------- The initial manifest, which should be used for mappings of hosts to types, -is executed. This stage creates objects in a cconfig database that contains +is executed. This stage creates objects in a config database that contains the objects as defined in the manifest for the specific host. In this stage, no conflicts may occur, i.e. no object of the same type with the same id may be created, if it has different parameters.