From 140bb1bf047bde1f0b3af89d68776b4e580795ee Mon Sep 17 00:00:00 2001 From: Darko Poljak Date: Mon, 22 Aug 2016 18:53:07 +0200 Subject: [PATCH] cdist doc update --- software/cdist/features.mdwn | 2 +- software/cdist/support.mdwn | 5 ++++- software/cdist/update.mdwn | 6 +++--- software/cdist/update/2.0-to-2.1.mdwn | 4 ++-- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/software/cdist/features.mdwn b/software/cdist/features.mdwn index a97f2013..77c61382 100644 --- a/software/cdist/features.mdwn +++ b/software/cdist/features.mdwn @@ -3,7 +3,7 @@ But cdist ticks differently, here is the feature set that makes it unique: [[!table data=""" Keywords | Description Simplicity | There is only one type to extend cdist called ***type*** -Design | Type and core cleanly seperated +Design | Type and core cleanly separated Design | Sticks completly to the KISS (keep it simple and stupid) paradigma Design | Meaningful error messages - do not lose time debugging error messages Design | Consistency in behaviour, naming and documentation diff --git a/software/cdist/support.mdwn b/software/cdist/support.mdwn index 39388c5a..4c89ee79 100644 --- a/software/cdist/support.mdwn +++ b/software/cdist/support.mdwn @@ -8,7 +8,7 @@ You can join the development ***IRC channel*** ### Mailing list Bug reports, questions, patches, etc. should be send to the -[cdist mailing list](http://l.schottelius.org/mailman/listinfo/cdist). +[cdist mailing list](https://groups.google.com/forum/#!forum/cdist-configuration-management). ### Linkedin @@ -17,6 +17,9 @@ at [Linked in](http://www.linkedin.com/), you can join the [cdist group](http://www.linkedin.com/groups/cdist-configuration-management-3952797). +### Chat +Chat with us: [ungleich chat] (https://chat.ungleich.ch/channel/cdist). + ### Commercial support You can request commercial support for cdist from diff --git a/software/cdist/update.mdwn b/software/cdist/update.mdwn index 28f41da7..df4617bb 100644 --- a/software/cdist/update.mdwn +++ b/software/cdist/update.mdwn @@ -67,7 +67,7 @@ Use [messaging](/software/cdist/man/3.0.0/man7/cdist-messaging.html) instead. ### Updating from 2.2 to 2.3 -No incompatiblities. +No incompatibilities. ### Updating from 2.1 to 2.2 @@ -134,7 +134,7 @@ Have a look at the update guide for [[2.0 to 2.1|2.0-to-2.1]]. ### Updating from 1.3 to 1.5 -No incompatiblities. +No incompatibilities. ### Updating from 1.2 to 1.3 @@ -142,7 +142,7 @@ Rename **gencode** of every type to **gencode-remote**. ### Updating from 1.1 to 1.2 -No incompatiblities. +No incompatibilities. ### Updating from 1.0 to 1.1 diff --git a/software/cdist/update/2.0-to-2.1.mdwn b/software/cdist/update/2.0-to-2.1.mdwn index 1d0037ab..3b5f5dc4 100644 --- a/software/cdist/update/2.0-to-2.1.mdwn +++ b/software/cdist/update/2.0-to-2.1.mdwn @@ -10,7 +10,7 @@ explorers and manifest to custom directories. This document will guide you to a successful update. -## Preperation +## Preparation As for every software and system you use in production, you should first of all make a backup of your data. To prevent any breakage, it is @@ -35,7 +35,7 @@ Now try to merge upstream into the new branch. % git merge origin/2.1 Fix any conflicts that may have been occurred due to local changes -and then **git add** and *git commit** those changes. This should seldomly +and then **git add** and *git commit** those changes. This should seldom occur and if, it's mostly for people hacking on the cdist core. ## Move "conf" directory