From 68fa5ab7e53f5fccf7818482b41d240a80a63624 Mon Sep 17 00:00:00 2001
From: Thomas Klaehn <Thomas.klaehn@lairdtech.com>
Date: Tue, 11 Oct 2016 14:16:28 +0200
Subject: [PATCH] branching strategy for upcoming I320 moray white2 release
 refactored

---
 content.tex                        |  2 +-
 img_deploy.tex                     | 97 ------------------------------
 img_history.tex                    | 74 -----------------------
 img_gitlab.tex => img_workflow.tex | 86 +++++++++++++-------------
 4 files changed, 44 insertions(+), 215 deletions(-)
 delete mode 100644 img_deploy.tex
 delete mode 100644 img_history.tex
 rename img_gitlab.tex => img_workflow.tex (87%)

diff --git a/content.tex b/content.tex
index f0b83bf..dbafa2a 100644
--- a/content.tex
+++ b/content.tex
@@ -1,6 +1,6 @@
 \begin{figure}
 	\begin{center}
-		\input{img_gitlab.tex}
+		\input{img_workflow.tex}
 %		\caption{Gitlab workflow}
 %		\label{fig:gitlab_workflow}
 	\end{center}
diff --git a/img_deploy.tex b/img_deploy.tex
deleted file mode 100644
index 2e2a97c..0000000
--- a/img_deploy.tex
+++ /dev/null
@@ -1,97 +0,0 @@
-\psset{griddots=0,gridlabels=8pt,subgriddiv=5}
-\psset{xunit=10mm,yunit=10mm}
-\begin{pspicture}(12,10)
-%	\psgrid
-	\newcommand{\clr}{black}
-	% phases
-	\psline[linewidth=1pt,linecolor=\clr,linestyle=dashed](0,2)(12,2)
-	\psline[linewidth=1pt,linecolor=\clr,linestyle=dashed](0,8)(12,8)
-	\rput{0}(1.5,2){
-		\psset{fillcolor=white}
-		\psset{fillstyle=solid}
-		\psset{linecolor=\clr}
-		\psset{framearc=.5}
-		\psframebox{\textcolor{\clr}{code freeze}}
-	}
-	\psline[linewidth=1pt,linecolor=\clr]{<->}(11.5,2)(11.5,8)
-	\rput{90}(11.5,5){
-		\psset{fillcolor=white}
-		\psset{fillstyle=solid}
-		\psset{linecolor=\clr}
-		\psset{framearc=.5}
-		\psframebox{\textcolor{\clr}{release phase}}
-	}
-
-
-	% master
-	\newcommand{\masterx}{10}
-	\psline[linewidth=2pt,linecolor=\clr,arrowsize=15pt]{->}(\masterx,1)(\masterx,9)
-	\psset{fillcolor=\clr}
-	\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\masterx,2)
-	\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\masterx,8)
-	\rput(\masterx,0.5){
-		\psset{fillcolor=white}
-		\psset{fillstyle=solid}
-		\psset{linecolor=\clr}
-		\psset{framearc=.5}
-		\psframebox{\textcolor{\clr}{master}}
-	}
-	% feature/anti_osc
-	\renewcommand{\clr}{RedOrange}
-	\newcommand{\featurex}{8}
-	\psline[linewidth=2pt,linecolor=\clr](\masterx,2)(\featurex,3)
-	\psline[linewidth=2pt,linecolor=\clr](\featurex,3)(\featurex,7)
-	\psline[linewidth=2pt,linecolor=\clr,linestyle=dashed,arrowsize=15pt]{->}(\featurex,7)(\masterx,8)
-	\psline[linewidth=1pt,linecolor=\clr,linestyle=dashed](\featurex,2)(\featurex,8)
-	\multido{\nA=3+2}{3}{
-		\psset{fillcolor=\clr}
-		\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\featurex,\nA)
-	}
-	\rput(\featurex,1.5){
-		\psset{fillcolor=white}
-		\psset{fillstyle=solid}
-		\psset{linecolor=\clr}
-		\psset{framearc=.5}
-		\psframebox{\textcolor{\clr}{release/NAR\_C0}}
-	}
-	\newcommand{\rccolor}{Blue}
-	\psset{fillcolor=\rccolor}
-	\psdot[dotsize=5pt,dotstyle=o,linecolor=\rccolor](\masterx,2)
-	\psdot[dotsize=5pt,dotstyle=o,linecolor=\rccolor](\featurex,3)
-	\psdot[dotsize=5pt,dotstyle=o,linecolor=\rccolor](\featurex,5)
-	\psline[linewidth=1pt,linecolor=\rccolor,arrowsize=10pt]{->}(\masterx,2)(5.7,2.8)
-	\psline[linewidth=1pt,linecolor=\rccolor,arrowsize=10pt]{->}(\featurex,3)(5.7,4.6)
-	\psline[linewidth=1pt,linecolor=\rccolor,arrowsize=10pt]{->}(\featurex,5)(5.7,6.6)
-	\rput(3,3){
-		\psset{fillcolor=white}
-		\psset{fillstyle=solid}
-		\psset{linecolor=\rccolor}
-		\psset{framearc=.5}
-		\psframebox{\textcolor{\rccolor}{deploy: release candidate 1}}
-	}
-	\rput(3,5){
-		\psset{fillcolor=white}
-		\psset{fillstyle=solid}
-		\psset{linecolor=\rccolor}
-		\psset{framearc=.5}
-		\psframebox{\textcolor{\rccolor}{deploy: release candidate 2}}
-	}
-	\rput(3,7){
-		\psset{fillcolor=white}
-		\psset{fillstyle=solid}
-		\psset{linecolor=\rccolor}
-		\psset{framearc=.5}
-		\psframebox{\textcolor{\rccolor}{deploy: release candidate 3}}
-	}
-	\newcommand{\rcolor}{ForestGreen}
-	\psset{fillcolor=\rcolor}
-	\psdot[dotsize=5pt,dotstyle=o,linecolor=\rcolor](\featurex,7)
-	\psline[linewidth=1pt,linecolor=\rcolor,arrowsize=10pt]{->}(\featurex,7)(4.6,8.6)
-	\rput(3,9){
-		\psset{fillcolor=white}
-		\psset{fillstyle=solid}
-		\psset{linecolor=\rcolor}
-		\psset{framearc=.5}
-		\psframebox{\textcolor{\rcolor}{deploy: release}}
-	}
-\end{pspicture}
diff --git a/img_history.tex b/img_history.tex
deleted file mode 100644
index 7830be6..0000000
--- a/img_history.tex
+++ /dev/null
@@ -1,74 +0,0 @@
-\psset{griddots=0,gridlabels=8pt,subgriddiv=5}
-\psset{xunit=10mm,yunit=10mm}
-\begin{pspicture}(14,16)
-%	\psgrid
-	\newcommand{\clr}{Gray}
-	\newcommand{\bclr}{RedOrange}
-	\newcommand{\hclr}{Blue}
-	\newcommand{\mclr}{black}
-
-	% master
-	\newcommand{\masterx}{7}
-	\psline[linewidth=2pt,linecolor=\clr,arrowsize=15pt]{->}(\masterx,8)(\masterx,15)
-	\psline[linewidth=2pt,linecolor=\hclr](\masterx,1)(\masterx,8)
-	\psset{fillcolor=\hclr}
-	\psdot[dotsize=10pt,dotstyle=o,linecolor=\hclr](\masterx,2)
-	\psdot[dotsize=10pt,dotstyle=o,linecolor=\hclr](\masterx,3)
-	\psdot[dotsize=10pt,dotstyle=o,linecolor=\hclr](\masterx,7)
-	\psdot[dotsize=10pt,dotstyle=o,linecolor=\hclr](\masterx,8)
-	\rput(\masterx,0.5){
-		\psset{fillcolor=white}
-		\psset{fillstyle=solid}
-		\psset{linecolor=\mclr}
-		\psset{framearc=.5}
-		\psframebox{\textcolor{\mclr}{master}}
-	}
-	% feature/anti_osc
-	\newcommand{\featurex}{5}
-	\psline[linewidth=2pt,linecolor=\clr](\masterx,2)(\featurex,3)
-	\psline[linewidth=2pt,linecolor=\clr](\featurex,3)(\featurex,7)
-	\psline[linewidth=2pt,linecolor=\clr,arrowsize=15pt]{->}(\featurex,7)(\masterx,8)
-	\multido{\nA=3+2}{3}{
-		\psset{fillcolor=\clr}
-		\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\featurex,\nA)
-	}
-	% old_branch
-	\newcommand{\xpos}{9}
-	\psline[linewidth=2pt,linecolor=\clr,arrowsize=15pt]{->}(\xpos,2)(\masterx,3)
-	\psline[linewidth=2pt,linecolor=\clr](\xpos,1)(\xpos,2)
-	
-	% fix/calibration_crc
-	\newcommand{\fixx}{9}
-	\psline[linewidth=2pt,linecolor=\clr](\masterx,3)(\fixx,4)
-	\psline[linewidth=2pt,linecolor=\clr](\fixx,4)(\fixx,6)
-	\psline[linewidth=2pt,linecolor=\clr,arrowsize=15pt]{->}(\fixx,6)(\masterx,7)
-	\multido{\nA=4+2}{2}{
-		\psset{fillcolor=\clr}
-		\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\fixx,\nA)
-	}
-	% feature/dynamic_monitoring
-	\renewcommand{\fixx}{11}
-	\psline[linewidth=2pt,linecolor=\clr](\masterx,3)(\fixx,4)
-	\psline[linewidth=2pt,linecolor=\clr,arrowsize=15pt]{->}(\fixx,4)(\fixx,12)
-	\psset{fillcolor=\clr}
-	\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\fixx,4)
-	\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\fixx,6)
-	\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\fixx,8)
-	\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\fixx,10)
-	% release/NAR_C0
-	\renewcommand{\fixx}{5}
-	\psline[linewidth=1pt,linecolor=\bclr,linestyle=dashed](\fixx,8)(\fixx,14)
-	\psline[linewidth=2pt,linecolor=\hclr](\masterx,8)(\fixx,9)
-	\psline[linewidth=2pt,linecolor=\hclr](\fixx,9)(\fixx,13)
-	\rput(\fixx,14.5){
-		\psset{fillcolor=white}
-		\psset{fillstyle=solid}
-		\psset{linecolor=\bclr}
-		\psset{framearc=.5}
-		\psframebox{\textcolor{\bclr}{release/NAR\_C0}}
-	}
-	\psset{fillcolor=\hclr}
-	\psdot[dotsize=10pt,dotstyle=o,linecolor=\hclr](\fixx,9)
-	\psdot[dotsize=10pt,dotstyle=o,linecolor=\hclr](\fixx,11)
-	\psdot[dotsize=10pt,dotstyle=o,linecolor=\hclr](\fixx,13)
-\end{pspicture}
diff --git a/img_gitlab.tex b/img_workflow.tex
similarity index 87%
rename from img_gitlab.tex
rename to img_workflow.tex
index f559301..e699161 100644
--- a/img_gitlab.tex
+++ b/img_workflow.tex
@@ -3,7 +3,7 @@
 \begin{pspicture}(14,26)
 %	\psgrid
 	\newcommand{\clr}{black}
-	\newcommand{\masterx}{7}
+	\newcommand{\masterx}{8}
 	\psline[linewidth=2pt,linecolor=\clr,arrowsize=15pt]{->}(\masterx,1)(\masterx,26)
 	\psset{fillcolor=\clr}
 	\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\masterx,2)
@@ -27,7 +27,7 @@
 		\psframebox{\textcolor{\clr}{white2\_master}}
 	}
 	\renewcommand{\clr}{ForestGreen}
-	\newcommand{\featurex}{3}
+	\newcommand{\featurex}{4}
 	\psset{fillcolor=\clr}
 	\psline[linewidth=2pt,linecolor=\clr](\masterx,2)(\featurex,3)
 	\psline[linewidth=2pt,linecolor=\clr](\featurex,3)(\featurex,11)
@@ -36,7 +36,7 @@
 	\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\featurex,3)
 	\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\featurex,7)
 	\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\featurex,11)
-	\rput(2.5,2){
+	\rput(3.5,2){
 		\psset{fillcolor=white}
 		\psset{fillstyle=solid}
 		\psset{linecolor=\clr}
@@ -50,7 +50,7 @@
 	\psline[linewidth=1pt,linecolor=\clr,linestyle=dashed](\featurex,12.5)(\featurex,17.5)
 	\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\featurex,13)
 	\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\featurex,17)
-	\rput(2.5,12){
+	\rput(3.5,12){
 		\psset{fillcolor=white}
 		\psset{fillstyle=solid}
 		\psset{linecolor=\clr}
@@ -64,7 +64,7 @@
 	\psline[linewidth=1pt,linecolor=\clr,linestyle=dashed](\featurex,18.5)(\featurex,23.5)
 	\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\featurex,19)
 	\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\featurex,23)
-	\rput(2.5,18){
+	\rput(3.5,18){
 		\psset{fillcolor=white}
 		\psset{fillstyle=solid}
 		\psset{linecolor=\clr}
@@ -72,7 +72,7 @@
 		\psframebox{\textcolor{\clr}{release/white2/I320/RB3}}
 	}
 	\renewcommand{\clr}{Maroon}
-	\newcommand{\fixx}{5}
+	\newcommand{\fixx}{6}
 	\psline[linewidth=2pt,linecolor=\clr](\featurex,3)(\fixx,4)
 	\psline[linewidth=2pt,linecolor=\clr](\fixx,4)(\fixx,6)
 	\psline[linewidth=2pt,linecolor=\clr,arrowsize=15pt]{->}(\fixx,6)(\featurex,7)
@@ -82,7 +82,7 @@
 		\psset{fillcolor=\clr}
 		\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\fixx,\nA)
 	}
-	\rput(5.5,3.3){
+	\rput(6.5,3.3){
 		\psset{fillcolor=white}
 		\psset{fillstyle=solid}
 		\psset{linecolor=\clr}
@@ -98,7 +98,7 @@
 		\psset{fillcolor=\clr}
 		\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\fixx,\nA)
 	}
-	\rput(5.5,7.3){
+	\rput(6.5,7.3){
 		\psset{fillcolor=white}
 		\psset{fillstyle=solid}
 		\psset{linecolor=\clr}
@@ -114,7 +114,7 @@
 		\psset{fillcolor=\clr}
 		\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\fixx,\nA)
 	}
-	\rput(5.5,13.3){
+	\rput(6.5,13.3){
 		\psset{fillcolor=white}
 		\psset{fillstyle=solid}
 		\psset{linecolor=\clr}
@@ -130,7 +130,7 @@
 		\psset{fillcolor=\clr}
 		\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\fixx,\nA)
 	}
-	\rput(5.5,19.3){
+	\rput(6.5,19.3){
 		\psset{fillcolor=white}
 		\psset{fillstyle=solid}
 		\psset{linecolor=\clr}
@@ -138,12 +138,12 @@
 		\psframebox{\textcolor{\clr}{fix/white2/e\_4}}
 	}
 	\renewcommand{\clr}{RoyalBlue}
-	\renewcommand{\fixx}{11}
+	\renewcommand{\fixx}{12}
 	\psline[linewidth=2pt,linecolor=\clr](\masterx,2)(\fixx,3)
 	\psline[linewidth=2pt,linecolor=\clr](\fixx,3)(\fixx,5)
 	\psline[linewidth=2pt,linecolor=\clr,arrowsize=15pt]{->}(\fixx,5)(\masterx,6)
 	\psline[linewidth=1pt,linecolor=\clr,linestyle=dashed](\fixx,2.5)(\fixx,5.5)
-	\rput(12,2){
+	\rput(13,2){
 		\psset{fillcolor=white}
 		\psset{fillstyle=solid}
 		\psset{linecolor=\clr}
@@ -153,7 +153,7 @@
 	\psset{fillcolor=\clr}
 	\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\fixx,3)
 	\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\fixx,5)
-	\renewcommand{\fixx}{9}
+	\renewcommand{\fixx}{10}
 	\psline[linewidth=2pt,linecolor=\clr](\masterx,2)(\fixx,3)
 	\psline[linewidth=2pt,linecolor=\clr](\fixx,3)(\fixx,7)
 	\psline[linewidth=2pt,linecolor=\clr,arrowsize=15pt]{->}(\fixx,7)(\masterx,8)
@@ -169,12 +169,12 @@
 	\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\fixx,3)
 	\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\fixx,5)
 	\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\fixx,7)
-	\renewcommand{\fixx}{11}
+	\renewcommand{\fixx}{12}
 	\psline[linewidth=2pt,linecolor=\clr](\masterx,7)(\fixx,8)
 	\psline[linewidth=2pt,linecolor=\clr](\fixx,8)(\fixx,12)
 	\psline[linewidth=2pt,linecolor=\clr,arrowsize=15pt]{->}(\fixx,12)(\masterx,13)
 	\psline[linewidth=1pt,linecolor=\clr,linestyle=dashed](\fixx,7.5)(\fixx,12.5)
-	\rput(\fixx,7){
+	\rput(13,7){
 		\psset{fillcolor=white}
 		\psset{fillstyle=solid}
 		\psset{linecolor=\clr}
@@ -185,7 +185,7 @@
 	\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\fixx,8)
 	\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\fixx,10)
 	\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\fixx,12)
-	\renewcommand{\fixx}{9}
+	\renewcommand{\fixx}{10}
 	\psline[linewidth=2pt,linecolor=\clr](\masterx,11)(\fixx,12)
 	\psline[linewidth=2pt,linecolor=\clr](\fixx,12)(\fixx,14)
 	\psline[linewidth=2pt,linecolor=\clr,arrowsize=15pt]{->}(\fixx,14)(\masterx,15)
@@ -201,12 +201,12 @@
 	\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\fixx,12)
 	\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\fixx,14)
 	\renewcommand{\clr}{Magenta}
-	\renewcommand{\fixx}{11}
+	\renewcommand{\fixx}{12}
 	\psline[linewidth=2pt,linecolor=\clr](\masterx,12)(\fixx,13)
 	\psline[linewidth=2pt,linecolor=\clr](\fixx,13)(\fixx,15)
 	\psline[linewidth=2pt,linecolor=\clr,arrowsize=15pt]{->}(\fixx,15)(\masterx,16)
 	\psline[linewidth=1pt,linecolor=\clr,linestyle=dashed](\fixx,12.5)(\fixx,15.5)
-	\rput(11.5,12.5){
+	\rput(12.5,12.5){
 		\psset{fillcolor=white}
 		\psset{fillstyle=solid}
 		\psset{linecolor=\clr}
@@ -218,80 +218,80 @@
 	\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\fixx,15)
 	\renewcommand{\clr}{RedOrange}
 	\psset{fillcolor=\clr}
-	\psdot[dotsize=5pt,dotstyle=o,linecolor=\clr](3,23)
+	\psdot[dotsize=5pt,dotstyle=o,linecolor=\clr](4,23)
 	\rput(3,24){
 		\psset{fillcolor=white}
 		\psset{fillstyle=solid}
 		\psset{linecolor=\clr}
 		\psset{framearc=.5}
-		\psframebox{\textcolor{\clr}{customer release}}
+		\psframebox{\textcolor{\clr}{release/white2/MO\_WC\_42\_x.y.z}}
 	}
 	\renewcommand{\clr}{DarkOrchid}
 	\psset{fillcolor=\clr}
-	\psdot[dotsize=5pt,dotstyle=o,linecolor=\clr](3,3)
-	\rput(2,3){
+	\psdot[dotsize=5pt,dotstyle=o,linecolor=\clr](4,3)
+	\rput(0.7,3){
 		\psset{fillcolor=white}
 		\psset{fillstyle=solid}
 		\psset{linecolor=\clr}
 		\psset{framearc=.5}
-		\psframebox{\textcolor{\clr}{RC1}}
+		\psframebox{\textcolor{\clr}{release/white2/MO\_WC\_42\_x.y.z\_RC1}}
 	}
-	\psdot[dotsize=5pt,dotstyle=o,linecolor=\clr](3,11)
-	\rput(2,11){
+	\psdot[dotsize=5pt,dotstyle=o,linecolor=\clr](4,11)
+	\rput(0.7,11){
 		\psset{fillcolor=white}
 		\psset{fillstyle=solid}
 		\psset{linecolor=\clr}
 		\psset{framearc=.5}
-		\psframebox{\textcolor{\clr}{RC2}}
+		\psframebox{\textcolor{\clr}{release/white2/MO\_WC\_42\_x.y.z\_RC2}}
 	}
-	\psdot[dotsize=5pt,dotstyle=o,linecolor=\clr](3,13)
-	\rput(2,13){
+	\psdot[dotsize=5pt,dotstyle=o,linecolor=\clr](4,13)
+	\rput(0.7,13){
 		\psset{fillcolor=white}
 		\psset{fillstyle=solid}
 		\psset{linecolor=\clr}
 		\psset{framearc=.5}
-		\psframebox{\textcolor{\clr}{RC3}}
+		\psframebox{\textcolor{\clr}{release/white2/MO\_WC\_42\_x.y.z\_RC3}}
 	}
-	\psdot[dotsize=5pt,dotstyle=o,linecolor=\clr](3,17)
-	\rput(2,17){
+	\psdot[dotsize=5pt,dotstyle=o,linecolor=\clr](4,17)
+	\rput(0.7,17){
 		\psset{fillcolor=white}
 		\psset{fillstyle=solid}
 		\psset{linecolor=\clr}
 		\psset{framearc=.5}
-		\psframebox{\textcolor{\clr}{RC4}}
+		\psframebox{\textcolor{\clr}{release/white2/MO\_WC\_42\_x.y.z\_RC4}}
 	}
-	\psdot[dotsize=5pt,dotstyle=o,linecolor=\clr](3,19)
-	\rput(2,19){
+	\psdot[dotsize=5pt,dotstyle=o,linecolor=\clr](4,19)
+	\rput(0.7,19){
 		\psset{fillcolor=white}
 		\psset{fillstyle=solid}
 		\psset{linecolor=\clr}
 		\psset{framearc=.5}
-		\psframebox{\textcolor{\clr}{RC5}}
+		\psframebox{\textcolor{\clr}{release/white2/MO\_WC\_42\_x.y.z\_RC5}}
 	}
-	\rput(2,23){
+	\rput(0.7,23){
 		\psset{fillcolor=white}
 		\psset{fillstyle=solid}
 		\psset{linecolor=\clr}
 		\psset{framearc=.5}
-		\psframebox{\textcolor{\clr}{RC6}}
+		\psframebox{\textcolor{\clr}{release/white2/MO\_WC\_42\_x.y.z\_RC6}}
 	}
 	\psset{linecolor=white}
-	\rput(10.5,25){
+	\rput(11.5,25){
 		\psframebox{\textcolor{ForestGreen}{Release branch}}
 	}
-	\rput(10.5,24.5){
+	\rput(11.5,24.5){
 		\psframebox{\textcolor{DarkOrchid}{Release candidate}}
 	}
-	\rput(10.5,24){
+	\rput(11.5,24){
 		\psframebox{\textcolor{RedOrange}{Customer release}}
 	}
-	\rput(10.5,23.5){
+	\rput(11.5,23.5){
 		\psframebox{\textcolor{Maroon}{Error dedected by system test}}
 	}
-	\rput(10.5,23){
+	\rput(11.5,23){
 		\psframebox{\textcolor{Magenta}{Error detected while development}}
 	}
-	\rput(10.5,22.5){
+	\rput(11.5,22.5){
 		\psframebox{\textcolor{RoyalBlue}{Feature implementation}}
 	}
 \end{pspicture}