From fd8c2ff85c098149f11280af5f1a257dd6af3622 Mon Sep 17 00:00:00 2001
From: Pierre Letouzey
Date: Thu, 1 Jun 2017 17:35:58 +0200
Subject: mention 'make world' without 'byte' in CHANGES + 2 minor suggestions

---
 CHANGES        | 9 +++++++++
 Makefile       | 2 +-
 Makefile.build | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 30bea7a7b5..7038b490ab 100644
--- a/CHANGES
+++ b/CHANGES
@@ -74,6 +74,15 @@ Tools
   warnings when a deprecated feature is used.  Please upgrade your _CoqProject
   accordingly.
 
+Build Infrastructure
+
+- Note that 'make world' does not build the bytecode binaries anymore.
+  For that, you can use 'make byte' (and 'make install-byte' afterwards).
+  Warning: native and byte compilations should *not* be mixed in the same
+  instance of 'make -j', otherwise both ocamlc and ocamlopt might race for
+  access to the same .cmi files. In short, use "make -j && make -j byte"
+  instead of "make -j world byte".
+
 Changes from V8.6beta1 to V8.6
 ==============================
 
diff --git a/Makefile b/Makefile
index 23c6ea6380..91b0249137 100644
--- a/Makefile
+++ b/Makefile
@@ -123,7 +123,7 @@ help:
 	@echo "   make clean"
 	@echo "or make archclean"
 	@echo "For make to be verbose, add VERBOSE=1"
-	@echo "If you want camlp{4,5} to generate human-readable files, add READABLE_ML4=1"
+	@echo "If you want camlp5 to generate human-readable files, add READABLE_ML4=1"
 	@echo
 	@echo "Bytecode compilation is now a separate target:"
 	@echo "   make byte"
diff --git a/Makefile.build b/Makefile.build
index 6203dd7599..064f89aa03 100644
--- a/Makefile.build
+++ b/Makefile.build
@@ -53,7 +53,7 @@ world: coq coqide documentation revision
 
 coq: coqlib coqbinaries tools
 
-# Note: 'world' do not build the bytecode binaries anymore.
+# Note: 'world' does not build the bytecode binaries anymore.
 # For that, you can use the 'byte' rule. Native and byte compilations
 # shouldn't be done in a same make -j... run, otherwise both ocamlc and
 # ocamlopt might race for access to the same .cmi files.
-- 
cgit v1.2.3