merge collection-documentation-* into collection-lang*

git-svn-id: svn://tug.org/texlive/trunk@30372 c570f23f-e606-0410-a88d-b1316a301751

66 files changed, 204 insertions, 358 deletions

diff --git a/Master/install-tl b/Master/install-tl
index d4d466d2246..c0cdebaaafa 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -115,7 +115,7 @@ my $default_scheme='scheme-full';
 # our for menus
 our @collections_std;
 our @collections_lang;
-our @collections_lang_doc;
+
 # The global variable %vars is an associative list which contains all
 # variables and their values which can be changed by the user.
 # needs to be our since TeXLive::TLUtils uses it
@@ -1432,12 +1432,8 @@ sub initialize_collections {
       ++$vars{'n_collections_available'};
       if ($pkg=~/collection-lang/) {
         push @collections_lang, $pkg;
-      } elsif ($pkg=~/documentation/) {
-        if ($pkg=~/documentation-base/) {
-          push @collections_std, $pkg;
-        } else {
-          push @collections_lang_doc, $pkg;
-        }
+      } elsif ($pkg =~ /documentation/) {
+        push @collections_std, $pkg;
       } else {
         push @collections_std, $pkg;
       }
diff --git a/Master/texmf-dist/scripts/texlive/tlmgrgui.pl b/Master/texmf-dist/scripts/texlive/tlmgrgui.pl
index b6aacb96860..f9e9d45b584 100644
--- a/Master/texmf-dist/scripts/texlive/tlmgrgui.pl
+++ b/Master/texmf-dist/scripts/texlive/tlmgrgui.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 # $Id$
 #
-# Copyright 2009, 2010, 2011, 2012 Norbert Preining
+# Copyright 2009-2013 Norbert Preining
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
 #
@@ -2290,12 +2290,6 @@ sub update_list_remote {
     $sw->add("Label", -text => $t)->pack(-padx => "3m", -pady => "3m");
     $sw->Show;
   }
-  # change display names
-  for my $p (keys %Packages) {
-    if ($p =~ m/^collection-documentation-(.*)$/) {
-      $Packages{$p}{'displayname'} = "collection-doc-$1";
-    }
-  }
   #Devel::Leak::CheckSV($handle);
   #warn join(",", currmem());
 }
diff --git a/Master/tlpkg/installer/install-menu-perltk.pl b/Master/tlpkg/installer/install-menu-perltk.pl
index 37e70eb5e74..bbb221085d5 100644
--- a/Master/tlpkg/installer/install-menu-perltk.pl
+++ b/Master/tlpkg/installer/install-menu-perltk.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 # $Id$
 #
-# Copyright 2008, 2009, 2010, 2011, 2012 Norbert Preining
+# Copyright 2008-2013 Norbert Preining
 # Copyright 2008 Reinhard Kotucha
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
@@ -234,7 +234,8 @@ sub run_menu_perltk {
 
   # image frame on the left
   my $fl = $mw->Frame(-background => "#0078b8");
-  my $img = $fl->Photo(-format => 'png', -file => "$::installerdir/tlpkg/installer/texlive.png");
+  my $img = $fl->Photo(-format => 'png',
+                       -file => "$::installerdir/tlpkg/installer/texlive.png");
   $fl->Label(-image => $img, -background => "#0078b8")->pack(-expand => 1, -fill => "y");
   $fl->Label(-text => "v$::installerrevision/$::menurevision", -background => "#0078b8")->pack;
 
@@ -863,9 +864,7 @@ sub menu_select_lang_collections {
   my $f1 = $sw->Frame;
   $f1->pack;
   my $f1lang = $f1->Labelframe(-text => __("Select language support"));
-  my $f1doc  = $f1->Labelframe(-text => __("Select language-specific documentation"));
   $f1lang->pack(-side => 'left', -padx => "2m", -pady => "2m", -ipadx => "2m", -ipady => "2m");
-  $f1doc->pack(-side => 'right', -padx => "2m", -pady => "2m", -ipadx => "2m", -ipady => "2m", -expand => 1, -fill => "y");
   my $f1langT = $f1lang->Frame; $f1langT->pack;
   my $f1langL = $f1lang->Frame; $f1langL->pack;
   my $f1langLa = $f1langL->Frame; $f1langLa->pack(-side => 'left');
@@ -896,27 +895,6 @@ sub menu_select_lang_collections {
   $f1langB->Button(-text => __("Deselect All"),
     -command => sub { deselect_collections(\%lvars, @collections_lang) })->pack(-side => 'right', -padx => "2m", -pady => "2m");
 
-  my $f1docT = $f1doc->Frame; $f1docT->pack;
-  my $f1docL = $f1doc->Frame; $f1docL->pack;
-  my $f1docLa = $f1docL->Frame; $f1docLa->pack(-side => 'left');
-  my $f1docLb = $f1docL->Frame; $f1docLb->pack(-side => 'right');
-  my $doch = $#collections_lang_doc / 2;
-  $i = 0;
-  foreach my $coll (sort @collections_lang_doc) {
-    my $tlpobj = $tlpdb->get_package("$coll");
-    if ($i < $doch) {
-      $f1docLa->Checkbutton(-variable => \$lvars{$coll}, -text => __($tlpobj->shortdesc))->pack(-anchor => 'w');
-    } else {
-      $f1docLb->Checkbutton(-variable => \$lvars{$coll}, -text => __($tlpobj->shortdesc))->pack(-anchor => 'w');
-    }
-    $i++;
-  }
-  my $f1docB = $f1doc->Frame;
-  $f1docB->pack(-expand => 1, -side => "bottom");
-  $f1docB->Button(-text => __("Select All"),
-    -command => sub { select_collections(\%lvars, @collections_lang_doc) })->pack(-side => 'left', -padx => "2m", -pady => "2m");
-  $f1docB->Button(-text => __("Deselect All"),
-    -command => sub { deselect_collections(\%lvars, @collections_lang_doc) })->pack(-side => 'left', -padx => "2m", -pady => "2m");
   my $f2 = $sw->Frame; $f2->pack(-expand => 'x');
   my $okbutton = $f2->Button(-text => __("Ok"),
     -command => sub {
diff --git a/Master/tlpkg/installer/install-menu-text.pl b/Master/tlpkg/installer/install-menu-text.pl
index 18d2fa66a0b..e963add563d 100755
--- a/Master/tlpkg/installer/install-menu-text.pl
+++ b/Master/tlpkg/installer/install-menu-text.pl
@@ -2,7 +2,7 @@
 # $Id$
 # install-menu-txt.pl
 #
-# Copyright 2007, 2008, 2009, 2010, 2011 Norbert Preining, Karl Berry
+# Copyright 2007-2013 Norbert Preining, Karl Berry
 # Copyright 2007, 2008 Reinhard Kotucha
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
@@ -18,7 +18,6 @@ our $media;
 our $previoustlpdb;
 our @collections_std;
 our @collections_lang;
-our @collections_lang_doc;
 our $texlive_release;
 
 my $MENU_CONTINUE = -1;
@@ -473,18 +472,14 @@ sub language_menu {
       );
 
   my @languages;
-  my @lang_docs;
   my @lang_keys=string_to_list "abcdefghijklmnopstuvwxyz0123456789";
-  my @lang_doc_keys=string_to_list "ABCDEFGHIJKLMNOPSTUVWXYZ";
   my %keyval;
   my $lang_index=0;
-  my $lang_doc_index=0;
   my $lines;
 
   menu_head 'Language support:';
 
   @languages=sort @collections_lang;
-  @lang_docs=sort @collections_lang_doc;
 
   $lines=@languages/2;
   ++$lines if (@languages%2);
@@ -505,27 +500,6 @@ sub language_menu {
     }
   }
 
-  print "\nLanguage-specific documentation:\n\n";
-
-  $lines=@lang_docs/2;
-  ++$lines if (@lang_docs%2);
-  for my $index (0..$lines-1) {
-    my $lang_doc=$lang_docs[$index];
-    my $tlpobj = $tlpdb->get_package("$lang_doc");
-    $keyval{$lang_doc_keys[$index]}="$lang_doc";
-    printf " %s %s %-33s", $lang_doc_keys[$index], button($vars{"$lang_doc"}),
-           substr($tlpobj->shortdesc,0,33);
-    if (defined $lang_docs[$index+$lines]) {
-      my $lang_doc=$lang_docs[$index+$lines];
-      my $tlpobj = $tlpdb->get_package("$lang_doc");
-      $keyval{$lang_doc_keys[$index+$lines]}="$lang_doc";
-      printf " %s %s %-32s\n", $lang_doc_keys[$index+$lines],
-             button($vars{"$lang_doc"}), substr($tlpobj->shortdesc,0,32);
-    } else {
-      print "\n";
-    }
-  }
-
   other_options qw (+ - R Q diskspace);
   my $answer = prompt 'Enter letter(s) to select language(s)';
 
@@ -533,12 +507,12 @@ sub language_menu {
 
   foreach my $keystroke (@keystrokes) {
     if ($keystroke eq '-') {
-      for my $collection (@languages,@lang_docs) {
+      for my $collection (@languages) {
         $vars{"$collection"}=0 if defined $vars{"$collection"};
       }
     }
     if ($keystroke eq '+') {
-      for my $collection (@languages,@lang_docs) {
+      for my $collection (@languages) {
         $vars{"$collection"}=1 if defined $vars{"$collection"};
       }
     }
diff --git a/Master/tlpkg/installer/install-menu-wizard.pl b/Master/tlpkg/installer/install-menu-wizard.pl
index e44e29ed072..dac50904c4e 100644
--- a/Master/tlpkg/installer/install-menu-wizard.pl
+++ b/Master/tlpkg/installer/install-menu-wizard.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 # $Id$
-# Copyright 2009, 2010 Norbert Preining
+# Copyright 2009-2013 Norbert Preining
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
 
diff --git a/Master/tlpkg/tlpsrc/collection-basic.tlpsrc b/Master/tlpkg/tlpsrc/collection-basic.tlpsrc
index 6ebddb3882d..55d0ba9c34e 100644
--- a/Master/tlpkg/tlpsrc/collection-basic.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-basic.tlpsrc
@@ -4,7 +4,9 @@ longdesc These files are regarded as basic for any TeX system, covering
 longdesc plain TeX macros, Computer Modern fonts, and configuration for
 longdesc common drivers; no LaTeX.
 #
-depend collection-documentation-base
+# Special package that bootstraps everything else, but
+# just a normal dependency here.
+depend texlive.infra
 #
 depend amsfonts
 depend bibtex
@@ -34,7 +36,9 @@ depend plain
 depend tetex
 depend tex
 depend texconfig
+depend texlive-common
+depend texlive-docindex
+depend texlive-en
 depend texlive-msg-translations
 depend texlive-scripts
-depend texlive.infra
 depend xdvi
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-arabic.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-arabic.tlpsrc
deleted file mode 100644
index f0742bb2037..00000000000
--- a/Master/tlpkg/tlpsrc/collection-documentation-arabic.tlpsrc
+++ /dev/null
@@ -1,4 +0,0 @@
-category Collection
-shortdesc Arabic documentation
-depend lshort-persian
-depend collection-documentation-base
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-base.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-base.tlpsrc
deleted file mode 100644
index 9873171918f..00000000000
--- a/Master/tlpkg/tlpsrc/collection-documentation-base.tlpsrc
+++ /dev/null
@@ -1,5 +0,0 @@
-category Collection
-shortdesc TeX Live documentation
-depend texlive-common
-depend texlive-docindex
-depend texlive-en
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-bulgarian.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-bulgarian.tlpsrc
deleted file mode 100644
index 991ef388fd6..00000000000
--- a/Master/tlpkg/tlpsrc/collection-documentation-bulgarian.tlpsrc
+++ /dev/null
@@ -1,5 +0,0 @@
-category Collection
-shortdesc Bulgarian documentation
-depend lshort-bulgarian
-depend pst-eucl-translation-bg
-depend collection-documentation-base
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-chinese.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-chinese.tlpsrc
deleted file mode 100644
index 2f4cd3db4c6..00000000000
--- a/Master/tlpkg/tlpsrc/collection-documentation-chinese.tlpsrc
+++ /dev/null
@@ -1,10 +0,0 @@
-category Collection
-shortdesc Chinese documentation
-depend asymptote-faq-zh-cn
-depend asymptote-by-example-zh-cn
-depend asymptote-manual-zh-cn
-depend ctex-faq
-depend latex-notes-zh-cn
-depend lshort-chinese
-depend texlive-zh-cn
-depend collection-documentation-base
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-czechslovak.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-czechslovak.tlpsrc
deleted file mode 100644
index f06b61f6005..00000000000
--- a/Master/tlpkg/tlpsrc/collection-documentation-czechslovak.tlpsrc
+++ /dev/null
@@ -1,6 +0,0 @@
-category Collection
-shortdesc Czech/Slovak documentation
-depend lshort-czech
-depend lshort-slovak
-depend texlive-cz
-depend collection-documentation-base
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-dutch.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-dutch.tlpsrc
deleted file mode 100644
index 2e16c7073c3..00000000000
--- a/Master/tlpkg/tlpsrc/collection-documentation-dutch.tlpsrc
+++ /dev/null
@@ -1,4 +0,0 @@
-category Collection
-shortdesc Dutch documentation
-depend lshort-dutch
-depend collection-documentation-base
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-english.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-english.tlpsrc
deleted file mode 100644
index 9d805ba442c..00000000000
--- a/Master/tlpkg/tlpsrc/collection-documentation-english.tlpsrc
+++ /dev/null
@@ -1,57 +0,0 @@
-category Collection
-shortdesc English documentation
-depend FAQ-en
-depend MemoirChapStyles
-depend Type1fonts
-depend amslatex-primer
-depend around-the-bend
-depend ascii-chart
-depend components-of-TeX
-depend comprehensive
-depend dtxtut
-depend first-latex-doc
-depend gentle
-depend guide-to-latex
-depend happy4th
-depend impatient
-depend intro-scientific
-depend knuth
-depend l2tabu-english
-depend latex-brochure
-depend latex-course
-depend latex-doc-ptr
-depend latex-graphics-companion
-depend latex-veryshortguide
-depend latex-web-companion
-depend latex2e-help-texinfo
-depend latex4wp
-depend latexcheat
-depend latexfileinfo-pkgs
-depend lshort-english
-depend macros2e
-depend math-e
-depend mathmode
-depend memdesign
-depend metafont-beginners
-depend metapost-examples
-depend mil3
-depend patgen2-tutorial
-depend pictexsum
-depend plain-doc
-depend presentations-en
-depend pstricks-examples-en
-depend simplified-latex
-depend svg-inkscape
-depend tabulars-e
-depend tamethebeast
-depend tds
-depend tex-font-errors-cheatsheet
-depend tex-overview
-depend tex-refs
-depend texbytopic
-depend titlepages
-depend tlc2
-depend visualfaq
-depend webguide
-depend xetexref
-depend collection-documentation-base
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-finnish.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-finnish.tlpsrc
deleted file mode 100644
index c47887dac99..00000000000
--- a/Master/tlpkg/tlpsrc/collection-documentation-finnish.tlpsrc
+++ /dev/null
@@ -1,4 +0,0 @@
-category Collection
-shortdesc Finnish documentation
-depend lshort-finnish
-depend collection-documentation-base
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-french.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-french.tlpsrc
deleted file mode 100644
index c5e59410b05..00000000000
--- a/Master/tlpkg/tlpsrc/collection-documentation-french.tlpsrc
+++ /dev/null
@@ -1,13 +0,0 @@
-category Collection
-shortdesc French documentation
-depend apprends-latex
-depend epslatex-fr
-depend impatient-fr
-depend l2tabu-french
-depend lshort-french
-depend texlive-fr
-depend translation-array-fr
-depend translation-dcolumn-fr
-depend translation-natbib-fr
-depend translation-tabbing-fr
-depend collection-documentation-base
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-german.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-german.tlpsrc
deleted file mode 100644
index 2b0348cf546..00000000000
--- a/Master/tlpkg/tlpsrc/collection-documentation-german.tlpsrc
+++ /dev/null
@@ -1,26 +0,0 @@
-category Collection
-shortdesc German documentation
-depend einfuehrung
-depend fifinddo-info
-depend koma-script-examples
-depend l2picfaq
-depend l2tabu
-depend latex-bib-ex
-depend latex-referenz
-depend latex-tabellen
-depend lshort-german
-depend presentations
-depend pstricks-examples
-depend templates-fenn
-depend templates-sommer
-depend texlive-de
-depend translation-arsclassica-de
-depend translation-biblatex-de
-depend translation-chemsym-de
-depend translation-ecv-de
-depend translation-enumitem-de
-depend translation-europecv-de
-depend translation-filecontents-de
-depend translation-moreverb-de
-depend voss-de
-depend collection-documentation-base
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-italian.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-italian.tlpsrc
deleted file mode 100644
index 153b76604ed..00000000000
--- a/Master/tlpkg/tlpsrc/collection-documentation-italian.tlpsrc
+++ /dev/null
@@ -1,13 +0,0 @@
-category Collection
-shortdesc Italian documentation
-depend amsldoc-it
-depend amsmath-it
-depend amsthdoc-it
-depend fancyhdr-it
-depend l2tabu-italian
-depend latex4wp-it
-depend lshort-italian
-depend psfrag-italian
-depend texlive-it
-#
-depend collection-documentation-base
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-japanese.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-japanese.tlpsrc
deleted file mode 100644
index 3a1742b8f3c..00000000000
--- a/Master/tlpkg/tlpsrc/collection-documentation-japanese.tlpsrc
+++ /dev/null
@@ -1,4 +0,0 @@
-category Collection
-shortdesc Japanese documentation
-depend lshort-japanese
-depend collection-documentation-base
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-korean.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-korean.tlpsrc
deleted file mode 100644
index bb23938741c..00000000000
--- a/Master/tlpkg/tlpsrc/collection-documentation-korean.tlpsrc
+++ /dev/null
@@ -1,4 +0,0 @@
-category Collection
-shortdesc Korean documentation
-depend lshort-korean
-depend collection-documentation-base
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-mongolian.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-mongolian.tlpsrc
deleted file mode 100644
index a60af3364a5..00000000000
--- a/Master/tlpkg/tlpsrc/collection-documentation-mongolian.tlpsrc
+++ /dev/null
@@ -1,4 +0,0 @@
-category Collection
-shortdesc Mongolian documentation
-depend lshort-mongol
-depend collection-documentation-base
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-polish.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-polish.tlpsrc
deleted file mode 100644
index 8919835c5c3..00000000000
--- a/Master/tlpkg/tlpsrc/collection-documentation-polish.tlpsrc
+++ /dev/null
@@ -1,6 +0,0 @@
-category Collection
-shortdesc Polish documentation
-depend lshort-polish
-depend tex-virtual-academy-pl
-depend texlive-pl
-depend collection-documentation-base
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-portuguese.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-portuguese.tlpsrc
deleted file mode 100644
index 006a1ea0eee..00000000000
--- a/Master/tlpkg/tlpsrc/collection-documentation-portuguese.tlpsrc
+++ /dev/null
@@ -1,8 +0,0 @@
-category Collection
-shortdesc Portuguese documentation
-depend beamer-tut-pt
-depend cursolatex
-depend latexcheat-ptbr
-depend lshort-portuguese
-depend xypic-tut-pt
-depend collection-documentation-base
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-russian.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-russian.tlpsrc
deleted file mode 100644
index fa81dc4f833..00000000000
--- a/Master/tlpkg/tlpsrc/collection-documentation-russian.tlpsrc
+++ /dev/null
@@ -1,6 +0,0 @@
-category Collection
-shortdesc Russian documentation
-depend lshort-russian
-depend mpman-ru
-depend texlive-ru
-depend collection-documentation-base
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-serbian.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-serbian.tlpsrc
deleted file mode 100644
index c134f31228d..00000000000
--- a/Master/tlpkg/tlpsrc/collection-documentation-serbian.tlpsrc
+++ /dev/null
@@ -1,4 +0,0 @@
-category Collection
-shortdesc Serbian documentation
-depend texlive-sr
-depend collection-documentation-base
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-slovenian.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-slovenian.tlpsrc
deleted file mode 100644
index dd924efb66b..00000000000
--- a/Master/tlpkg/tlpsrc/collection-documentation-slovenian.tlpsrc
+++ /dev/null
@@ -1,4 +0,0 @@
-category Collection
-shortdesc Slovenian documentation
-depend lshort-slovenian
-depend collection-documentation-base
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-spanish.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-spanish.tlpsrc
deleted file mode 100644
index 1b03e82128d..00000000000
--- a/Master/tlpkg/tlpsrc/collection-documentation-spanish.tlpsrc
+++ /dev/null
@@ -1,8 +0,0 @@
-category Collection
-shortdesc Spanish documentation
-depend es-tex-faq
-depend l2tabu-spanish
-depend latex2e-help-texinfo-spanish
-depend latexcheat-esmx
-depend lshort-spanish
-depend collection-documentation-base
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-thai.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-thai.tlpsrc
deleted file mode 100644
index 100fc43bcf8..00000000000
--- a/Master/tlpkg/tlpsrc/collection-documentation-thai.tlpsrc
+++ /dev/null
@@ -1,4 +0,0 @@
-category Collection
-shortdesc Thai documentation
-depend lshort-thai
-depend collection-documentation-base
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-turkish.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-turkish.tlpsrc
deleted file mode 100644
index 653a7bc180b..00000000000
--- a/Master/tlpkg/tlpsrc/collection-documentation-turkish.tlpsrc
+++ /dev/null
@@ -1,4 +0,0 @@
-category Collection
-shortdesc Turkish documentation
-depend lshort-turkish
-depend collection-documentation-base
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-ukrainian.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-ukrainian.tlpsrc
deleted file mode 100644
index cb8eacb075a..00000000000
--- a/Master/tlpkg/tlpsrc/collection-documentation-ukrainian.tlpsrc
+++ /dev/null
@@ -1,4 +0,0 @@
-category Collection
-shortdesc Ukrainian documentation
-depend lshort-ukr
-depend collection-documentation-base
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-vietnamese.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-vietnamese.tlpsrc
deleted file mode 100644
index 7e0028540c2..00000000000
--- a/Master/tlpkg/tlpsrc/collection-documentation-vietnamese.tlpsrc
+++ /dev/null
@@ -1,6 +0,0 @@
-category Collection
-shortdesc Vietnamese documentation
-depend amsldoc-vn
-depend lshort-vietnamese
-depend ntheorem-vn
-depend collection-documentation-base
diff --git a/Master/tlpkg/tlpsrc/collection-langafrican.tlpsrc b/Master/tlpkg/tlpsrc/collection-langafrican.tlpsrc
index 8c342c13099..ff65bbf054a 100644
--- a/Master/tlpkg/tlpsrc/collection-langafrican.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langafrican.tlpsrc
@@ -1,6 +1,6 @@
 category Collection
 shortdesc African scripts
-longdesc Support for typesetting some African scripts
+longdesc Support for African scripts.
 #
 depend collection-basic
 #
diff --git a/Master/tlpkg/tlpsrc/collection-langarabic.tlpsrc b/Master/tlpkg/tlpsrc/collection-langarabic.tlpsrc
index dd092cede4c..076e1212fff 100644
--- a/Master/tlpkg/tlpsrc/collection-langarabic.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langarabic.tlpsrc
@@ -1,6 +1,6 @@
 category Collection
 shortdesc Arabic
-longdesc Support for typesetting Arabic and Persian.
+longdesc Support for Arabic and Persian.
 #
 depend collection-basic
 #
@@ -12,6 +12,7 @@ depend ghab
 depend hyphen-arabic
 depend hyphen-farsi
 depend imsproc
+depend lshort-persian
 depend persian-bib
 depend persian-hm-ftx
 depend persian-hm-xbs
diff --git a/Master/tlpkg/tlpsrc/collection-langcjk.tlpsrc b/Master/tlpkg/tlpsrc/collection-langcjk.tlpsrc
index 6249086d76a..9aac50440e9 100644
--- a/Master/tlpkg/tlpsrc/collection-langcjk.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langcjk.tlpsrc
@@ -1,23 +1,26 @@
 category Collection
-shortdesc Chinese, Japanese, Korean
-longdesc CJK (Chinese, Japanese, Korean) macros, fonts, documentation,
+shortdesc Chinese, Japanese, Korean, Thai
+longdesc CJK (Chinese, Japanese, Korean) macros, fonts, documentation;
 longdesc also Thai since there is some overlap in the fonts.
 #
 depend collection-basic
-depend collection-documentation-chinese
 #
 depend adobemapping
 depend arphic
+depend asymptote-by-example-zh-cn
+depend asymptote-faq-zh-cn
+depend asymptote-manual-zh-cn
 depend bxbase
 depend bxjscls
 depend bxpict2e
 depend c90
-depend cjk-ko
 depend cjk
+depend cjk-ko
 depend cjkpunct
 depend cjkutils
 depend cns
 depend ctex
+depend ctex-faq
 depend dnp
 depend fonts-tlwg
 depend garuda-c90
@@ -28,6 +31,11 @@ depend japanese-otf
 depend japanese-otf-uptex
 depend jfontmaps
 depend jsclasses
+depend latex-notes-zh-cn
+depend lshort-chinese
+depend lshort-japanese
+depend lshort-korean
+depend lshort-thai
 depend luatexja
 depend nanumtype1
 depend norasi-c90
@@ -38,6 +46,7 @@ depend pxchfon
 depend pxcjkcat
 depend pxjahyper
 depend pxrubrica
+depend texlive-zh-cn
 depend thailatex
 depend uhc
 depend uptex
diff --git a/Master/tlpkg/tlpsrc/collection-langcroatian.tlpsrc b/Master/tlpkg/tlpsrc/collection-langcroatian.tlpsrc
index ff51e931906..83188a39b92 100644
--- a/Master/tlpkg/tlpsrc/collection-langcroatian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langcroatian.tlpsrc
@@ -1,6 +1,6 @@
 category Collection
 shortdesc Croatian
-longdesc Support for typesetting Croatian.
+longdesc Support for Croatian.
 #
 depend collection-basic
 #
diff --git a/Master/tlpkg/tlpsrc/collection-langcyrillic.tlpsrc b/Master/tlpkg/tlpsrc/collection-langcyrillic.tlpsrc
index 817f6d208fd..6deb9d447b1 100644
--- a/Master/tlpkg/tlpsrc/collection-langcyrillic.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langcyrillic.tlpsrc
@@ -1,12 +1,15 @@
 category Collection
 shortdesc Cyrillic
-longdesc Support for typesetting Cyrillic.
+longdesc Support for Cyrillic scripts (Bulgarian, Russian,
+longdesc Serbian, Ukrainian), even if Latin alphabets may also be used.
 #
 depend collection-basic
 depend collection-latex
 #
 depend babel-bulgarian
 depend babel-russian
+depend babel-serbian
+depend babel-serbianc
 depend babel-ukraineb
 depend cmcyr
 depend cyrillic
@@ -18,11 +21,23 @@ depend eskdx
 depend gost
 depend hyphen-bulgarian
 depend hyphen-russian
+depend hyphen-serbian
 depend hyphen-ukrainian
 depend lcyw
 depend lh
 depend lhcyr
+depend lshort-bulgarian
+depend lshort-russian
+depend lshort-ukr
+depend mpman-ru
+depend pst-eucl-translation-bg
 depend ruhyphen
 depend russ
+depend serbian-apostrophe
+depend serbian-date-lat
+depend serbian-def-cyr
+depend serbian-lig
 depend t2
+depend texlive-ru
+depend texlive-sr
 depend ukrhyph
diff --git a/Master/tlpkg/tlpsrc/collection-langczechslovak.tlpsrc b/Master/tlpkg/tlpsrc/collection-langczechslovak.tlpsrc
index 78fffa589cc..2f8dad5d6fa 100644
--- a/Master/tlpkg/tlpsrc/collection-langczechslovak.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langczechslovak.tlpsrc
@@ -1,6 +1,6 @@
 category Collection
 shortdesc Czech/Slovak
-longdesc Support for typesetting Czech/Slovak.
+longdesc Support for Czech/Slovak.
 #
 depend collection-basic
 depend collection-latex
@@ -15,3 +15,6 @@ depend cstex
 depend hyphen-czech
 depend hyphen-slovak
 depend vlna
+depend lshort-czech
+depend lshort-slovak
+depend texlive-cz
diff --git a/Master/tlpkg/tlpsrc/collection-langdanish.tlpsrc b/Master/tlpkg/tlpsrc/collection-langdanish.tlpsrc
index 6e3d00900b5..40919dbbe28 100644
--- a/Master/tlpkg/tlpsrc/collection-langdanish.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langdanish.tlpsrc
@@ -1,6 +1,6 @@
 category Collection
 shortdesc Danish
-longdesc Support for typesetting Danish.
+longdesc Support for Danish.
 #
 depend collection-basic
 #
diff --git a/Master/tlpkg/tlpsrc/collection-langdutch.tlpsrc b/Master/tlpkg/tlpsrc/collection-langdutch.tlpsrc
index fc101071e08..bd4ec818042 100644
--- a/Master/tlpkg/tlpsrc/collection-langdutch.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langdutch.tlpsrc
@@ -1,8 +1,9 @@
 category Collection
 shortdesc Dutch
-longdesc Support for typesetting Dutch.
+longdesc Support for Dutch.
 #
 depend collection-basic
 #
 depend babel-dutch
 depend hyphen-dutch
+depend lshort-dutch
diff --git a/Master/tlpkg/tlpsrc/collection-langenglish.tlpsrc b/Master/tlpkg/tlpsrc/collection-langenglish.tlpsrc
index 55446149cb8..89934373131 100644
--- a/Master/tlpkg/tlpsrc/collection-langenglish.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langenglish.tlpsrc
@@ -1,7 +1,62 @@
 category Collection
 shortdesc US and UK English
-longdesc Support for typesetting US and UK English.
+longdesc Support for US and UK English.
 #
 depend collection-basic
 #
 depend hyphen-english
+#
+depend FAQ-en
+depend MemoirChapStyles
+depend Type1fonts
+depend amslatex-primer
+depend around-the-bend
+depend ascii-chart
+depend components-of-TeX
+depend comprehensive
+depend dtxtut
+depend first-latex-doc
+depend gentle
+depend guide-to-latex
+depend happy4th
+depend impatient
+depend intro-scientific
+depend knuth
+depend l2tabu-english
+depend latex-brochure
+depend latex-course
+depend latex-doc-ptr
+depend latex-graphics-companion
+depend latex-veryshortguide
+depend latex-web-companion
+depend latex2e-help-texinfo
+depend latex4wp
+depend latexcheat
+depend latexfileinfo-pkgs
+depend lshort-english
+depend macros2e
+depend math-e
+depend mathmode
+depend memdesign
+depend metafont-beginners
+depend metapost-examples
+depend mil3
+depend patgen2-tutorial
+depend pictexsum
+depend plain-doc
+depend presentations-en
+depend pstricks-examples-en
+depend simplified-latex
+depend svg-inkscape
+depend tabulars-e
+depend tamethebeast
+depend tds
+depend tex-font-errors-cheatsheet
+depend tex-overview
+depend tex-refs
+depend texbytopic
+depend titlepages
+depend tlc2
+depend visualfaq
+depend webguide
+depend xetexref
diff --git a/Master/tlpkg/tlpsrc/collection-langfinnish.tlpsrc b/Master/tlpkg/tlpsrc/collection-langfinnish.tlpsrc
index 1be57e04f34..9787c0adc64 100644
--- a/Master/tlpkg/tlpsrc/collection-langfinnish.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langfinnish.tlpsrc
@@ -1,9 +1,10 @@
 category Collection
 shortdesc Finnish
-longdesc Support for typesetting Finnish.
+longdesc Support for Finnish.
 #
 depend collection-basic
 #
 depend babel-finnish
 depend finbib
 depend hyphen-finnish
+depend lshort-finnish
diff --git a/Master/tlpkg/tlpsrc/collection-langfrench.tlpsrc b/Master/tlpkg/tlpsrc/collection-langfrench.tlpsrc
index dd2cfe4d309..2278b3ca2be 100644
--- a/Master/tlpkg/tlpsrc/collection-langfrench.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langfrench.tlpsrc
@@ -1,10 +1,11 @@
 category Collection
 shortdesc French
-longdesc Support for typesetting French and Basque.
+longdesc Support for French and Basque.
 #
 depend collection-basic
 #
 depend aeguill
+depend apprends-latex
 depend babel-basque
 depend babel-french
 depend basque-book
@@ -13,13 +14,22 @@ depend bib-fr
 depend bibleref-french
 depend booktabs-fr
 depend droit-fr
+depend epslatex-fr
 depend facture
 depend frenchle
 depend frletter
 depend hyphen-basque
 depend hyphen-french
+depend impatient-fr
 depend impnattypo
+depend l2tabu-french
+depend lshort-french
 depend mafr
 depend tabvar
 depend tdsfrmath
+depend texlive-fr
+depend translation-array-fr
+depend translation-dcolumn-fr
+depend translation-natbib-fr
+depend translation-tabbing-fr
 depend variations
diff --git a/Master/tlpkg/tlpsrc/collection-langgerman.tlpsrc b/Master/tlpkg/tlpsrc/collection-langgerman.tlpsrc
index dbddc1a2f63..44d0ebb908c 100644
--- a/Master/tlpkg/tlpsrc/collection-langgerman.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langgerman.tlpsrc
@@ -1,6 +1,6 @@
 category Collection
 shortdesc German
-longdesc Support for typesetting German.
+longdesc Support for German.
 #
 depend collection-basic
 #
@@ -10,13 +10,36 @@ depend booktabs-de
 depend csquotes-de
 depend dehyph-exptl
 depend dhua
+depend einfuehrung
 depend etoolbox-de
+depend fifinddo-info
 depend geometry-de
 depend germbib
 depend germkorr
 depend hausarbeit-jura
 depend hyphen-german
+depend koma-script-examples
+depend l2picfaq
+depend l2tabu
+depend latex-bib-ex
+depend latex-referenz
+depend latex-tabellen
+depend lshort-german
 depend microtype-de
+depend presentations
+depend pstricks-examples
 depend r_und_s
+depend templates-fenn
+depend templates-sommer
+depend texlive-de
 depend tipa-de
+depend translation-arsclassica-de
+depend translation-biblatex-de
+depend translation-chemsym-de
+depend translation-ecv-de
+depend translation-enumitem-de
+depend translation-europecv-de
+depend translation-filecontents-de
+depend translation-moreverb-de
 depend umlaute
+depend voss-de
diff --git a/Master/tlpkg/tlpsrc/collection-langgreek.tlpsrc b/Master/tlpkg/tlpsrc/collection-langgreek.tlpsrc
index 47596f50737..35850c9fc88 100644
--- a/Master/tlpkg/tlpsrc/collection-langgreek.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langgreek.tlpsrc
@@ -1,6 +1,6 @@
 category Collection
 shortdesc Greek
-longdesc Support for typesetting Greek.
+longdesc Support for Greek.
 #
 depend collection-basic
 #
diff --git a/Master/tlpkg/tlpsrc/collection-langhebrew.tlpsrc b/Master/tlpkg/tlpsrc/collection-langhebrew.tlpsrc
index 736336bdf4c..874517107b2 100644
--- a/Master/tlpkg/tlpsrc/collection-langhebrew.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langhebrew.tlpsrc
@@ -1,6 +1,6 @@
 category Collection
 shortdesc Hebrew
-longdesc Support for typesetting Hebrew.
+longdesc Support for Hebrew.
 #
 depend collection-basic
 #
diff --git a/Master/tlpkg/tlpsrc/collection-langhungarian.tlpsrc b/Master/tlpkg/tlpsrc/collection-langhungarian.tlpsrc
index 084b8864793..e0fe36c9876 100644
--- a/Master/tlpkg/tlpsrc/collection-langhungarian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langhungarian.tlpsrc
@@ -1,6 +1,6 @@
 category Collection
 shortdesc Hungarian
-longdesc Support for typesetting Hungarian.
+longdesc Support for Hungarian.
 #
 depend collection-basic
 #
diff --git a/Master/tlpkg/tlpsrc/collection-langindic.tlpsrc b/Master/tlpkg/tlpsrc/collection-langindic.tlpsrc
index d2c6a179cc2..7cda4624113 100644
--- a/Master/tlpkg/tlpsrc/collection-langindic.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langindic.tlpsrc
@@ -1,6 +1,6 @@
 category Collection
 shortdesc Indic scripts
-longdesc Support for typesetting some Indic scripts.
+longdesc Support for Indic scripts.
 #
 depend collection-basic
 #
diff --git a/Master/tlpkg/tlpsrc/collection-langitalian.tlpsrc b/Master/tlpkg/tlpsrc/collection-langitalian.tlpsrc
index 3a92293cd0b..2b4d874982d 100644
--- a/Master/tlpkg/tlpsrc/collection-langitalian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langitalian.tlpsrc
@@ -1,13 +1,22 @@
 category Collection
 shortdesc Italian
-longdesc Support for typesetting Italian.
+longdesc Support for Italian.
 #
 depend collection-basic
 #
+depend amsldoc-it
+depend amsmath-it
+depend amsthdoc-it
 depend babel-italian
 depend codicefiscaleitaliano
+depend fancyhdr-it
 depend fixltxhyph
 depend frontespizio
 depend hyphen-italian
 depend itnumpar
+depend l2tabu-italian
+depend latex4wp-it
 depend layaureo
+depend lshort-italian
+depend psfrag-italian
+depend texlive-it
diff --git a/Master/tlpkg/tlpsrc/collection-langlatin.tlpsrc b/Master/tlpkg/tlpsrc/collection-langlatin.tlpsrc
index 7a8d71abb10..02437ac87c6 100644
--- a/Master/tlpkg/tlpsrc/collection-langlatin.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langlatin.tlpsrc
@@ -1,6 +1,6 @@
 category Collection
 shortdesc Latin
-longdesc Support for typesetting Latin.
+longdesc Support for Latin (the language).
 #
 depend collection-basic
 #
diff --git a/Master/tlpkg/tlpsrc/collection-langlatvian.tlpsrc b/Master/tlpkg/tlpsrc/collection-langlatvian.tlpsrc
index 0e18534818d..789f09bc194 100644
--- a/Master/tlpkg/tlpsrc/collection-langlatvian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langlatvian.tlpsrc
@@ -1,6 +1,6 @@
 category Collection
 shortdesc Latvian
-longdesc Support for typesetting Latvian.
+longdesc Support for Latvian.
 #
 depend collection-basic
 #
diff --git a/Master/tlpkg/tlpsrc/collection-langlithuanian.tlpsrc b/Master/tlpkg/tlpsrc/collection-langlithuanian.tlpsrc
index 66017ddb9d5..0b8bb72b1e5 100644
--- a/Master/tlpkg/tlpsrc/collection-langlithuanian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langlithuanian.tlpsrc
@@ -1,6 +1,6 @@
 category Collection
 shortdesc Lithuanian
-longdesc Support for typesetting Lithuanian.
+longdesc Support for Lithuanian.
 #
 depend collection-basic
 #
diff --git a/Master/tlpkg/tlpsrc/collection-langmongolian.tlpsrc b/Master/tlpkg/tlpsrc/collection-langmongolian.tlpsrc
index a2e5661e03a..60b39d76ef3 100644
--- a/Master/tlpkg/tlpsrc/collection-langmongolian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langmongolian.tlpsrc
@@ -1,9 +1,10 @@
 category Collection
 shortdesc Mongolian
-longdesc Support for typesetting Mongolian.
+longdesc Support for Mongolian.
 #
 depend collection-basic
 #
 depend hyphen-mongolian
+depend lshort-mongol
 depend mongolian-babel
 depend montex
diff --git a/Master/tlpkg/tlpsrc/collection-langnorwegian.tlpsrc b/Master/tlpkg/tlpsrc/collection-langnorwegian.tlpsrc
index a7b9acac230..179fbc2c375 100644
--- a/Master/tlpkg/tlpsrc/collection-langnorwegian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langnorwegian.tlpsrc
@@ -1,6 +1,6 @@
 category Collection
 shortdesc Norwegian
-longdesc Support for typesetting Norwegian.
+longdesc Support for Norwegian.
 #
 depend collection-basic
 #
diff --git a/Master/tlpkg/tlpsrc/collection-langother.tlpsrc b/Master/tlpkg/tlpsrc/collection-langother.tlpsrc
index 264b445be20..03d81889d08 100644
--- a/Master/tlpkg/tlpsrc/collection-langother.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langother.tlpsrc
@@ -1,11 +1,10 @@
 category Collection
-shortdesc Other hyphenation patterns
-longdesc Hyphenation patterns for languages without (much) other support.
+shortdesc Other languages
+longdesc Support for languages not otherwise listed.
 #
-# Some have extra packages (cbcoptic, serbian-lig, maybe others -- all
-# in collection-latexextra at present), but I just didn't want to split
-# them off into tiny collections of their own.  Maybe another time.
-# --karl
+# Some have extra packages (cbcoptic, etc.), but I just didn't want to
+# split them off into tiny collections of their own.  Maybe another
+# time.  --karl
 #
 depend collection-basic
 # 
@@ -24,8 +23,6 @@ depend babel-romanian
 depend babel-romansh
 depend babel-samin
 depend babel-scottish
-depend babel-serbian
-depend babel-serbianc
 depend babel-slovenian
 depend babel-sorbian
 depend babel-welsh
@@ -44,8 +41,9 @@ depend hyphen-kurmanji
 depend hyphen-piedmontese
 depend hyphen-romanian
 depend hyphen-romansh
-depend hyphen-serbian
 depend hyphen-slovenian
 depend hyphen-turkish
 depend hyphen-uppersorbian
 depend hyphen-welsh
+#
+depend lshort-slovenian
diff --git a/Master/tlpkg/tlpsrc/collection-langpolish.tlpsrc b/Master/tlpkg/tlpsrc/collection-langpolish.tlpsrc
index 27f4abdb14e..7df58fcac53 100644
--- a/Master/tlpkg/tlpsrc/collection-langpolish.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langpolish.tlpsrc
@@ -1,6 +1,6 @@
 category Collection
 shortdesc Polish
-longdesc Support for typesetting Polish.
+longdesc Support for Polish.
 #
 depend collection-latex
 depend collection-basic
@@ -10,6 +10,7 @@ depend cc-pl
 depend gustlib
 depend gustprog
 depend hyphen-polish
+depend lshort-polish
 depend mex
 depend mwcls
 depend pl
@@ -17,4 +18,6 @@ depend polski
 depend przechlewski-book
 depend qpxqtx
 depend tap
+depend tex-virtual-academy-pl
+depend texlive-pl
 depend utf8mex
diff --git a/Master/tlpkg/tlpsrc/collection-langportuguese.tlpsrc b/Master/tlpkg/tlpsrc/collection-langportuguese.tlpsrc
index aed6d541746..b1c666163f0 100644
--- a/Master/tlpkg/tlpsrc/collection-langportuguese.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langportuguese.tlpsrc
@@ -1,9 +1,14 @@
 category Collection
 shortdesc Portuguese
-longdesc Support for typesetting Portuguese.
+longdesc Support for Portuguese.
 #
 depend collection-basic
 #
 depend babel-portuges
+depend beamer-tut-pt
+depend cursolatex
 depend hyphen-portuguese
+depend latexcheat-ptbr
+depend lshort-portuguese
 depend ordinalpt
+depend xypic-tut-pt
diff --git a/Master/tlpkg/tlpsrc/collection-langspanish.tlpsrc b/Master/tlpkg/tlpsrc/collection-langspanish.tlpsrc
index 9a397e4bfef..77b2aedf76e 100644
--- a/Master/tlpkg/tlpsrc/collection-langspanish.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langspanish.tlpsrc
@@ -1,13 +1,18 @@
 category Collection
 shortdesc Spanish
-longdesc Support for typesetting Spanish.
+longdesc Support for Spanish.
 #
 depend collection-basic
 #
 depend babel-catalan
 depend babel-galician
 depend babel-spanish
+depend es-tex-faq
 depend hyphen-catalan
 depend hyphen-galician
 depend hyphen-spanish
+depend l2tabu-spanish
+depend latex2e-help-texinfo-spanish
+depend latexcheat-esmx
+depend lshort-spanish
 depend spanish-mx
diff --git a/Master/tlpkg/tlpsrc/collection-langswedish.tlpsrc b/Master/tlpkg/tlpsrc/collection-langswedish.tlpsrc
index f42e1eaec98..afe6bcf1181 100644
--- a/Master/tlpkg/tlpsrc/collection-langswedish.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langswedish.tlpsrc
@@ -1,6 +1,6 @@
 category Collection
 shortdesc Swedish
-longdesc Support for typesetting Swedish.
+longdesc Support for Swedish.
 #
 depend collection-basic
 #
diff --git a/Master/tlpkg/tlpsrc/collection-langtibetan.tlpsrc b/Master/tlpkg/tlpsrc/collection-langtibetan.tlpsrc
index 3c814dd4851..fdfb8d87e85 100644
--- a/Master/tlpkg/tlpsrc/collection-langtibetan.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langtibetan.tlpsrc
@@ -1,6 +1,6 @@
 category Collection
 shortdesc Tibetan
-longdesc Support for typesetting Tibetan.
+longdesc Support for Tibetan.
 #
 depend collection-basic
 #
diff --git a/Master/tlpkg/tlpsrc/collection-langturkmen.tlpsrc b/Master/tlpkg/tlpsrc/collection-langturkmen.tlpsrc
index 9924508bd7c..8fb811999ab 100644
--- a/Master/tlpkg/tlpsrc/collection-langturkmen.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langturkmen.tlpsrc
@@ -1,9 +1,10 @@
 category Collection
-shortdesc Turkmen
-longdesc Support for typesetting Turkish and Turkmen.
+shortdesc Turkish and Turkmen
+longdesc Support for Turkish and Turkmen.
 #
 depend collection-basic
 #
 depend babel-turkish
 depend hyphen-turkmen
+depend lshort-turkish
 depend turkmen
diff --git a/Master/tlpkg/tlpsrc/collection-langvietnamese.tlpsrc b/Master/tlpkg/tlpsrc/collection-langvietnamese.tlpsrc
index 30a53b1df23..75bfadfd268 100644
--- a/Master/tlpkg/tlpsrc/collection-langvietnamese.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langvietnamese.tlpsrc
@@ -1,7 +1,10 @@
 category Collection
 shortdesc Vietnamese
-longdesc Support for typesetting Vietnamese.
+longdesc Support for Vietnamese.
 #
 depend collection-basic
 #
+depend amsldoc-vn
+depend lshort-vietnamese
+depend ntheorem-vn
 depend vntex
diff --git a/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
index 055f66d5614..6ca6374fd8e 100644
--- a/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
@@ -693,10 +693,6 @@ depend semantic
 depend semioneside
 depend sepfootnotes
 depend seqsplit
-depend serbian-apostrophe
-depend serbian-date-lat
-depend serbian-def-cyr
-depend serbian-lig
 depend sf298
 depend sffms
 depend sfmath
diff --git a/Master/tlpkg/tlpsrc/scheme-full.tlpsrc b/Master/tlpkg/tlpsrc/scheme-full.tlpsrc
index 86ba6c9e38c..45a373b5b78 100644
--- a/Master/tlpkg/tlpsrc/scheme-full.tlpsrc
+++ b/Master/tlpkg/tlpsrc/scheme-full.tlpsrc
@@ -5,30 +5,6 @@ depend collection-basic
 depend collection-bibtexextra
 depend collection-binextra
 depend collection-context
-depend collection-documentation-arabic
-depend collection-documentation-base
-depend collection-documentation-bulgarian
-depend collection-documentation-chinese
-depend collection-documentation-czechslovak
-depend collection-documentation-dutch
-depend collection-documentation-english
-depend collection-documentation-finnish
-depend collection-documentation-french
-depend collection-documentation-german
-depend collection-documentation-italian
-depend collection-documentation-japanese
-depend collection-documentation-korean
-depend collection-documentation-mongolian
-depend collection-documentation-polish
-depend collection-documentation-portuguese
-depend collection-documentation-russian
-depend collection-documentation-serbian
-depend collection-documentation-slovenian
-depend collection-documentation-spanish
-depend collection-documentation-thai
-depend collection-documentation-turkish
-depend collection-documentation-ukrainian
-depend collection-documentation-vietnamese
 depend collection-fontsextra
 depend collection-fontsrecommended
 depend collection-fontutils
diff --git a/Master/tlpkg/tlpsrc/scheme-gust.tlpsrc b/Master/tlpkg/tlpsrc/scheme-gust.tlpsrc
index 164b2eb1dbb..74e2215e60d 100644
--- a/Master/tlpkg/tlpsrc/scheme-gust.tlpsrc
+++ b/Master/tlpkg/tlpsrc/scheme-gust.tlpsrc
@@ -29,7 +29,6 @@ depend texdoc
 #
 depend collection-basic
 depend collection-context
-depend collection-documentation-polish
 depend collection-fontutils
 depend collection-fontsrecommended
 depend collection-genericrecommended
diff --git a/Master/tlpkg/tlpsrc/scheme-medium.tlpsrc b/Master/tlpkg/tlpsrc/scheme-medium.tlpsrc
index bc9a66ddf0f..cc424d61a0a 100644
--- a/Master/tlpkg/tlpsrc/scheme-medium.tlpsrc
+++ b/Master/tlpkg/tlpsrc/scheme-medium.tlpsrc
@@ -6,11 +6,11 @@ longdesc widely-used European languages.
 depend collection-basic
 depend collection-binextra
 depend collection-context
-depend collection-documentation-english
 depend collection-fontutils
 depend collection-fontsrecommended
 depend collection-langczechslovak
 depend collection-langdutch
+depend collection-langenglish
 depend collection-langfrench
 depend collection-langgerman
 depend collection-langitalian
diff --git a/Master/tlpkg/tlpsrc/scheme-tetex.tlpsrc b/Master/tlpkg/tlpsrc/scheme-tetex.tlpsrc
index f24b2afdd9c..a1ad69ce5ab 100644
--- a/Master/tlpkg/tlpsrc/scheme-tetex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/scheme-tetex.tlpsrc
@@ -41,7 +41,6 @@ depend tds
 depend tex-refs
 depend collection-basic
 depend collection-context
-depend collection-documentation-base
 depend collection-fontutils
 depend collection-fontsrecommended
 depend collection-genericrecommended
diff --git a/Master/tlpkg/tlpsrc/texlive-scripts.tlpsrc b/Master/tlpkg/tlpsrc/texlive-scripts.tlpsrc
index 060dc4566c5..559594005e7 100644
--- a/Master/tlpkg/tlpsrc/texlive-scripts.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texlive-scripts.tlpsrc
@@ -1,6 +1,6 @@
 category TLCore
 shortdesc TeX Live infrastructure programs
-longdesc Includes install-tl, tl-portable, rungs, etc., not needed for
+longdesc Includes install-tl, tl-portable, rungs, etc.; not needed for
 longdesc tlmgr to run but still ours.  Not included in tlcritical.
 #
 depend texlive.infra