Index: DamOverall/trunk/doc/DAM - Architecture Overall/DAM - Architecture Overall.tex
===================================================================
diff -u -r6449 -r6474
--- DamOverall/trunk/doc/DAM - Architecture Overall/DAM - Architecture Overall.tex	(.../DAM - Architecture Overall.tex)	(revision 6449)
+++ DamOverall/trunk/doc/DAM - Architecture Overall/DAM - Architecture Overall.tex	(.../DAM - Architecture Overall.tex)	(revision 6474)
@@ -475,6 +475,7 @@
 \section{Dam UI}
 This application is dependent on the \ProgramName Engine (see \autoref{app:DamUI}).
 
+\subsection{Step 1: Create branch}
 The following steps are needed to release this application.
 \begin{enumerate}
 	\item In the trunk, update the Tutorials in the release folder.
@@ -492,23 +493,49 @@
 	\item For the setup, replace all GUIDS in ApplicationGUIDs.wxi by newly created GUIDS (use an online GUID generator such as found at www.guidgenerator.com). 
 	Be sure to use Uppercase, Braces and Hyphens when generating the GUIDS. Replace the GUID in DamDefines.wxi (in sub folder Harvest) with a new GUID too
 	\item In the trunk, update version number of User Manual to XX.Y.
-	\item Create a branch DamUI XX.Y.
-	\item Set version number in branch to XX.Y.1 in .$\backslash$src$\backslash$build$\backslash$Base.targets.
-	\item Set version number in branch to XX.Y.1 in .$\backslash$src$\backslash$DamClientsLibrary$\backslash$build$\backslash$Base.targets.
-	\item Set version number in branch to XX.Y.1 in file .$\backslash$setup$\backslash$Product.wxs (ReleaseVersion).
+	\item Create a branch DamUI XX.Y. Set explicit revision for all the externals.
+	\item Set version number in branch to XX.Y.1 in the following files:
+	\begin{itemize}
+		\item in .$\backslash$src$\backslash$build$\backslash$Base.targets.
+		\item in .$\backslash$src$\backslash$DamClientsLibrary$\backslash$build$\backslash$Base.targets.
+		\item in .$\backslash$setup$\backslash$Product.wxs (ReleaseVersion).
+	\end{itemize}
 	\item Create release notes in branch. Include release notes from DSL, Macrostability, WTIPiping if they are applicable.
 	\item Adapt/Correct all externals where needed to the proper tags (instead of trunk).
 	\item Change the 'current' external in the branch ’signing’ of DAM UI to the src folder of the new branch DamUI XX.Y.
-	\item Create a new Dam UI TeamCity Project XX.Y by copying the entire trunk project (with all sub projects) a adapt the TeamCity configuration for the subproject to use the branch XX.Y.
+	\item Create a new Dam UI TeamCity Project XX.Y by copying the entire trunk project (with all sub projects) a adapt the TeamCity configuration for the subproject to use the branch XX.Y. Remove all dependencies and triggers associated to DAM Engine trunk.
 	\item Run the TC Release project. This triggers the Signing DAM UI project.
 	\item Pin the signed artifacts on TC with XX.Y.1 (select apply on all snapshot dependencies).
-	\item Get the artifacts and update the release folder of the branch with this.
-	Both the Dam.msi as well as DAM.zip are releasable products and should therefore be updated.
-	\item When the user manual and release notes are final, set pin on the Documentation project of the branch in TeamCity (convert release notes from Word to LaTeX if needed).
-	\item Get the artifacts (i.e. User Manual and Release Notes) from the pinned version and commit them in the release/Documents folder of the branch.
+	\item Get the artifacts and update the release$\backslash$Install\_Version folder of the branch with this.
+\end{enumerate}
+
+\subsection{Step 2: Signing setup}
+Actions:
+\begin{enumerate}	
+	\item When the user manual and release notes are final, set pin on the Documentation project of the branch in TeamCity.
+	\item Get the artifacts (i.e. User Manual and Release Notes) from the pinned version and commit them in the release folder of the branch:
+	\begin{itemize}
+		\item User Manual in release/Install\_Version/Manual
+		\item Release Notes, FD and TD in release/Documents
+	\end{itemize}
+	\item Run the Release Setup project. This triggers the Signing Setup project.
+	\item Set pin on signed setup in signing project on build server (select apply on all snapshot dependencies).
+	\item Download the pinned setup from TeamCity and put setup Dam.msi and release notes in TestInstalls (N:$\backslash$Teams$\backslash$DSC TeCo$\backslash$Test Installs$\backslash$GEO).
+	\item Add the setup to the release folder of the branch. 
+\end{enumerate}
+
+\subsection{Step 3: Tag and final actions}
+Actions:
+\begin{enumerate}	
 	\item Create a tag XX.Y.1.
-	\item In the branch, reset version to XX.Y.0 in .$\backslash$src$\backslash$build$\backslash$Base.targets, .$\backslash$src$\backslash$DamClientsLibrary$\backslash$build$\backslash$Base.targets and .$\backslash$setup$\backslash$Product.wxs.
+	\item In the branch, reset version to XX.Y.0 in the following files:
+	\begin{itemize}
+		\item in .$\backslash$src$\backslash$build$\backslash$Base.targets
+		\item in .$\backslash$src$\backslash$DamClientsLibrary$\backslash$build$\backslash$Base.targets
+		\item in .$\backslash$setup$\backslash$Product.wxs (ReleaseVersion)
+	\end{itemize}
 	\item Merge release folder from branch to trunk.
+	\item Release version XX.Y in Jira (select Project, Settings (wheel), Versions. Select version XX.Y, choose action Release).
 \end{enumerate}
 
 \section{DamLive}
@@ -531,7 +558,7 @@
 	\item Run the TC Release project. This triggers the Signing DAM Live project.
 	\item Pin the signed artifacts on TC with XX.Y.1 (select apply on all snapshot dependencies).
 	\item Get the artifacts and update the release folder of the branch with this.
-	\item Create a tag XX.Y.1
+	\item Create a tag XX.Y.1.
 	\item In the branch, reset version to XX.Y.0
 	\item Merge release folder from branch to trunk.	
 \end{enumerate}
