Update why unified diff is _sometimes_ better.

diff --git a/doc/FAQ_DEV b/doc/FAQ_DEV
index 78974070284aeac9f248535c4a427577fec21fb5..5aca07b4a5338da914eabaf8701a90dec7707bcb 100644 (file)
--- a/doc/FAQ_DEV
+++ b/doc/FAQ_DEV
@@ -1,7 +1,7 @@
 
           Developer's Frequently Asked Questions (FAQ) for PostgreSQL
                                        
-   Last updated: Tue Nov 22 10:17:51 EST 2005
+   Last updated: Sat Dec 24 13:36:54 EST 2005
    
    Current maintainer: Bruce Momjian ([email protected])
    
@@ -110,7 +110,8 @@ General Questions
   
    Generate the patch in contextual diff format. If you are unfamiliar
    with this, you might find the script src/tools/makediff/difforig
-   useful.
+   useful. Unified diffs are only preferrable if the file changes are
+   single-line changes and do not rely on the surrouding lines.
    
    Ensure that your patch is generated against the most recent version of
    the code. If it is a patch adding new functionality, the most recent

diff --git a/doc/src/FAQ/FAQ_DEV.html b/doc/src/FAQ/FAQ_DEV.html
index 1a08888e46375eec6c006d2773e0fd11000e16c9..3cb29b016a663d9e0e423edd7add72f04ac391a0 100644 (file)
--- a/doc/src/FAQ/FAQ_DEV.html
+++ b/doc/src/FAQ/FAQ_DEV.html
@@ -13,7 +13,7 @@
     Developer's Frequently Asked Questions (FAQ) for
     PostgreSQL
 
-    Last updated: Tue Nov 22 10:17:51 EST 2005
+    Last updated: Sat Dec 24 13:36:54 EST 2005
 
     Current maintainer: Bruce Momjian (
     "mailto:[email protected]">[email protected])
@@ -158,7 +158,9 @@
 
     Generate the patch in contextual diff format. If you are
     unfamiliar with this, you might find the script
-    src/tools/makediff/difforig useful.
+    src/tools/makediff/difforig useful.  Unified diffs are
+    only preferrable if the file changes are single-line changes and
+    do not rely on the surrouding lines.
 
     Ensure that your patch is generated against the most recent
     version of the code. If it is a patch adding new functionality, the