# 
# 
# patch "ChangeLog"
#  from [14fff4321f781f1c13c4f9da5695bc1136e54c82]
#    to [59140c16308c0a59a06eec5c27dc4fb1d0e25389]
# 
# patch "HACKING"
#  from [f7c096ad0e0f32ac5e7c61531915fd4a9d484485]
#    to [de2336f3aeace0bf7cdb2a9d9a98e0efc7b2ba85]
# 
============================================================
--- ChangeLog	14fff4321f781f1c13c4f9da5695bc1136e54c82
+++ ChangeLog	59140c16308c0a59a06eec5c27dc4fb1d0e25389
@@ -1,3 +1,7 @@
+2006-12-12  Thomas Moschny  <address@hidden>
+
+	* HACKING: Updated "Patch submission guidelines" section.
+
 2006-12-11  Ben Walton  <address@hidden>
  
         * cmd_ws_commit.cc,
============================================================
--- HACKING	f7c096ad0e0f32ac5e7c61531915fd4a9d484485
+++ HACKING	de2336f3aeace0bf7cdb2a9d9a98e0efc7b2ba85
@@ -242,11 +242,19 @@ list.
 patch (e.g. by wrapping lines in the patch) before sending your patch to the
 list.
 
-All changes to the monotone source require an accompanying ChangeLog entry.
-Any changes that affect the user interface (e.g. adding command-line
-options, changing the output format) or affect the documented behaviour of
-monotone must include appropriate changes to the documentation.
+All changes to the monotone source require an accompanying ChangeLog
+entry (except translation updates, and changes to the ChangeLog itself
+[e.g. typos], obviously).  Any changes that affect the user interface
+(e.g. adding command-line options, changing the output format) or
+affect the documented behaviour of monotone must include appropriate
+changes to the documentation.
 
+Please review your patch prior to submission, to not include
+accidental white-space-only changes or changes to the language
+files. Usually you should revert po/*.po files before generating a
+patch - unfortunately these are often changed when you build but do
+not contain any reasonable changes.
+
 The monotone development team review and comment on all patches on a
 best-efforts basis.  Patches are never ignored, but a patch may not be
 discussed or applied immediately according to the amount of spare time the