From c515c1acb91a7e003e78b736cd9d0016248fa060 Mon Sep 17 00:00:00 2001
From: Alex Dellapenta <adellape@redhat.com>
Date: Wed, 5 Jul 2017 12:55:34 -0400
Subject: [PATCH] Clarify 'client' usage, add redcircles

---
 release_notes/images/redcircle-1.png | Bin 0 -> 596 bytes
 release_notes/images/redcircle-2.png | Bin 0 -> 731 bytes
 release_notes/images/redcircle-3.png | Bin 0 -> 755 bytes
 release_notes/index.adoc             |  38 +++++++++++++++------------
 4 files changed, 21 insertions(+), 17 deletions(-)
 create mode 100644 release_notes/images/redcircle-1.png
 create mode 100644 release_notes/images/redcircle-2.png
 create mode 100644 release_notes/images/redcircle-3.png

diff --git a/release_notes/images/redcircle-1.png b/release_notes/images/redcircle-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..4cbb364a2d76902701bb1b08e16bafb3ccb94ab4
GIT binary patch
literal 596
zcmV-a0;~OrP)<h;3K|Lk000e1NJLTq000*N000&U1^@s6D|QD300006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru;Rgi{Egju}Rha+)0pUqR
zK~y-)z16=<8(|#B@%LS9eq16%N*A$0%#gN0F4#$jBU?KbcOy=XyF>qjlC4fg5ElvP
zWbrQu2L^LfL<m;U9HpCrLhiAqt#=(tQkvW)*EIIvrstm5efU0npReRNj>7{zV|`ce
z@3}cRKvb*T)@t0=Y9L7{nar<uZjOn?MF<33w@Y5hTNf8JmX;8eO5guS7ZynD>=2rn
z=~<KAHe79OQCHQ0Fo393sH-Yh+uMVaUlxmeUR@ok#?u=cJjv(X@z(h{bydX{VklgW
zMtO03OemS`DvNE?$mKlYu~+X&T|2zI-e)4@j@v@eSY8I({u395;Zfrdk+=Ii`}mGn
zd~kYkc!)5JF8t`o{p(bo=?|}=T;#^|SDv=j!7VTRQxP+p<@C)i-+k8J>c%~j)1p<a
z^5ZWKwkNrLcQ>-OZ(AK)$z(=`x2^w!M@ERZtxkv9LU1}i&)1Wae}cp5G|vqKSy6r`
zm!nY<r4mvwI5aE;gCzI%kQJr(R*cNfGF2!HjZYN{gwyH%_xa`KCSTUpur13M8i>bv
zy1vfiT+ZLH_-2}zD=Re1<-YKEHcO&Z;?d-!|4G#8&$Ba{x=vHqv2-0AhnS`@u4%+H
ijc_XEeFhIXpnn2Sz{#wUqZ%gw0000<MNUMnLSTX;3l5+F

literal 0
HcmV?d00001

diff --git a/release_notes/images/redcircle-2.png b/release_notes/images/redcircle-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..23f4a0d23f93f85f06c4d2d82c3b1681f193785d
GIT binary patch
literal 731
zcmV<10wn#3P)<h;3K|Lk000e1NJLTq000*N000&U1^@s6D|QD300006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru;Rgi{E)a+udglND0%%D@
zK~y-)wbegJ8&Mp<@o%CgF&C-QT8j8D#u9CiJM2;&LdJHgxYWg{n@+VLbagaS>!gB+
zMFM6rb<wRFFleR|sfbl$|3F)`pqSH3HJ1);QmS`}r1;>b_ul7z@Ar7WpDCSAr@5g~
zoO3pn;%I&zWo?a9S>{xh!DPZNNx#3=Rw_C>p{PiAyU8f><lY|f?rxN5H0S??_I8{z
zGguoMuFRSBHXKe)vMGvrVE`o>Wm6P6oSMoX`N8-&p9TgB%5m-37?u6~`gn48mrYSb
zQ<Q>mvmo$beI2XIbtx^HM%?ee3R~S&yqcr=>lqKzXNd84)IP1##Wh7C-qQn`_Ajo)
zV!Aml?iitFumg)KbG#^%y62;EcA7hN26wQsf)a~e!dF*y7hi;W+3oQ0-r2^^6Ca<$
zM__A0sJ9wl@*gXUCk${nMtQr;1%R~)hg1&g7RpxA5Kmmj6+=8TZs8c2=5CXUIzG&g
z@8pd<`$9EU%?S%H7jX?roQHead9h5cnvt=xk=rH7V5ybT=V2O0BvRpCK6Jeyndgid
zD=%*8ndSa#AI0i7&TU=PgcoRBn4|VtU0yt!mQr2Zisg|+34pC0$K(3!j4BU9=%X&4
zv9d2zQxvw^+Bn<T_^&c+^LS{E#W36Lf74<X1f0PjCX1zD*krNb3WYG+?N_T}X-f;$
zfk44{bs&Jv<H=pm4<;t~GBkviNL&joDleyIbd=kE|Mi;1&;5P&`}#OpTFMER`FuEo
zK}xEsuHT8WWq5m=lSqV<NQ6Wr0_ijkua`2f7l+r2&Fwb6gPUy7zW~SV`18yq=t%$o
N002ovPDHLkV1oFGP&fbp

literal 0
HcmV?d00001

diff --git a/release_notes/images/redcircle-3.png b/release_notes/images/redcircle-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..06ac69f6a99cc0bcd22037e24da6be5e0a73387b
GIT binary patch
literal 755
zcmV<P0u23$P)<h;3K|Lk000e1NJLTq000*N000&U1^@s6D|QD300006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru;Rgi{E*}`9XLbMp0)R<G
zK~y-)wUs|i6Hy$;KW(8LJqU;*4Fd9KXtlv>a48H;M@Pb<3k5dV7#J8C?W9bUgb)bn
zz(!bviKYon+r=X!h$KKUYDypq(t}p)or6*YdZnr1lDFLZzR&x;@B6*q&!B0V#vOen
zd1o^jjusbDqESv|nNwK?g8_@v`Db)=aIdEaOs1U64SJEMcXrtA?L`TP^X@Npb<r|6
zM_Fs@jX7hk1&32pY)I0rU;rf?W<!!VoSwct@&mu0PeVgRdE7KHLG9pRZg_fon+-`q
zRg|LOMp5MH+8SkTZP#p3Rd&7J8(@>vN7K9aJo|pebL|Z2!wO9=Z5VRERYhU9uMbr9
zDqM-ha(b)^c0`wz^T-0<7G$($54AIIsj1VsgVj}(SnO&lDv?M|u@)U;t9gvfaT=)N
z!AgS19xEl)z`o7~kqDy8bqP=Ez#&a0RfpMTrPTh48oR)+;0#9}^}SC<B0MZ4asY$p
zHTI=`N&z*#z?ab(()rT!FDvW0no8-4HQCQze?NPpeiWgb#$b>~l0N)`m4#cJPJQ)$
zl;hc14t>KUmJ%R15nWZf@(WhUzdwE~FJF_DQSl~7qccG&o<J3xRCZf|O%(aKaCmvn
z$kUw5o2cC{sCHQ~lHxqR#QxYYU!(d5y<lZusH!Mzc6M^MzW!fjR&Y3Y5{qH9SS~#`
ziXtt600y(UXt2R-rfq&6qs4NwDwemm)8O+J4R7%I5FC#D_55IRlFuU}sL5nOP*Zg^
zjpO6o_j(I!7C+;0;sXPm1cQ0Ol^zc*fdHlT^@Vq$Y`$!5aS{q~5(<$Fg+SA&aJ#8=
lyQy%y5o|X7JGjdR{ToP&3yGB0S~may002ovPDHLkV1gd7Nsa&j

literal 0
HcmV?d00001

diff --git a/release_notes/index.adoc b/release_notes/index.adoc
index 393fe8be6b1c..c6c74bcfdc1c 100644
--- a/release_notes/index.adoc
+++ b/release_notes/index.adoc
@@ -24,16 +24,21 @@ endif::[]
 == Versioning Policy
 
 {product-title} provides strict backwards compatibility guarantees for all
-supported APIs (excluding alpha APIs, which may be changed without notice, and
-beta APIs, which may occasionally be changed in a non-backwards compatible
-manner). {product-title} will continue to support older clients against newer
-servers. For example, a 3.4 client will work against 3.3, 3.4, and 3.5 servers.
+supported APIs, excluding alpha APIs (which may be changed without notice) and
+beta APIs (which may occasionally be changed in a non-backwards compatible
+manner).
+
+The {product-title} version must match between master and node hosts, excluding
+temporary mismatches during cluster upgrades. For example, in a 3.5 cluster, all
+masters must be 3.5 and all nodes must be 3.5. However, {product-title} will
+continue to support older `oc` clients against newer servers. For example, a 3.4
+`oc` will work against 3.3, 3.4, and 3.5 servers.
 
 Changes of APIs for non-security related reasons will involve, at minimum, two
-minor releases (3.1 to 3.2 to 3.3, for example) to allow older clients to
-update. Using new capabilities may require newer clients. A 3.2 server may have
-additional capabilities that a 3.1 client cannot use and a 3.2 client may have
-additional capabilities that are not supported by a 3.1 server.
+minor releases (3.1 to 3.2 to 3.3, for example) to allow older `oc` to update.
+Using new capabilities may require newer `oc`. A 3.2 server may have additional
+capabilities that a 3.1 `oc` cannot use and a 3.2 `oc` may have additional
+capabilities that are not supported by a 3.1 server.
 
 .Compatibility Matrix
 
@@ -41,19 +46,18 @@ additional capabilities that are not supported by a 3.1 server.
 |===
 
 |
-|*X.Y* (Client)
-|*X.Y+N* footnoteref:[versionpolicyn,Where *N* is a number greater than 1.] (Client)
+|*X.Y* (`oc` Client)
+|*X.Y+N* footnoteref:[versionpolicyn,Where *N* is a number greater than 1.] (`oc` Client)
 
 |*X.Y* (Server)
-|1
-|3
+|image:redcircle-1.png[]
+|image:redcircle-3.png[]
 
 |*X.Y+N* footnoteref:[versionpolicyn] (Server)
-|2
-|1
+|image:redcircle-2.png[]
+|image:redcircle-1.png[]
 
 |===
-
 <1> Fully compatible.
-<2> Client may not be able to access server features.
-<3> Client may provide options and features that may not be compatible with the accessed server.
+<2> `oc` client may not be able to access server features.
+<3> `oc` client may provide options and features that may not be compatible with the accessed server.