From a9b6e82eedf77e0da024190e2d5a15289a547a83 Mon Sep 17 00:00:00 2001 From: "James O. D. Hunt" Date: Tue, 12 Sep 2017 11:30:47 +0100 Subject: [PATCH] docs: Improve wording in dev install guide Refer to "2.x" and "3.x" rather than "2.1" and "3.0" since this ensures the document will be future-proof ("2.1" is already wrong - it should have said "2.2"). Add a reference to the upgrading doc. Signed-off-by: James O. D. Hunt --- docs/developers-clear-containers-install.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/developers-clear-containers-install.md b/docs/developers-clear-containers-install.md index ce141fa2..b42ed225 100644 --- a/docs/developers-clear-containers-install.md +++ b/docs/developers-clear-containers-install.md @@ -36,8 +36,9 @@ Since the installation guide will have installed packaged versions of all required components, it is only necessary to install the source for the component(s) you wish to develop with. -**IMPORTANT:** Do not combine [Clear Containers 2.1](https://github.com/01org/cc-oci-runtime) and [Clear Containers 3.0](https://github.com/clearcontainers). -Both projects ship ``cc-proxy`` and they are not compatible with each other. +**IMPORTANT:** Do not combine [Clear Containers 2.x](https://github.com/01org/cc-oci-runtime) and [Clear Containers 3.x](https://github.com/clearcontainers) on the same system. +Both projects ship ``cc-proxy`` and ``cc-shim`` which are not compatible with each other. +See [the upgrading document](upgrading.md) for further details. ### Setup the environment