From 81d183681aea972fddd453d62109f8ccda3f447a Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 25 Nov 2013 08:16:37 +0100 Subject: [PATCH] start adding apt.8.xml --- cmdline/apt.cc | 2 +- doc/apt-verbatim.ent | 18 ++++++ doc/{apt.8 => apt.7} | 7 ++- doc/apt.8.xml | 128 +++++++++++++++++++++++++++++++++++++++++++ doc/makefile | 4 +- doc/po4a.conf | 3 +- 6 files changed, 156 insertions(+), 6 deletions(-) rename doc/{apt.8 => apt.7} (92%) create mode 100644 doc/apt.8.xml diff --git a/cmdline/apt.cc b/cmdline/apt.cc index e30967ec2..b2f19c049 100644 --- a/cmdline/apt.cc +++ b/cmdline/apt.cc @@ -120,7 +120,7 @@ int main(int argc, const char *argv[]) /*{{{*/ } // FIXME: move into a new libprivate/private-install.cc:Install() - _config->Set("DPkgPM::Progress", "1"); + _config->Set("DPkgPM::Progress-Fancy", "1"); _config->Set("Apt::Color", "1"); // Parse the command line and initialize the package library diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index 0d0d95c7a..8581ec630 100644 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@ -247,6 +247,24 @@ &synopsis-filename;"> -v--version -h--help"> + + apt + + &synopsis-arg-option; + &synopsis-arg-config; + &synopsis-arg-target-release; + &synopsis-arg-architecture; + + list + search + show + update + upgrade + install &synopsis-arg-pkgver; + remove &synopsis-arg-pkg; + &synopsis-help; + +"> apt-get diff --git a/doc/apt.8 b/doc/apt.7 similarity index 92% rename from doc/apt.8 rename to doc/apt.7 index d84a3b4dd..5cdfa781e 100644 --- a/doc/apt.8 +++ b/doc/apt.7 @@ -14,13 +14,15 @@ .\" License along with APT; if not, write to the Free Software .\" Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA .\" 02111-1307 USA -.TH apt 8 "16 June 1998" "Debian" +.TH apt 7 "16 June 1998" "Debian" .SH NAME apt \- Advanced Package Tool .SH SYNOPSIS .B apt .SH DESCRIPTION -APT is a management system for software packages. For normal day to day +APT is a management system for software packages. + +For normal day to day package management there are several frontends available, such as .BR aptitude (8) for the command line or @@ -29,6 +31,7 @@ for the X Window System. Some options are only implemented in .BR apt-get (8) though. .SH SEE ALSO +.BR apt (8), .BR apt-cache (8), .BR apt-get (8), .BR apt.conf (5), diff --git a/doc/apt.8.xml b/doc/apt.8.xml new file mode 100644 index 000000000..0340e043f --- /dev/null +++ b/doc/apt.8.xml @@ -0,0 +1,128 @@ + + +%aptent; + + +%aptverbatiment; + +]> + + + + + &apt-author.jgunthorpe; + &apt-author.team; + &apt-email; + &apt-product; + + 2013-11-25T00:00:00Z + + + + apt + 8 + APT + + + + + apt + APT package -- command-line interface + + + &synopsis-command-apt; + + Description + apt is the command-line tool for handling packages. It provides a commandline interface for the package management of the system. + + See also &apt-get; and &apt-cache; for more low-level command options. + + + + + update is used to + resynchronize the package index files from their sources. + + + + + upgrade is used to install the + newest versions of all packages currently installed on the system + from the sources enumerated in + /etc/apt/sources.list. New package will be + installed, but existing package will never removed. + + + + + + install is followed by one or more + package names desired for installation or upgrading. + + + A specific version of a package can be selected for installation by + following the package name with an equals and the version of the package + to select. This will cause that version to be located and selected for + install. Alternatively a specific distribution can be selected by + following the package name with a slash and the version of the + distribution or the Archive name (stable, testing, unstable). + + + + + remove is identical to install except that packages are + removed instead of installed. Note that removing a package leaves its + configuration files on the system. If a plus sign is appended to the package + name (with no intervening space), the identified package will be + installed instead of removed. + + + + + + options + &apt-cmdblurb; + + + + &apt-commonoptions; + + + + + Differences to &apt-get; + The apt command is meant to be pleasant for + end users and does not need to be backward compatilbe like + &apt-get;. Therefore some options are different: + + + The option DPkgPM::Progress-Fancy is enabled. + + The option APT::Color is enabled. + + A new list command is available + similar to dpkg --list. + + The option upgrade has + --with-new-pkgs enabled by default. + + + + + + + + See Also + &apt-get; &apt-cache;, &sources-list;, + &apt-conf;, &apt-config;, + The APT User's guide in &guidesdir;, &apt-preferences;, the APT Howto. + + + Diagnostics + apt returns zero on normal operation, decimal 100 on error. + + &manbugs; + diff --git a/doc/makefile b/doc/makefile index 274fbc278..fdbf53e9f 100644 --- a/doc/makefile +++ b/doc/makefile @@ -59,9 +59,9 @@ update-po: manpages/subdirs: $(MANPAGEPOLIST) $(MANPAGEPOLIST) :: manpages-translation-% : %/makefile po4a.conf - # first line is for apt.8 (see Bug#696923) + # first line is for apt.7 (see Bug#696923) po4a --previous --no-backups --translate-only $(dir $<)apt.ent \ - $(patsubst %,--translate-only $(dir $<)%,$(patsubst %.8,%.$(subst /,,$(dir $<)).8,$(wildcard *.8))) \ + $(patsubst %,--translate-only $(dir $<)%,$(patsubst %.7,%.$(subst /,,$(dir $<)).7,$(wildcard *.7))) \ $(patsubst %,--translate-only $(dir $<)%,$(patsubst %.1.xml,%.$(subst /,,$(dir $<)).1.xml,$(wildcard *.1.xml))) \ $(patsubst %,--translate-only $(dir $<)%,$(patsubst %.2.xml,%.$(subst /,,$(dir $<)).2.xml,$(wildcard *.2.xml))) \ $(patsubst %,--translate-only $(dir $<)%,$(patsubst %.3.xml,%.$(subst /,,$(dir $<)).3.xml,$(wildcard *.3.xml))) \ diff --git a/doc/po4a.conf b/doc/po4a.conf index 14f19eddd..cf8999452 100644 --- a/doc/po4a.conf +++ b/doc/po4a.conf @@ -12,6 +12,7 @@ # define source file and translated file (one file per line) [type: entity] apt.ent $lang:$lang/apt.ent +[type: manpage] apt.8.xml $lang:$lang/apt.$lang.8.xml add_$lang:xml.add [type: manpage] apt-get.8.xml $lang:$lang/apt-get.$lang.8.xml add_$lang:xml.add [type: manpage] apt-cache.8.xml $lang:$lang/apt-cache.$lang.8.xml add_$lang:xml.add [type: manpage] apt-key.8.xml $lang:$lang/apt-key.$lang.8.xml add_$lang:xml.add @@ -25,7 +26,7 @@ [type: manpage] apt-extracttemplates.1.xml $lang:$lang/apt-extracttemplates.$lang.1.xml add_$lang:xml.add [type: manpage] apt-sortpkgs.1.xml $lang:$lang/apt-sortpkgs.$lang.1.xml add_$lang:xml.add [type: manpage] apt-ftparchive.1.xml $lang:$lang/apt-ftparchive.$lang.1.xml add_$lang:xml.add -[type: man] apt.8 $lang:$lang/apt.$lang.8 +[type: man] apt.7 $lang:$lang/apt.$lang.7 [type: sgml] guide.sgml $lang:$lang/guide.$lang.sgml # add_$lang::$lang/addendum/debiandoc_$lang.add -- 2.45.2