aboutsummaryrefslogtreecommitdiffhomepage
path: root/doc_src/design.hdr
diff options
context:
space:
mode:
authorGravatar Mark Griffiths <mark@thebespokepixel.com>2014-09-03 20:31:43 +0100
committerGravatar Mark Griffiths <mark@thebespokepixel.com>2014-09-03 20:31:43 +0100
commit5f3b0d9f1e7e948acdfa4c2005476fe2d766f8a5 (patch)
tree3cd3ddff1912df19777320b6971ada0841cb7016 /doc_src/design.hdr
parent05848038dbeff00636a41a6919587315dcedc6fd (diff)
Merge branch 'master' into documentation-update
Conflicts: doc_src/design.hdr
Diffstat (limited to 'doc_src/design.hdr')
-rw-r--r--doc_src/design.hdr7
1 files changed, 7 insertions, 0 deletions
diff --git a/doc_src/design.hdr b/doc_src/design.hdr
index 1bb6f8c8..adca7551 100644
--- a/doc_src/design.hdr
+++ b/doc_src/design.hdr
@@ -52,7 +52,14 @@ Examples:
\section design-configurability Configurability is the root of all evil
+<<<<<<< HEAD
Every configuration option in a program is a place where the program is too stupid to figure out for itself what the user really wants, and should be considered a failiure of both the program and the programmer who implemented it.
+=======
+Every configuration option in a program is a place where the program
+is too stupid to figure out for itself what the user really wants, and
+should be considered a failure of both the program and the programmer
+who implemented it.
+>>>>>>> master
Rationale:
Different configuration options are a nightmare to maintain, since the number of potential bugs caused by specific configuration combinations quickly becomes an issue. Configuration options often imply assumptions about the code which change when reimplementing the code, causing issues with backwards compatibility. But mostly, configuration options should be avoided since they simply should not exist, as the program should be smart enough to do what is best, or at least a good enough approximation of it.