Change: clariy what CI is in arch doc

1 files changed, 16 insertions, 2 deletions

diff --git a/architecture.mdwn b/architecture.mdwn
index 4bea4fd..a036cd2 100644
--- a/architecture.mdwn
+++ b/architecture.mdwn
@@ -5,14 +5,28 @@
 Introduction
 =============================================================================
 
-Ick is a continuous integration (CI) system. It may some day evolve
-into also being a continuous deployment (CD) system.
+Ick is a tool to aid in continuous integration (CI). It may some day
+evolve into also being a tool for also doing continuous deployment
+(CD).
 
 This document describes the technical architecture of ick.
 Specifically, the architecture for the upcoming ALPHA-6 release, but
 not further than that. ALPHA-6 is meant to usable by people other than
 the primary developer.
 
+What is continuous integration?
+-----------------------------------------------------------------------------
+
+Continuous integration is a style software development where changes
+get integrated to the main line of development freuqently. It is
+contrasted with a style where features get developed in their own,
+long-living branches and only get integrated when finished, often
+after weeks or months of development. The latter often results in an
+integration phase that is long and error-prone. Frequent integration
+typically results in fast, painless integration, because not much has
+changed.
+
+
 Background and justification
 -----------------------------------------------------------------------------