2 files changed, 43 insertions, 50 deletions
diff --git a/Master/texmf/doc/man/man1/tlmgr.1 b/Master/texmf/doc/man/man1/tlmgr.1
index a124d494ef6..8caa19cb1d5 100644
--- a/Master/texmf/doc/man/man1/tlmgr.1
+++ b/Master/texmf/doc/man/man1/tlmgr.1
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "TLMGR 1"
-.TH TLMGR 1 "2012-05-15" "perl v5.14.2" "User Contributed Perl Documentation"
+.TH TLMGR 1 "2012-05-23" "perl v5.14.2" "User Contributed Perl Documentation"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -1209,39 +1209,42 @@ Examples:
 .Ve
 .SH "MULTIPLE REPOSITORIES"
 .IX Header "MULTIPLE REPOSITORIES"
-Most packages are distributed via the main TeX Live repository, but
-sometimes local repositories are used to provide local packages (e.g.,
-proprietary fonts, internal styles).  There are also alternative package
-repositories for packages that cannot or should not be included in TeX
-Live, due to being under rapid development or for other reasons.
-.PP
-It's possible to tell \f(CW\*(C`tlmgr\*(C'\fR about additional repositories you want to
-use.  Although this support for multiple repositories has been tested
-extensively, we cannot guarantee proper operation.  If in doubt or if
-problems, you can temporarily set the installation source to any
-repository and perform your operations.
+The main TeX Live repository includes a vast array of packages.
+Nevertheless, additional local repositories can be useful to provide
+locally-installed resources, such as proprietary fonts and house styles.
+Also, alternative package repositories distribute packages that cannot
+or should not be included in TeX Live, due to being under rapid
+development or for other reasons.
+.PP
+The simplest and most reliable method is simply to temporarily set the
+installation source to any repository (with the \f(CW\*(C`\-repository\*(C'\fR command
+line option or \f(CW\*(C`option repository\*(C'\fR), and perform your operations.  When
+you are using multiple repositories over a sustained time, however, this
+is inconvenient.  Thus, it's possible to tell \f(CW\*(C`tlmgr\*(C'\fR about additional
+repositories you want to use.  The basic command is \f(CW\*(C`tlmgr repository
+add\*(C'\fR.  The rest of this section explains further.
 .PP
 When using multiple repositories, one of them has to be set as the main
 repository, which distributes most of the installed packages.  If you
 switch from a single repository installation to a multiple repository
-installation (by calling \f(CW\*(C`tlmgr repository add\*(C'\fR), the previously set
-repository will be set as the main repository.
+installation, the previously set repository will be set as the main
+repository.
 .PP
 By default, even if multiple repositories are configured, packages are
 \&\fIonly\fR installed from the main repository.  Thus, simply adding a
-second repository does not enable installation of anything from there.
-You first have to specify which packages should be taken from a
-different repository by specifying some so-called ``pinning'' rules,
+second repository does not actually enable installation of anything from
+there.  You also have to specify which packages should be taken from a
+different repository by specifying so-called ``pinning'' rules,
 described next.
 .SS "Pinning"
 .IX Subsection "Pinning"
-Pinning a package is done by editing (adding) a file
+Pinning a package is done by editing (creating) this file:
 .PP
 .Vb 1
 \&  TEXMFLOCAL/tlpkg/pinning.txt
 .Ve
 .PP
-which contains lines of the form:
+with lines of the form:
 .PP
 .Vb 1
 \&  repo:pkg[,pkg]
@@ -1251,20 +1254,20 @@ In this line, the \fIrepo\fR is either a full url or repository tag that
 was added to the repository list.  Each \fIpkg\fR is a shell-style glob for
 package identifiers.
 .PP
+When a package \f(CW\*(C`foo\*(C'\fR is pinned to a repository, a package \f(CW\*(C`foo\*(C'\fR in any
+other repository, even if it has a higher revision number, will not be
+considered an installable candidate.
+.PP
 By default, everything is pinned to the main repository, 
-as if at the end of \f(CW\*(C`pinning.txt\*(C'\fR there is a line
+as if the last line of \f(CW\*(C`pinning.txt\*(C'\fR was
 .PP
 .Vb 1
 \&  main:*
 .Ve
-.PP
-Now, if a package \f(CW\*(C`foo\*(C'\fR is pinned to a repository, any package \f(CW\*(C`foo\*(C'\fR
-in any other repository, even if it has a higher revision number, will
-not be considered as an installable candidate.
 .SS "Multiple repository example with tlcontrib"
 .IX Subsection "Multiple repository example with tlcontrib"
-First, check that we have support for multiple repositories, and only
-one specified (as is the case by default):
+First, check that we have support for multiple repositories, and have
+only one enabled (as is the case by default):
 .PP
 .Vb 3
 \& $ tlmgr repository list
@@ -1272,11 +1275,11 @@ one specified (as is the case by default):
 \&   /var/www/norbert/tlnet
 .Ve
 .PP
-Add the \f(CW\*(C`tlcontrib\*(C'\fR repository maintained by Taco Hoekwater et al.,
-with the tag \f(CW\*(C`tlcontrib\*(C'\fR:
+Let's add the \f(CW\*(C`tlcontrib\*(C'\fR repository (<http://tlcontrib.metatex.org>,
+maintained by Taco Hoekwater et al.), with the tag \f(CW\*(C`tlcontrib\*(C'\fR:
 .PP
 .Vb 1
-\& $ tlmgr repository add http://tlcontrib.metatex.org/2011 tlcontrib
+\& $ tlmgr repository add http://tlcontrib.metatex.org/2012 tlcontrib
 .Ve
 .PP
 Check the repository list again:
@@ -1290,45 +1293,35 @@ Check the repository list again:
 .PP
 Specify a pinning entry to get the package \f(CW\*(C`cowfont\*(C'\fR from \f(CW\*(C`tlcontrib\*(C'\fR:
 .PP
-.Vb 3
+.Vb 2
 \& $ tlocal=\`kpsewhich \-var\-value TEXMFLOCAL\`
-\& $ mkdir \-p $tlocal/tlpkg
 \& $ echo "tlcontrib:cowfont" > $tlocal/tlpkg/pinning.txt
 .Ve
 .PP
 Check that we can find \f(CW\*(C`cowfont\*(C'\fR:
 .PP
-.Vb 6
+.Vb 7
 \& $ tlmgr show cowfont
 \& tlmgr: using pinning file .../tlpkg/pinning.txt
-\& tlmgr: package repository /var/www/norbert/tlnet http://tlcontrib.metatex.org/2011
+\& tlmgr: package repositories:
+\& ...
 \& package:     cowfont
 \& category:    Package
 \& ...
 .Ve
 .PP
-\&\- install cowfont and context (which is needed!)
+\&\- install \f(CW\*(C`cowfont\*(C'\fR:
 .PP
-.Vb 10
-\& $ tlmgr install context cowfont
+.Vb 5
+\& $ tlmgr install cowfont
 \& tlmgr: using pinning file .../tlpkg/pinning.txt
-\& tlmgr: package repository /var/www/norbert/tlnet http://tlcontrib.metatex.org/2011
-\& [1/11, ??:??/??:??] install: context.x86_64\-linux @main [84k]
-\& [2/11, 00:00/00:00] install: context @main [4274k]
-\& [3/11, 00:01/00:02] install: cowfont @tlcontrib [655k]
-\& [4/11, 00:05/00:09] install: metapost.x86_64\-linux @main [198k]
-\& [5/11, 00:05/00:09] install: metapost @main [72k]
-\& [6/11, 00:05/00:09] install: mptopdf.x86_64\-linux @main [1k]
-\& [7/11, 00:06/00:11] install: mptopdf @main [37k]
-\& [8/11, 00:06/00:11] install: stmaryrd @main [163k]
-\& [9/11, 00:07/00:12] install: xetex.x86_64\-linux @main [4442k]
-\& [10/11, 00:08/00:08] install: xetex @main [46k]
-\& [11/11, 00:08/00:08] install: xetexconfig @main [13k]
+\& tlmgr: package repositories:
 \& ...
+\& [1/1,  ??:??/??:??] install: cowfont @tlcontrib [655k]
 .Ve
 .PP
-In the last part you see that the cowfont is installed from
-the tlcontrib part (@tlcontrib).
+In the output here you can see that the \f(CW\*(C`cowfont\*(C'\fR package is installed
+from the \f(CW\*(C`tlcontrib\*(C'\fR repository (\f(CW@tlcontrib\fR).
 .SH "GUI FOR TLMGR"
 .IX Header "GUI FOR TLMGR"
 The graphical user interface for \f(CW\*(C`tlmgr\*(C'\fR needs Perl/Tk to be installed.
diff --git a/Master/texmf/doc/man/man1/tlmgr.man1.pdf b/Master/texmf/doc/man/man1/tlmgr.man1.pdf
index 0fb0d56f238..87f281107e8 100644
--- a/Master/texmf/doc/man/man1/tlmgr.man1.pdf
+++ b/Master/texmf/doc/man/man1/tlmgr.man1.pdf