summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-08-27 17:45:49 +0000
committerKarl Berry <karl@freefriends.org>2009-08-27 17:45:49 +0000
commit5a2a2cd8d334a65bf398aa53a6df59dd930167a2 (patch)
treeda8ee49f02f89f817023ff7067bd126640f8089f /Master
parentd90a296d0cf73b92fb0e1396865232d8cefbd7da (diff)
sort list of %TLPDBOptions
git-svn-id: svn://tug.org/texlive/trunk@14892 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/tlpkg/TeXLive/TLConfig.pm38
-rw-r--r--Master/tlpkg/tlpsrc/00texlive.installation.tlpsrc2
2 files changed, 20 insertions, 20 deletions
diff --git a/Master/tlpkg/TeXLive/TLConfig.pm b/Master/tlpkg/TeXLive/TLConfig.pm
index c6fd878c66d..308109ecfa2 100644
--- a/Master/tlpkg/TeXLive/TLConfig.pm
+++ b/Master/tlpkg/TeXLive/TLConfig.pm
@@ -112,7 +112,7 @@ our %TLPDBConfigs = (
# - u: url
# - b: boolean, saved as 0/1
# - p: path (local path)
-# - n: naturnal number
+# - n: natural number
# it allows n:[a]..[b]
# if a is empty start at -infty
# if b is empty end at +infty
@@ -125,9 +125,12 @@ our %TLPDBConfigs = (
# the "option" is the value in the TLPDB
our %TLPDBOptions = (
- "location" =>
- [ "u", "__MASTER__", "repository",
- "Default package repository" ],
+ "autobackup" =>
+ [ "n:-1..", 0, "autobackup",
+ "Number of backups to keep" ],
+ "backupdir" =>
+ [ "p", "", "backupdir",
+ "Directory for backups" ],
"create_formats" =>
[ "b", 1, "formats",
"Create formats on installation" ],
@@ -137,33 +140,30 @@ our %TLPDBOptions = (
"file_assocs" =>
[ "n:0..2", 1, "fileassocs",
"Change file associations in postinst" ],
+ "install_docfiles" =>
+ [ "b", 1, "docfiles",
+ "Install documentation files" ],
+ "install_srcfiles" =>
+ [ "b", 1, "srcfiles",
+ "Install source files" ],
+ "location" =>
+ [ "u", "__MASTER__", "repository",
+ "Default package repository" ],
"post_code" =>
[ "b", 1, "postcode",
"Run postinst code blobs" ],
"sys_bin" =>
[ "p", "/usr/local/bin", "sys_bin",
"Destination for symlinks for binaries" ],
- "sys_man" =>
- [ "p", "/usr/local/man", "sys_man",
- "Destination for symlinks for man pages" ],
"sys_info" =>
[ "p", "/usr/local/info", "sys_info",
"Destination for symlinks for info docs" ],
- "install_docfiles" =>
- [ "b", 1, "docfiles",
- "Install documentation files" ],
- "install_srcfiles" =>
- [ "b", 1, "srcfiles",
- "Install source files" ],
+ "sys_man" =>
+ [ "p", "/usr/local/man", "sys_man",
+ "Destination for symlinks for man pages" ],
"w32_multi_user" =>
[ "b", 1, "multiuser",
"Install for shortcuts/menu items for all users (w32)" ],
- "autobackup" =>
- [ "n:-1..", 0, "autobackup",
- "Number of backups to keep" ],
- "backupdir" =>
- [ "p", "", "backupdir",
- "Directory for backups" ],
);
diff --git a/Master/tlpkg/tlpsrc/00texlive.installation.tlpsrc b/Master/tlpkg/tlpsrc/00texlive.installation.tlpsrc
index 0b49550966f..37f9560cd2c 100644
--- a/Master/tlpkg/tlpsrc/00texlive.installation.tlpsrc
+++ b/Master/tlpkg/tlpsrc/00texlive.installation.tlpsrc
@@ -19,7 +19,7 @@ longdesc All other options are set from TLConfig::TLPDBOptions to the
longdesc default values specified there.
longdesc
longdesc There are two types here:
-longdesc - If the key starts with opt_ this is an options that can be
+longdesc - If the key starts with opt_ this is an option that can be
longdesc set by the user either at installation time or via tlmgr later on
longdesc - If the key starts with setting_ this value cannot be changed
longdesc by the user directly with tlmgr, but only by other actions.