andrewschleifer/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

improve docu wording

Browse source
This commit is contained in:
tpo 2013-07-07 12:25:46 +02:00
parent dbe65795f5
commit fb3cad7bb6
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
docs/man/man7/cdist-bootstrap.text
View file

@ -64,11 +64,11 @@ So **2.0** is the latest version branch in this example.
All versions (2.0.x) within one version branch (2.0) are compatible to each All versions (2.0.x) within one version branch (2.0) are compatible to each
other and won't break your configuration when updating. other and won't break your configuration when updating.
It's up to you decide on which branch you want to base your own work: It's up to you to decide which branch you want to base your own work on:
master contains more recent changes, newer types, but may also break. master contains more recent changes, newer types, but may also break.
The versions branches are stable, but thus may miss the latest features. The version branches are stable, but may lack the latest features.
Your decision can be changed later on, but may result in merge conflicts, Your decision can be changed later on, but may result in merge conflicts,
which you'd have to solve. which you will need to solve.
Let's assume you want latest stuff and select the master branch as base for Let's assume you want latest stuff and select the master branch as base for
your own work. Now it's time to create your branch, which contains your your own work. Now it's time to create your branch, which contains your