From 6e8b4572fb7d3e575821fe8799ded1c865cd866f Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 5 Apr 2012 11:54:36 +0200 Subject: * doc/*: - move the command synopsis out of each manpage into apt-verbatim.ent as they are a hell to translate and just single out the parameters which can be translated to apt.ent --- debian/changelog | 6 +- doc/apt-cache.8.xml | 30 +------- doc/apt-cdrom.8.xml | 15 +--- doc/apt-config.8.xml | 16 +---- doc/apt-extracttemplates.1.xml | 12 +--- doc/apt-ftparchive.1.xml | 25 +------ doc/apt-get.8.xml | 88 +---------------------- doc/apt-key.8.xml | 24 +++---- doc/apt-mark.8.xml | 22 +----- doc/apt-sortpkgs.1.xml | 13 +--- doc/apt-verbatim.ent | 155 +++++++++++++++++++++++++++++++++++++++++ doc/apt.ent | 43 ++++++++++++ 12 files changed, 226 insertions(+), 223 deletions(-) diff --git a/debian/changelog b/debian/changelog index 57d4e8679..d6913b003 100644 --- a/debian/changelog +++ b/debian/changelog @@ -55,12 +55,16 @@ apt (0.8.16~exp14) UNRELEASED; urgency=low - do not sed in configure.in to set the version-number * prepare-release: - add as a small script to lazy check and prepare releases + * doc/*: + - move the command synopsis out of each manpage into apt-verbatim.ent + as they are a hell to translate and just single out the parameters + which can be translated to apt.ent [ Bogdan Purcareata ] * doc/apt-get.8.xml: - add 'download' to the usage line (Closes: #649340) - -- David Kalnischkies Wed, 04 Apr 2012 22:41:13 +0200 + -- David Kalnischkies Thu, 05 Apr 2012 11:22:34 +0200 apt (0.8.16~exp13) experimental; urgency=low diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml index 1393de015..42d700c82 100644 --- a/doc/apt-cache.8.xml +++ b/doc/apt-cache.8.xml @@ -33,34 +33,8 @@ query the APT cache - - - - apt-cache - - - - - gencaches - showpkg pkg - showsrc pkg - stats - dump - dumpavail - unmet - search regex - show pkg - depends pkg - rdepends pkg - pkgnames prefix - dotty pkg - xvcg pkg - policy pkgs - madison pkgs - - - - + &synopsis-command-apt-cache; + Description apt-cache performs a variety of operations on APT's package cache. apt-cache does not manipulate the state of the system diff --git a/doc/apt-cdrom.8.xml b/doc/apt-cdrom.8.xml index 53ab392ab..94fc6fd8b 100644 --- a/doc/apt-cdrom.8.xml +++ b/doc/apt-cdrom.8.xml @@ -32,20 +32,7 @@ APT CDROM management utility - - - - apt-cdrom - - - - - - add - ident - - - + &synopsis-command-apt-cdrom; Description apt-cdrom is used to add a new CDROM to APTs list diff --git a/doc/apt-config.8.xml b/doc/apt-config.8.xml index 862a034a1..b6fcf4bf2 100644 --- a/doc/apt-config.8.xml +++ b/doc/apt-config.8.xml @@ -33,20 +33,8 @@ APT Configuration Query program - - - - apt-config - - - - - shell - dump - - - - + &synopsis-command-apt-config; + Description apt-config is an internal program used by various portions of the APT suite to provide consistent configurability. It accesses diff --git a/doc/apt-extracttemplates.1.xml b/doc/apt-extracttemplates.1.xml index af4cacfce..8f28f8c54 100644 --- a/doc/apt-extracttemplates.1.xml +++ b/doc/apt-extracttemplates.1.xml @@ -33,16 +33,8 @@ Utility to extract DebConf config and templates from Debian packages - - - - apt-extracttemplates - - - file - - - + &synopsis-command-apt-extracttemplates; + Description apt-extracttemplates will take one or more Debian package files as input and write out (to a temporary directory) all associated config diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml index b08ebe80f..93b109af1 100644 --- a/doc/apt-ftparchive.1.xml +++ b/doc/apt-ftparchive.1.xml @@ -33,29 +33,8 @@ Utility to generate index files - - - - apt-ftparchive - - - - - - - - - - packagespathoverridepathprefix - sourcespathoverridepathprefix - contents path - release path - generate config-file section - clean config-file - - - - + &synopsis-command-apt-ftparchive; + Description apt-ftparchive is the command line tool that generates the index files that APT uses to access a distribution source. The index files should diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 956259ef4..65929e733 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -33,92 +33,8 @@ APT package handling utility -- command-line interface - - - - apt-get - - - - - - - - - - - target_release - - - - - - default_architecture - - - - - - update - upgrade - dselect-upgrade - dist-upgrade - install - pkg - - - - =pkg_version_number - - - /target_release - - - - - - remove pkg - purge pkg - source - pkg - - - - =pkg_version_number - - - /target_release - - - - - - build-dep pkg - check - download pkg - clean - autoclean - autoremove - - - -v - --version - - - - - -h - --help - - - - - - + &synopsis-command-apt-get; + Description apt-get is the command-line tool for handling packages, and may be considered the user's "back-end" to other tools using the APT diff --git a/doc/apt-key.8.xml b/doc/apt-key.8.xml index cae2b00a0..3748b5e17 100644 --- a/doc/apt-key.8.xml +++ b/doc/apt-key.8.xml @@ -25,15 +25,7 @@ APT key management utility - - - - apt-key - - command - - - + &synopsis-command-apt-key; Description @@ -45,19 +37,19 @@ Commands - add filename + add &synopsis-param-filename; Add a new key to the list of trusted keys. The key is read - from filename, or standard input if - filename is -. + from &synopsis-param-filename;, or standard input if + &synopsis-param-filename; is -. - del keyid + del &synopsis-param-keyid; @@ -68,11 +60,11 @@ - export keyid + export &synopsis-param-keyid; - Output the key keyid to standard output. + Output the key &synopsis-param-keyid; to standard output. @@ -161,7 +153,7 @@ Options Note that options need to be defined before the commands described in the previous section. - --keyring filename + --keyring &synopsis-param-filename; With this option it is possible to specify a specific keyring file the command should operate on. The default is that a command is executed on the trusted.gpg file as well as on all parts in the diff --git a/doc/apt-mark.8.xml b/doc/apt-mark.8.xml index 01c8665dd..d62731124 100644 --- a/doc/apt-mark.8.xml +++ b/doc/apt-mark.8.xml @@ -33,26 +33,8 @@ mark/unmark a package as being automatically-installed - - - - apt-mark - - - - - - auto - manual - showauto - showmanual - - package - - - - - + &synopsis-command-apt-mark; + Description apt-mark will change whether a package has been marked as being automatically installed. diff --git a/doc/apt-sortpkgs.1.xml b/doc/apt-sortpkgs.1.xml index f2bd3c3ea..c1d1aa1e1 100644 --- a/doc/apt-sortpkgs.1.xml +++ b/doc/apt-sortpkgs.1.xml @@ -33,17 +33,8 @@ Utility to sort package index files - - - - apt-sortpkgs - - - - file - - - + &synopsis-command-apt-sortpkgs; + Description apt-sortpkgs will take an index file (Source index or Package index) and sort the records so that they are ordered by the package name. diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index 14cd70e89..ad4554e2f 100644 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@ -192,3 +192,158 @@ + + + +"> +"> +"> +"> +&synopsis-pkg; + =&synopsis-pkg-ver-number; + /&synopsis-target-release; +"> +&synopsis-pkg;"> +&synopsis-filename;"> +-v--version + -h--help"> + + apt-get + + &synopsis-arg-option; + &synopsis-arg-config; + &synopsis-arg-target-release; + &synopsis-arg-architecture; + + update + upgrade + dselect-upgrade + dist-upgrade + install &synopsis-arg-pkgver; + remove &synopsis-arg-pkg; + purge &synopsis-arg-pkg; + source &synopsis-arg-pkgver; + build-dep &synopsis-arg-pkgver; + download &synopsis-arg-pkgver; + check + clean + autoclean + autoremove + &synopsis-help; + +"> + + apt-cache + + &synopsis-arg-option; + &synopsis-arg-config; + + gencaches + showpkg &synopsis-arg-pkg; + showsrc &synopsis-arg-pkg; + stats + dump + dumpavail + unmet + search &synopsis-regex; + show &synopsis-arg-pkgver; + depends &synopsis-arg-pkgver; + rdepends &synopsis-arg-pkgver; + pkgnames &synopsis-prefix; + dotty &synopsis-arg-pkgver; + xvcg &synopsis-arg-pkgver; + policy &synopsis-arg-pkg; + madison &synopsis-arg-pkg; + &synopsis-help; + +"> + + apt-cdrom + + + &synopsis-arg-option; + &synopsis-arg-config; + + add + ident + &synopsis-help; + +"> + + apt-config + &synopsis-arg-option; + &synopsis-arg-config; + + shell + dump + &synopsis-help; + +"> + + apt-extracttemplates + + &synopsis-param-filename; + &synopsis-help; +"> +&synopsis-path;&synopsis-override;&synopsis-pathprefix;"> + + apt-ftparchive + + + + + + + &synopsis-arg-option; + &synopsis-arg-config; + + packages &synopsis-arg-ftparchive; + sources &synopsis-arg-ftparchive; + contents &synopsis-path; + release &synopsis-path; + generate &synopsis-config-file; &synopsis-section; + clean &synopsis-config-file; + &synopsis-help; + +"> +&synopsis-keyid;"> + + apt-key + + + add &synopsis-param-filename; + del &synopsis-param-keyid; + export &synopsis-param-keyid; + exportall + list + finger + adv + update + net-update + &synopsis-help; + +"> + + apt-mark + + + + + auto + manual + showauto + showmanual + + &synopsis-arg-pkg; + + &synopsis-help; + +"> + + apt-sortpkgs + + &synopsis-arg-option; + &synopsis-arg-config; + &synopsis-param-filename; + &synopsis-help; +"> diff --git a/doc/apt.ent b/doc/apt.ent index fc745989f..e48087fa7 100644 --- a/doc/apt.ent +++ b/doc/apt.ent @@ -208,3 +208,46 @@ This is done on purpose, to avoid losing content when the translation is lagging behind the original content. "> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3