diff --git a/doc/source/configuration/kayobe.rst b/doc/source/configuration/kayobe.rst index 4dd43fd7a..f0ccdb022 100644 --- a/doc/source/configuration/kayobe.rst +++ b/doc/source/configuration/kayobe.rst @@ -62,8 +62,8 @@ variables. Configuring Kayobe ================== -The `kayobe-config `_ git repository -contains a Kayobe configuration directory structure and unmodified +The `kayobe-config `_ git +repository contains a Kayobe configuration directory structure and unmodified configuration files. This repository can be used as a mechanism for version controlling Kayobe configuration. As Kayobe is updated, the configuration should be merged to incorporate any upstream changes with local modifications. diff --git a/doc/source/upgrading.rst b/doc/source/upgrading.rst index 81f551c1b..3f827257c 100644 --- a/doc/source/upgrading.rst +++ b/doc/source/upgrading.rst @@ -33,7 +33,7 @@ Migrating Kayobe Configuration Kayobe configuration options may be changed between releases of kayobe. Ensure that all site local configuration is migrated to the target version format. If -using the `kayobe-config `_ git +using the `kayobe-config `_ git repository to manage local configuration, this process can be managed via git. For example, to fetch version 1.0.0 of the configuration from the ``origin`` remote and merge it into the current branch::