Add collision-protect description to make.conf and it's manpage

7 files changed, 28 insertions, 7 deletions

diff --git a/cnf/make.conf b/cnf/make.conf
index 8573a1d..03b7c4f 100644
--- a/cnf/make.conf
+++ b/cnf/make.conf
@@ -1,6 +1,6 @@
 # Copyright 2000-2003 Daniel Robbins, Gentoo Technologies, Inc.
 # Contains local system settings for Portage system
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf,v 1.73 2004/05/23 02:42:19 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf,v 1.74 2004/06/08 09:31:21 genone Exp $
 
 # Please review 'man make.conf' for more information.
 
@@ -244,6 +244,9 @@ CHOST="i686-pc-linux-gnu"
 #  'buildpkg'    causes binary packages to be created of all packages that 
 #                are merged.
 #  'ccache'      enables ccache support via CC.
+#  'collision-protect'
+#                this will prevent packages from overwriting files that
+#                are owned by another package or by no package at all.
 #  'cvs'         feature for developers that causes portage to enable all
 #                cvs features (commits, adds) and all USE flags in SRC_URI
 #                will be applied for digests.
diff --git a/cnf/make.conf.alpha b/cnf/make.conf.alpha
index b509b8b..58042f7 100644
--- a/cnf/make.conf.alpha
+++ b/cnf/make.conf.alpha
@@ -1,6 +1,6 @@
 # Copyright 2000-2003 Daniel Robbins, Gentoo Technologies, Inc.
 # Contains local system settings for Portage system
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf.alpha,v 1.29 2004/03/22 01:40:55 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf.alpha,v 1.30 2004/06/08 09:31:21 genone Exp $
 
 # Please review 'man make.conf' for more information.
 
@@ -230,6 +230,9 @@ CFLAGS="-mcpu=ev5 -O3 -pipe "
 #  'buildpkg'    causes binary packages to be created of all packages that 
 #                are merged.
 #  'ccache'      enables ccache support via CC.
+#  'collision-protect'
+#                this will prevent packages from overwriting files that
+#                are owned by another package or by no package at all.
 #  'cvs'         feature for developers that causes portage to enable all
 #                cvs features (commits, adds) and all USE flags in SRC_URI
 #                will be applied for digests.
diff --git a/cnf/make.conf.arm b/cnf/make.conf.arm
index 7ec1c2e..9bfad10 100644
--- a/cnf/make.conf.arm
+++ b/cnf/make.conf.arm
@@ -1,6 +1,6 @@
 # Copyright 2000-2003 Daniel Robbins, Gentoo Technologies, Inc.
 # Contains local system settings for Portage system
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf.arm,v 1.19 2004/05/28 12:45:40 vapier Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf.arm,v 1.20 2004/06/08 09:31:21 genone Exp $
 
 # Please review 'man make.conf' for more information.
 
@@ -235,6 +235,9 @@ CHOST="armv4l-unknown-linux-gnu"
 #  'buildpkg'    causes binary packages to be created of all packages that 
 #                are merged.
 #  'ccache'      enables ccache support via CC.
+#  'collision-protect'
+#                this will prevent packages from overwriting files that
+#                are owned by another package or by no package at all.
 #  'cvs'         feature for developers that causes portage to enable all
 #                cvs features (commits, adds) and all USE flags in SRC_URI
 #                will be applied for digests.
diff --git a/cnf/make.conf.hppa b/cnf/make.conf.hppa
index 8a5f3c6..bdfdcb1 100644
--- a/cnf/make.conf.hppa
+++ b/cnf/make.conf.hppa
@@ -1,6 +1,6 @@
 # Copyright 2000-2003 Daniel Robbins, Gentoo Technologies, Inc.
 # Contains local system settings for Portage system
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf.hppa,v 1.26 2004/03/22 01:40:55 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf.hppa,v 1.27 2004/06/08 09:31:21 genone Exp $
 
 # Please review 'man make.conf' for more information.
 
@@ -247,6 +247,9 @@ CHOST="hppa-unknown-linux-gnu"
 #  'buildpkg'    causes binary packages to be created of all packages that 
 #                are merged.
 #  'ccache'      enables ccache support via CC.
+#  'collision-protect'
+#                this will prevent packages from overwriting files that
+#                are owned by another package or by no package at all.
 #  'cvs'         feature for developers that causes portage to enable all
 #                cvs features (commits, adds) and all USE flags in SRC_URI
 #                will be applied for digests.
diff --git a/cnf/make.conf.mips b/cnf/make.conf.mips
index d429aeb..af2c24a 100644
--- a/cnf/make.conf.mips
+++ b/cnf/make.conf.mips
@@ -1,6 +1,6 @@
 # Copyright 2000-2003 Daniel Robbins, Gentoo Technologies, Inc.
 # Contains local system settings for Portage system
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf.mips,v 1.27 2004/03/22 01:40:55 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf.mips,v 1.28 2004/06/08 09:31:21 genone Exp $
 
 # Please review 'man make.conf' for more information.
 
@@ -228,6 +228,9 @@ CHOST="mips-unknown-linux-gnu"
 #  'buildpkg'    causes binary packages to be created of all packages that 
 #                are merged.
 #  'ccache'      enables ccache support via CC.
+#  'collision-protect'
+#                this will prevent packages from overwriting files that
+#                are owned by another package or by no package at all.
 #  'cvs'         feature for developers that causes portage to enable all
 #                cvs features (commits, adds) and all USE flags in SRC_URI
 #                will be applied for digests.
diff --git a/cnf/make.conf.ppc b/cnf/make.conf.ppc
index e1cfc84..f063814 100644
--- a/cnf/make.conf.ppc
+++ b/cnf/make.conf.ppc
@@ -1,6 +1,6 @@
 # Copyright 2000-2003 Daniel Robbins, Gentoo Technologies, Inc.
 # Contains local system settings for Portage system
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf.ppc,v 1.46 2004/03/22 01:40:55 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf.ppc,v 1.47 2004/06/08 09:31:22 genone Exp $
 
 # Please review 'man make.conf' for more information.
 
@@ -261,6 +261,9 @@ CHOST="powerpc-unknown-linux-gnu"
 #  'buildpkg'    causes binary packages to be created of all packages that 
 #                are merged.
 #  'ccache'      enables ccache support via CC.
+#  'collision-protect'
+#                this will prevent packages from overwriting files that
+#                are owned by another package or by no package at all.
 #  'cvs'         feature for developers that causes portage to enable all
 #                cvs features (commits, adds) and all USE flags in SRC_URI
 #                will be applied for digests.
diff --git a/cnf/make.conf.sparc b/cnf/make.conf.sparc
index ae56517..53cde79 100644
--- a/cnf/make.conf.sparc
+++ b/cnf/make.conf.sparc
@@ -1,6 +1,6 @@
 # Copyright 2000-2003 Daniel Robbins, Gentoo Technologies, Inc.
 # Contains local system settings for Portage system
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf.sparc,v 1.31 2004/03/22 01:40:55 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf.sparc,v 1.32 2004/06/08 09:31:22 genone Exp $
 
 # Please review 'man make.conf' for more information.
 
@@ -251,6 +251,9 @@ CHOST="sparc-unknown-linux-gnu"
 #  'buildpkg'    causes binary packages to be created of all packages that 
 #                are merged.
 #  'ccache'      enables ccache support via CC.
+#  'collision-protect'
+#                this will prevent packages from overwriting files that
+#                are owned by another package or by no package at all.
 #  'cvs'         feature for developers that causes portage to enable all
 #                cvs features (commits, adds) and all USE flags in SRC_URI
 #                will be applied for digests.