aboutsummaryrefslogtreecommitdiff
path: root/cnf
diff options
context:
space:
mode:
authorNicholas Jones <carpaski@gentoo.org>2004-08-02 18:49:31 +0000
committerNicholas Jones <carpaski@gentoo.org>2004-08-02 18:49:31 +0000
commit5d4e95342ff095a74ad291725d985e6fae4c4c49 (patch)
tree2cf4f64c8891101781b9fecfc8e0fc9d1ab77c4a /cnf
parentbin/emerge: Added code to skip directory in info dir. (#59138) (diff)
downloadportage-cvs-5d4e95342ff095a74ad291725d985e6fae4c4c49.tar.gz
portage-cvs-5d4e95342ff095a74ad291725d985e6fae4c4c49.tar.bz2
portage-cvs-5d4e95342ff095a74ad291725d985e6fae4c4c49.zip
Cleanups, typo fixes, extra info output, binary altroot fix, bad mirror
message. portage-2.0.51_pre14
Diffstat (limited to 'cnf')
-rw-r--r--cnf/make.conf18
-rw-r--r--cnf/make.conf.alpha18
-rw-r--r--cnf/make.conf.arm18
-rw-r--r--cnf/make.conf.hppa18
-rw-r--r--cnf/make.conf.mips18
-rw-r--r--cnf/make.conf.ppc18
-rw-r--r--cnf/make.conf.sparc18
7 files changed, 63 insertions, 63 deletions
diff --git a/cnf/make.conf b/cnf/make.conf
index 461d501..d63bf45 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.77 2004/07/13 20:36:28 genone Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf,v 1.78 2004/08/02 18:49:30 carpaski Exp $
# Please review 'man make.conf' for more information.
@@ -162,7 +162,7 @@ CHOST="i686-pc-linux-gnu"
#FETCHCOMMAND='/usr/bin/proz --no-getch -s ${URI} -P ${DISTDIR}'
#
# Portage uses GENTOO_MIRRORS to specify mirrors to use for source retrieval.
-# The list is a space seperated list which is read left to right. If you use
+# The list is a space separated list which is read left to right. If you use
# another mirror we highly recommend leaving the default mirror at the end of
# the list so that portage will fall back to it if the files cannot be found
# on your specified mirror. We _HIGHLY_ recommend that you change this setting
@@ -170,7 +170,7 @@ CHOST="i686-pc-linux-gnu"
#GENTOO_MIRRORS="<your_mirror_here> http://gentoo.osuosl.org http://www.ibiblio.org/pub/Linux/distributions/gentoo"
#
# Portage uses PORTAGE_BINHOST to specify mirrors for prebuilt-binary packages.
-# The list is a single extry specifying the full address of the directory
+# The list is a single entry specifying the full address of the directory
# serving the tbz2's for your system. Running emerge with either '--getbinpkg'
# or '--getbinpkgonly' will cause portage to retrieve the metadata from all
# packages in the directory specified, and use that data to determine what will
@@ -182,7 +182,7 @@ CHOST="i686-pc-linux-gnu"
# Synchronizing Portage
# =====================
#
-# Each of these settings effects how Gentoo synchronizes your Portage tree.
+# Each of these settings affects how Gentoo synchronizes your Portage tree.
# Synchronization is handled by rsync and these settings allow some control
# over how it is done.
#
@@ -260,12 +260,12 @@ CHOST="i686-pc-linux-gnu"
# from a merge.
# 'keepwork' prevents the clean phase from deleting the WORKDIR.
# 'noauto' causes ebuild to perform only the action requested and
-# not any other required actions like clean or
+# not any other required actions like clean.
# 'noclean' prevents portage from removing the source and temporary files
# after a merge -- for debugging purposes only.
# 'nostrip' prevents stripping of binaries.
# 'notitles' disables xterm titlebar updates (which contain status info).
-# 'sandbox' enable sandbox-ing when running emerge and ebuild
+# 'sandbox' enable sandbox-ing when running emerge and ebuild.
# 'strict' causes portage to react strongly to conditions that
# have the potential to be dangerous -- like missing or
# incorrect Manifest files.
@@ -283,14 +283,14 @@ CHOST="i686-pc-linux-gnu"
# user's environment, for userpriv it sets: ${PORTAGE_TMPDIR}/ccache
# (/var/tmp/ccache), and for regular use the default is /root/.ccache.
# Sizes are specified with 'G' 'M' or 'K'.
-# '4G' for 4 gigabytes, '4096M' for 4 gigabytes, etc... Default is 2G
-#CCACHE_SIZE="2G"
+# '2G' for 2 gigabytes, '2048M' for 2048 megabytes (same as 2G).
+#CCACHE_SIZE="512M"
#
# DISTCC_DIR sets the temporary space used by distcc.
#DISTCC_DIR="${PORTAGE_TMPDIR}/.distcc"
#
# RSYNC_EXCLUDEFROM is a file that portage will pass to rsync when it updates
-# the portage tree. Specific chucks of the tree may be excluded from
+# the portage tree. Specific chunks of the tree may be excluded from
# consideration. This may cause dependency failures if you are not careful.
# The file format is one pattern per line, blanks and ';' or '#' lines are
# comments. See 'man rsync' for more details on the exclude-from format.
diff --git a/cnf/make.conf.alpha b/cnf/make.conf.alpha
index da51594..d8e134a 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.33 2004/07/13 20:36:28 genone Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf.alpha,v 1.34 2004/08/02 18:49:30 carpaski Exp $
# Please review 'man make.conf' for more information.
@@ -148,7 +148,7 @@ CFLAGS="-mcpu=ev5 -O3 -pipe "
#FETCHCOMMAND='/usr/bin/proz --no-getch -s ${URI} -P ${DISTDIR}'
#
# Portage uses GENTOO_MIRRORS to specify mirrors to use for source retrieval.
-# The list is a space seperated list which is read left to right. If you use
+# The list is a space separated list which is read left to right. If you use
# another mirror we highly recommend leaving the default mirror at the end of
# the list so that portage will fall back to it if the files cannot be found
# on your specified mirror. We _HIGHLY_ recommend that you change this setting
@@ -156,7 +156,7 @@ CFLAGS="-mcpu=ev5 -O3 -pipe "
#GENTOO_MIRRORS="<your_mirror_here> http://gentoo.osuosl.org http://www.ibiblio.org/pub/Linux/distributions/gentoo"
#
# Portage uses PORTAGE_BINHOST to specify mirrors for prebuilt-binary packages.
-# The list is a single extry specifying the full address of the directory
+# The list is a single entry specifying the full address of the directory
# serving the tbz2's for your system. Running emerge with either '--getbinpkg'
# or '--getbinpkgonly' will cause portage to retrieve the metadata from all
# packages in the directory specified, and use that data to determine what will
@@ -168,7 +168,7 @@ CFLAGS="-mcpu=ev5 -O3 -pipe "
# Synchronizing Portage
# =====================
#
-# Each of these settings effects how Gentoo synchronizes your Portage tree.
+# Each of these settings affects how Gentoo synchronizes your Portage tree.
# Synchronization is handled by rsync and these settings allow some control
# over how it is done.
#
@@ -246,12 +246,12 @@ CFLAGS="-mcpu=ev5 -O3 -pipe "
# from a merge.
# 'keepwork' prevents the clean phase from deleting the WORKDIR.
# 'noauto' causes ebuild to perform only the action requested and
-# not any other required actions like clean or
+# not any other required actions like clean.
# 'noclean' prevents portage from removing the source and temporary files
# after a merge -- for debugging purposes only.
# 'nostrip' prevents stripping of binaries.
# 'notitles' disables xterm titlebar updates (which contain status info).
-# 'sandbox' enable sandbox-ing when running emerge and ebuild
+# 'sandbox' enable sandbox-ing when running emerge and ebuild.
# 'strict' causes portage to react strongly to conditions that
# have the potential to be dangerous -- like missing or
# incorrect Manifest files.
@@ -268,14 +268,14 @@ CFLAGS="-mcpu=ev5 -O3 -pipe "
# user's environment, for userpriv it sets: ${PORTAGE_TMPDIR}/ccache
# (/var/tmp/ccache), and for regular use the default is /root/.ccache.
# Sizes are specified with 'G' 'M' or 'K'.
-# '4G' for 4 gigabytes, '4096M' for 4 gigabytes, etc... Default is 2G
-#CCACHE_SIZE="2G"
+# '2G' for 2 gigabytes, '2048M' for 2048 megabytes (same as 2G).
+#CCACHE_SIZE="512M"
#
# DISTCC_DIR sets the temporary space used by distcc.
#DISTCC_DIR="${PORTAGE_TMPDIR}/.distcc"
#
# RSYNC_EXCLUDEFROM is a file that portage will pass to rsync when it updates
-# the portage tree. Specific chucks of the tree may be excluded from
+# the portage tree. Specific chunks of the tree may be excluded from
# consideration. This may cause dependency failures if you are not careful.
# The file format is one pattern per line, blanks and ';' or '#' lines are
# comments. See 'man rsync' for more details on the exclude-from format.
diff --git a/cnf/make.conf.arm b/cnf/make.conf.arm
index e175d3c..313e451 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.23 2004/07/13 20:36:28 genone Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf.arm,v 1.24 2004/08/02 18:49:30 carpaski Exp $
# Please review 'man make.conf' for more information.
@@ -153,7 +153,7 @@ CHOST="armv4l-unknown-linux-gnu"
#FETCHCOMMAND='/usr/bin/proz --no-getch -s ${URI} -P ${DISTDIR}'
#
# Portage uses GENTOO_MIRRORS to specify mirrors to use for source retrieval.
-# The list is a space seperated list which is read left to right. If you use
+# The list is a space separated list which is read left to right. If you use
# another mirror we highly recommend leaving the default mirror at the end of
# the list so that portage will fall back to it if the files cannot be found
# on your specified mirror. We _HIGHLY_ recommend that you change this setting
@@ -161,7 +161,7 @@ CHOST="armv4l-unknown-linux-gnu"
#GENTOO_MIRRORS="<your_mirror_here> http://gentoo.osuosl.org http://www.ibiblio.org/pub/Linux/distributions/gentoo"
#
# Portage uses PORTAGE_BINHOST to specify mirrors for prebuilt-binary packages.
-# The list is a single extry specifying the full address of the directory
+# The list is a single entry specifying the full address of the directory
# serving the tbz2's for your system. Running emerge with either '--getbinpkg'
# or '--getbinpkgonly' will cause portage to retrieve the metadata from all
# packages in the directory specified, and use that data to determine what will
@@ -173,7 +173,7 @@ CHOST="armv4l-unknown-linux-gnu"
# Synchronizing Portage
# =====================
#
-# Each of these settings effects how Gentoo synchronizes your Portage tree.
+# Each of these settings affects how Gentoo synchronizes your Portage tree.
# Synchronization is handled by rsync and these settings allow some control
# over how it is done.
#
@@ -251,12 +251,12 @@ CHOST="armv4l-unknown-linux-gnu"
# from a merge.
# 'keepwork' prevents the clean phase from deleting the WORKDIR.
# 'noauto' causes ebuild to perform only the action requested and
-# not any other required actions like clean or
+# not any other required actions like clean.
# 'noclean' prevents portage from removing the source and temporary files
# after a merge -- for debugging purposes only.
# 'nostrip' prevents stripping of binaries.
# 'notitles' disables xterm titlebar updates (which contain status info).
-# 'sandbox' enable sandbox-ing when running emerge and ebuild
+# 'sandbox' enable sandbox-ing when running emerge and ebuild.
# 'strict' causes portage to react strongly to conditions that
# have the potential to be dangerous -- like missing or
# incorrect Manifest files.
@@ -274,14 +274,14 @@ CHOST="armv4l-unknown-linux-gnu"
# user's environment, for userpriv it sets: ${PORTAGE_TMPDIR}/ccache
# (/var/tmp/ccache), and for regular use the default is /root/.ccache.
# Sizes are specified with 'G' 'M' or 'K'.
-# '4G' for 4 gigabytes, '4096M' for 4 gigabytes, etc... Default is 2G
-#CCACHE_SIZE="2G"
+# '2G' for 2 gigabytes, '2048M' for 2048 megabytes (same as 2G).
+#CCACHE_SIZE="512M"
#
# DISTCC_DIR sets the temporary space used by distcc.
#DISTCC_DIR="${PORTAGE_TMPDIR}/.distcc"
#
# RSYNC_EXCLUDEFROM is a file that portage will pass to rsync when it updates
-# the portage tree. Specific chucks of the tree may be excluded from
+# the portage tree. Specific chunks of the tree may be excluded from
# consideration. This may cause dependency failures if you are not careful.
# The file format is one pattern per line, blanks and ';' or '#' lines are
# comments. See 'man rsync' for more details on the exclude-from format.
diff --git a/cnf/make.conf.hppa b/cnf/make.conf.hppa
index c012c11..afb7e7c 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.30 2004/07/13 20:36:28 genone Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf.hppa,v 1.31 2004/08/02 18:49:30 carpaski Exp $
# Please review 'man make.conf' for more information.
@@ -165,7 +165,7 @@ CHOST="hppa-unknown-linux-gnu"
#FETCHCOMMAND='/usr/bin/proz --no-getch -s ${URI} -P ${DISTDIR}'
#
# Portage uses GENTOO_MIRRORS to specify mirrors to use for source retrieval.
-# The list is a space seperated list which is read left to right. If you use
+# The list is a space separated list which is read left to right. If you use
# another mirror we highly recommend leaving the default mirror at the end of
# the list so that portage will fall back to it if the files cannot be found
# on your specified mirror. We _HIGHLY_ recommend that you change this setting
@@ -173,7 +173,7 @@ CHOST="hppa-unknown-linux-gnu"
#GENTOO_MIRRORS="<your_mirror_here> http://gentoo.osuosl.org http://www.ibiblio.org/pub/Linux/distributions/gentoo"
#
# Portage uses PORTAGE_BINHOST to specify mirrors for prebuilt-binary packages.
-# The list is a single extry specifying the full address of the directory
+# The list is a single entry specifying the full address of the directory
# serving the tbz2's for your system. Running emerge with either '--getbinpkg'
# or '--getbinpkgonly' will cause portage to retrieve the metadata from all
# packages in the directory specified, and use that data to determine what will
@@ -185,7 +185,7 @@ CHOST="hppa-unknown-linux-gnu"
# Synchronizing Portage
# =====================
#
-# Each of these settings effects how Gentoo synchronizes your Portage tree.
+# Each of these settings affects how Gentoo synchronizes your Portage tree.
# Synchronization is handled by rsync and these settings allow some control
# over how it is done.
#
@@ -263,12 +263,12 @@ CHOST="hppa-unknown-linux-gnu"
# from a merge.
# 'keepwork' prevents the clean phase from deleting the WORKDIR.
# 'noauto' causes ebuild to perform only the action requested and
-# not any other required actions like clean or
+# not any other required actions like clean.
# 'noclean' prevents portage from removing the source and temporary files
# after a merge -- for debugging purposes only.
# 'nostrip' prevents stripping of binaries.
# 'notitles' disables xterm titlebar updates (which contain status info).
-# 'sandbox' enable sandbox-ing when running emerge and ebuild
+# 'sandbox' enable sandbox-ing when running emerge and ebuild.
# 'strict' causes portage to react strongly to conditions that
# have the potential to be dangerous -- like missing or
# incorrect Manifest files.
@@ -285,14 +285,14 @@ CHOST="hppa-unknown-linux-gnu"
# user's environment, for userpriv it sets: ${PORTAGE_TMPDIR}/ccache
# (/var/tmp/ccache), and for regular use the default is /root/.ccache.
# Sizes are specified with 'G' 'M' or 'K'.
-# '4G' for 4 gigabytes, '4096M' for 4 gigabytes, etc... Default is 2G
-#CCACHE_SIZE="2G"
+# '2G' for 2 gigabytes, '2048M' for 2048 megabytes (same as 2G).
+#CCACHE_SIZE="512M"
#
# DISTCC_DIR sets the temporary space used by distcc.
#DISTCC_DIR="${PORTAGE_TMPDIR}/.distcc"
#
# RSYNC_EXCLUDEFROM is a file that portage will pass to rsync when it updates
-# the portage tree. Specific chucks of the tree may be excluded from
+# the portage tree. Specific chunks of the tree may be excluded from
# consideration. This may cause dependency failures if you are not careful.
# The file format is one pattern per line, blanks and ';' or '#' lines are
# comments. See 'man rsync' for more details on the exclude-from format.
diff --git a/cnf/make.conf.mips b/cnf/make.conf.mips
index 12c8c9a..db359e2 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.31 2004/07/13 20:36:28 genone Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf.mips,v 1.32 2004/08/02 18:49:30 carpaski Exp $
# Please review 'man make.conf' for more information.
@@ -146,7 +146,7 @@ CHOST="mips-unknown-linux-gnu"
#FETCHCOMMAND='/usr/bin/proz --no-getch -s ${URI} -P ${DISTDIR}'
#
# Portage uses GENTOO_MIRRORS to specify mirrors to use for source retrieval.
-# The list is a space seperated list which is read left to right. If you use
+# The list is a space separated list which is read left to right. If you use
# another mirror we highly recommend leaving the default mirror at the end of
# the list so that portage will fall back to it if the files cannot be found
# on your specified mirror. We _HIGHLY_ recommend that you change this setting
@@ -154,7 +154,7 @@ CHOST="mips-unknown-linux-gnu"
#GENTOO_MIRRORS="<your_mirror_here> http://gentoo.osuosl.org http://www.ibiblio.org/pub/Linux/distributions/gentoo"
#
# Portage uses PORTAGE_BINHOST to specify mirrors for prebuilt-binary packages.
-# The list is a single extry specifying the full address of the directory
+# The list is a single entry specifying the full address of the directory
# serving the tbz2's for your system. Running emerge with either '--getbinpkg'
# or '--getbinpkgonly' will cause portage to retrieve the metadata from all
# packages in the directory specified, and use that data to determine what will
@@ -166,7 +166,7 @@ CHOST="mips-unknown-linux-gnu"
# Synchronizing Portage
# =====================
#
-# Each of these settings effects how Gentoo synchronizes your Portage tree.
+# Each of these settings affects how Gentoo synchronizes your Portage tree.
# Synchronization is handled by rsync and these settings allow some control
# over how it is done.
#
@@ -244,12 +244,12 @@ CHOST="mips-unknown-linux-gnu"
# from a merge.
# 'keepwork' prevents the clean phase from deleting the WORKDIR.
# 'noauto' causes ebuild to perform only the action requested and
-# not any other required actions like clean or
+# not any other required actions like clean.
# 'noclean' prevents portage from removing the source and temporary files
# after a merge -- for debugging purposes only.
# 'nostrip' prevents stripping of binaries.
# 'notitles' disables xterm titlebar updates (which contain status info).
-# 'sandbox' enable sandbox-ing when running emerge and ebuild
+# 'sandbox' enable sandbox-ing when running emerge and ebuild.
# 'strict' causes portage to react strongly to conditions that
# have the potential to be dangerous -- like missing or
# incorrect Manifest files.
@@ -266,14 +266,14 @@ CHOST="mips-unknown-linux-gnu"
# user's environment, for userpriv it sets: ${PORTAGE_TMPDIR}/ccache
# (/var/tmp/ccache), and for regular use the default is /root/.ccache.
# Sizes are specified with 'G' 'M' or 'K'.
-# '4G' for 4 gigabytes, '4096M' for 4 gigabytes, etc... Default is 2G
-#CCACHE_SIZE="2G"
+# '2G' for 2 gigabytes, '2048M' for 2048 megabytes (same as 2G).
+#CCACHE_SIZE="512M"
#
# DISTCC_DIR sets the temporary space used by distcc.
#DISTCC_DIR="${PORTAGE_TMPDIR}/.distcc"
#
# RSYNC_EXCLUDEFROM is a file that portage will pass to rsync when it updates
-# the portage tree. Specific chucks of the tree may be excluded from
+# the portage tree. Specific chunks of the tree may be excluded from
# consideration. This may cause dependency failures if you are not careful.
# The file format is one pattern per line, blanks and ';' or '#' lines are
# comments. See 'man rsync' for more details on the exclude-from format.
diff --git a/cnf/make.conf.ppc b/cnf/make.conf.ppc
index 4948a87..b189827 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.50 2004/07/13 20:36:28 genone Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf.ppc,v 1.51 2004/08/02 18:49:30 carpaski Exp $
# Please review 'man make.conf' for more information.
@@ -179,7 +179,7 @@ CHOST="powerpc-unknown-linux-gnu"
#FETCHCOMMAND='/usr/bin/proz --no-getch -s ${URI} -P ${DISTDIR}'
#
# Portage uses GENTOO_MIRRORS to specify mirrors to use for source retrieval.
-# The list is a space seperated list which is read left to right. If you use
+# The list is a space separated list which is read left to right. If you use
# another mirror we highly recommend leaving the default mirror at the end of
# the list so that portage will fall back to it if the files cannot be found
# on your specified mirror. We _HIGHLY_ recommend that you change this setting
@@ -187,7 +187,7 @@ CHOST="powerpc-unknown-linux-gnu"
#GENTOO_MIRRORS="<your_mirror_here> http://gentoo.osuosl.org http://www.ibiblio.org/pub/Linux/distributions/gentoo"
#
# Portage uses PORTAGE_BINHOST to specify mirrors for prebuilt-binary packages.
-# The list is a single extry specifying the full address of the directory
+# The list is a single entry specifying the full address of the directory
# serving the tbz2's for your system. Running emerge with either '--getbinpkg'
# or '--getbinpkgonly' will cause portage to retrieve the metadata from all
# packages in the directory specified, and use that data to determine what will
@@ -199,7 +199,7 @@ CHOST="powerpc-unknown-linux-gnu"
# Synchronizing Portage
# =====================
#
-# Each of these settings effects how Gentoo synchronizes your Portage tree.
+# Each of these settings affects how Gentoo synchronizes your Portage tree.
# Synchronization is handled by rsync and these settings allow some control
# over how it is done.
#
@@ -277,12 +277,12 @@ CHOST="powerpc-unknown-linux-gnu"
# from a merge.
# 'keepwork' prevents the clean phase from deleting the WORKDIR.
# 'noauto' causes ebuild to perform only the action requested and
-# not any other required actions like clean or
+# not any other required actions like clean.
# 'noclean' prevents portage from removing the source and temporary files
# after a merge -- for debugging purposes only.
# 'nostrip' prevents stripping of binaries.
# 'notitles' disables xterm titlebar updates (which contain status info).
-# 'sandbox' enable sandbox-ing when running emerge and ebuild
+# 'sandbox' enable sandbox-ing when running emerge and ebuild.
# 'strict' causes portage to react strongly to conditions that
# have the potential to be dangerous -- like missing or
# incorrect Manifest files.
@@ -299,14 +299,14 @@ CHOST="powerpc-unknown-linux-gnu"
# user's environment, for userpriv it sets: ${PORTAGE_TMPDIR}/ccache
# (/var/tmp/ccache), and for regular use the default is /root/.ccache.
# Sizes are specified with 'G' 'M' or 'K'.
-# '4G' for 4 gigabytes, '4096M' for 4 gigabytes, etc... Default is 2G
-#CCACHE_SIZE="2G"
+# '2G' for 2 gigabytes, '2048M' for 2048 megabytes (same as 2G).
+#CCACHE_SIZE="512M"
#
# DISTCC_DIR sets the temporary space used by distcc.
#DISTCC_DIR="${PORTAGE_TMPDIR}/.distcc"
#
# RSYNC_EXCLUDEFROM is a file that portage will pass to rsync when it updates
-# the portage tree. Specific chucks of the tree may be excluded from
+# the portage tree. Specific chunks of the tree may be excluded from
# consideration. This may cause dependency failures if you are not careful.
# The file format is one pattern per line, blanks and ';' or '#' lines are
# comments. See 'man rsync' for more details on the exclude-from format.
diff --git a/cnf/make.conf.sparc b/cnf/make.conf.sparc
index 8695973..7b92e60 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.35 2004/07/13 20:36:28 genone Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf.sparc,v 1.36 2004/08/02 18:49:30 carpaski Exp $
# Please review 'man make.conf' for more information.
@@ -169,7 +169,7 @@ CHOST="sparc-unknown-linux-gnu"
#FETCHCOMMAND='/usr/bin/proz --no-getch -s ${URI} -P ${DISTDIR}'
#
# Portage uses GENTOO_MIRRORS to specify mirrors to use for source retrieval.
-# The list is a space seperated list which is read left to right. If you use
+# The list is a space separated list which is read left to right. If you use
# another mirror we highly recommend leaving the default mirror at the end of
# the list so that portage will fall back to it if the files cannot be found
# on your specified mirror. We _HIGHLY_ recommend that you change this setting
@@ -177,7 +177,7 @@ CHOST="sparc-unknown-linux-gnu"
#GENTOO_MIRRORS="<your_mirror_here> http://gentoo.osuosl.org http://www.ibiblio.org/pub/Linux/distributions/gentoo"
#
# Portage uses PORTAGE_BINHOST to specify mirrors for prebuilt-binary packages.
-# The list is a single extry specifying the full address of the directory
+# The list is a single entry specifying the full address of the directory
# serving the tbz2's for your system. Running emerge with either '--getbinpkg'
# or '--getbinpkgonly' will cause portage to retrieve the metadata from all
# packages in the directory specified, and use that data to determine what will
@@ -189,7 +189,7 @@ CHOST="sparc-unknown-linux-gnu"
# Synchronizing Portage
# =====================
#
-# Each of these settings effects how Gentoo synchronizes your Portage tree.
+# Each of these settings affects how Gentoo synchronizes your Portage tree.
# Synchronization is handled by rsync and these settings allow some control
# over how it is done.
#
@@ -267,12 +267,12 @@ CHOST="sparc-unknown-linux-gnu"
# from a merge.
# 'keepwork' prevents the clean phase from deleting the WORKDIR.
# 'noauto' causes ebuild to perform only the action requested and
-# not any other required actions like clean or
+# not any other required actions like clean.
# 'noclean' prevents portage from removing the source and temporary files
# after a merge -- for debugging purposes only.
# 'nostrip' prevents stripping of binaries.
# 'notitles' disables xterm titlebar updates (which contain status info).
-# 'sandbox' enable sandbox-ing when running emerge and ebuild
+# 'sandbox' enable sandbox-ing when running emerge and ebuild.
# 'strict' causes portage to react strongly to conditions that
# have the potential to be dangerous -- like missing or
# incorrect Manifest files.
@@ -289,14 +289,14 @@ CHOST="sparc-unknown-linux-gnu"
# user's environment, for userpriv it sets: ${PORTAGE_TMPDIR}/ccache
# (/var/tmp/ccache), and for regular use the default is /root/.ccache.
# Sizes are specified with 'G' 'M' or 'K'.
-# '4G' for 4 gigabytes, '4096M' for 4 gigabytes, etc... Default is 2G
-#CCACHE_SIZE="2G"
+# '2G' for 2 gigabytes, '2048M' for 2048 megabytes (same as 2G).
+#CCACHE_SIZE="512M"
#
# DISTCC_DIR sets the temporary space used by distcc.
#DISTCC_DIR="${PORTAGE_TMPDIR}/.distcc"
#
# RSYNC_EXCLUDEFROM is a file that portage will pass to rsync when it updates
-# the portage tree. Specific chucks of the tree may be excluded from
+# the portage tree. Specific chunks of the tree may be excluded from
# consideration. This may cause dependency failures if you are not careful.
# The file format is one pattern per line, blanks and ';' or '#' lines are
# comments. See 'man rsync' for more details on the exclude-from format.