From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 25 Jul 2013 22:43:11 +0000 (-0700)
Subject: make.conf.5: restore SYNC documentation
X-Git-Tag: v2.2.0_alpha189
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2bdc9420cff2196a6f2783d445958ab1ed82c9c2;p=portage.git

make.conf.5: restore SYNC documentation

The SYNC variable is deprecated, but it is still supported, for
backward compatibility with mirrorselect --rsync.
---

diff --git a/man/make.conf.5 b/man/make.conf.5
index 74f047b21..ddacf56c9 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -966,6 +966,32 @@ Defines the location where created RPM packages will be stored.
 .br
 Defaults to ${PORTDIR}/rpm.
 .TP
+\fBSYNC\fR = \fI[RSYNC]\fR
+Insert your preferred rsync mirror here.  This rsync server
+is used to sync the local portage tree when `emerge \-\-sync` is run.
+
+Note that the \fBSYNC\fR variable is now deprecated, and instead the
+sync\-type and sync\-uri attributes in repos.conf should be used. See
+\fBportage\fR(5) for more information.
+
+Defaults to rsync://rsync.gentoo.org/gentoo\-portage
+.RS
+.TP
+.B Usage:
+(rsync|ssh)://[username@]hostname[:port]/(module|path)
+.TP
+.B Examples:
+rsync://private\-mirror.com/portage\-module
+.br
+rsync://rsync\-user@private\-mirror.com:873/gentoo\-portage
+.br
+ssh://ssh\-user@192.168.0.1:22/usr/portage
+.br
+ssh://ssh\-user@192.168.0.1:22/\\${HOME}/portage\-storage
+.TP
+Note: For the ssh:// scheme, key\-based authentication might be of interest.
+.RE
+.TP
 \fBUNINSTALL_IGNORE\fR = \fI[space delimited list of fnmatch patterns]\fR
 This variable prevents uninstallation of files that match
 specific \fBfnmatch\fR(3) patterns. In order to ignore file