6 files changed, 50 insertions, 9 deletions

diff --git a/share/examples/cvsup/cvs-supfile b/share/examples/cvsup/cvs-supfile
index 2db0c6b47e24..bd4776fb3dc3 100644
--- a/share/examples/cvsup/cvs-supfile
+++ b/share/examples/cvsup/cvs-supfile
@@ -62,7 +62,7 @@
 #
 # The easiest way to get the main source tree is to use the "src-all"
 # mega-collection.  It includes all of the individual "src-*" collections,
-# except "src-crypto" and "src-secure".
+# except the export-restricted collections.
 src-all
 
 # These are the individual collections that make up "src-all".  If you
@@ -90,8 +90,17 @@ src-all
 # Only people in the USA and Canada may fetch these collections.  If
 # you are not in the USA or Canada, please use the collections in the
 # "secure-cvs-supfile" instead.
+#
+# The easiest way to get the export-restricted code is to use the
+# "cvs-crypto" mega-collection.
+#cvs-crypto
+#
+# These are the individual collections that make up "cvs-crypto".  If
+# you use these, be sure to comment out "cvs-crypto" above.
 #src-crypto
+#src-eBones
 #src-secure
+#src-sys-crypto
 
 ## Ports Collection.
 #
diff --git a/share/examples/cvsup/secure-cvs-supfile b/share/examples/cvsup/secure-cvs-supfile
index 26ba58ddba07..e56bea1f5612 100644
--- a/share/examples/cvsup/secure-cvs-supfile
+++ b/share/examples/cvsup/secure-cvs-supfile
@@ -49,5 +49,11 @@
 *default compress
 
 ## The international secure collections.
-src-crypto
-src-secure
+cvs-crypto
+#
+# These are the individual collections that make up "cvs-crypto".  If
+# you use these, be sure to comment out "cvs-crypto" above.
+#src-crypto
+#src-eBones
+#src-secure
+#src-sys-crypto
diff --git a/share/examples/cvsup/secure-stable-supfile b/share/examples/cvsup/secure-stable-supfile
index 4f1f1fd4eca9..d52ee6be596c 100644
--- a/share/examples/cvsup/secure-stable-supfile
+++ b/share/examples/cvsup/secure-stable-supfile
@@ -50,5 +50,10 @@
 *default compress
 
 ## The international secure collections.
-src-crypto
-src-secure
+cvs-crypto
+#
+# These are the individual collections that make up "cvs-crypto".  If
+# you use these, be sure to comment out "cvs-crypto" above.
+#src-crypto
+#src-secure
+#src-sys-crypto
diff --git a/share/examples/cvsup/secure-supfile b/share/examples/cvsup/secure-supfile
index dac08070bee8..d68ed1a29f1a 100644
--- a/share/examples/cvsup/secure-supfile
+++ b/share/examples/cvsup/secure-supfile
@@ -48,5 +48,10 @@
 *default compress
 
 ## The international secure collections.
-src-crypto
-src-secure
+cvs-crypto
+#
+# These are the individual collections that make up "cvs-crypto".  If
+# you use these, be sure to comment out "cvs-crypto" above.
+#src-crypto
+#src-secure
+#src-sys-crypto
diff --git a/share/examples/cvsup/stable-supfile b/share/examples/cvsup/stable-supfile
index 10b14d0445f7..72ebb61f7573 100644
--- a/share/examples/cvsup/stable-supfile
+++ b/share/examples/cvsup/stable-supfile
@@ -78,7 +78,7 @@
 #
 # The easiest way to get the main source tree is to use the "src-all"
 # mega-collection.  It includes all of the individual "src-*" collections,
-# except "src-crypto" and "src-secure".
+# except the export-restricted collections.
 src-all
 
 # These are the individual collections that make up "src-all".  If you
@@ -106,5 +106,13 @@ src-all
 # Only people in the USA and Canada may fetch these collections.  If
 # you are not in the USA or Canada, please use the collections in the
 # "secure-supfile" instead.
+#
+# The easiest way to get the export-restricted code is to use the
+# "cvs-crypto" mega-collection.
+#cvs-crypto
+#
+# These are the individual collections that make up "cvs-crypto".  If
+# you use these, be sure to comment out "cvs-crypto" above.
 #src-crypto
 #src-secure
+#src-sys-crypto
diff --git a/share/examples/cvsup/standard-supfile b/share/examples/cvsup/standard-supfile
index 5a090868e5ee..a2e866ad12cb 100644
--- a/share/examples/cvsup/standard-supfile
+++ b/share/examples/cvsup/standard-supfile
@@ -61,7 +61,7 @@
 #
 # The easiest way to get the main source tree is to use the "src-all"
 # mega-collection.  It includes all of the individual "src-*" collections,
-# except "src-crypto" and "src-secure".
+# except the export-restricted collections.
 src-all
 
 # These are the individual collections that make up "src-all".  If you
@@ -89,5 +89,13 @@ src-all
 # Only people in the USA and Canada may fetch these collections.  If
 # you are not in the USA or Canada, please use the collections in the
 # "secure-supfile" instead.
+#
+# The easiest way to get the export-restricted code is to use the
+# "cvs-crypto" mega-collection.
+#cvs-crypto
+#
+# These are the individual collections that make up "cvs-crypto".  If
+# you use these, be sure to comment out "cvs-crypto" above.
 #src-crypto
 #src-secure
+#src-sys-crypto