diff --git a/doc/man/man7/cdist-stages.text b/doc/man/man7/cdist-stages.text index c1b73a8d..fa5e28d1 100644 --- a/doc/man/man7/cdist-stages.text +++ b/doc/man/man7/cdist-stages.text @@ -27,7 +27,7 @@ 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 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. +be created, if it has different parameters. STAGE 3: OBJECT INFORMATION RETRIEVAL @@ -44,7 +44,7 @@ Every object is checked whether its type has a executable manifest. The manifest script may generate and change the created objects. In other words, one type can reuse other types. -For instance the object __apache/www.test.ch is of type __apache, which may +For instance the object __apache/www.example.org is of type __apache, which may contain a manifest script, which creates new objects of type __file. The newly created objects are merged back into the existing tree. No conflicts