summaryrefslogtreecommitdiff
path: root/Master/texmf
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-03-21 19:11:59 +0000
committerKarl Berry <karl@freefriends.org>2013-03-21 19:11:59 +0000
commitcd9ea7c07e135acaaf34015219ee0777aa78630c (patch)
tree9c4437e34e900b392644490d887d352ab7db6178 /Master/texmf
parent9c70b2604e5b5c37899b063768cfc91b73525ac6 (diff)
pinning doc and msg tweaks
git-svn-id: svn://tug.org/texlive/trunk@29458 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf')
-rwxr-xr-xMaster/texmf/scripts/texlive/tlmgr.pl85
1 files changed, 33 insertions, 52 deletions
diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl
index afa73537ef8..2b4131e3d7a 100755
--- a/Master/texmf/scripts/texlive/tlmgr.pl
+++ b/Master/texmf/scripts/texlive/tlmgr.pl
@@ -1184,7 +1184,7 @@ sub action_info {
}
if (defined($tag)) {
if (!$remotetlpdb->is_virtual) {
- tlwarn("tlmgr: specifying implicite tags is not allowed for non-virtual databases!\n");
+ tlwarn("tlmgr: specifying implicit tags is not allowed for non-virtual databases!\n");
next;
} else {
if (!$remotetlpdb->is_repository($tag)) {
@@ -3259,7 +3259,7 @@ END_DISK_WARN
# not (that is the --reinstall)
#
# TLPDB->install_package does ONLY INSTALL ONE PACKAGE, no deps whatsoever
-# anymore! That has all to be done by hand.
+# anymore! That has all to be done by the caller.
#
sub action_install {
init_local_db(1);
@@ -3529,7 +3529,7 @@ sub action_pinning {
print " ", $p->{'repo'}, ":", $p->{'glob'}, "\n";
}
} elsif ($what =~ m/^check$/i) {
- tlwarn("Not implemented by now, sorry!\n");
+ tlwarn("Not implemented yet, sorry!\n");
return 0;
} elsif ($what =~ m/^add$/i) {
# we need at least two more arguments
@@ -3670,7 +3670,7 @@ sub action_repository {
}
my ($tlpdb, $errormsg) = setup_one_remotetlpdb($loc);
if (!defined($tlpdb)) {
- tlwarn("cannot locate get TLPDB from $loc\n\n");
+ tlwarn("cannot get TLPDB from location $loc\n\n");
} else {
print "Packages at $loc:\n";
my %pkgs = merge_sub_packages($tlpdb->list_packages);
@@ -6474,30 +6474,27 @@ is issued that the caller does not have enough privileges.
=head2 pinning
-The pinning action manages the pinning file, see L<Pinning> for details.
+The C<pinning> action manages the pinning file, see L<Pinning> below.
=over 4
-=item B<pinning show>
+=item C<pinning show>
Shows the current pinning data.
-=item B<pinning check>
+=item C<pinning add I<repo> I<pkgglob>...
-Not implemented at the moment.
+Pins the packages matching the I<pkgglob>(s) to the repository
+I<repo>.
-=item B<pinning add I<repo> I<pgkglob> [I<pkgglob>]>
+=item C<pinning remove I<repo> I<pgkglob>...
-Pins the packages specified by I<pkgglob> to the repo I<repo>.
+Any packages recorded in the pinning file matching the <pkgglob>s for
+the given repository I<repo> are removed.
-=item B<pinning remove I<repo> I<pgkglob> [I<pkgglob>]>
+=item C<pinning remove I<repo> --all>
-If there is a the very package glob <pkgglob> recorded in the pinning file
-for the given repo I<repo>, it is removed.
-
-=item B<pinning remove I<repo> --all>
-
-Remove all pinning data for repo I<repo>.
+Remove all pinning data for repository I<repo>.
=back
@@ -7026,20 +7023,19 @@ Examples:
=head1 MULTIPLE REPOSITORIES
-The main TeX Live repository includes a vast array of packages.
+The main TeX Live repository contains 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.
+or should not be included in TeX Live, for whatever reason.
-The simplest and most reliable method is simply to temporarily set the
-installation source to any repository (with the C<-repository> command
-line option or C<option repository>), and perform your operations. When
-you are using multiple repositories over a sustained time, however, this
-is inconvenient. Thus, it's possible to tell C<tlmgr> about additional
-repositories you want to use. The basic command is C<tlmgr repository
-add>. The rest of this section explains further.
+The simplest and most reliable method is to temporarily set the
+installation source to any repository (with the C<-repository> or
+C<option repository> command line options), and perform your operations.
+When you are using multiple repositories over a sustained time, however,
+this is inconvenient. Thus, it's possible to tell C<tlmgr> about
+additional repositories you want to use. The basic command is C<tlmgr
+repository add>. The rest of this section explains further.
When using multiple repositories, one of them has to be set as the main
repository, which distributes most of the installed packages. If you
@@ -7048,7 +7044,7 @@ installation, the previously set repository will be set as the main
repository.
By default, even if multiple repositories are configured, packages are
-I<only> installed from the main repository. Thus, simply adding a
+still I<only> installed from the main repository. Thus, simply adding a
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,
@@ -7056,18 +7052,6 @@ described next.
=head2 Pinning
-Pinning a package is done by editing (creating) this file:
-
- TEXMFLOCAL/tlpkg/pinning.txt
-
-with lines of the form:
-
- repo:pkg[,pkg]
-
-In this line, the I<repo> is either a full url or repository tag that
-was added to the repository list. Each I<pkg> is a shell-style glob for
-package identifiers.
-
When a package C<foo> is pinned to a repository, a package C<foo> in any
other repository, even if it has a higher revision number, will not be
considered an installable candidate.
@@ -7095,15 +7079,15 @@ Check the repository list again:
$ tlmgr repository list
List of repositories (with tags if set):
- http://tlcontrib.metatex.org/2011 (tlcontrib)
+ http://tlcontrib.metatex.org/2012 (tlcontrib)
/var/www/norbert/tlnet (main)
-Specify a pinning entry to get the package C<microtype> from C<tlcontrib>:
+Specify a pinning entry to get the package C<context> from C<tlcontrib>:
$ tlocal=`kpsewhich -var-value TEXMFLOCAL`
- $ echo "tlcontrib:microtype" > $tlocal/tlpkg/pinning.txt
+ $ echo "tlcontrib:context" > $tlocal/tlpkg/pinning.txt
-Check that we can find C<microtype>:
+Check that we can find C<context>:
$ tlmgr show microtype
tlmgr: using pinning file .../tlpkg/pinning.txt
@@ -7113,19 +7097,16 @@ Check that we can find C<microtype>:
category: Package
...
-- install C<microtype>:
+- install C<context>:
- $ tlmgr install microtype
+ $ tlmgr install context
tlmgr: using pinning file .../tlpkg/pinning.txt
tlmgr: package repositories:
...
- [1/1, ??:??/??:??] install: microtype @tlcontrib [39k]
+ [1/1, ??:??/??:??] install: context @tlcontrib [39k]
-In the output here you can see that the C<microtype> package is
-installed from the C<tlcontrib> repository (C<@tlcontrib>). (By the
-way, hopefully the new version of microtype that is in tlcontrib as of
-this writing will be released on CTAN soon, but meanwhile, it serves as
-an example.)
+In the output here you can see that the C<context> package is now
+installed from the C<tlcontrib> repository (C<@tlcontrib>).
=head1 GUI FOR TLMGR