aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/FAQ_DEV3
-rw-r--r--doc/src/FAQ/FAQ_DEV.html3
2 files changed, 4 insertions, 2 deletions
diff --git a/doc/FAQ_DEV b/doc/FAQ_DEV
index 0de0d6407c9..9481c36b389 100644
--- a/doc/FAQ_DEV
+++ b/doc/FAQ_DEV
@@ -80,7 +80,8 @@
glimpse.
make_diff has tools to create patch diff files that can be applied to
- the distribution.
+ the distribution. This produces context diffs, which is our preferred
+ format.
Our standard format is to indent each code level with one tab, where
each tab is four spaces. You will need to set your editor to display
diff --git a/doc/src/FAQ/FAQ_DEV.html b/doc/src/FAQ/FAQ_DEV.html
index 3b302172184..179f6168438 100644
--- a/doc/src/FAQ/FAQ_DEV.html
+++ b/doc/src/FAQ/FAQ_DEV.html
@@ -112,7 +112,8 @@
Others prefer <I>glimpse.</I>
<P><I>make_diff</I> has tools to create patch diff files that can
- be applied to the distribution.</P>
+ be applied to the distribution. This produces context diffs, which
+ is our preferred format.</P>
<P>Our standard format is to indent each code level with one tab,
where each tab is four spaces. You will need to set your editor to