[sr-dev] git:master: doc: change commit requirements according the discussion on ml

[Henning Westerholt]

Module: sip-router
Branch: master
Commit: df264708d4eb9946ce4b3f26ae8f3fe4eb4b4484
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=df264708d4eb9946ce4b3f26ae8f3fe4eb4b4484

Author: Henning Westerholt <henning.westerholt at 1und1.de>
Committer: Henning Westerholt <henning.westerholt at 1und1.de>
Date:   Fri Nov 27 17:16:41 2009 +0100

doc: change commit requirements according the discussion on ml

---

 doc/cvs-commit-rules.txt |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/cvs-commit-rules.txt b/doc/cvs-commit-rules.txt
index 430c1bc..6fa8d74 100644
--- a/doc/cvs-commit-rules.txt
+++ b/doc/cvs-commit-rules.txt
@@ -15,14 +15,14 @@ Exceptions:
 2. Code requirements
 --------------------
 2.1 Unstable branch:
- - the code must compile (at least on one arhitecture). If the code does not compile, but you still want to commit it, comment it out (#if 0 ... #endif)
+ - the code must compile (at least on one architecture). If the code does not compile, but you still want to commit it, comment it out (#if 0 ... #endif)
  - the code should compile without warnings (with -Wall) (exceptions: very difficult to avoid warnings)
  - follow SIP-router coding style
 
 2.2. Stable branch (everything for unstable branch +)
 ------------------------------------------------------
- - the code must compile on all the arhitectures (this currently includes
+ - the code should compile on all the architectures (this currently includes
    linux, freebsd, netbsd, openbsd, solaris >= 8; x86, ultrasparc, strongarm;
-    gcc 2.95, 3.x, icc, sun cc >=5.3).
+   gcc 4.x, icc, sun cc >=5.3). It should also compile on gcc 2.95 and 3.x.
  - the code must be tested or the change trivial enough
- - the code must compile without warnings on all the arhitectures (with some exceptions)
+ - the code should compile without warnings on all the arhitectures (with some exceptions)