From d186a7f908e4796311fbfb97fc5e534b2bdb681d Mon Sep 17 00:00:00 2001
From: Kean Johnston <kean@isc.org>
Date: Mon, 2 Dec 2013 16:06:17 +0200
Subject: [PATCH 1/3] [1501] Added warning about -j to configure output

---
 configure.ac | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/configure.ac b/configure.ac
index b9007b0e73..070466fb68 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1709,4 +1709,8 @@ cat <<EOF
   run "make check", you must run "make" first as some files need to be
   generated by "make" before "make check" can be run.
 
+  When running "make install" do not use any form of parallel or job
+  server options (such as GNU make's -j option). Doing so is guaranteed
+  to cause errors.
+
 EOF

From cf3e0e1c486079543ad11af9a3ec48f0a70b4b57 Mon Sep 17 00:00:00 2001
From: Kean Johnston <kean@isc.org>
Date: Mon, 2 Dec 2013 16:06:38 +0200
Subject: [PATCH 2/3] [1501] Added warning about -j to BIND guide

---
 doc/guide/bind10-guide.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/guide/bind10-guide.xml b/doc/guide/bind10-guide.xml
index 6d52f42c23..d73d81c214 100644
--- a/doc/guide/bind10-guide.xml
+++ b/doc/guide/bind10-guide.xml
@@ -836,6 +836,11 @@ as a dependency earlier -->
           and documentation, run:
           <screen>$ <userinput>make install</userinput></screen>
         </para>
+        <para>
+          Please note that you should not use any form of parallel or job
+          server options (such as GNU make's -j option) when performing
+          this step. Doing so is guaranteed to cause errors.
+        </para>
         <note>
           <para>The install step may require superuser privileges.</para>
         </note>

From c4af356c438e33f0edcefcb305eb82d11326860d Mon Sep 17 00:00:00 2001
From: Mukund Sivaraman <muks@isc.org>
Date: Thu, 5 Dec 2013 17:38:23 +0530
Subject: [PATCH 3/3] [1501] Change language to say it may cause errors

---
 configure.ac               | 4 ++--
 doc/guide/bind10-guide.xml | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 070466fb68..3f2b3faf5e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1710,7 +1710,7 @@ cat <<EOF
   generated by "make" before "make check" can be run.
 
   When running "make install" do not use any form of parallel or job
-  server options (such as GNU make's -j option). Doing so is guaranteed
-  to cause errors.
+  server options (such as GNU make's -j option). Doing so may cause
+  errors.
 
 EOF
diff --git a/doc/guide/bind10-guide.xml b/doc/guide/bind10-guide.xml
index d73d81c214..16fffa8672 100644
--- a/doc/guide/bind10-guide.xml
+++ b/doc/guide/bind10-guide.xml
@@ -837,9 +837,9 @@ as a dependency earlier -->
           <screen>$ <userinput>make install</userinput></screen>
         </para>
         <para>
-          Please note that you should not use any form of parallel or job
-          server options (such as GNU make's -j option) when performing
-          this step. Doing so is guaranteed to cause errors.
+          Please don't use any form of parallel or job server options
+          (such as GNU make's <command>-j</command> option) when
+          performing this step. Doing so may cause errors.
         </para>
         <note>
           <para>The install step may require superuser privileges.</para>