Merge branch 'debian/sid' of git://anonscm.debian.org/apt/apt

Conflicts:
	.gitignore
	Makefile
	apt-inst/makefile
	apt-pkg/install-progress.h
	apt-pkg/makefile
	buildlib/defaults.mak
	buildlib/environment.mak.in
	buildlib/library.mak
	buildlib/po4a_manpage.mak
	buildlib/program.mak
	buildlib/python.mak
	buildlib/staticlibrary.mak
	cmdline/makefile
	configure.ac
	debian/apt.install.in
	debian/changelog
	debian/control
	debian/libapt-pkg4.12.symbols
	debian/rules
	doc/makefile
	ftparchive/makefile
	po/ar.po
	po/bs.po
	po/cy.po
	po/dz.po
	po/el.po
	po/fi.po
	po/km.po
	po/ku.po
	po/lt.po
	po/ne.po
	po/nn.po
	po/pt_BR.po
	po/ro.po
	po/th.po
	po/tl.po
	po/uk.po
	test/libapt/makefile

31 files changed, 11985 insertions, 9757 deletions

diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index ffd7c88b..6ca8d118 100644
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -1,112 +1,129 @@
-# Doxyfile 1.8.4
+# Doxyfile 1.8.7
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
 #
-# All text after a double hash (##) is considered a comment and is placed
-# in front of the TAG it is preceding .
-# All text after a hash (#) is considered a comment and will be ignored.
+# All text after a double hash (##) is considered a comment and is placed in
+# front of the TAG it is preceding.
+#
+# All text after a single hash (#) is considered a comment and will be ignored.
 # The format is:
-#       TAG = value [value, ...]
-# For lists items can also be appended using:
-#       TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ").
+# TAG = value [value, ...]
+# For lists, items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (\" \").
 
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------
 
 # This tag specifies the encoding used for all characters in the config file
-# that follow. The default is UTF-8 which is also the encoding used for all
-# text before the first occurrence of this tag. Doxygen uses libiconv (or the
-# iconv built into libc) for the transcoding. See
-# http://www.gnu.org/software/libiconv for the list of possible encodings.
+# that follow. The default is UTF-8 which is also the encoding used for all text
+# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
+# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv
+# for the list of possible encodings.
+# The default value is: UTF-8.
 
 DOXYFILE_ENCODING      = UTF-8
 
-# The PROJECT_NAME tag is a single word (or sequence of words) that should
-# identify the project. Note that if you do not use Doxywizard you need
-# to put quotes around the project name if it contains spaces.
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
+# double-quotes, unless you are using Doxywizard) that should identify the
+# project for which the documentation is generated. This name is used in the
+# title of most generated pages and in a few other places.
+# The default value is: My Project.
 
 PROJECT_NAME           = @PACKAGE@
 
-# The PROJECT_NUMBER tag can be used to enter a project or revision number.
-# This could be handy for archiving the generated documentation or
-# if some version control system is used.
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
+# could be handy for archiving the generated documentation or if some version
+# control system is used.
 
 PROJECT_NUMBER         = @PACKAGE_VERSION@
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
-# for a project that appears at the top of each page and should give viewer
-# a quick idea about the purpose of the project. Keep the description short.
+# for a project that appears at the top of each page and should give viewer a
+# quick idea about the purpose of the project. Keep the description short.
 
 PROJECT_BRIEF          = "commandline package manager"
 
-# With the PROJECT_LOGO tag one can specify an logo or icon that is
-# included in the documentation. The maximum height of the logo should not
-# exceed 55 pixels and the maximum width should not exceed 200 pixels.
-# Doxygen will copy the logo to the output directory.
+# With the PROJECT_LOGO tag one can specify an logo or icon that is included in
+# the documentation. The maximum height of the logo should not exceed 55 pixels
+# and the maximum width should not exceed 200 pixels. Doxygen will copy the logo
+# to the output directory.
 
 PROJECT_LOGO           =
 
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
-# base path where the generated documentation will be put.
-# If a relative path is entered, it will be relative to the location
-# where doxygen was started. If left blank the current directory will be used.
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
+# into which the generated documentation will be written. If a relative path is
+# entered, it will be relative to the location where doxygen was started. If
+# left blank the current directory will be used.
 
 OUTPUT_DIRECTORY       = ../build/doc/doxygen
 
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
-# 4096 sub-directories (in 2 levels) under the output directory of each output
-# format and will distribute the generated files over these directories.
-# Enabling this option can be useful when feeding doxygen a huge amount of
-# source files, where putting all generated files in the same directory would
-# otherwise cause performance problems for the file system.
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 4096 sub-
+# directories (in 2 levels) under the output directory of each output format and
+# will distribute the generated files over these directories. Enabling this
+# option can be useful when feeding doxygen a huge amount of source files, where
+# putting all generated files in the same directory would otherwise causes
+# performance problems for the file system.
+# The default value is: NO.
 
 CREATE_SUBDIRS         = NO
 
+# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
+# characters to appear in the names of generated files. If set to NO, non-ASCII
+# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
+# U+3044.
+# The default value is: NO.
+
+ALLOW_UNICODE_NAMES    = NO
+
 # The OUTPUT_LANGUAGE tag is used to specify the language in which all
 # documentation generated by doxygen is written. Doxygen will use this
 # information to generate all constant output in the proper language.
-# The default language is English, other supported languages are:
-# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
-# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
-# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
-# messages), Korean, Korean-en, Latvian, Lithuanian, Norwegian, Macedonian,
-# Persian, Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic,
-# Slovak, Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
+# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
+# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
+# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
+# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
+# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
+# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
+# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
+# Ukrainian and Vietnamese.
+# The default value is: English.
 
 OUTPUT_LANGUAGE        = English
 
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
-# include brief member descriptions after the members that are listed in
-# the file and class documentation (similar to JavaDoc).
-# Set to NO to disable this.
+# If the BRIEF_MEMBER_DESC tag is set to YES doxygen will include brief member
+# descriptions after the members that are listed in the file and class
+# documentation (similar to Javadoc). Set to NO to disable this.
+# The default value is: YES.
 
 BRIEF_MEMBER_DESC      = YES
 
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
-# the brief description of a member or function before the detailed description.
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# If the REPEAT_BRIEF tag is set to YES doxygen will prepend the brief
+# description of a member or function before the detailed description
+#
+# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
 # brief descriptions will be completely suppressed.
+# The default value is: YES.
 
 REPEAT_BRIEF           = YES
 
-# This tag implements a quasi-intelligent brief description abbreviator
-# that is used to form the text in various listings. Each string
-# in this list, if found as the leading text of the brief description, will be
-# stripped from the text and the result after processing the whole list, is
-# used as the annotated text. Otherwise, the brief description is used as-is.
-# If left blank, the following values are used ("$name" is automatically
-# replaced with the name of the entity): "The $name class" "The $name widget"
-# "The $name file" "is" "provides" "specifies" "contains"
-# "represents" "a" "an" "the"
+# This tag implements a quasi-intelligent brief description abbreviator that is
+# used to form the text in various listings. Each string in this list, if found
+# as the leading text of the brief description, will be stripped from the text
+# and the result, after processing the whole list, is used as the annotated
+# text. Otherwise, the brief description is used as-is. If left blank, the
+# following values are used ($name is automatically replaced with the name of
+# the entity):The $name class, The $name widget, The $name file, is, provides,
+# specifies, contains, represents, a, an and the.
 
 ABBREVIATE_BRIEF       =
 
 # If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# Doxygen will generate a detailed section even if there is only a brief
+# doxygen will generate a detailed section even if there is only a brief
 # description.
+# The default value is: NO.
 
 ALWAYS_DETAILED_SEC    = NO
 
@@ -114,143 +131,165 @@ ALWAYS_DETAILED_SEC    = NO
 # inherited members of a class in the documentation of that class as if those
 # members were ordinary class members. Constructors, destructors and assignment
 # operators of the base classes will not be shown.
+# The default value is: NO.
 
 INLINE_INHERITED_MEMB  = NO
 
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
-# path before files name in the file list and in the header files. If set
-# to NO the shortest path that makes the file name unique will be used.
+# If the FULL_PATH_NAMES tag is set to YES doxygen will prepend the full path
+# before files name in the file list and in the header files. If set to NO the
+# shortest path that makes the file name unique will be used
+# The default value is: YES.
 
 FULL_PATH_NAMES        = YES
 
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
-# can be used to strip a user-defined part of the path. Stripping is
-# only done if one of the specified strings matches the left-hand part of
-# the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the
-# path to strip. Note that you specify absolute paths here, but also
-# relative paths, which will be relative from the directory where doxygen is
-# started.
+# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
+# Stripping is only done if one of the specified strings matches the left-hand
+# part of the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the path to
+# strip.
+#
+# Note that you can specify absolute paths here, but also relative paths, which
+# will be relative from the directory where doxygen is started.
+# This tag requires that the tag FULL_PATH_NAMES is set to YES.
 
 STRIP_FROM_PATH        =
 
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
-# the path mentioned in the documentation of a class, which tells
-# the reader which header file to include in order to use a class.
-# If left blank only the name of the header file containing the class
-# definition is used. Otherwise one should specify the include paths that
-# are normally passed to the compiler using the -I flag.
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
+# path mentioned in the documentation of a class, which tells the reader which
+# header file to include in order to use a class. If left blank only the name of
+# the header file containing the class definition is used. Otherwise one should
+# specify the list of include paths that are normally passed to the compiler
+# using the -I flag.
 
 STRIP_FROM_INC_PATH    =
 
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
-# (but less readable) file names. This can be useful if your file system
-# doesn't support long names like on DOS, Mac, or CD-ROM.
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
+# less readable) file names. This can be useful is your file systems doesn't
+# support long names like on DOS, Mac, or CD-ROM.
+# The default value is: NO.
 
 SHORT_NAMES            = NO
 
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
-# will interpret the first line (until the first dot) of a JavaDoc-style
-# comment as the brief description. If set to NO, the JavaDoc
-# comments will behave just like regular Qt-style comments
-# (thus requiring an explicit @brief command for a brief description.)
+# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
+# first line (until the first dot) of a Javadoc-style comment as the brief
+# description. If set to NO, the Javadoc-style will behave just like regular Qt-
+# style comments (thus requiring an explicit @brief command for a brief
+# description.)
+# The default value is: NO.
 
 JAVADOC_AUTOBRIEF      = NO
 
-# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
-# interpret the first line (until the first dot) of a Qt-style
-# comment as the brief description. If set to NO, the comments
-# will behave just like regular Qt-style comments (thus requiring
-# an explicit \brief command for a brief description.)
+# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
+# line (until the first dot) of a Qt-style comment as the brief description. If
+# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
+# requiring an explicit \brief command for a brief description.)
+# The default value is: NO.
 
 QT_AUTOBRIEF           = NO
 
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
-# treat a multi-line C++ special comment block (i.e. a block of //! or ///
-# comments) as a brief description. This used to be the default behaviour.
-# The new default is to treat a multi-line C++ comment block as a detailed
-# description. Set this tag to YES if you prefer the old behaviour instead.
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
+# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
+# a brief description. This used to be the default behavior. The new default is
+# to treat a multi-line C++ comment block as a detailed description. Set this
+# tag to YES if you prefer the old behavior instead.
+#
+# Note that setting this tag to YES also means that rational rose comments are
+# not recognized any more.
+# The default value is: NO.
 
 MULTILINE_CPP_IS_BRIEF = NO
 
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
-# member inherits the documentation from any documented member that it
-# re-implements.
+# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
+# documentation from any documented member that it re-implements.
+# The default value is: YES.
 
 INHERIT_DOCS           = YES
 
-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
-# a new page for each member. If set to NO, the documentation of a member will
-# be part of the file/class/namespace that contains it.
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce a
+# new page for each member. If set to NO, the documentation of a member will be
+# part of the file/class/namespace that contains it.
+# The default value is: NO.
 
 SEPARATE_MEMBER_PAGES  = NO
 
-# The TAB_SIZE tag can be used to set the number of spaces in a tab.
-# Doxygen uses this value to replace tabs by spaces in code fragments.
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
+# uses this value to replace tabs by spaces in code fragments.
+# Minimum value: 1, maximum value: 16, default value: 4.
 
 TAB_SIZE               = 8
 
-# This tag can be used to specify a number of aliases that acts
-# as commands in the documentation. An alias has the form "name=value".
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to
-# put the command \sideeffect (or @sideeffect) in the documentation, which
-# will result in a user-defined paragraph with heading "Side Effects:".
-# You can put \n's in the value part of an alias to insert newlines.
+# This tag can be used to specify a number of aliases that act as commands in
+# the documentation. An alias has the form:
+# name=value
+# For example adding
+# "sideeffect=@par Side Effects:\n"
+# will allow you to put the command \sideeffect (or @sideeffect) in the
+# documentation, which will result in a user-defined paragraph with heading
+# "Side Effects:". You can put \n's in the value part of an alias to insert
+# newlines.
 
 ALIASES                = "TODO=\todo"
 
 # This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding
-# "class=itcl::class" will allow you to use the command class in the
-# itcl::class meaning.
+# A mapping has the form "name=value". For example adding "class=itcl::class"
+# will allow you to use the command class in the itcl::class meaning.
 
 TCL_SUBST              =
 
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
-# sources only. Doxygen will then generate output that is more tailored for C.
-# For instance, some of the names that are used will be different. The list
-# of all members will be omitted, etc.
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
+# only. Doxygen will then generate output that is more tailored for C. For
+# instance, some of the names that are used will be different. The list of all
+# members will be omitted, etc.
+# The default value is: NO.
 
 OPTIMIZE_OUTPUT_FOR_C  = NO
 
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
-# sources only. Doxygen will then generate output that is more tailored for
-# Java. For instance, namespaces will be presented as packages, qualified
-# scopes will look different, etc.
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
+# Python sources only. Doxygen will then generate output that is more tailored
+# for that language. For instance, namespaces will be presented as packages,
+# qualified scopes will look different, etc.
+# The default value is: NO.
 
 OPTIMIZE_OUTPUT_JAVA   = NO
 
 # Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
-# sources only. Doxygen will then generate output that is more tailored for
-# Fortran.
+# sources. Doxygen will then generate output that is tailored for Fortran.
+# The default value is: NO.
 
 OPTIMIZE_FOR_FORTRAN   = NO
 
 # Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
-# sources. Doxygen will then generate output that is tailored for
-# VHDL.
+# sources. Doxygen will then generate output that is tailored for VHDL.
+# The default value is: NO.
 
 OPTIMIZE_OUTPUT_VHDL   = NO
 
 # Doxygen selects the parser to use depending on the extension of the files it
 # parses. With this tag you can assign which parser to use for a given
 # extension. Doxygen has a built-in mapping, but you can override or extend it
-# using this tag. The format is ext=language, where ext is a file extension,
-# and language is one of the parsers supported by doxygen: IDL, Java,
-# Javascript, CSharp, C, C++, D, PHP, Objective-C, Python, Fortran, VHDL, C,
-# C++. For instance to make doxygen treat .inc files as Fortran files (default
-# is PHP), and .f files as C (default is Fortran), use: inc=Fortran f=C. Note
-# that for custom extensions you also need to set FILE_PATTERNS otherwise the
-# files are not read by doxygen.
+# using this tag. The format is ext=language, where ext is a file extension, and
+# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
+# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran:
+# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran:
+# Fortran. In the later case the parser tries to guess whether the code is fixed
+# or free formatted code, this is the default for Fortran type files), VHDL. For
+# instance to make doxygen treat .inc files as Fortran files (default is PHP),
+# and .f files as C (default is Fortran), use: inc=Fortran f=C.
+#
+# Note For files without extension you can use no_extension as a placeholder.
+#
+# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
+# the files are not read by doxygen.
 
 EXTENSION_MAPPING      =
 
-# If MARKDOWN_SUPPORT is enabled (the default) then doxygen pre-processes all
-# comments according to the Markdown format, which allows for more readable
+# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
+# according to the Markdown format, which allows for more readable
 # documentation. See http://daringfireball.net/projects/markdown/ for details.
-# The output of markdown processing is further processed by doxygen, so you
-# can mix doxygen, HTML, and XML commands with Markdown formatting.
-# Disable only in case of backward compatibilities issues.
+# The output of markdown processing is further processed by doxygen, so you can
+# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
+# case of backward compatibilities issues.
+# The default value is: YES.
 
 MARKDOWN_SUPPORT       = YES
 
@@ -258,35 +297,41 @@ MARKDOWN_SUPPORT       = YES
 # classes, or namespaces to their corresponding documentation. Such a link can
 # be prevented in individual cases by by putting a % sign in front of the word
 # or globally by setting AUTOLINK_SUPPORT to NO.
+# The default value is: YES.
 
 AUTOLINK_SUPPORT       = YES
 
 # If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
-# to include (a tag file for) the STL sources as input, then you should
-# set this tag to YES in order to let doxygen match functions declarations and
-# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
-# func(std::string) {}). This also makes the inheritance and collaboration
+# to include (a tag file for) the STL sources as input, then you should set this
+# tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string);
+# versus func(std::string) {}). This also make the inheritance and collaboration
 # diagrams that involve STL classes more complete and accurate.
+# The default value is: NO.
 
 BUILTIN_STL_SUPPORT    = YES
 
 # If you use Microsoft's C++/CLI language, you should set this option to YES to
 # enable parsing support.
+# The default value is: NO.
 
 CPP_CLI_SUPPORT        = NO
 
-# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
-# Doxygen will parse them like normal C++ but will assume all classes use public
-# instead of private inheritance when no explicit protection keyword is present.
+# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
+# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen
+# will parse them like normal C++ but will assume all classes use public instead
+# of private inheritance when no explicit protection keyword is present.
+# The default value is: NO.
 
 SIP_SUPPORT            = NO
 
 # For Microsoft's IDL there are propget and propput attributes to indicate
-# getter and setter methods for a property. Setting this option to YES (the
-# default) will make doxygen replace the get and set methods by a property in
-# the documentation. This will only work if the methods are indeed getting or
-# setting a simple type. If this is not the case, or you want to show the
-# methods anyway, you should set this option to NO.
+# getter and setter methods for a property. Setting this option to YES will make
+# doxygen to replace the get and set methods by a property in the documentation.
+# This will only work if the methods are indeed getting or setting a simple
+# type. If this is not the case, or you want to show the methods anyway, you
+# should set this option to NO.
+# The default value is: YES.
 
 IDL_PROPERTY_SUPPORT   = YES
 
@@ -294,51 +339,61 @@ IDL_PROPERTY_SUPPORT   = YES
 # tag is set to YES, then doxygen will reuse the documentation of the first
 # member in the group (if any) for the other members of the group. By default
 # all members of a group must be documented explicitly.
+# The default value is: NO.
 
 DISTRIBUTE_GROUP_DOC   = NO
 
-# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
-# the same type (for instance a group of public functions) to be put as a
-# subgroup of that type (e.g. under the Public Functions section). Set it to
-# NO to prevent subgrouping. Alternatively, this can be done per class using
-# the \nosubgrouping command.
+# Set the SUBGROUPING tag to YES to allow class member groups of the same type
+# (for instance a group of public functions) to be put as a subgroup of that
+# type (e.g. under the Public Functions section). Set it to NO to prevent
+# subgrouping. Alternatively, this can be done per class using the
+# \nosubgrouping command.
+# The default value is: YES.
 
 SUBGROUPING            = YES
 
-# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and
-# unions are shown inside the group in which they are included (e.g. using
-# @ingroup) instead of on a separate page (for HTML and Man pages) or
-# section (for LaTeX and RTF).
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
+# are shown inside the group in which they are included (e.g. using \ingroup)
+# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
+# and RTF).
+#
+# Note that this feature does not work in combination with
+# SEPARATE_MEMBER_PAGES.
+# The default value is: NO.
 
 INLINE_GROUPED_CLASSES = NO
 
-# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and
-# unions with only public data fields or simple typedef fields will be shown
-# inline in the documentation of the scope in which they are defined (i.e. file,
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
+# with only public data fields or simple typedef fields will be shown inline in
+# the documentation of the scope in which they are defined (i.e. file,
 # namespace, or group documentation), provided this scope is documented. If set
-# to NO (the default), structs, classes, and unions are shown on a separate
-# page (for HTML and Man pages) or section (for LaTeX and RTF).
+# to NO, structs, classes, and unions are shown on a separate page (for HTML and
+# Man pages) or section (for LaTeX and RTF).
+# The default value is: NO.
 
 INLINE_SIMPLE_STRUCTS  = NO
 
-# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
-# is documented as struct, union, or enum with the name of the typedef. So
+# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
+# enum is documented as struct, union, or enum with the name of the typedef. So
 # typedef struct TypeS {} TypeT, will appear in the documentation as a struct
 # with name TypeT. When disabled the typedef will appear as a member of a file,
-# namespace, or class. And the struct will be named TypeS. This can typically
-# be useful for C code in case the coding convention dictates that all compound
+# namespace, or class. And the struct will be named TypeS. This can typically be
+# useful for C code in case the coding convention dictates that all compound
 # types are typedef'ed and only the typedef is referenced, never the tag name.
+# The default value is: NO.
 
 TYPEDEF_HIDES_STRUCT   = NO
 
 # The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
-# cache is used to resolve symbols given their name and scope. Since this can
-# be an expensive process and often the same symbol appear multiple times in
-# the code, doxygen keeps a cache of pre-resolved symbols. If the cache is too
-# small doxygen will become slower. If the cache is too large, memory is wasted.
-# The cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid
-# range is 0..9, the default is 0, corresponding to a cache size of 2^16 = 65536
-# symbols.
+# cache is used to resolve symbols given their name and scope. Since this can be
+# an expensive process and often the same symbol appears multiple times in the
+# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
+# doxygen will become slower. If the cache is too large, memory is wasted. The
+# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
+# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
+# symbols. At the end of a run doxygen will report the cache usage and suggest
+# the optimal cache size from a speed point of view.
+# Minimum value: 0, maximum value: 9, default value: 0.
 
 LOOKUP_CACHE_SIZE      = 0
 
@@ -347,343 +402,391 @@ LOOKUP_CACHE_SIZE      = 0
 #---------------------------------------------------------------------------
 
 # If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
-# documentation are documented, even if no documentation was available.
-# Private class members and static file members will be hidden unless
-# the EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES
+# documentation are documented, even if no documentation was available. Private
+# class members and static file members will be hidden unless the
+# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
+# Note: This will also disable the warnings about undocumented members that are
+# normally produced when WARNINGS is set to YES.
+# The default value is: NO.
 
 EXTRACT_ALL            = NO
 
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
-# will be included in the documentation.
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class will
+# be included in the documentation.
+# The default value is: NO.
 
 EXTRACT_PRIVATE        = NO
 
 # If the EXTRACT_PACKAGE tag is set to YES all members with package or internal
 # scope will be included in the documentation.
+# The default value is: NO.
 
 EXTRACT_PACKAGE        = NO
 
-# If the EXTRACT_STATIC tag is set to YES all static members of a file
-# will be included in the documentation.
+# If the EXTRACT_STATIC tag is set to YES all static members of a file will be
+# included in the documentation.
+# The default value is: NO.
 
 EXTRACT_STATIC         = NO
 
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
-# defined locally in source files will be included in the documentation.
-# If set to NO only classes defined in header files are included.
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) defined
+# locally in source files will be included in the documentation. If set to NO
+# only classes defined in header files are included. Does not have any effect
+# for Java sources.
+# The default value is: YES.
 
 EXTRACT_LOCAL_CLASSES  = YES
 
-# This flag is only useful for Objective-C code. When set to YES local
-# methods, which are defined in the implementation section but not in
-# the interface are included in the documentation.
-# If set to NO (the default) only methods in the interface are included.
+# This flag is only useful for Objective-C code. When set to YES local methods,
+# which are defined in the implementation section but not in the interface are
+# included in the documentation. If set to NO only methods in the interface are
+# included.
+# The default value is: NO.
 
 EXTRACT_LOCAL_METHODS  = NO
 
 # If this flag is set to YES, the members of anonymous namespaces will be
 # extracted and appear in the documentation as a namespace called
-# 'anonymous_namespace{file}', where file will be replaced with the base
-# name of the file that contains the anonymous namespace. By default
-# anonymous namespaces are hidden.
+# 'anonymous_namespace{file}', where file will be replaced with the base name of
+# the file that contains the anonymous namespace. By default anonymous namespace
+# are hidden.
+# The default value is: NO.
 
 EXTRACT_ANON_NSPACES   = NO
 
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
-# undocumented members of documented classes, files or namespaces.
-# If set to NO (the default) these members will be included in the
-# various overviews, but no documentation section is generated.
-# This option has no effect if EXTRACT_ALL is enabled.
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
+# undocumented members inside documented classes or files. If set to NO these
+# members will be included in the various overviews, but no documentation
+# section is generated. This option has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
 
 HIDE_UNDOC_MEMBERS     = NO
 
-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
-# undocumented classes that are normally visible in the class hierarchy.
-# If set to NO (the default) these classes will be included in the various
-# overviews. This option has no effect if EXTRACT_ALL is enabled.
+# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy. If set
+# to NO these classes will be included in the various overviews. This option has
+# no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
 
 HIDE_UNDOC_CLASSES     = NO
 
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
-# friend (class|struct|union) declarations.
-# If set to NO (the default) these declarations will be included in the
-# documentation.
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
+# (class|struct|union) declarations. If set to NO these declarations will be
+# included in the documentation.
+# The default value is: NO.
 
 HIDE_FRIEND_COMPOUNDS  = NO
 
-# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
-# documentation blocks found inside the body of a function.
-# If set to NO (the default) these blocks will be appended to the
-# function's detailed documentation block.
+# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
+# documentation blocks found inside the body of a function. If set to NO these
+# blocks will be appended to the function's detailed documentation block.
+# The default value is: NO.
 
 HIDE_IN_BODY_DOCS      = NO
 
-# The INTERNAL_DOCS tag determines if documentation
-# that is typed after a \internal command is included. If the tag is set
-# to NO (the default) then the documentation will be excluded.
-# Set it to YES to include the internal documentation.
+# The INTERNAL_DOCS tag determines if documentation that is typed after a
+# \internal command is included. If the tag is set to NO then the documentation
+# will be excluded. Set it to YES to include the internal documentation.
+# The default value is: NO.
 
 INTERNAL_DOCS          = NO
 
-# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
-# file names in lower-case letters. If set to YES upper-case letters are also
+# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
+# names in lower-case letters. If set to YES upper-case letters are also
 # allowed. This is useful if you have classes or files whose names only differ
 # in case and if your file system supports case sensitive file names. Windows
 # and Mac users are advised to set this option to NO.
+# The default value is: system dependent.
 
 CASE_SENSE_NAMES       = YES
 
-# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
-# will show members with their full class and namespace scopes in the
-# documentation. If set to YES the scope will be hidden.
+# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
+# their full class and namespace scopes in the documentation. If set to YES the
+# scope will be hidden.
+# The default value is: NO.
 
 HIDE_SCOPE_NAMES       = YES
 
-# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
-# will put a list of the files that are included by a file in the documentation
-# of that file.
+# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
+# the files that are included by a file in the documentation of that file.
+# The default value is: YES.
 
 SHOW_INCLUDE_FILES     = YES
 
-# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen
-# will list include files with double quotes in the documentation
-# rather than with sharp brackets.
+# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
+# grouped member an include statement to the documentation, telling the reader
+# which file to include in order to use the member.
+# The default value is: NO.
+
+SHOW_GROUPED_MEMB_INC  = NO
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
+# files with double quotes in the documentation rather than with sharp brackets.
+# The default value is: NO.
 
 FORCE_LOCAL_INCLUDES   = NO
 
-# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
-# is inserted in the documentation for inline members.
+# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
+# documentation for inline members.
+# The default value is: YES.
 
 INLINE_INFO            = YES
 
-# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
-# will sort the (detailed) documentation of file and class members
-# alphabetically by member name. If set to NO the members will appear in
-# declaration order.
+# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
+# (detailed) documentation of file and class members alphabetically by member
+# name. If set to NO the members will appear in declaration order.
+# The default value is: YES.
 
 SORT_MEMBER_DOCS       = YES
 
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
-# brief documentation of file, namespace and class members alphabetically
-# by member name. If set to NO (the default) the members will appear in
-# declaration order.
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
+# descriptions of file, namespace and class members alphabetically by member
+# name. If set to NO the members will appear in declaration order. Note that
+# this will also influence the order of the classes in the class list.
+# The default value is: NO.
 
 SORT_BRIEF_DOCS        = NO
 
-# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen
-# will sort the (brief and detailed) documentation of class members so that
-# constructors and destructors are listed first. If set to NO (the default)
-# the constructors will appear in the respective orders defined by
-# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS.
-# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO
-# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
+# (brief and detailed) documentation of class members so that constructors and
+# destructors are listed first. If set to NO the constructors will appear in the
+# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
+# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
+# member documentation.
+# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
+# detailed member documentation.
+# The default value is: NO.
 
 SORT_MEMBERS_CTORS_1ST = NO
 
-# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
-# hierarchy of group names into alphabetical order. If set to NO (the default)
-# the group names will appear in their defined order.
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
+# of group names into alphabetical order. If set to NO the group names will
+# appear in their defined order.
+# The default value is: NO.
 
 SORT_GROUP_NAMES       = NO
 
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
-# sorted by fully-qualified names, including namespaces. If set to
-# NO (the default), the class list will be sorted only by class name,
-# not including the namespace part.
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
+# fully-qualified names, including namespaces. If set to NO, the class list will
+# be sorted only by class name, not including the namespace part.
 # Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the
-# alphabetical list.
+# Note: This option applies only to the class list, not to the alphabetical
+# list.
+# The default value is: NO.
 
 SORT_BY_SCOPE_NAME     = NO
 
-# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to
-# do proper type resolution of all parameters of a function it will reject a
-# match between the prototype and the implementation of a member function even
-# if there is only one candidate or it is obvious which candidate to choose
-# by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen
-# will still accept a match between prototype and implementation in such cases.
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
+# type resolution of all parameters of a function it will reject a match between
+# the prototype and the implementation of a member function even if there is
+# only one candidate or it is obvious which candidate to choose by doing a
+# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
+# accept a match between prototype and implementation in such cases.
+# The default value is: NO.
 
 STRICT_PROTO_MATCHING  = NO
 
-# The GENERATE_TODOLIST tag can be used to enable (YES) or
-# disable (NO) the todo list. This list is created by putting \todo
-# commands in the documentation.
+# The GENERATE_TODOLIST tag can be used to enable ( YES) or disable ( NO) the
+# todo list. This list is created by putting \todo commands in the
+# documentation.
+# The default value is: YES.
 
 GENERATE_TODOLIST      = YES
 
-# The GENERATE_TESTLIST tag can be used to enable (YES) or
-# disable (NO) the test list. This list is created by putting \test
-# commands in the documentation.
+# The GENERATE_TESTLIST tag can be used to enable ( YES) or disable ( NO) the
+# test list. This list is created by putting \test commands in the
+# documentation.
+# The default value is: YES.
 
 GENERATE_TESTLIST      = YES
 
-# The GENERATE_BUGLIST tag can be used to enable (YES) or
-# disable (NO) the bug list. This list is created by putting \bug
-# commands in the documentation.
+# The GENERATE_BUGLIST tag can be used to enable ( YES) or disable ( NO) the bug
+# list. This list is created by putting \bug commands in the documentation.
+# The default value is: YES.
 
 GENERATE_BUGLIST       = YES
 
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
-# disable (NO) the deprecated list. This list is created by putting
-# \deprecated commands in the documentation.
+# The GENERATE_DEPRECATEDLIST tag can be used to enable ( YES) or disable ( NO)
+# the deprecated list. This list is created by putting \deprecated commands in
+# the documentation.
+# The default value is: YES.
 
 GENERATE_DEPRECATEDLIST= YES
 
-# The ENABLED_SECTIONS tag can be used to enable conditional
-# documentation sections, marked by \if section-label ... \endif
-# and \cond section-label ... \endcond blocks.
+# The ENABLED_SECTIONS tag can be used to enable conditional documentation
+# sections, marked by \if <section_label> ... \endif and \cond <section_label>
+# ... \endcond blocks.
 
 ENABLED_SECTIONS       =
 
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
-# the initial value of a variable or macro consists of for it to appear in
-# the documentation. If the initializer consists of more lines than specified
-# here it will be hidden. Use a value of 0 to hide initializers completely.
-# The appearance of the initializer of individual variables and macros in the
-# documentation can be controlled using \showinitializer or \hideinitializer
-# command in the documentation regardless of this setting.
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
+# initial value of a variable or macro / define can have for it to appear in the
+# documentation. If the initializer consists of more lines than specified here
+# it will be hidden. Use a value of 0 to hide initializers completely. The
+# appearance of the value of individual variables and macros / defines can be
+# controlled using \showinitializer or \hideinitializer command in the
+# documentation regardless of this setting.
+# Minimum value: 0, maximum value: 10000, default value: 30.
 
 MAX_INITIALIZER_LINES  = 30
 
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
-# at the bottom of the documentation of classes and structs. If set to YES the
-# list will mention the files that were used to generate the documentation.
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
+# the bottom of the documentation of classes and structs. If set to YES the list
+# will mention the files that were used to generate the documentation.
+# The default value is: YES.
 
 SHOW_USED_FILES        = YES
 
-# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
-# This will remove the Files entry from the Quick Index and from the
-# Folder Tree View (if specified). The default is YES.
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
+# will remove the Files entry from the Quick Index and from the Folder Tree View
+# (if specified).
+# The default value is: YES.
 
 SHOW_FILES             = YES
 
-# Set the SHOW_NAMESPACES tag to NO to disable the generation of the
-# Namespaces page.
-# This will remove the Namespaces entry from the Quick Index
-# and from the Folder Tree View (if specified). The default is YES.
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
+# page. This will remove the Namespaces entry from the Quick Index and from the
+# Folder Tree View (if specified).
+# The default value is: YES.
 
 SHOW_NAMESPACES        = YES
 
 # The FILE_VERSION_FILTER tag can be used to specify a program or script that
 # doxygen should invoke to get the current version for each file (typically from
 # the version control system). Doxygen will invoke the program by executing (via
-# popen()) the command <command> <input-file>, where <command> is the value of
-# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
-# provided by doxygen. Whatever the program writes to standard output
-# is used as the file version. See the manual for examples.
+# popen()) the command command input-file, where command is the value of the
+# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
+# by doxygen. Whatever the program writes to standard output is used as the file
+# version. For an example see the documentation.
 
 FILE_VERSION_FILTER    =
 
 # The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
 # by doxygen. The layout file controls the global structure of the generated
 # output files in an output format independent way. To create the layout file
-# that represents doxygen's defaults, run doxygen with the -l option.
-# You can optionally specify a file name after the option, if omitted
-# DoxygenLayout.xml will be used as the name of the layout file.
+# that represents doxygen's defaults, run doxygen with the -l option. You can
+# optionally specify a file name after the option, if omitted DoxygenLayout.xml
+# will be used as the name of the layout file.
+#
+# Note that if you run doxygen from a directory containing a file called
+# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
+# tag is left empty.
 
 LAYOUT_FILE            =
 
-# The CITE_BIB_FILES tag can be used to specify one or more bib files
-# containing the references data. This must be a list of .bib files. The
-# .bib extension is automatically appended if omitted. Using this command
-# requires the bibtex tool to be installed. See also
-# http://en.wikipedia.org/wiki/BibTeX for more info. For LaTeX the style
-# of the bibliography can be controlled using LATEX_BIB_STYLE. To use this
-# feature you need bibtex and perl available in the search path. Do not use
-# file names with spaces, bibtex cannot handle them.
+# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
+# the reference definitions. This must be a list of .bib files. The .bib
+# extension is automatically appended if omitted. This requires the bibtex tool
+# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info.
+# For LaTeX the style of the bibliography can be controlled using
+# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
+# search path. Do not use file names with spaces, bibtex cannot handle them. See
+# also \cite for info how to create references.
 
 CITE_BIB_FILES         =
 
 #---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
+# Configuration options related to warning and progress messages
 #---------------------------------------------------------------------------
 
-# The QUIET tag can be used to turn on/off the messages that are generated
-# by doxygen. Possible values are YES and NO. If left blank NO is used.
+# The QUIET tag can be used to turn on/off the messages that are generated to
+# standard output by doxygen. If QUIET is set to YES this implies that the
+# messages are off.
+# The default value is: NO.
 
 QUIET                  = YES
 
 # The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated by doxygen. Possible values are YES and NO. If left blank
-# NO is used.
+# generated to standard error ( stderr) by doxygen. If WARNINGS is set to YES
+# this implies that the warnings are on.
+#
+# Tip: Turn warnings on while writing the documentation.
+# The default value is: YES.
 
 WARNINGS               = YES
 
-# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
-# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
-# automatically be disabled.
+# If the WARN_IF_UNDOCUMENTED tag is set to YES, then doxygen will generate
+# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
+# will automatically be disabled.
+# The default value is: YES.
 
 WARN_IF_UNDOCUMENTED   = NO
 
-# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some
-# parameters in a documented function, or documenting parameters that
-# don't exist or using markup commands wrongly.
+# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some parameters
+# in a documented function, or documenting parameters that don't exist or using
+# markup commands wrongly.
+# The default value is: YES.
 
 WARN_IF_DOC_ERROR      = YES
 
-# The WARN_NO_PARAMDOC option can be enabled to get warnings for
-# functions that are documented, but have no documentation for their parameters
-# or return value. If set to NO (the default) doxygen will only warn about
-# wrong or incomplete parameter documentation, but not about the absence of
-# documentation.
+# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
+# are documented, but have no documentation for their parameters or return
+# value. If set to NO doxygen will only warn about wrong or incomplete parameter
+# documentation, but not about the absence of documentation.
+# The default value is: NO.
 
 WARN_NO_PARAMDOC       = NO
 
-# The WARN_FORMAT tag determines the format of the warning messages that
-# doxygen can produce. The string should contain the $file, $line, and $text
-# tags, which will be replaced by the file and line number from which the
-# warning originated and the warning text. Optionally the format may contain
-# $version, which will be replaced by the version of the file (if it could
-# be obtained via FILE_VERSION_FILTER)
+# The WARN_FORMAT tag determines the format of the warning messages that doxygen
+# can produce. The string should contain the $file, $line, and $text tags, which
+# will be replaced by the file and line number from which the warning originated
+# and the warning text. Optionally the format may contain $version, which will
+# be replaced by the version of the file (if it could be obtained via
+# FILE_VERSION_FILTER)
+# The default value is: $file:$line: $text.
 
 WARN_FORMAT            = "$file:$line: $text"
 
-# The WARN_LOGFILE tag can be used to specify a file to which warning
-# and error messages should be written. If left blank the output is written
-# to stderr.
+# The WARN_LOGFILE tag can be used to specify a file to which warning and error
+# messages should be written. If left blank the output is written to standard
+# error (stderr).
 
 WARN_LOGFILE           =
 
 #---------------------------------------------------------------------------
-# configuration options related to the input files
+# Configuration options related to the input files
 #---------------------------------------------------------------------------
 
-# The INPUT tag can be used to specify the files and/or directories that contain
-# documented source files. You may enter file names like "myfile.cpp" or
-# directories like "/usr/src/myproject". Separate the files or directories
-# with spaces.
+# The INPUT tag is used to specify the files and/or directories that contain
+# documented source files. You may enter file names like myfile.cpp or
+# directories like /usr/src/myproject. Separate the files or directories with
+# spaces.
+# Note: If this tag is empty the current directory is searched.
 
 INPUT                  = ../apt-pkg
 
 # This tag can be used to specify the character encoding of the source files
-# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
-# also the default input encoding. Doxygen uses libiconv (or the iconv built
-# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
-# the list of possible encodings.
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
+# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
+# documentation (see: http://www.gnu.org/software/libiconv) for the list of
+# possible encodings.
+# The default value is: UTF-8.
 
 INPUT_ENCODING         = UTF-8
 
 # If the value of the INPUT tag contains directories, you can use the
-# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank the following patterns are tested:
-# *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh
-# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py
-# *.f90 *.f *.for *.vhd *.vhdl
+# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
+# *.h) to filter out the source-files in the directories. If left blank the
+# following patterns are tested:*.c, *.cc, *.cxx, *.cpp, *.c++, *.java, *.ii,
+# *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, *.hh, *.hxx, *.hpp,
+# *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, *.m, *.markdown,
+# *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf,
+# *.qsf, *.as and *.js.
 
 FILE_PATTERNS          = *.cc \
                          *.h
 
-# The RECURSIVE tag can be used to turn specify whether or not subdirectories
-# should be searched for input files as well. Possible values are YES and NO.
-# If left blank NO is used.
+# The RECURSIVE tag can be used to specify whether or not subdirectories should
+# be searched for input files as well.
+# The default value is: NO.
 
 RECURSIVE              = YES
 
 # The EXCLUDE tag can be used to specify files and/or directories that should be
 # excluded from the INPUT source files. This way you can easily exclude a
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
+#
 # Note that relative paths are relative to the directory from which doxygen is
 # run.
 
@@ -692,14 +795,16 @@ EXCLUDE                =
 # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
 # directories that are symbolic links (a Unix file system feature) are excluded
 # from the input.
+# The default value is: NO.
 
 EXCLUDE_SYMLINKS       = NO
 
 # If the value of the INPUT tag contains directories, you can use the
 # EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# certain files from those directories. Note that the wildcards are matched
-# against the file with absolute path, so to exclude all test directories
-# for example use the pattern */test/*
+# certain files from those directories.
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories for example use the pattern */test/*
 
 EXCLUDE_PATTERNS       =
 
@@ -708,42 +813,49 @@ EXCLUDE_PATTERNS       =
 # output. The symbol name can be a fully qualified name, a word, or if the
 # wildcard * is used, a substring. Examples: ANamespace, AClass,
 # AClass::ANamespace, ANamespace::*Test
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories use the pattern */test/*
 
 EXCLUDE_SYMBOLS        =
 
-# The EXAMPLE_PATH tag can be used to specify one or more files or
-# directories that contain example code fragments that are included (see
-# the \include command).
+# The EXAMPLE_PATH tag can be used to specify one or more files or directories
+# that contain example code fragments that are included (see the \include
+# command).
 
 EXAMPLE_PATH           =
 
 # If the value of the EXAMPLE_PATH tag contains directories, you can use the
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank all files are included.
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
+# *.h) to filter out the source-files in the directories. If left blank all
+# files are included.
 
 EXAMPLE_PATTERNS       =
 
 # If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
-# searched for input files to be used with the \include or \dontinclude
-# commands irrespective of the value of the RECURSIVE tag.
-# Possible values are YES and NO. If left blank NO is used.
+# searched for input files to be used with the \include or \dontinclude commands
+# irrespective of the value of the RECURSIVE tag.
+# The default value is: NO.
 
 EXAMPLE_RECURSIVE      = NO
 
-# The IMAGE_PATH tag can be used to specify one or more files or
-# directories that contain image that are included in the documentation (see
-# the \image command).
+# The IMAGE_PATH tag can be used to specify one or more files or directories
+# that contain images that are to be included in the documentation (see the
+# \image command).
 
 IMAGE_PATH             =
 
 # The INPUT_FILTER tag can be used to specify a program that doxygen should
 # invoke to filter for each input file. Doxygen will invoke the filter program
-# by executing (via popen()) the command <filter> <input-file>, where <filter>
-# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
-# input file. Doxygen will then use the output that the filter program writes
-# to standard output.
-# If FILTER_PATTERNS is specified, this tag will be ignored.
+# by executing (via popen()) the command:
+#
+# <filter> <input-file>
+#
+# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
+# name of an input file. Doxygen will then use the output that the filter
+# program writes to standard output. If FILTER_PATTERNS is specified, this tag
+# will be ignored.
+#
 # Note that the filter must not add or remove lines; it is applied before the
 # code is scanned, but not when the output code is generated. If lines are added
 # or removed, the anchors will not be placed correctly.
@@ -751,172 +863,222 @@ IMAGE_PATH             =
 INPUT_FILTER           = "sed -e 's#//[ ]*FIXME:\?#/// \\todo#'"
 
 # The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-# basis.
-# Doxygen will compare the file name with each pattern and apply the
-# filter if there is a match.
-# The filters are a list of the form:
-# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
-# info on how filters are used. If FILTER_PATTERNS is empty or if
-# non of the patterns match the file name, INPUT_FILTER is applied.
+# basis. Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match. The filters are a list of the form: pattern=filter
+# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
+# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
+# patterns match the file name, INPUT_FILTER is applied.
 
 FILTER_PATTERNS        =
 
 # If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-# INPUT_FILTER) will be used to filter the input files when producing source
-# files to browse (i.e. when SOURCE_BROWSER is set to YES).
+# INPUT_FILTER ) will also be used to filter the input files that are used for
+# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
+# The default value is: NO.
 
 FILTER_SOURCE_FILES    = NO
 
 # The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
-# pattern. A pattern will override the setting for FILTER_PATTERN (if any)
-# and it is also possible to disable source filtering for a specific pattern
-# using *.ext= (so without naming a filter). This option only has effect when
-# FILTER_SOURCE_FILES is enabled.
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
+# it is also possible to disable source filtering for a specific pattern using
+# *.ext= (so without naming a filter).
+# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
 
 FILTER_SOURCE_PATTERNS =
 
-# If the USE_MD_FILE_AS_MAINPAGE tag refers to the name of a markdown file that
+# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
 # is part of the input, its contents will be placed on the main page
 # (index.html). This can be useful if you have a project on for instance GitHub
-# and want reuse the introduction page also for the doxygen output.
+# and want to reuse the introduction page also for the doxygen output.
 
 USE_MDFILE_AS_MAINPAGE =
 
 #---------------------------------------------------------------------------
-# configuration options related to source browsing
+# Configuration options related to source browsing
 #---------------------------------------------------------------------------
 
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will
-# be generated. Documented entities will be cross-referenced with these sources.
-# Note: To get rid of all source code in the generated output, make sure also
-# VERBATIM_HEADERS is set to NO.
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
+# generated. Documented entities will be cross-referenced with these sources.
+#
+# Note: To get rid of all source code in the generated output, make sure that
+# also VERBATIM_HEADERS is set to NO.
+# The default value is: NO.
 
 SOURCE_BROWSER         = NO
 
-# Setting the INLINE_SOURCES tag to YES will include the body
-# of functions and classes directly in the documentation.
+# Setting the INLINE_SOURCES tag to YES will include the body of functions,
+# classes and enums directly into the documentation.
+# The default value is: NO.
 
 INLINE_SOURCES         = NO
 
-# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
-# doxygen to hide any special comment blocks from generated source code
-# fragments. Normal C, C++ and Fortran comments will always remain visible.
+# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
+# special comment blocks from generated source code fragments. Normal C, C++ and
+# Fortran comments will always remain visible.
+# The default value is: YES.
 
 STRIP_CODE_COMMENTS    = YES
 
-# If the REFERENCED_BY_RELATION tag is set to YES
-# then for each documented function all documented
-# functions referencing it will be listed.
+# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
+# function all documented functions referencing it will be listed.
+# The default value is: NO.
 
 REFERENCED_BY_RELATION = YES
 
-# If the REFERENCES_RELATION tag is set to YES
-# then for each documented function all documented entities
-# called/used by that function will be listed.
+# If the REFERENCES_RELATION tag is set to YES then for each documented function
+# all documented entities called/used by that function will be listed.
+# The default value is: NO.
 
 REFERENCES_RELATION    = YES
 
-# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
-# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
-# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
-# link to the source code.
-# Otherwise they will link to the documentation.
+# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
+# to YES, then the hyperlinks from functions in REFERENCES_RELATION and
+# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
+# link to the documentation.
+# The default value is: YES.
 
 REFERENCES_LINK_SOURCE = YES
 
-# If the USE_HTAGS tag is set to YES then the references to source code
-# will point to the HTML generated by the htags(1) tool instead of doxygen
-# built-in source browser. The htags tool is part of GNU's global source
-# tagging system (see http://www.gnu.org/software/global/global.html). You
-# will need version 4.8.6 or higher.
+# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
+# source code will show a tooltip with additional information such as prototype,
+# brief description and links to the definition and documentation. Since this
+# will make the HTML file larger and loading of large files a bit slower, you
+# can opt to disable this feature.
+# The default value is: YES.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+SOURCE_TOOLTIPS        = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code will
+# point to the HTML generated by the htags(1) tool instead of doxygen built-in
+# source browser. The htags tool is part of GNU's global source tagging system
+# (see http://www.gnu.org/software/global/global.html). You will need version
+# 4.8.6 or higher.
+#
+# To use it do the following:
+# - Install the latest version of global
+# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
+# - Make sure the INPUT points to the root of the source tree
+# - Run doxygen as normal
+#
+# Doxygen will invoke htags (and that will in turn invoke gtags), so these
+# tools must be available from the command line (i.e. in the search path).
+#
+# The result: instead of the source browser generated by doxygen, the links to
+# source code will now point to the output of htags.
+# The default value is: NO.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
 
 USE_HTAGS              = NO
 
-# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
-# will generate a verbatim copy of the header file for each class for
-# which an include is specified. Set to NO to disable this.
+# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
+# verbatim copy of the header file for each class for which an include is
+# specified. Set to NO to disable this.
+# See also: Section \class.
+# The default value is: YES.
 
 VERBATIM_HEADERS       = YES
 
 #---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
+# Configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------
 
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
-# of all compounds will be generated. Enable this if the project
-# contains a lot of classes, structs, unions or interfaces.
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
+# compounds will be generated. Enable this if the project contains a lot of
+# classes, structs, unions or interfaces.
+# The default value is: YES.
 
 ALPHABETICAL_INDEX     = NO
 
-# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
-# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
-# in which this list will be split (can be a number in the range [1..20])
+# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
+# which the alphabetical index list will be split.
+# Minimum value: 1, maximum value: 20, default value: 5.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
 
 COLS_IN_ALPHA_INDEX    = 5
 
-# In case all classes in a project start with a common prefix, all
-# classes will be put under the same header in the alphabetical index.
-# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
-# should be ignored while generating the index headers.
+# In case all classes in a project start with a common prefix, all classes will
+# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
+# can be used to specify a prefix (or a list of prefixes) that should be ignored
+# while generating the index headers.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
 
 IGNORE_PREFIX          =
 
 #---------------------------------------------------------------------------
-# configuration options related to the HTML output
+# Configuration options related to the HTML output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
-# generate HTML output.
+# If the GENERATE_HTML tag is set to YES doxygen will generate HTML output
+# The default value is: YES.
 
 GENERATE_HTML          = YES
 
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `html' will be used as the default path.
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_OUTPUT            = html
 
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
-# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
-# doxygen will generate files with .html extension.
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
+# generated HTML page (for example: .htm, .php, .asp).
+# The default value is: .html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_FILE_EXTENSION    = .xhtml
 
-# The HTML_HEADER tag can be used to specify a personal HTML header for
-# each generated HTML page. If it is left blank doxygen will generate a
-# standard header. Note that when using a custom header you are responsible
-#  for the proper inclusion of any scripts and style sheets that doxygen
-# needs, which is dependent on the configuration options used.
-# It is advised to generate a default header using "doxygen -w html
-# header.html footer.html stylesheet.css YourConfigFile" and then modify
-# that header. Note that the header is subject to change so you typically
-# have to redo this when upgrading to a newer version of doxygen or when
-# changing the value of configuration settings such as GENERATE_TREEVIEW!
+# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
+# each generated HTML page. If the tag is left blank doxygen will generate a
+# standard header.
+#
+# To get valid HTML the header file that includes any scripts and style sheets
+# that doxygen needs, which is dependent on the configuration options used (e.g.
+# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
+# default header using
+# doxygen -w html new_header.html new_footer.html new_stylesheet.css
+# YourConfigFile
+# and then modify the file new_header.html. See also section "Doxygen usage"
+# for information on how to generate the default header that doxygen normally
+# uses.
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. For a description
+# of the possible markers and block names see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_HEADER            =
 
-# The HTML_FOOTER tag can be used to specify a personal HTML footer for
-# each generated HTML page. If it is left blank doxygen will generate a
-# standard footer.
+# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
+# generated HTML page. If the tag is left blank doxygen will generate a standard
+# footer. See HTML_HEADER for more information on how to generate a default
+# footer and what special commands can be used inside the footer. See also
+# section "Doxygen usage" for information on how to generate the default footer
+# that doxygen normally uses.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_FOOTER            =
 
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
-# style sheet that is used by each HTML page. It can be used to
-# fine-tune the look of the HTML output. If left blank doxygen will
-# generate a default style sheet. Note that it is recommended to use
-# HTML_EXTRA_STYLESHEET instead of this one, as it is more robust and this
-# tag will in the future become obsolete.
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
+# sheet that is used by each HTML page. It can be used to fine-tune the look of
+# the HTML output. If left blank doxygen will generate a default style sheet.
+# See also section "Doxygen usage" for information on how to generate the style
+# sheet that doxygen normally uses.
+# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
+# it is more robust and this tag (HTML_STYLESHEET) will in the future become
+# obsolete.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_STYLESHEET        =
 
-# The HTML_EXTRA_STYLESHEET tag can be used to specify an additional
-# user-defined cascading style sheet that is included after the standard
-# style sheets created by doxygen. Using this option one can overrule
-# certain style aspects. This is preferred over using HTML_STYLESHEET
-# since it does not replace the standard style sheet and is therefor more
-# robust against future updates. Doxygen will copy the style sheet file to
-# the output directory.
+# The HTML_EXTRA_STYLESHEET tag can be used to specify an additional user-
+# defined cascading style sheet that is included after the standard style sheets
+# created by doxygen. Using this option one can overrule certain style aspects.
+# This is preferred over using HTML_STYLESHEET since it does not replace the
+# standard style sheet and is therefor more robust against future updates.
+# Doxygen will copy the style sheet file to the output directory. For an example
+# see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_EXTRA_STYLESHEET  =
 
@@ -924,632 +1086,803 @@ HTML_EXTRA_STYLESHEET  =
 # other source files which should be copied to the HTML output directory. Note
 # that these files will be copied to the base HTML output directory. Use the
 # $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
-# files. In the HTML_STYLESHEET file, use the file name only. Also note that
-# the files will be copied as-is; there are no commands or markers available.
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
+# files will be copied as-is; there are no commands or markers available.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_EXTRA_FILES       =
 
-# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output.
-# Doxygen will adjust the colors in the style sheet and background images
-# according to this color. Hue is specified as an angle on a colorwheel,
-# see http://en.wikipedia.org/wiki/Hue for more information.
-# For instance the value 0 represents red, 60 is yellow, 120 is green,
-# 180 is cyan, 240 is blue, 300 purple, and 360 is red again.
-# The allowed range is 0 to 359.
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
+# will adjust the colors in the stylesheet and background images according to
+# this color. Hue is specified as an angle on a colorwheel, see
+# http://en.wikipedia.org/wiki/Hue for more information. For instance the value
+# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
+# purple, and 360 is red again.
+# Minimum value: 0, maximum value: 359, default value: 220.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_COLORSTYLE_HUE    = 220
 
-# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of
-# the colors in the HTML output. For a value of 0 the output will use
-# grayscales only. A value of 255 will produce the most vivid colors.
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
+# in the HTML output. For a value of 0 the output will use grayscales only. A
+# value of 255 will produce the most vivid colors.
+# Minimum value: 0, maximum value: 255, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_COLORSTYLE_SAT    = 100
 
-# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to
-# the luminance component of the colors in the HTML output. Values below
-# 100 gradually make the output lighter, whereas values above 100 make
-# the output darker. The value divided by 100 is the actual gamma applied,
-# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2,
-# and 100 does not change the gamma.
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
+# luminance component of the colors in the HTML output. Values below 100
+# gradually make the output lighter, whereas values above 100 make the output
+# darker. The value divided by 100 is the actual gamma applied, so 80 represents
+# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
+# change the gamma.
+# Minimum value: 40, maximum value: 240, default value: 80.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_COLORSTYLE_GAMMA  = 80
 
 # If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
-# page will contain the date and time when the page was generated. Setting
-# this to NO can help when comparing the output of multiple runs.
+# page will contain the date and time when the page was generated. Setting this
+# to NO can help when comparing the output of multiple runs.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_TIMESTAMP         = YES
 
 # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
 # documentation will contain sections that can be hidden and shown after the
 # page has loaded.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_DYNAMIC_SECTIONS  = NO
 
-# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of
-# entries shown in the various tree structured indices initially; the user
-# can expand and collapse entries dynamically later on. Doxygen will expand
-# the tree to such a level that at most the specified number of entries are
-# visible (unless a fully collapsed tree already exceeds this amount).
-# So setting the number of entries 1 will produce a full collapsed tree by
-# default. 0 is a special value representing an infinite number of entries
-# and will result in a full expanded tree by default.
+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
+# shown in the various tree structured indices initially; the user can expand
+# and collapse entries dynamically later on. Doxygen will expand the tree to
+# such a level that at most the specified number of entries are visible (unless
+# a fully collapsed tree already exceeds this amount). So setting the number of
+# entries 1 will produce a full collapsed tree by default. 0 is a special value
+# representing an infinite number of entries and will result in a full expanded
+# tree by default.
+# Minimum value: 0, maximum value: 9999, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_INDEX_NUM_ENTRIES = 100
 
-# If the GENERATE_DOCSET tag is set to YES, additional index files
-# will be generated that can be used as input for Apple's Xcode 3
-# integrated development environment, introduced with OSX 10.5 (Leopard).
-# To create a documentation set, doxygen will generate a Makefile in the
-# HTML output directory. Running make will produce the docset in that
-# directory and running "make install" will install the docset in
-# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
-# it at startup.
-# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
+# If the GENERATE_DOCSET tag is set to YES, additional index files will be
+# generated that can be used as input for Apple's Xcode 3 integrated development
+# environment (see: http://developer.apple.com/tools/xcode/), introduced with
+# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
+# Makefile in the HTML output directory. Running make will produce the docset in
+# that directory and running make install will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
+# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
 # for more information.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_DOCSET        = NO
 
-# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the
-# feed. A documentation feed provides an umbrella under which multiple
-# documentation sets from a single provider (such as a company or product suite)
-# can be grouped.
+# This tag determines the name of the docset feed. A documentation feed provides
+# an umbrella under which multiple documentation sets from a single provider
+# (such as a company or product suite) can be grouped.
+# The default value is: Doxygen generated docs.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
 
 DOCSET_FEEDNAME        = "Doxygen generated docs"
 
-# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that
-# should uniquely identify the documentation set bundle. This should be a
-# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
-# will append .docset to the name.
+# This tag specifies a string that should uniquely identify the documentation
+# set bundle. This should be a reverse domain-name style string, e.g.
+# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
 
 DOCSET_BUNDLE_ID       = org.doxygen.Project
 
-# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely
-# identify the documentation publisher. This should be a reverse domain-name
-# style string, e.g. com.mycompany.MyDocSet.documentation.
+# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
+# the documentation publisher. This should be a reverse domain-name style
+# string, e.g. com.mycompany.MyDocSet.documentation.
+# The default value is: org.doxygen.Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
 
 DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
 
-# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher.
+# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
+# The default value is: Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
 
 DOCSET_PUBLISHER_NAME  = Publisher
 
-# If the GENERATE_HTMLHELP tag is set to YES, additional index files
-# will be generated that can be used as input for tools like the
-# Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
-# of the generated HTML documentation.
+# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
+# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
+# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
+# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
+# Windows.
+#
+# The HTML Help Workshop contains a compiler that can convert all HTML output
+# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
+# files are now used as the Windows 98 help format, and will replace the old
+# Windows help format (.hlp) on all Windows platforms in the future. Compressed
+# HTML files also contain an index, a table of contents, and you can search for
+# words in the documentation. The HTML workshop also contains a viewer for
+# compressed HTML files.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_HTMLHELP      = NO
 
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
-# be used to specify the file name of the resulting .chm file. You
-# can add a path in front of the file if the result should not be
+# The CHM_FILE tag can be used to specify the file name of the resulting .chm
+# file. You can add a path in front of the file if the result should not be
 # written to the html output directory.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
 CHM_FILE               =
 
-# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
-# be used to specify the location (absolute path including file name) of
-# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
-# the HTML help compiler on the generated index.hhp.
+# The HHC_LOCATION tag can be used to specify the location (absolute path
+# including file name) of the HTML help compiler ( hhc.exe). If non-empty
+# doxygen will try to run the HTML help compiler on the generated index.hhp.
+# The file has to be specified with full path.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
 HHC_LOCATION           =
 
-# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
-# controls if a separate .chi index file is generated (YES) or that
-# it should be included in the master .chm file (NO).
+# The GENERATE_CHI flag controls if a separate .chi index file is generated (
+# YES) or that it should be included in the master .chm file ( NO).
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
 GENERATE_CHI           = NO
 
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING
-# is used to encode HtmlHelp index (hhk), content (hhc) and project file
-# content.
+# The CHM_INDEX_ENCODING is used to encode HtmlHelp index ( hhk), content ( hhc)
+# and project file content.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
 CHM_INDEX_ENCODING     =
 
-# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
-# controls whether a binary table of contents is generated (YES) or a
-# normal table of contents (NO) in the .chm file.
+# The BINARY_TOC flag controls whether a binary table of contents is generated (
+# YES) or a normal table of contents ( NO) in the .chm file. Furthermore it
+# enables the Previous and Next buttons.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
 BINARY_TOC             = NO
 
-# The TOC_EXPAND flag can be set to YES to add extra items for group members
-# to the contents of the HTML help documentation and to the tree view.
+# The TOC_EXPAND flag can be set to YES to add extra items for group members to
+# the table of contents of the HTML help documentation and to the tree view.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
 TOC_EXPAND             = NO
 
 # If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
-# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated
-# that can be used as input for Qt's qhelpgenerator to generate a
-# Qt Compressed Help (.qch) of the generated HTML documentation.
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
+# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
+# (.qch) of the generated HTML documentation.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_QHP           = NO
 
-# If the QHG_LOCATION tag is specified, the QCH_FILE tag can
-# be used to specify the file name of the resulting .qch file.
-# The path specified is relative to the HTML output folder.
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
+# the file name of the resulting .qch file. The path specified is relative to
+# the HTML output folder.
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
 QCH_FILE               =
 
-# The QHP_NAMESPACE tag specifies the namespace to use when generating
-# Qt Help Project output. For more information please see
-# http://doc.trolltech.com/qthelpproject.html#namespace
+# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
+# Project output. For more information please see Qt Help Project / Namespace
+# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace).
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_NAMESPACE          =
 
-# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
-# Qt Help Project output. For more information please see
-# http://doc.trolltech.com/qthelpproject.html#virtual-folders
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
+# Help Project output. For more information please see Qt Help Project / Virtual
+# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual-
+# folders).
+# The default value is: doc.
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_VIRTUAL_FOLDER     = doc
 
-# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to
-# add. For more information please see
-# http://doc.trolltech.com/qthelpproject.html#custom-filters
+# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
+# filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_CUST_FILTER_NAME   =
 
-# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the
-# custom filter to add. For more information please see
-# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">
-# Qt Help Project / Custom Filters</a>.
+# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
+# custom filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_CUST_FILTER_ATTRS  =
 
 # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
-# project's
-# filter section matches.
-# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">
-# Qt Help Project / Filter Attributes</a>.
+# project's filter section matches. Qt Help Project / Filter Attributes (see:
+# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_SECT_FILTER_ATTRS  =
 
-# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
-# be used to specify the location of Qt's qhelpgenerator.
-# If non-empty doxygen will try to run qhelpgenerator on the generated
-# .qhp file.
+# The QHG_LOCATION tag can be used to specify the location of Qt's
+# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
+# generated .qhp file.
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHG_LOCATION           =
 
-# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files
-#  will be generated, which together with the HTML files, form an Eclipse help
-# plugin. To install this plugin and make it available under the help contents
-# menu in Eclipse, the contents of the directory containing the HTML and XML
-# files needs to be copied into the plugins directory of eclipse. The name of
-# the directory within the plugins directory should be the same as
-# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before
-# the help appears.
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
+# generated, together with the HTML files, they form an Eclipse help plugin. To
+# install this plugin and make it available under the help contents menu in
+# Eclipse, the contents of the directory containing the HTML and XML files needs
+# to be copied into the plugins directory of eclipse. The name of the directory
+# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
+# After copying Eclipse needs to be restarted before the help appears.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_ECLIPSEHELP   = NO
 
-# A unique identifier for the eclipse help plugin. When installing the plugin
-# the directory name containing the HTML and XML files should also have
-# this name.
+# A unique identifier for the Eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have this
+# name. Each documentation set should have its own identifier.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
 
 ECLIPSE_DOC_ID         = org.doxygen.Project
 
-# The DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs)
-# at top of each HTML page. The value NO (the default) enables the index and
-# the value YES disables it. Since the tabs have the same information as the
-# navigation tree you can set this option to NO if you already set
-# GENERATE_TREEVIEW to YES.
+# If you want full control over the layout of the generated HTML pages it might
+# be necessary to disable the index and replace it with your own. The
+# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
+# of each HTML page. A value of NO enables the index and the value YES disables
+# it. Since the tabs in the index contain the same information as the navigation
+# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 DISABLE_INDEX          = NO
 
 # The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
-# structure should be generated to display hierarchical information.
-# If the tag value is set to YES, a side panel will be generated
-# containing a tree-like index structure (just like the one that
-# is generated for HTML Help). For this to work a browser that supports
-# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser).
-# Windows users are probably better off using the HTML help feature.
-# Since the tree basically has the same information as the tab index you
-# could consider to set DISABLE_INDEX to NO when enabling this option.
+# structure should be generated to display hierarchical information. If the tag
+# value is set to YES, a side panel will be generated containing a tree-like
+# index structure (just like the one that is generated for HTML Help). For this
+# to work a browser that supports JavaScript, DHTML, CSS and frames is required
+# (i.e. any modern browser). Windows users are probably better off using the
+# HTML help feature. Via custom stylesheets (see HTML_EXTRA_STYLESHEET) one can
+# further fine-tune the look of the index. As an example, the default style
+# sheet generated by doxygen has an example that shows how to put an image at
+# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
+# the same information as the tab index, you could consider setting
+# DISABLE_INDEX to YES when enabling this option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_TREEVIEW      = NO
 
-# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values
-# (range [0,1..20]) that doxygen will group on one line in the generated HTML
-# documentation. Note that a value of 0 will completely suppress the enum
-# values from appearing in the overview section.
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
+# doxygen will group on one line in the generated HTML documentation.
+#
+# Note that a value of 0 will completely suppress the enum values from appearing
+# in the overview section.
+# Minimum value: 0, maximum value: 20, default value: 4.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 ENUM_VALUES_PER_LINE   = 4
 
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
-# used to set the initial width (in pixels) of the frame in which the tree
-# is shown.
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
+# to set the initial width (in pixels) of the frame in which the tree is shown.
+# Minimum value: 0, maximum value: 1500, default value: 250.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 TREEVIEW_WIDTH         = 250
 
-# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open
-# links to external symbols imported via tag files in a separate window.
+# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open links to
+# external symbols imported via tag files in a separate window.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 EXT_LINKS_IN_WINDOW    = NO
 
-# Use this tag to change the font size of Latex formulas included
-# as images in the HTML documentation. The default is 10. Note that
-# when you change the font size after a successful doxygen run you need
-# to manually remove any form_*.png images from the HTML output directory
-# to force them to be regenerated.
+# Use this tag to change the font size of LaTeX formulas included as images in
+# the HTML documentation. When you change the font size after a successful
+# doxygen run you need to manually remove any form_*.png images from the HTML
+# output directory to force them to be regenerated.
+# Minimum value: 8, maximum value: 50, default value: 10.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 FORMULA_FONTSIZE       = 10
 
 # Use the FORMULA_TRANPARENT tag to determine whether or not the images
-# generated for formulas are transparent PNGs. Transparent PNGs are
-# not supported properly for IE 6.0, but are supported on all modern browsers.
-# Note that when changing this option you need to delete any form_*.png files
-# in the HTML output before the changes have effect.
+# generated for formulas are transparent PNGs. Transparent PNGs are not
+# supported properly for IE 6.0, but are supported on all modern browsers.
+#
+# Note that when changing this option you need to delete any form_*.png files in
+# the HTML output directory before the changes have effect.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 FORMULA_TRANSPARENT    = YES
 
-# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax
-# (see http://www.mathjax.org) which uses client side Javascript for the
-# rendering instead of using prerendered bitmaps. Use this if you do not
-# have LaTeX installed or if you want to formulas look prettier in the HTML
-# output. When enabled you may also need to install MathJax separately and
-# configure the path to it using the MATHJAX_RELPATH option.
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
+# http://www.mathjax.org) which uses client side Javascript for the rendering
+# instead of using prerendered bitmaps. Use this if you do not have LaTeX
+# installed or if you want to formulas look prettier in the HTML output. When
+# enabled you may also need to install MathJax separately and configure the path
+# to it using the MATHJAX_RELPATH option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 USE_MATHJAX            = NO
 
 # When MathJax is enabled you can set the default output format to be used for
-# the MathJax output. Supported types are HTML-CSS, NativeMML (i.e. MathML) and
-# SVG. The default value is HTML-CSS, which is slower, but has the best
-# compatibility.
+# the MathJax output. See the MathJax site (see:
+# http://docs.mathjax.org/en/latest/output.html) for more details.
+# Possible values are: HTML-CSS (which is slower, but has the best
+# compatibility), NativeMML (i.e. MathML) and SVG.
+# The default value is: HTML-CSS.
+# This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_FORMAT         = HTML-CSS
 
-# When MathJax is enabled you need to specify the location relative to the
-# HTML output directory using the MATHJAX_RELPATH option. The destination
-# directory should contain the MathJax.js script. For instance, if the mathjax
-# directory is located at the same level as the HTML output directory, then
-# MATHJAX_RELPATH should be ../mathjax. The default value points to
-# the MathJax Content Delivery Network so you can quickly see the result without
-# installing MathJax.
-# However, it is strongly recommended to install a local
-# copy of MathJax from http://www.mathjax.org before deployment.
+# When MathJax is enabled you need to specify the location relative to the HTML
+# output directory using the MATHJAX_RELPATH option. The destination directory
+# should contain the MathJax.js script. For instance, if the mathjax directory
+# is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
+# Content Delivery Network so you can quickly see the result without installing
+# MathJax. However, it is strongly recommended to install a local copy of
+# MathJax from http://www.mathjax.org before deployment.
+# The default value is: http://cdn.mathjax.org/mathjax/latest.
+# This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
 
-# The MATHJAX_EXTENSIONS tag can be used to specify one or MathJax extension
-# names that should be enabled during MathJax rendering.
+# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
+# extension names that should be enabled during MathJax rendering. For example
+# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_EXTENSIONS     =
 
-# The MATHJAX_CODEFILE tag can be used to specify a file with javascript
-# pieces of code that will be used on startup of the MathJax code.
+# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
+# of code that will be used on startup of the MathJax code. See the MathJax site
+# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
+# example see the documentation.
+# This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_CODEFILE       =
 
-# When the SEARCHENGINE tag is enabled doxygen will generate a search box
-# for the HTML output. The underlying search engine uses javascript
-# and DHTML and should work on any modern browser. Note that when using
-# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets
-# (GENERATE_DOCSET) there is already a search function so this one should
-# typically be disabled. For large projects the javascript based search engine
-# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
+# the HTML output. The underlying search engine uses javascript and DHTML and
+# should work on any modern browser. Note that when using HTML help
+# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
+# there is already a search function so this one should typically be disabled.
+# For large projects the javascript based search engine can be slow, then
+# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
+# search using the keyboard; to jump to the search box use <access key> + S
+# (what the <access key> is depends on the OS and browser, but it is typically
+# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
+# key> to jump into the search results window, the results can be navigated
+# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
+# the search. The filter options can be selected when the cursor is inside the
+# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
+# to select a filter and <Enter> or <escape> to activate or cancel the filter
+# option.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 SEARCHENGINE           = NO
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript.
-# There are two flavours of web server based search depending on the
-# EXTERNAL_SEARCH setting. When disabled, doxygen will generate a PHP script for
-# searching and an index file used by the script. When EXTERNAL_SEARCH is
-# enabled the indexing and searching needs to be provided by external tools.
-# See the manual for details.
+# implemented using a web server instead of a web client using Javascript. There
+# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
+# setting. When disabled, doxygen will generate a PHP script for searching and
+# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
+# and searching needs to be provided by external tools. See the section
+# "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
 
 SERVER_BASED_SEARCH    = NO
 
-# When EXTERNAL_SEARCH is enabled doxygen will no longer generate the PHP
+# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
 # script for searching. Instead the search results are written to an XML file
 # which needs to be processed by an external indexer. Doxygen will invoke an
-# external search engine pointed to by the SEARCHENGINE_URL option to obtain
-# the search results. Doxygen ships with an example indexer (doxyindexer) and
-# search engine (doxysearch.cgi) which are based on the open source search
-# engine library Xapian. See the manual for configuration details.
+# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
+# search results.
+#
+# Doxygen ships with an example indexer ( doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/).
+#
+# See the section "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
 
 EXTERNAL_SEARCH        = NO
 
 # The SEARCHENGINE_URL should point to a search engine hosted by a web server
-# which will returned the search results when EXTERNAL_SEARCH is enabled.
-# Doxygen ships with an example search engine (doxysearch) which is based on
-# the open source search engine library Xapian. See the manual for configuration
-# details.
+# which will return the search results when EXTERNAL_SEARCH is enabled.
+#
+# Doxygen ships with an example indexer ( doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/). See the section "External Indexing and
+# Searching" for details.
+# This tag requires that the tag SEARCHENGINE is set to YES.
 
 SEARCHENGINE_URL       =
 
 # When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
 # search data is written to a file for indexing by an external tool. With the
 # SEARCHDATA_FILE tag the name of this file can be specified.
+# The default file is: searchdata.xml.
+# This tag requires that the tag SEARCHENGINE is set to YES.
 
 SEARCHDATA_FILE        = searchdata.xml
 
-# When SERVER_BASED_SEARCH AND EXTERNAL_SEARCH are both enabled the
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
 # EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
 # useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
 # projects and redirect the results back to the right project.
+# This tag requires that the tag SEARCHENGINE is set to YES.
 
 EXTERNAL_SEARCH_ID     =
 
 # The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
 # projects other than the one defined by this configuration file, but that are
 # all added to the same external search index. Each project needs to have a
-# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id
-# of to a relative location where the documentation can be found.
-# The format is: EXTRA_SEARCH_MAPPINGS = id1=loc1 id2=loc2 ...
+# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
+# to a relative location where the documentation can be found. The format is:
+# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
+# This tag requires that the tag SEARCHENGINE is set to YES.
 
 EXTRA_SEARCH_MAPPINGS  =
 
 #---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
+# Configuration options related to the LaTeX output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
-# generate Latex output.
+# If the GENERATE_LATEX tag is set to YES doxygen will generate LaTeX output.
+# The default value is: YES.
 
 GENERATE_LATEX         = NO
 
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `latex' will be used as the default path.
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_OUTPUT           = latex
 
 # The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
-# invoked. If left blank `latex' will be used as the default command name.
-# Note that when enabling USE_PDFLATEX this option is only used for
-# generating bitmaps for formulas in the HTML output, but not in the
-# Makefile that is written to the output directory.
+# invoked.
+#
+# Note that when enabling USE_PDFLATEX this option is only used for generating
+# bitmaps for formulas in the HTML output, but not in the Makefile that is
+# written to the output directory.
+# The default file is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_CMD_NAME         = latex
 
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
-# generate index for LaTeX. If left blank `makeindex' will be used as the
-# default command name.
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
+# index for LaTeX.
+# The default file is: makeindex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 MAKEINDEX_CMD_NAME     = makeindex
 
-# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
-# LaTeX documents. This may be useful for small projects and may help to
-# save some trees in general.
+# If the COMPACT_LATEX tag is set to YES doxygen generates more compact LaTeX
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 COMPACT_LATEX          = NO
 
-# The PAPER_TYPE tag can be used to set the paper type that is used
-# by the printer. Possible values are: a4, letter, legal and
-# executive. If left blank a4 will be used.
+# The PAPER_TYPE tag can be used to set the paper type that is used by the
+# printer.
+# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
+# 14 inches) and executive (7.25 x 10.5 inches).
+# The default value is: a4.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 PAPER_TYPE             = a4wide
 
-# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
-# packages that should be included in the LaTeX output.
+# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
+# that should be included in the LaTeX output. To get the times font for
+# instance you can specify
+# EXTRA_PACKAGES=times
+# If left blank no extra packages will be included.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 EXTRA_PACKAGES         =
 
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
-# the generated latex document. The header should contain everything until
-# the first chapter. If it is left blank doxygen will generate a
-# standard header. Notice: only use this tag if you know what you are doing!
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
+# generated LaTeX document. The header should contain everything until the first
+# chapter. If it is left blank doxygen will generate a standard header. See
+# section "Doxygen usage" for information on how to let doxygen write the
+# default header to a separate file.
+#
+# Note: Only use a user-defined header if you know what you are doing! The
+# following commands have a special meaning inside the header: $title,
+# $datetime, $date, $doxygenversion, $projectname, $projectnumber. Doxygen will
+# replace them by respectively the title of the page, the current date and time,
+# only the current date, the version number of doxygen, the project name (see
+# PROJECT_NAME), or the project number (see PROJECT_NUMBER).
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_HEADER           =
 
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for
-# the generated latex document. The footer should contain everything after
-# the last chapter. If it is left blank doxygen will generate a
-# standard footer. Notice: only use this tag if you know what you are doing!
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
+# generated LaTeX document. The footer should contain everything after the last
+# chapter. If it is left blank doxygen will generate a standard footer.
+#
+# Note: Only use a user-defined footer if you know what you are doing!
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_FOOTER           =
 
-# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images
-# or other source files which should be copied to the LaTeX output directory.
-# Note that the files will be copied as-is; there are no commands or markers
-# available.
+# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the LATEX_OUTPUT output
+# directory. Note that the files will be copied as-is; there are no commands or
+# markers available.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_EXTRA_FILES      =
 
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
-# is prepared for conversion to pdf (using ps2pdf). The pdf file will
-# contain links (just like the HTML output) instead of page references
-# This makes the output suitable for online browsing using a pdf viewer.
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
+# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
+# contain links (just like the HTML output) instead of page references. This
+# makes the output suitable for online browsing using a PDF viewer.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 PDF_HYPERLINKS         = NO
 
-# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
-# plain latex in the generated Makefile. Set this option to YES to get a
+# If the LATEX_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
+# the PDF file directly from the LaTeX files. Set this option to YES to get a
 # higher quality PDF documentation.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 USE_PDFLATEX           = NO
 
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
-# command to the generated LaTeX files. This will instruct LaTeX to keep
-# running if errors occur, instead of asking the user for help.
-# This option is also used when generating formulas in HTML.
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
+# command to the generated LaTeX files. This will instruct LaTeX to keep running
+# if errors occur, instead of asking the user for help. This option is also used
+# when generating formulas in HTML.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_BATCHMODE        = NO
 
-# If LATEX_HIDE_INDICES is set to YES then doxygen will not
-# include the index chapters (such as File Index, Compound Index, etc.)
-# in the output.
+# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
+# index chapters (such as File Index, Compound Index, etc.) in the output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_HIDE_INDICES     = NO
 
-# If LATEX_SOURCE_CODE is set to YES then doxygen will include
-# source code with syntax highlighting in the LaTeX output.
-# Note that which sources are shown also depends on other settings
-# such as SOURCE_BROWSER.
+# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
+# code with syntax highlighting in the LaTeX output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_SOURCE_CODE      = NO
 
 # The LATEX_BIB_STYLE tag can be used to specify the style to use for the
-# bibliography, e.g. plainnat, or ieeetr. The default style is "plain". See
-# http://en.wikipedia.org/wiki/BibTeX for more info.
+# bibliography, e.g. plainnat, or ieeetr. See
+# http://en.wikipedia.org/wiki/BibTeX and \cite for more info.
+# The default value is: plain.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_BIB_STYLE        = plain
 
 #---------------------------------------------------------------------------
-# configuration options related to the RTF output
+# Configuration options related to the RTF output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
-# The RTF output is optimized for Word 97 and may not look very pretty with
-# other RTF readers or editors.
+# If the GENERATE_RTF tag is set to YES doxygen will generate RTF output. The
+# RTF output is optimized for Word 97 and may not look too pretty with other RTF
+# readers/editors.
+# The default value is: NO.
 
 GENERATE_RTF           = NO
 
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `rtf' will be used as the default path.
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: rtf.
+# This tag requires that the tag GENERATE_RTF is set to YES.
 
 RTF_OUTPUT             = rtf
 
-# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
-# RTF documents. This may be useful for small projects and may help to
-# save some trees in general.
+# If the COMPACT_RTF tag is set to YES doxygen generates more compact RTF
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
 
 COMPACT_RTF            = NO
 
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
-# will contain hyperlink fields. The RTF file will
-# contain links (just like the HTML output) instead of page references.
-# This makes the output suitable for online browsing using WORD or other
-# programs which support those fields.
-# Note: wordpad (write) and others do not support links.
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
+# contain hyperlink fields. The RTF file will contain links (just like the HTML
+# output) instead of page references. This makes the output suitable for online
+# browsing using Word or some other Word compatible readers that support those
+# fields.
+#
+# Note: WordPad (write) and others do not support links.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
 
 RTF_HYPERLINKS         = NO
 
-# Load style sheet definitions from file. Syntax is similar to doxygen's
-# config file, i.e. a series of assignments. You only have to provide
-# replacements, missing definitions are set to their default value.
+# Load stylesheet definitions from file. Syntax is similar to doxygen's config
+# file, i.e. a series of assignments. You only have to provide replacements,
+# missing definitions are set to their default value.
+#
+# See also section "Doxygen usage" for information on how to generate the
+# default style sheet that doxygen normally uses.
+# This tag requires that the tag GENERATE_RTF is set to YES.
 
 RTF_STYLESHEET_FILE    =
 
-# Set optional variables used in the generation of an rtf document.
-# Syntax is similar to doxygen's config file.
+# Set optional variables used in the generation of an RTF document. Syntax is
+# similar to doxygen's config file. A template extensions file can be generated
+# using doxygen -e rtf extensionFile.
+# This tag requires that the tag GENERATE_RTF is set to YES.
 
 RTF_EXTENSIONS_FILE    =
 
 #---------------------------------------------------------------------------
-# configuration options related to the man page output
+# Configuration options related to the man page output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
-# generate man pages
+# If the GENERATE_MAN tag is set to YES doxygen will generate man pages for
+# classes and files.
+# The default value is: NO.
 
 GENERATE_MAN           = NO
 
-# The MAN_OUTPUT tag is used to specify where the man pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `man' will be used as the default path.
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it. A directory man3 will be created inside the directory specified by
+# MAN_OUTPUT.
+# The default directory is: man.
+# This tag requires that the tag GENERATE_MAN is set to YES.
 
 MAN_OUTPUT             = man
 
-# The MAN_EXTENSION tag determines the extension that is added to
-# the generated man pages (default is the subroutine's section .3)
+# The MAN_EXTENSION tag determines the extension that is added to the generated
+# man pages. In case the manual section does not start with a number, the number
+# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
+# optional.
+# The default value is: .3.
+# This tag requires that the tag GENERATE_MAN is set to YES.
 
 MAN_EXTENSION          = .3
 
-# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
-# then it will generate one additional man file for each entity
-# documented in the real man page(s). These additional files
-# only source the real man page, but without them the man command
-# would be unable to find the correct page. The default is NO.
+# The MAN_SUBDIR tag determines the name of the directory created within
+# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
+# MAN_EXTENSION with the initial . removed.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_SUBDIR             =
+
+# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
+# will generate one additional man file for each entity documented in the real
+# man page(s). These additional files only source the real man page, but without
+# them the man command would be unable to find the correct page.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_MAN is set to YES.
 
 MAN_LINKS              = NO
 
 #---------------------------------------------------------------------------
-# configuration options related to the XML output
+# Configuration options related to the XML output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_XML tag is set to YES Doxygen will
-# generate an XML file that captures the structure of
-# the code including all documentation.
+# If the GENERATE_XML tag is set to YES doxygen will generate an XML file that
+# captures the structure of the code including all documentation.
+# The default value is: NO.
 
 GENERATE_XML           = NO
 
-# The XML_OUTPUT tag is used to specify where the XML pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `xml' will be used as the default path.
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: xml.
+# This tag requires that the tag GENERATE_XML is set to YES.
 
 XML_OUTPUT             = xml
 
-# The XML_SCHEMA tag can be used to specify an XML schema,
-# which can be used by a validating XML parser to check the
-# syntax of the XML files.
-
-XML_SCHEMA             =
-
-# The XML_DTD tag can be used to specify an XML DTD,
-# which can be used by a validating XML parser to check the
-# syntax of the XML files.
-
-XML_DTD                =
-
-# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
-# dump the program listings (including syntax highlighting
-# and cross-referencing information) to the XML output. Note that
-# enabling this will significantly increase the size of the XML output.
+# If the XML_PROGRAMLISTING tag is set to YES doxygen will dump the program
+# listings (including syntax highlighting and cross-referencing information) to
+# the XML output. Note that enabling this will significantly increase the size
+# of the XML output.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_XML is set to YES.
 
 XML_PROGRAMLISTING     = YES
 
 #---------------------------------------------------------------------------
-# configuration options related to the DOCBOOK output
+# Configuration options related to the DOCBOOK output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_DOCBOOK tag is set to YES Doxygen will generate DOCBOOK files
+# If the GENERATE_DOCBOOK tag is set to YES doxygen will generate Docbook files
 # that can be used to generate PDF.
+# The default value is: NO.
 
 GENERATE_DOCBOOK       = NO
 
-# The DOCBOOK_OUTPUT tag is used to specify where the DOCBOOK pages will be put.
+# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
-# front of it. If left blank docbook will be used as the default path.
+# front of it.
+# The default directory is: docbook.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
 
 DOCBOOK_OUTPUT         = docbook
 
 #---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
+# Configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
-# generate an AutoGen Definitions (see autogen.sf.net) file
-# that captures the structure of the code including all
-# documentation. Note that this feature is still experimental
-# and incomplete at the moment.
+# If the GENERATE_AUTOGEN_DEF tag is set to YES doxygen will generate an AutoGen
+# Definitions (see http://autogen.sf.net) file that captures the structure of
+# the code including all documentation. Note that this feature is still
+# experimental and incomplete at the moment.
+# The default value is: NO.
 
 GENERATE_AUTOGEN_DEF   = NO
 
 #---------------------------------------------------------------------------
-# configuration options related to the Perl module output
+# Configuration options related to the Perl module output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_PERLMOD tag is set to YES Doxygen will
-# generate a Perl module file that captures the structure of
-# the code including all documentation. Note that this
-# feature is still experimental and incomplete at the
-# moment.
+# If the GENERATE_PERLMOD tag is set to YES doxygen will generate a Perl module
+# file that captures the structure of the code including all documentation.
+#
+# Note that this feature is still experimental and incomplete at the moment.
+# The default value is: NO.
 
 GENERATE_PERLMOD       = NO
 
-# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
-# the necessary Makefile rules, Perl scripts and LaTeX code to be able
-# to generate PDF and DVI output from the Perl module output.
+# If the PERLMOD_LATEX tag is set to YES doxygen will generate the necessary
+# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
+# output from the Perl module output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
 
 PERLMOD_LATEX          = NO
 
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
-# nicely formatted so it can be parsed by a human reader.
-# This is useful
-# if you want to understand what is going on.
-# On the other hand, if this
-# tag is set to NO the size of the Perl module output will be much smaller
-# and Perl will parse it just the same.
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be nicely
+# formatted so it can be parsed by a human reader. This is useful if you want to
+# understand what is going on. On the other hand, if this tag is set to NO the
+# size of the Perl module output will be much smaller and Perl will parse it
+# just the same.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
 
 PERLMOD_PRETTY         = YES
 
-# The names of the make variables in the generated doxyrules.make file
-# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
-# This is useful so different doxyrules.make files included by the same
-# Makefile don't overwrite each other's variables.
+# The names of the make variables in the generated doxyrules.make file are
+# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
+# so different doxyrules.make files included by the same Makefile don't
+# overwrite each other's variables.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
 
 PERLMOD_MAKEVAR_PREFIX =
 
@@ -1557,112 +1890,128 @@ PERLMOD_MAKEVAR_PREFIX =
 # Configuration options related to the preprocessor
 #---------------------------------------------------------------------------
 
-# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
-# evaluate all C-preprocessor directives found in the sources and include
-# files.
+# If the ENABLE_PREPROCESSING tag is set to YES doxygen will evaluate all
+# C-preprocessor directives found in the sources and include files.
+# The default value is: YES.
 
 ENABLE_PREPROCESSING   = YES
 
-# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
-# names in the source code. If set to NO (the default) only conditional
-# compilation will be performed. Macro expansion can be done in a controlled
-# way by setting EXPAND_ONLY_PREDEF to YES.
+# If the MACRO_EXPANSION tag is set to YES doxygen will expand all macro names
+# in the source code. If set to NO only conditional compilation will be
+# performed. Macro expansion can be done in a controlled way by setting
+# EXPAND_ONLY_PREDEF to YES.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 MACRO_EXPANSION        = NO
 
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
-# then the macro expansion is limited to the macros specified with the
-# PREDEFINED and EXPAND_AS_DEFINED tags.
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
+# the macro expansion is limited to the macros specified with the PREDEFINED and
+# EXPAND_AS_DEFINED tags.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 EXPAND_ONLY_PREDEF     = NO
 
-# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
-# pointed to by INCLUDE_PATH will be searched when a #include is found.
+# If the SEARCH_INCLUDES tag is set to YES the includes files in the
+# INCLUDE_PATH will be searched if a #include is found.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 SEARCH_INCLUDES        = YES
 
 # The INCLUDE_PATH tag can be used to specify one or more directories that
-# contain include files that are not input files but should be processed by
-# the preprocessor.
+# contain include files that are not input files but should be processed by the
+# preprocessor.
+# This tag requires that the tag SEARCH_INCLUDES is set to YES.
 
 INCLUDE_PATH           =
 
 # You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
 # patterns (like *.h and *.hpp) to filter out the header-files in the
-# directories. If left blank, the patterns specified with FILE_PATTERNS will
-# be used.
+# directories. If left blank, the patterns specified with FILE_PATTERNS will be
+# used.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 INCLUDE_FILE_PATTERNS  =
 
-# The PREDEFINED tag can be used to specify one or more macro names that
-# are defined before the preprocessor is started (similar to the -D option of
-# gcc). The argument of the tag is a list of macros of the form: name
-# or name=definition (no spaces). If the definition and the = are
-# omitted =1 is assumed. To prevent a macro definition from being
-# undefined via #undef or recursively expanded use the := operator
-# instead of the = operator.
+# The PREDEFINED tag can be used to specify one or more macro names that are
+# defined before the preprocessor is started (similar to the -D option of e.g.
+# gcc). The argument of the tag is a list of macros of the form: name or
+# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
+# is assumed. To prevent a macro definition from being undefined via #undef or
+# recursively expanded use the := operator instead of the = operator.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 PREDEFINED             =
 
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
-# this tag can be used to specify a list of macro names that should be expanded.
-# The macro definition that is found in the sources will be used.
-# Use the PREDEFINED tag if you want to use a different macro definition that
-# overrules the definition found in the source code.
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
+# tag can be used to specify a list of macro names that should be expanded. The
+# macro definition that is found in the sources will be used. Use the PREDEFINED
+# tag if you want to use a different macro definition that overrules the
+# definition found in the source code.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 EXPAND_AS_DEFINED      =
 
-# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
-# doxygen's preprocessor will remove all references to function-like macros
-# that are alone on a line, have an all uppercase name, and do not end with a
-# semicolon, because these will confuse the parser if not removed.
+# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
+# remove all references to function-like macros that are alone on a line, have
+# an all uppercase name, and do not end with a semicolon. Such function macros
+# are typically used for boiler-plate code, and will confuse the parser if not
+# removed.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 SKIP_FUNCTION_MACROS   = YES
 
 #---------------------------------------------------------------------------
-# Configuration::additions related to external references
+# Configuration options related to external references
 #---------------------------------------------------------------------------
 
-# The TAGFILES option can be used to specify one or more tagfiles. For each
-# tag file the location of the external documentation should be added. The
-# format of a tag file without this location is as follows:
-#
+# The TAGFILES tag can be used to specify one or more tag files. For each tag
+# file the location of the external documentation should be added. The format of
+# a tag file without this location is as follows:
 # TAGFILES = file1 file2 ...
 # Adding location for the tag files is done as follows:
-#
 # TAGFILES = file1=loc1 "file2 = loc2" ...
-# where "loc1" and "loc2" can be relative or absolute paths
-# or URLs. Note that each tag file must have a unique name (where the name does
-# NOT include the path). If a tag file is not located in the directory in which
-# doxygen is run, you must also specify the path to the tagfile here.
+# where loc1 and loc2 can be relative or absolute paths or URLs. See the
+# section "Linking to external documentation" for more information about the use
+# of tag files.
+# Note: Each tag file must have a unique name (where the name does NOT include
+# the path). If a tag file is not located in the directory in which doxygen is
+# run, you must also specify the path to the tagfile here.
 
 TAGFILES               =
 
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create
-# a tag file that is based on the input files it reads.
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
+# tag file that is based on the input files it reads. See section "Linking to
+# external documentation" for more information about the usage of tag files.
 
 GENERATE_TAGFILE       =
 
-# If the ALLEXTERNALS tag is set to YES all external classes will be listed
-# in the class index. If set to NO only the inherited external classes
-# will be listed.
+# If the ALLEXTERNALS tag is set to YES all external class will be listed in the
+# class index. If set to NO only the inherited external classes will be listed.
+# The default value is: NO.
 
 ALLEXTERNALS           = NO
 
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
-# in the modules index. If set to NO, only the current project's groups will
-# be listed.
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed in
+# the modules index. If set to NO, only the current project's groups will be
+# listed.
+# The default value is: YES.
 
 EXTERNAL_GROUPS        = YES
 
-# If the EXTERNAL_PAGES tag is set to YES all external pages will be listed
-# in the related pages index. If set to NO, only the current project's
-# pages will be listed.
+# If the EXTERNAL_PAGES tag is set to YES all external pages will be listed in
+# the related pages index. If set to NO, only the current project's pages will
+# be listed.
+# The default value is: YES.
 
 EXTERNAL_PAGES         = YES
 
 # The PERL_PATH should be the absolute path and name of the perl script
-# interpreter (i.e. the result of `which perl').
+# interpreter (i.e. the result of 'which perl').
+# The default file (with absolute path) is: /usr/bin/perl.
 
 PERL_PATH              = /usr/bin/perl
 
@@ -1670,222 +2019,295 @@ PERL_PATH              = /usr/bin/perl
 # Configuration options related to the dot tool
 #---------------------------------------------------------------------------
 
-# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
-# or super classes. Setting the tag to NO turns the diagrams off. Note that
-# this option also works with HAVE_DOT disabled, but it is recommended to
-# install and use dot, since it yields more powerful graphs.
+# If the CLASS_DIAGRAMS tag is set to YES doxygen will generate a class diagram
+# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
+# NO turns the diagrams off. Note that this option also works with HAVE_DOT
+# disabled, but it is recommended to install and use dot, since it yields more
+# powerful graphs.
+# The default value is: YES.
 
 CLASS_DIAGRAMS         = YES
 
 # You can define message sequence charts within doxygen comments using the \msc
-# command. Doxygen will then run the mscgen tool (see
-# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the
+# command. Doxygen will then run the mscgen tool (see:
+# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
 # documentation. The MSCGEN_PATH tag allows you to specify the directory where
 # the mscgen tool resides. If left empty the tool is assumed to be found in the
 # default search path.
 
 MSCGEN_PATH            =
 
-# If set to YES, the inheritance and collaboration graphs will hide
-# inheritance and usage relations if the target is undocumented
-# or is not a class.
+# You can include diagrams made with dia in doxygen documentation. Doxygen will
+# then run dia to produce the diagram and insert it in the documentation. The
+# DIA_PATH tag allows you to specify the directory where the dia binary resides.
+# If left empty dia is assumed to be found in the default search path.
+
+DIA_PATH               =
+
+# If set to YES, the inheritance and collaboration graphs will hide inheritance
+# and usage relations if the target is undocumented or is not a class.
+# The default value is: YES.
 
 HIDE_UNDOC_RELATIONS   = YES
 
 # If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
-# available from the path. This tool is part of Graphviz, a graph visualization
-# toolkit from AT&T and Lucent Bell Labs. The other options in this section
-# have no effect if this option is set to NO (the default)
+# available from the path. This tool is part of Graphviz (see:
+# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
+# Bell Labs. The other options in this section have no effect if this option is
+# set to NO
+# The default value is: YES.
 
 HAVE_DOT               = @HAVE_DOT@
 
-# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is
-# allowed to run in parallel. When set to 0 (the default) doxygen will
-# base this on the number of processors available in the system. You can set it
-# explicitly to a value larger than 0 to get control over the balance
-# between CPU load and processing speed.
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
+# to run in parallel. When set to 0 doxygen will base this on the number of
+# processors available in the system. You can set it explicitly to a value
+# larger than 0 to get control over the balance between CPU load and processing
+# speed.
+# Minimum value: 0, maximum value: 32, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_NUM_THREADS        = 0
 
-# By default doxygen will use the Helvetica font for all dot files that
-# doxygen generates. When you want a differently looking font you can specify
-# the font name using DOT_FONTNAME. You need to make sure dot is able to find
-# the font, which can be done by putting it in a standard location or by setting
-# the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the
-# directory containing the font.
+# When you want a differently looking font n the dot files that doxygen
+# generates you can specify the font name using DOT_FONTNAME. You need to make
+# sure dot is able to find the font, which can be done by putting it in a
+# standard location or by setting the DOTFONTPATH environment variable or by
+# setting DOT_FONTPATH to the directory containing the font.
+# The default value is: Helvetica.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_FONTNAME           =
 
-# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
-# The default size is 10pt.
+# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
+# dot graphs.
+# Minimum value: 4, maximum value: 24, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_FONTSIZE           = 10
 
-# By default doxygen will tell dot to use the Helvetica font.
-# If you specify a different font using DOT_FONTNAME you can use DOT_FONTPATH to
-# set the path where dot can find it.
+# By default doxygen will tell dot to use the default font as specified with
+# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
+# the path where dot can find it using this tag.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_FONTPATH           =
 
-# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect inheritance relations. Setting this tag to YES will force the
-# CLASS_DIAGRAMS tag to NO.
+# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
+# each documented class showing the direct and indirect inheritance relations.
+# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 CLASS_GRAPH            = YES
 
-# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect implementation dependencies (inheritance, containment, and
-# class references variables) of the class with other documented classes.
+# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
+# graph for each documented class showing the direct and indirect implementation
+# dependencies (inheritance, containment, and class references variables) of the
+# class with other documented classes.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 COLLABORATION_GRAPH    = YES
 
-# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for groups, showing the direct groups dependencies
+# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
+# groups, showing the direct groups dependencies.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 GROUP_GRAPHS           = YES
 
 # If the UML_LOOK tag is set to YES doxygen will generate inheritance and
 # collaboration diagrams in a style similar to the OMG's Unified Modeling
 # Language.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 UML_LOOK               = NO
 
-# If the UML_LOOK tag is enabled, the fields and methods are shown inside
-# the class node. If there are many fields or methods and many nodes the
-# graph may become too big to be useful. The UML_LIMIT_NUM_FIELDS
-# threshold limits the number of items for each type to make the size more
-# manageable. Set this to 0 for no limit. Note that the threshold may be
-# exceeded by 50% before the limit is enforced.
+# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
+# class node. If there are many fields or methods and many nodes the graph may
+# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
+# number of items for each type to make the size more manageable. Set this to 0
+# for no limit. Note that the threshold may be exceeded by 50% before the limit
+# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
+# but if the number exceeds 15, the total amount of fields shown is limited to
+# 10.
+# Minimum value: 0, maximum value: 100, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 UML_LIMIT_NUM_FIELDS   = 10
 
-# If set to YES, the inheritance and collaboration graphs will show the
-# relations between templates and their instances.
+# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
+# collaboration graphs will show the relations between templates and their
+# instances.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 TEMPLATE_RELATIONS     = NO
 
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
-# tags are set to YES then doxygen will generate a graph for each documented
-# file showing the direct and indirect include dependencies of the file with
-# other documented files.
+# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
+# YES then doxygen will generate a graph for each documented file showing the
+# direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 INCLUDE_GRAPH          = YES
 
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
-# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
-# documented header file showing the documented files that directly or
-# indirectly include this file.
+# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
+# set to YES then doxygen will generate a graph for each documented file showing
+# the direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 INCLUDED_BY_GRAPH      = YES
 
-# If the CALL_GRAPH and HAVE_DOT options are set to YES then
-# doxygen will generate a call dependency graph for every global function
-# or class method. Note that enabling this option will significantly increase
-# the time of a run. So in most cases it will be better to enable call graphs
-# for selected functions only using the \callgraph command.
+# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable call graphs for selected
+# functions only using the \callgraph command.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 CALL_GRAPH             = NO
 
-# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then
-# doxygen will generate a caller dependency graph for every global function
-# or class method. Note that enabling this option will significantly increase
-# the time of a run. So in most cases it will be better to enable caller
-# graphs for selected functions only using the \callergraph command.
+# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable caller graphs for selected
+# functions only using the \callergraph command.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 CALLER_GRAPH           = NO
 
-# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
-# will generate a graphical hierarchy of all classes instead of a textual one.
+# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
+# hierarchy of all classes instead of a textual one.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 GRAPHICAL_HIERARCHY    = YES
 
-# If the DIRECTORY_GRAPH and HAVE_DOT tags are set to YES
-# then doxygen will show the dependencies a directory has on other directories
-# in a graphical way. The dependency relations are determined by the #include
-# relations between the files in the directories.
+# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
+# dependencies a directory has on other directories in a graphical way. The
+# dependency relations are determined by the #include relations between the
+# files in the directories.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DIRECTORY_GRAPH        = YES
 
 # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot. Possible values are svg, png, jpg, or gif.
-# If left blank png will be used. If you choose svg you need to set
-# HTML_FILE_EXTENSION to xhtml in order to make the SVG files
-# visible in IE 9+ (other browsers do not have this requirement).
+# generated by dot.
+# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
+# to make the SVG files visible in IE 9+ (other browsers do not have this
+# requirement).
+# Possible values are: png, png:cairo, png:cairo:cairo, png:cairo:gd, png:gd,
+# png:gd:gd, jpg, jpg:cairo, jpg:cairo:gd, jpg:gd, jpg:gd:gd, gif, gif:cairo,
+# gif:cairo:gd, gif:gd, gif:gd:gd and svg.
+# The default value is: png.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_IMAGE_FORMAT       = svg
 
 # If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
 # enable generation of interactive SVG images that allow zooming and panning.
-# Note that this requires a modern browser other than Internet Explorer.
-# Tested and working are Firefox, Chrome, Safari, and Opera. For IE 9+ you
-# need to set HTML_FILE_EXTENSION to xhtml in order to make the SVG files
-# visible. Older versions of IE do not have SVG support.
+#
+# Note that this requires a modern browser other than Internet Explorer. Tested
+# and working are Firefox, Chrome, Safari, and Opera.
+# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
+# the SVG files visible. Older versions of IE do not have SVG support.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 INTERACTIVE_SVG        = YES
 
-# The tag DOT_PATH can be used to specify the path where the dot tool can be
+# The DOT_PATH tag can be used to specify the path where the dot tool can be
 # found. If left blank, it is assumed the dot tool can be found in the path.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_PATH               = @DOTDIR@
 
 # The DOTFILE_DIRS tag can be used to specify one or more directories that
-# contain dot files that are included in the documentation (see the
-# \dotfile command).
+# contain dot files that are included in the documentation (see the \dotfile
+# command).
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOTFILE_DIRS           =
 
 # The MSCFILE_DIRS tag can be used to specify one or more directories that
-# contain msc files that are included in the documentation (see the
-# \mscfile command).
+# contain msc files that are included in the documentation (see the \mscfile
+# command).
 
 MSCFILE_DIRS           =
 
-# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
-# nodes that will be shown in the graph. If the number of nodes in a graph
-# becomes larger than this value, doxygen will truncate the graph, which is
-# visualized by representing a node as a red box. Note that doxygen if the
-# number of direct children of the root node in a graph is already larger than
-# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
-# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+# The DIAFILE_DIRS tag can be used to specify one or more directories that
+# contain dia files that are included in the documentation (see the \diafile
+# command).
+
+DIAFILE_DIRS           =
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
+# that will be shown in the graph. If the number of nodes in a graph becomes
+# larger than this value, doxygen will truncate the graph, which is visualized
+# by representing a node as a red box. Note that doxygen if the number of direct
+# children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
+# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+# Minimum value: 0, maximum value: 10000, default value: 50.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_GRAPH_MAX_NODES    = 50
 
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
-# graphs generated by dot. A depth value of 3 means that only nodes reachable
-# from the root by following a path via at most 3 edges will be shown. Nodes
-# that lay further from the root node will be omitted. Note that setting this
-# option to 1 or 2 may greatly reduce the computation time needed for large
-# code bases. Also note that the size of a graph can be further restricted by
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
+# generated by dot. A depth value of 3 means that only nodes reachable from the
+# root by following a path via at most 3 edges will be shown. Nodes that lay
+# further from the root node will be omitted. Note that setting this option to 1
+# or 2 may greatly reduce the computation time needed for large code bases. Also
+# note that the size of a graph can be further restricted by
 # DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+# Minimum value: 0, maximum value: 1000, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 MAX_DOT_GRAPH_DEPTH    = 0
 
 # Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
-# background. This is disabled by default, because dot on Windows does not
-# seem to support this out of the box. Warning: Depending on the platform used,
-# enabling this option may lead to badly anti-aliased labels on the edges of
-# a graph (i.e. they become hard to read).
+# background. This is disabled by default, because dot on Windows does not seem
+# to support this out of the box.
+#
+# Warning: Depending on the platform used, enabling this option may lead to
+# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
+# read).
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_TRANSPARENT        = NO
 
 # Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
 # files in one run (i.e. multiple -o and -T options on the command line). This
-# makes dot run faster, but since only newer versions of dot (>1.8.10)
-# support this, this feature is disabled by default.
+# makes dot run faster, but since only newer versions of dot (>1.8.10) support
+# this, this feature is disabled by default.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_MULTI_TARGETS      = YES
 
-# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
-# generate a legend page explaining the meaning of the various boxes and
-# arrows in the dot generated graphs.
+# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
+# explaining the meaning of the various boxes and arrows in the dot generated
+# graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 GENERATE_LEGEND        = YES
 
-# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
-# remove the intermediate dot files that are used to generate
-# the various graphs.
+# If the DOT_CLEANUP tag is set to YES doxygen will remove the intermediate dot
+# files that are used to generate the various graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_CLEANUP            = YES
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index 1ed08904..a3bfc331 100644
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -536,7 +536,7 @@
      terminal window when packages are installed, upgraded or
      removed. For a machine parsable version of this data see
      README.progress-reporting in the apt doc directory.
-     Configuration Item: <literal>DpkgPM::Progress</literal> and <literal>Dpkg::Progress-Fancy</literal>.</para></listitem>
+     Configuration Item: <literal>Dpkg::Progress</literal> and <literal>Dpkg::Progress-Fancy</literal>.</para></listitem>
      </varlistentry>
     
 
diff --git a/doc/apt-secure.8.xml b/doc/apt-secure.8.xml
index 98135161..15a73476 100644
--- a/doc/apt-secure.8.xml
+++ b/doc/apt-secure.8.xml
@@ -193,7 +193,7 @@
 <refsect1><title>See Also</title> 
 <para> 
 &apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;,
-&debsign; &debsig-verify;, &gpg;
+&debsign;, &debsig-verify;, &gpg;
 </para>
 
 <para>For more background information you might want to review the
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 24c9f678..b9d3d11d 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -225,7 +225,7 @@
 ">
 
 <!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "1.0">
+<!ENTITY apt-product-version "1.0.6">
 
 <!-- (Code)names for various things used all over the place -->
 <!ENTITY oldstable-codename "squeeze">
diff --git a/doc/apt.8.xml b/doc/apt.8.xml
index 8d3b00fb..08a65ade 100644
--- a/doc/apt.8.xml
+++ b/doc/apt.8.xml
@@ -105,8 +105,8 @@
      <listitem><para><literal>upgrade</literal> is used to install the
      newest versions of all packages currently installed on the system
      from the sources enumerated in
-     <filename>/etc/apt/sources.list</filename>. New package will be
-     installed, but existing package will never removed.
+     <filename>/etc/apt/sources.list</filename>. New packages will be
+     installed, but existing packages will never be removed.
      </para></listitem>
      </varlistentry>
 
@@ -143,12 +143,12 @@
 
  <refsect1><title>Differences to &apt-get;</title>
  <para>The <command>apt</command> command is meant to be pleasant for
- end users and does not need to be backward compatilbe like
+ end users and does not need to be backward compatible like
  &apt-get;. Therefore some options are different:
  
  <itemizedlist>
    <listitem>
-     <para>The option <literal>DPkgPM::Progress-Fancy</literal> is enabled.
+     <para>The option <literal>DPkg::Progress-Fancy</literal> is enabled.
      </para>
    </listitem>
    <listitem>
diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml
index fcbf20da..ffecc6ce 100644
--- a/doc/apt.conf.5.xml
+++ b/doc/apt.conf.5.xml
@@ -608,10 +608,11 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
    information, such as the two package caches <literal>srcpkgcache</literal> and 
    <literal>pkgcache</literal> as well as the location to place downloaded archives, 
    <literal>Dir::Cache::archives</literal>. Generation of caches can be turned off
-   by setting their names to the empty string. This will slow down startup but
-   save disk space. It is probably preferable to turn off the pkgcache rather
-   than the srcpkgcache. Like <literal>Dir::State</literal> the default
-   directory is contained in <literal>Dir::Cache</literal></para>
+   by setting <literal>pkgcache</literal> or <literal>srcpkgcache</literal> to
+   <literal>""</literal>.  This will slow down startup but save disk space. It
+   is probably preferable to turn off the pkgcache rather than the srcpkgcache.
+   Like <literal>Dir::State</literal> the default directory is contained in
+   <literal>Dir::Cache</literal></para>
 
    <para><literal>Dir::Etc</literal> contains the location of configuration files, 
    <literal>sourcelist</literal> gives the location of the sourcelist and 
diff --git a/doc/design.dbk b/doc/design.dbk
new file mode 100644
index 00000000..06743c8a
--- /dev/null
+++ b/doc/design.dbk
@@ -0,0 +1,438 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- -*- DocBook -*- -->
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent"> %aptverbatiment;
+]>
+
+<book lang="en">
+
+<title>The APT project design document</title>
+
+<bookinfo>
+
+<authorgroup>
+  <author>
+    <personname>Manoj Srivastava</personname><email>srivasta@debian.org</email>
+  </author>
+</authorgroup>
+
+<releaseinfo>Version &apt-product-version;</releaseinfo>
+
+<abstract>
+<para>
+This document is an overview of the specifications and design goals of the APT
+project. It also attempts to give a broad description of the implementation
+as well.
+</para>
+</abstract>
+
+<copyright><year>1997</year><holder>Manoj Srivastava</holder></copyright>
+
+<legalnotice>
+<title>License Notice</title>
+<para>
+APT, including this document, is free software; you may redistribute it and/or
+modify it under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2, or (at your option) any later
+version.
+</para>
+<para>
+This is distributed in the hope that it will be useful, but <emphasis>without
+any warranty</emphasis>; without even the implied warranty of merchantability
+or fitness for a particular purpose. See the GNU General Public License for
+more details.
+</para>
+<para>
+You should have received a copy of the GNU General Public License with your
+Debian system, in <literal>/usr/share/common-licenses/GPL</literal>, or with
+the <command>debiandoc-sgml</command> source package as the file
+<literal>COPYING</literal>. If not, write to the Free Software Foundation,
+Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+</para>
+</legalnotice>
+
+</bookinfo>
+
+<chapter id="introduction"><title>Introduction</title>
+<para>
+APT is supposed to be a replacement for dselect, and not a replacement for
+dpkg. However, since addition functionality has been required for APT, and
+given the fact that this is very closely related to dpkg, it is not
+unreasonable to expect that additional functionality in the underlying dpkg
+would also be requested.
+</para>
+<para>
+Deity/dselect are the first introduction that people have to Debian, and
+unfortunately this first impression contributes greatly to the public
+perception of the distribution. It is imperative that this be a showcase for
+Debian, rather than frighten novices away (which has been an accusation often
+levelled at the current system)
+</para>
+</chapter>
+
+<chapter id="ch2"><title>Requirements</title>
+<orderedlist numeration="arabic">
+<listitem>
+<para>
+APT should be a replacement for dselect. Therefore it should have all the
+functionality that dselect has currently. This is the primary means of
+interaction between the user and the package management system, and it should
+be able to handle all tasks involved in installing, upgrading, and routine
+management without having the users take recourse to the underlying management
+system.
+</para>
+</listitem>
+<listitem>
+<para>
+It should be easier to use and less confusing for novice users. The primary
+stimulus for the creation of APT was the perceived intractability, complexity,
+and non-intuitive behavior of the existing user interface, and as such, human
+factors must be a primary mandate of APT.
+</para>
+</listitem>
+<listitem>
+<para>
+It should be able to group packages more flexibly, and possibly allow
+operations based on a group. One should be able to select, or deselect,
+a coherent group of related packages simultaneously, allowing one to add,
+remove, or upgrade functionality to a machine as one step.
+</para>
+</listitem>
+<listitem>
+<para>
+This would allow APT to handle <emphasis>standard installations</emphasis>,
+namely, one could then install a set of packages to enable a machine to
+fulfill specific tasks. Define a few standard installations, and which
+packages are included therein. The packages should be internally consistent.
+</para>
+</listitem>
+<listitem>
+<para>
+Make use of a keywords field in package headers; provide a standard list of
+keywords for people to use. This could be the underpinning to allow the
+previous two requirements to work (though the developers are not constrained
+to implement the previous requirements using keywords)
+</para>
+</listitem>
+<listitem>
+<para>
+Use dependencies, conflicts, and reverse dependencies to properly order
+packages for installation and removal. This has been a complaint in the past
+that the installation methods do not really understand dependencies, causing
+the upgrade process to break, or allowing the removal of packages that left the
+system in an untenable state by breaking the dependencies on packages that were
+dependent on the package being removed. A special emphasis is placed on
+handling pre-dependencies correctly; the target of a predependency has to be
+fully configured before attempting to install the pre-dependent package. Also,
+<emphasis>configure immediately</emphasis> requests mentioned below should be
+handled.
+</para>
+</listitem>
+<listitem>
+<para>
+Handle replacement of a package providing a virtual package with another (for
+example, it has been very difficult replacing <command>sendmail</command> with
+<command>smail</command>, or vice versa), making sure that the dependencies are
+still satisfied.
+</para>
+</listitem>
+<listitem>
+<para>
+Handle source lists for updates from multiple sources. APT should also be able
+to handle diverse methods of acquiring new packages; local filesystem,
+mountable CD-ROM drives, FTP accessible repositories are some of the methods
+that come to mind. Also, the source lists can be separated into categories,
+such as main, contrib, non-us, non-local, non-free, my-very-own, etc. APT
+should be set up to retrieve the Packages files from these multiple source
+lists, as well as retrieving the packages themselves.
+</para>
+</listitem>
+<listitem>
+<para>
+Handle base of source and acquire all Packages files underneath. (possibly
+select based on architecture), this should be a simple extension of the
+previous requirement.
+</para>
+</listitem>
+<listitem>
+<para>
+Handle remote installation (to be implemented maybe in a future version, it
+still needs to be designed). This would ease the burden of maintaining
+multiple Debian machines on a site. In the authors opinion this is a killer
+difference for the distribution, though it may be too hard a problem to be
+implemented with the initial version of APT. However, some thought must be
+given to this to enable APT to retain hooks for future functionality, or at
+least to refrain from methods that may preclude remote activity. It is
+desirable that adding remote installation not require a redesign of APT from
+the ground up.
+</para>
+</listitem>
+<listitem>
+<para>
+Be scalable. Dselect worked a lot better with 400 packages, but at last count
+the number of packages was around twelve hundred and climbing. This also
+requires APT to pay attention to the needs of small machines which are low on
+memory (though this requirement shall diminish as we move towards bigger
+machines, it would still be nice if Debian worked on all old machines where
+Linux itself would work).
+</para>
+</listitem>
+<listitem>
+<para>
+Handle install immediately requests. Some packages, like watchdog, are
+required to be working for the stability of the machine itself. There are
+others which may be required for the correct functioning of a production
+machine, or which are mission critical applications. APT should, in these
+cases, upgrade the packages with minimal downtime; allowing these packages to
+be one of potentially hundreds of packages being upgraded concurrently may
+not satisfy the requirements of the package or the site. (Watchdog, for
+example, if not restarted quickly, may cause the machine to reboot in the
+midst of installation, which may cause havoc on the machine)
+</para>
+</listitem>
+</orderedlist>
+</chapter>
+
+<chapter id="ch3"><title>Procedural description</title>
+<variablelist>
+<varlistentry>
+<term>Set Options</term>
+<listitem>
+<para>
+This process handles setting of user or site options, and configuration of all
+aspects of APT. It allows the user to set the location and order of package
+sources, allowing them to set up source list details, like ftp site locations,
+passwords, etc. Display options may also be set.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Updates</term>
+<listitem>
+<para>
+Build a list of available packages, using source lists or a base location and
+trawling for Packages files (needs to be aware of architecture). This may
+involve finding and retrieving Packages files, storing them locally for
+efficiency, and parsing the data for later use. This would entail contacting
+various underlying access modules (ftp, cdrom mounts, etc) Use a backing store
+for speed. This may also require downloading the actual package files locally
+for speed.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Local status</term>
+<listitem>
+<para>
+Build up a list of packages already installed. This requires reading and
+writing the local??  status file. For remote installation, this should
+probably use similar mechanisms as the Packages file retrieval does. Use
+the backing store for speed. One should consider multiple backing stores,
+one for each machine.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Relationship determination</term>
+<listitem>
+<para>
+Determine forward and reverse dependencies. All known dependency fields should
+be acted upon, since it is fairly cheap to do so. Update the backing store
+with this information.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Selection</term>
+<listitem>
+<para>
+Present the data to the user. Look at Behan Webster's documentation for the
+user interface procedures. (Note: In the authors opinion deletions and reverse
+dependencies should also be presented to the user, in a strictly symmetric
+fashion; this may make it easier to prevent a package being removed that breaks
+dependencies)
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Ordering of package installations and configuration</term>
+<listitem>
+<para>
+Build a list of events. Simple topological sorting gives order of packages
+in dependency order. At certain points in this ordering,
+predependencies/immediate configure directives cause an break in normal
+ordering. We need to insert the uninstall/purge directive in the stream
+(default: as early as possible).
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Action</term>
+<listitem>
+<para>
+Take the order of installations and removals and build up a stream of events
+to send to the packaging system (dpkg). Execute the list of events if
+successful. Do not partially install packages and leave system in broken
+state. Go to The Selection step as needed.
+</para>
+</listitem>
+</varlistentry>
+</variablelist>
+</chapter>
+
+<chapter id="ch4"><title>Modules and interfaces</title>
+<variablelist>
+<varlistentry>
+<term>The user interface module</term>
+<listitem>
+<para>
+Look at Behan Webster's documentation.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Widget set</term>
+<listitem>
+<para>
+Related closely to above Could some one present design decisions of the widget
+set here?
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>pdate Module</term>
+<listitem>
+<para>
+Distinct versions of the same package are recorded separately, but if multiple
+Packages files contain the same version of a package, then only the first one
+is recorded. For this reason, the least expensive update source should be
+listed first (local file system is better than a remote ftp site)
+</para>
+<para>
+This module should interact with the user interface module to set and change
+configuration parameters for the modules listed below. It needs to record that
+information in an on disk data file, to be read on future invocations.
+</para>
+<orderedlist numeration="arabic">
+<listitem>
+<para>
+FTP methods
+</para>
+</listitem>
+<listitem>
+<para>
+mount and file traversal module(s)?
+</para>
+</listitem>
+<listitem>
+<para>
+Other methods ???
+</para>
+</listitem>
+</orderedlist>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Status file parser/generator</term>
+<listitem>
+<para>
+The status file records the current state of the system, listing the packages
+installed, etc. The status file is also one method of communicating with dpkg,
+since it is perfectly permissible for the user to use APT to request packages
+be updated, put others on hold, mark other for removal, etc, and then run
+<literal>dpkg -BORGiE</literal> on a file system.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Package file parser/generator</term>
+<listitem>
+<para>
+Related to above. Handle multiple Packages files, from different
+sources. Each package contains a link back to the packages file structure
+that contains details about the origin of the data.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Dependency module</term>
+<listitem>
+<itemizedlist>
+<listitem>
+<para>
+dependency/conflict determination and linking
+</para>
+</listitem>
+<listitem>
+<para>
+reverse dependency generator. Maybe merged with above
+</para>
+</listitem>
+</itemizedlist>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Package ordering Module</term>
+<listitem>
+<para>
+Create an ordering of the actions to be taken.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Event generator</term>
+<listitem>
+<para>
+module to interact with dpkg
+</para>
+</listitem>
+</varlistentry>
+</variablelist>
+</chapter>
+
+<chapter id="ch5"><title>Data flow and conversions analysis.</title>
+<screen>
+                                                          ____________
+                                                       __\|ftp modules|
+                                                      /  /|___________|
+                                    _ ____________   /     ________________
+                                    |    update   | /     |mount/local file|
+        |==========================&gt;|   module    |/_____\|  traversals    |
+        |                           |_____________|      /|________________|
+        |                             ^        ^
+        |                             |        |               ______________
+  ______|_______    _ _____ ______    |   _____v________      \|            |
+ |Configuration |   |configuration|   |   |Packages Files|  ===|Status file |
+ |  module      |&lt;=&gt;|    data     |   |   |______________| /  /|____________|
+ |______________|   |_____________|   |        ^          /
+         ^                            |        |         /
+         |                            | _______v_______|/_
+         |                            | |              |    ________________
+         |                            | |              |/_\|   Dependency  |
+         |                            | |backing store |\ /|     Module    |
+         |                            | |______________|  _|_______________|
+         |                             \       ^          /|       ^
+         |                              \      |         /         |
+         |                              _\|____v_______|/__    ____v_______
+         |_____________________________\| User interaction|    |    dpkg   |
+                                       /|_________________|&lt;==&gt;  Invoker  |
+                                                               |___________|
+</screen>
+<para>
+dpkg also interacts with status and available files.
+</para>
+<para>
+The backing store and the associated data structures are the core of APT. All
+modules essentially revolve around the backing store, feeding it data, adding
+and manipulating links and relationships between data in the backing store,
+allowing the user to interact with and modify the data in the backing store,
+and finally writing it out as the status file and possibly issuing directives
+to dpkg.
+</para>
+<para>
+The other focal point for APT is the user interface.
+</para>
+</chapter>
+
+</book>
diff --git a/doc/design.sgml b/doc/design.sgml
deleted file mode 100644
index 67406aa0..00000000
--- a/doc/design.sgml
+++ /dev/null
@@ -1,411 +0,0 @@
-<!doctype debiandoc  PUBLIC  "-//DebianDoc//DTD DebianDoc//EN">
-<debiandoc>
-  <book>
-    <titlepag>
-      <title> The APT project design document</title>
-      <author>
-	<name>Manoj Srivastava</name>
-	<email>srivasta@debian.org</email>
-      </author>
-      <version>$Id: design.sgml,v 1.4 2003/02/12 15:05:45 doogie Exp $</version>
-      <abstract>
-	This document is an overview of the specifications and design
-	goals of the APT project. It also attempts to give a broad
-	description of the implementation as well.
-      </abstract>
-      <copyright>
-	<copyrightsummary>Copyright &copy;1997 Manoj Srivastava
-	</copyrightsummary>
-	<p>
-	  APT, including this document, is free software; you may
-	  redistribute it and/or modify it under the terms of the GNU
-	  General Public License as published by the Free Software
-	  Foundation; either version 2, or (at your option) any later
-	  version.</p>
-	<p>
-	  This is distributed in the hope that it will be useful, but
-	  <em>without any warranty</em>; without even the implied
-	  warranty of merchantability or fitness for a particular
-	  purpose.  See the GNU General Public License for more
-	  details.</p>
-
-	<p>
-	  You should have received a copy of the GNU General Public
-	  License with your Debian system, in
-	  <tt>/usr/share/common-licenses/GPL</tt>, or with the
-	  <prgn/debiandoc-sgml/ source package as the file
-	  <tt>COPYING</tt>.  If not, write to the Free Software
-	  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,
-	  USA.</p>
-      </copyright>
-    </titlepag>
-    <chapt id="introduction">
-      <heading>Introduction</heading>
-      <p>APT is supposed to be a replacement for dselect, and not a 
-	replacement for dpkg. However, since addition functionality
-	has been required for APT, and given the fact that this is
-	very closely related to dpkg, it is not unreasonable to expect
-	that additional functionality in the underlying dpkg would
-	also be requested.</p>
-
-      <p> Deity/dselect are the first introduction that people have to
-	Debian, and unfortunately this first impression contributes
-	greatly to the public perception of the distribution. It is
-	imperative that this be a showcase for Debian, rather than
-	frighten novices away (which has been an accusation often
-	levelled at the current system)</p>
-    </chapt>
-    <chapt>
-      <heading>Requirements</heading>
-      <p>
-	<enumlist compact="compact">
-	  <item>
-	    <p>
-	      APT should be a replacement for dselect. Therefore it
-	      should have all the functionality that dselect has
-	      currently. This is the primary means of interaction
-	      between the user and the package management system, and
-	      it should be able to handle all tasks involved in
-	      installing, upgrading, and routine management without
-	      having the users take recourse to the underlying
-	      management system.</p>
-	  </item>
-	  <item>
-	    <p>
-	      It should be easier to use and less confusing for novice
-	      users. The primary stimulus for the creation of APT
-	      was the perceived intractability, complexity, and
-	      non-intuitive behavior of the existing user interface,
-	      and as such, human factors must be a primary mandate of
-	      APT.</p>
-	  </item>
-	  <item>
-	    <p>
-	      It should be able to group packages more flexibly, and
-	      possibly allow operations based on a group. One should
-	      be able to select, or deselect, a coherent group of
-	      related packages simultaneously, allowing one to add,
-	      remove, or upgrade functionality to a machine as one
-	      step.
-	    </p>
-	  </item>
-	  <item>
-	    <p>
-	      This would allow APT to handle <em>standard
-		installations</em>, namely, one could then install a
-	      set of packages to enable a machine to fulfill specific
-	      tasks.  Define a few standard installations, and which
-	      packages are included therein. The packages should be
-	      internally consistent.</p>
-	  </item>
-	  <item>
-	    <p>
-	      Make use of a keywords field in package headers; provide
-	      a standard list of keywords for people to use. This
-	      could be the underpinning to allow the previous two
-	      requirements to work (though the developers are not
-	      constrained to implement the previous requirements using
-	      keywords)
-	    </p>
-	  </item>
-	  <item>
-	    <p>
-	      Use dependencies, conflicts, and reverse dependencies to
-	      properly order packages for installation and
-	      removal. This has been a complaint in the past that the
-	      installation methods do not really understand
-	      dependencies, causing the upgrade process to break, or
-	      allowing the removal of packages that left the system in
-	      an untenable state by breaking the dependencies on
-	      packages that were dependent on the package being
-	      removed. A special emphasis is placed on handling
-	      pre-dependencies correctly; the target of a
-	      predependency has to be fully configured before
-	      attempting to install the pre-dependent package. Also,
-	      <em>configure immediately</em> requests mentioned below
-	      should be handled.</p>
-	  </item>
-	  <item>
-	    <p>
-	      Handle replacement of a package providing a virtual
-	      package with another (for example, it has been very
-	      difficult replacing <prgn>sendmail</prgn> with
-	      <prgn>smail</prgn>, or vice versa), making sure that the
-	      dependencies are still satisfied. </p>
-	  </item>
-	  <item>
-	    <p>
-	      Handle source lists for updates from multiple
-	      sources. APT should also be able to handle diverse
-	      methods of acquiring new packages; local filesystem,
-	      mountable CD-ROM drives, FTP accessible repositories are
-	      some of the methods that come to mind.  Also, the source
-	      lists can be separated into categories, such as main,
-	      contrib, non-us, non-local, non-free, my-very-own,
-	      etc. APT should be set up to retrieve the Packages
-	      files from these multiple source lists, as well as
-	      retrieving the packages themselves. </p>
-	  </item>
-	  <item>
-	    <p>
-	      Handle base of source and acquire all Packages files
-	      underneath.  (possibly select based on architecture),
-	      this should be a simple extension of the previous
-	      requirement.</p>
-	  </item>
-	  <item>
-	    <p>
-	      Handle remote installation (to be implemented maybe in a
-	      future version, it still needs to be designed). This
-	      would ease the burden of maintaining multiple Debian
-	      machines on a site. In the authors opinion this is a
-	      killer difference for the distribution, though it may be
-	      too hard a problem to be implemented with the initial
-	      version of APT. However, some thought must be given to
-	      this to enable APT to retain hooks for future
-	      functionality, or at least to refrain from methods that
-	      may preclude remote activity. It is desirable that
-	      adding remote installation not require a redesign of
-	      APT from the ground up.</p>
-	  </item>
-	  <item>
-	    <p>
-	      Be scalable. Dselect worked a lot better with 400
-	      packages, but at last count the number of packages was
-	      around twelve hundred and climbing. This also requires
-	      APT to pay attention to the needs of small machines
-	      which are low on memory (though this requirement shall
-	      diminish as we move towards bigger machines, it would
-	      still be nice if Debian worked on all old machines where
-	      Linux itself would work).</p>
-	  </item>
-	  <item>
-	    <p>
-	      Handle install immediately requests. Some packages, like
-	      watchdog, are required to be working for the stability
-	      of the machine itself. There are others which may be
-	      required for the correct functioning of a production
-	      machine, or which are mission critical
-	      applications. APT should, in these cases, upgrade the
-	      packages with minimal downtime; allowing these packages
-	      to be one of potentially hundreds of packages being
-	      upgraded concurrently may not satisfy the requirements
-	      of the package or the site. (Watchdog, for example, if
-	      not restarted quickly, may cause the machine to reboot
-	      in the midst of installation, which may cause havoc on
-	      the machine)</p>
-	  </item>
-	</enumlist> 
-      </p>
-    </chapt>
-    <chapt>
-      <heading>Procedural description</heading>
-      <p><taglist>
-	  <tag>Set Options</tag>
-	  <item>
-	    <p>
-	      This process handles setting of user or
-	      site options, and configuration of all aspects of
-	      APT. It allows the user to set the location and order
-	      of package sources, allowing them to set up source list
-	      details, like ftp site locations, passwords,
-	      etc. Display options may also be set.</p>
-	  </item>
-	  <tag>Updates</tag>
-	  <item>
-	    <p>
-	      Build a list of available packages, using
-	      source lists or a base location and trawling for
-	      Packages files (needs to be aware of architecture). This
-	      may involve finding and retrieving Packages files,
-	      storing them locally for efficiency, and parsing the
-	      data for later use. This would entail contacting various
-	      underlying access modules (ftp, cdrom mounts, etc) Use a
-	      backing store for speed. This may also require
-	      downloading the actual package files locally for
-	      speed.</p>
-	  </item>
-	  <tag>Local status</tag>
-	  <item>
-	    <p>
-	      Build up a list of packages already
-	      installed. This requires reading and writing the local??
-	      status file. For remote installation, this should
-	      probably use similar mechanisms as the Packages file
-	      retrieval does. Use the backing store for speed. One
-	      should consider multiple backing stores, one for each
-	      machine.
-	    </p>
-	  </item>
-	  <tag>Relationship determination</tag>
-	  <item>
-	    <p>
-	      Determine forward and reverse dependencies. All known
-	      dependency fields should be acted upon, since it is
-	      fairly cheap to do so. Update the backing store with
-	      this information.</p>
-	  </item>
-	  <tag>Selection</tag>
-	  <item>
-	    <p>
-	      Present the data to the user. Look at Behan Webster's
-	      documentation for the user interface procedures. (Note:
-	      In the authors opinion deletions and reverse
-	      dependencies should also be presented to the user, in a
-	      strictly symmetric fashion; this may make it easier to
-	      prevent a package being removed that breaks
-	      dependencies)
-	    </p>
-	  </item>
-	  <tag>Ordering of package installations and configuration </tag>
-	  <item>
-	    <p>
-	      Build a list of events. Simple topological sorting gives
-	      order of packages in dependency order. At certain points
-	      in this ordering, predependencies/immediate configure
-	      directives cause an break in normal ordering. We need to
-	      insert the uninstall/purge directive in the stream
-	      (default: as early as possible).</p>
-	  </item>
-	  <tag>Action</tag>
-	  <item>
-	    <p>
-	      Take the order of installations and removals and build
-	      up a stream of events to send to the packaging system
-	      (dpkg). Execute the list of events if successful. Do not
-	      partially install packages and leave system in broken
-	      state. Go to The Selection step as needed.</p>
-	  </item>
-
-	</taglist>
-      </p>
-    </chapt>
-    <chapt>
-      <heading>Modules and interfaces</heading>
-      <p><taglist>
-	  <tag>The user interface module</tag>
-	  <item>
-	    <p> Look at Behan Webster's documentation.</p> 
-	  </item>
-	  <tag>Widget set</tag>
-	  <item>
-	    <p>
-	      Related closely to above Could some one present design
-	      decisions of the widget set here?</p>
-	  </item>
-	  <tag>pdate Module</tag>
-	  <item>
-	    <p>	    
-	      Distinct versions of the same package are recorded
-	      separately, but if multiple Packages files contain the
-	      same version of a package, then only the first one is
-	      recorded. For this reason, the least expensive update
-	      source should be listed first (local file system is
-	      better than a remote ftp site)</p>
-	    <p>
-	      This module should interact with the user interface
-	      module to set and change configuration parameters for
-	      the modules listed below. It needs to record that
-	      information in an on disk data file, to be read on
-	      future invocations. </p>
-	    <p><enumlist>
-		<item>
-		  <p>FTP methods</p>
-		</item>
-		<item>
-		  <p>mount and file traversal module(s)?</p>
-		</item>
-		<item>
-		  <p>Other methods ???</p>
-		</item>
-	      </enumlist>
-	    </p>
-	  </item>
-	  <tag>Status file parser/generator</tag>
-	  <item>
-	    <p> 
-	      The status file records the current state of the system,
-	      listing the packages installed, etc. The status file is
-	      also one method of communicating with dpkg, since it is
-	      perfectly permissible for the user to use APT to
-	      request packages be updated, put others on hold, mark
-	      other for removal, etc, and then run <tt>dpkg
-		-BORGiE</tt> on a file system.</p>
-	  </item>
-	  <tag>Package file parser/generator</tag>
-	  <item>
-	    <p>
-	      Related to above. Handle multiple Packages files, from
-	      different sources. Each package contains a link back to
-	      the packages file structure that contains details about
-	      the origin of the data. </p>
-	  </item>
-	  <tag>Dependency module</tag>
-	  <item>
-	    <p><list>
-		<item>
-		  <p>dependency/conflict determination and linking</p>
-		</item>
-		<item>
-		  <p>reverse dependency generator. Maybe merged with above</p>
-		</item>
-	      </list>
-	    </p>
-	  </item>
-	  <tag>Package ordering Module</tag>
-	  <item>
-	    <p>Create an ordering of the actions to be taken.</p>
-	  </item>
-	  <tag>Event generator</tag>
-	  <item>
-	    <p>module to interact with dpkg</p>
-	  </item>
-	</taglist>
-    </chapt>
-    <chapt>
-      <heading>Data flow and conversions analysis.</heading>
-      <p> 
-	<example>
-                                                          ____________
-                                                       __\|ftp modules|
-                                                      /  /|___________|
-                                    _ ____________   /     ________________
-                                    |    update   | /     |mount/local file|
-        |==========================>|   module    |/_____\|  traversals    |
-        |                           |_____________|      /|________________|
-        |                             ^        ^
-        |                             |        |               ______________
-  ______|_______    _ _____ ______    |   _____v________      \|            |
- |Configuration |   |configuration|   |   |Packages Files|  ===|Status file |
- |  module      |<=>|    data     |   |   |______________| /  /|____________|
- |______________|   |_____________|   |        ^          /
-         ^                            |        |         /
-         |                            | _______v_______|/_
-         |                            | |              |    ________________
-         |                            | |              |/_\|   Dependency  |
-         |                            | |backing store |\ /|     Module    |
-         |                            | |______________|  _|_______________|
-         |                             \       ^          /|       ^
-         |                              \      |         /         |
-         |                              _\|____v_______|/__    ____v_______
-         |_____________________________\| User interaction|    |    dpkg   |
-                                       /|_________________|<==>|  Invoker  |
-                                                               |___________|
-
-	</example>
-      <p> dpkg also interacts with status and available files.</p>
-
-
-      <p>
-	The backing store and the associated data structures are the
-	core of APT. All modules essentially revolve around the
-	backing store, feeding it data, adding and manipulating links
-	and relationships between data in the backing store, allowing
-	the user to interact with and modify the data in the backing
-	store, and finally writing it out as the status file and
-	possibly issuing directives to dpkg.</p>
-
-      <p>The other focal point for APT is the user interface.</p> 
-    </chapt>
-  </book>
-</debiandoc>
diff --git a/doc/docbook-html-style.xsl b/doc/docbook-html-style.xsl
new file mode 100644
index 00000000..e4af9f55
--- /dev/null
+++ b/doc/docbook-html-style.xsl
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+  <!-- Import our base stylesheet -->
+  <xsl:import href="/usr/share/xml/docbook/stylesheet/docbook-xsl/xhtml-1_1/chunk.xsl" />
+
+  <!-- Since we use xsltproc (not saxon), add a workaround to ensure UTF-8 -->
+  <xsl:template xmlns="http://www.w3.org/1999/xhtml" name="head.content.generator">
+    <xsl:param name="node" select="."/>
+    <meta name="generator" content="DocBook {$DistroTitle} V{$VERSION}"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+  </xsl:template>
+
+  <xsl:template name="generate.html.title"/>
+
+  <xsl:template match="releaseinfo" mode="titlepage.mode">
+    <xsl:apply-imports/>
+    <hr/>
+  </xsl:template>
+
+  <xsl:param name="root.filename">index</xsl:param>
+
+  <!-- We do not want a title in HTML. -->
+  <xsl:param name="generate.meta.abstract" select="0"/>
+
+  <!-- We do not want the first subsection on the same page as content. -->
+  <xsl:param name="chunk.first.sections" select="0"/>
+  <xsl:param name="chunk.section.depth" select="0"/>
+  <xsl:param name="chunker.output.indent" select="'yes'"/>
+
+  <xsl:param name="use.id.as.filename" select="1"/>
+
+  <xsl:param name="toc.section.depth" select="1"/>
+  <xsl:param name="generate.section.toc.level" select="0"/>
+  <xsl:param name="section.label.includes.component.label" select="1"/>
+  <xsl:param name="section.autolabel" select="1"/>
+
+  <xsl:param name="generate.css.header" select="1"/>
+
+</xsl:stylesheet>
diff --git a/doc/docbook-text-style.xsl b/doc/docbook-text-style.xsl
new file mode 100644
index 00000000..376dded5
--- /dev/null
+++ b/doc/docbook-text-style.xsl
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+  <xsl:import href="/usr/share/xml/docbook/stylesheet/docbook-xsl/xhtml-1_1/docbook.xsl" />
+
+  <!-- Parameters for optimal text output. -->
+  <xsl:param name="callout.graphics" select="0"/>
+  <xsl:param name="callout.unicode" select="0"/>
+  <xsl:param name="section.autolabel" select="1"/>
+  <xsl:param name="section.label.includes.component.label" select="1"/>
+
+  <!-- Centering and aligning title elements. -->
+  <xsl:template match="/*/title[position()=1]" mode="titlepage.mode">
+    <br/>
+    <center>
+      <xsl:apply-imports/>
+    </center>
+    <br/>
+    <hr/> <!-- No underline, but at least something. -->
+  </xsl:template>
+  <xsl:template match="author|editor" mode="titlepage.mode">
+    <center>
+      <xsl:apply-imports/>
+    </center>
+  </xsl:template>
+
+  <xsl:template match="releaseinfo" mode="titlepage.mode">
+    <center>
+      <xsl:apply-imports/>
+    </center>
+    <hr/>
+  </xsl:template>
+
+  <!-- Dirty hack to get a left margin for paragraphs etc. -->
+  <xsl:template match="legalnotice/*
+        |chapter/*[not(name(.)='section') and not(name(.)='title')]
+        |section/*[not(name(.)='section') and not(name(.)='title')]
+        |appendix/*[not(name(.)='section') and not(name(.)='title')]
+        |footnote/*">
+    <xsl:copy><table><tr><td>&#xa0;&#xa0;&#xa0;</td><td>
+    <xsl:apply-imports/>
+    </td></tr></table></xsl:copy>
+  </xsl:template>
+
+  <!-- Skip URLs if it has something to print. -->
+  <xsl:template match="ulink[.!='']">
+    <xsl:copy-of select="."/>
+  </xsl:template>
+  <!-- Print URLs if nothing to print. -->
+  <xsl:template match="ulink[.='']">
+    <xsl:value-of select="@url"/>
+  </xsl:template>
+
+  <!-- Make clear where notes etc. begin and end. -->
+  <xsl:template match="caution|important|note|tip|warning">
+    <table width="80%" border="1">
+      <colgroup>
+        <col align="justify"/>
+      </colgroup>
+      <tbody>
+        <tr>
+          <td align="justify">
+            <xsl:apply-imports/>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/doc/dpkg-tech.dbk b/doc/dpkg-tech.dbk
new file mode 100644
index 00000000..e7d150ce
--- /dev/null
+++ b/doc/dpkg-tech.dbk
@@ -0,0 +1,895 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- -*- DocBook -*- -->
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent"> %aptverbatiment;
+]>
+
+<book lang="en">
+
+<title>dpkg technical manual</title>
+
+<bookinfo>
+
+<authorgroup>
+  <author>
+    <personname>Tom Lees</personname><email>tom@lpsg.demon.co.uk</email>
+  </author>
+</authorgroup>
+
+<releaseinfo>Version &apt-product-version;</releaseinfo>
+
+<abstract>
+<para>
+This document describes the minimum necessary workings for the APT dselect
+replacement. It gives an overall specification of what its external interface
+must look like for compatibility, and also gives details of some internal
+quirks.
+</para>
+</abstract>
+
+<copyright><year>1997</year><holder>Tom Lees</holder></copyright>
+
+<legalnotice>
+<title>License Notice</title>
+<para>
+APT and this document are free software; you can redistribute them and/or
+modify them under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or (at your
+option) any later version.
+</para>
+<para>
+For more details, on Debian systems, see the file
+/usr/share/common-licenses/GPL for the full license.
+</para>
+</legalnotice>
+
+</bookinfo>
+
+<chapter id="ch1"><title>Quick summary of dpkg's external interface</title>
+
+<section id="control"><title>Control files</title>
+<para>
+The basic dpkg package control file supports the following major features:-
+</para>
+<itemizedlist>
+<listitem>
+<para>
+5 types of dependencies:-
+</para>
+<itemizedlist>
+<listitem>
+<para>
+Pre-Depends, which must be satisfied before a package may be unpacked
+</para>
+</listitem>
+<listitem>
+<para>
+Depends, which must be satisfied before a package may be configured
+</para>
+</listitem>
+<listitem>
+<para>
+Recommends, to specify a package which if not installed may severely limit the
+usefulness of the package
+</para>
+</listitem>
+<listitem>
+<para>
+Suggests, to specify a package which may increase the productivity of the
+package
+</para>
+</listitem>
+<listitem>
+<para>
+Conflicts, to specify a package which must NOT be installed in order for the
+package to be configured
+</para>
+</listitem>
+<listitem>
+<para>
+Breaks, to specify a package which is broken by the package and which should
+therefore not be configured while broken
+</para>
+</listitem>
+</itemizedlist>
+<para>
+Each of these dependencies can specify a version and a depedency on that
+version, for example "&lt;= 0.5-1", "== 2.7.2-1", etc. The comparators
+available are:-
+</para>
+<itemizedlist>
+<listitem>
+<para>
+"&lt;&lt;" - less than
+</para>
+</listitem>
+<listitem>
+<para>
+"&lt;=" - less than or equal to
+</para>
+</listitem>
+<listitem>
+<para>
+"&gt;&gt;" - greater than
+</para>
+</listitem>
+<listitem>
+<para>
+"&gt;=" - greater than or equal to
+</para>
+</listitem>
+<listitem>
+<para>
+"==" - equal to
+</para>
+</listitem>
+</itemizedlist>
+</listitem>
+<listitem>
+<para>
+The concept of "virtual packages", which many other packages may provide,
+using the Provides mechanism. An example of this is the "httpd" virtual
+package, which all web servers should provide. Virtual package names may be
+used in dependency headers. However, current policy is that virtual packages
+do not support version numbers, so dependencies on virtual packages with
+versions will always fail.
+</para>
+</listitem>
+<listitem>
+<para>
+Several other control fields, such as Package, Version, Description, Section,
+Priority, etc., which are mainly for classification purposes. The package
+name must consist entirely of lowercase characters, plus the characters '+',
+'-', and '.'. Fields can extend across multiple lines - on the second and
+subsequent lines, there is a space at the beginning instead of a field name
+and a ':'. Empty lines must consist of the text " .", which will be ignored,
+as will the initial space for other continuation lines. This feature is
+usually only used in the Description field.
+</para>
+</listitem>
+</itemizedlist>
+</section>
+
+<section id="s1.2"><title>The dpkg status area</title>
+<para>
+The "dpkg status area" is the term used to refer to the directory where dpkg
+keeps its various status files (GNU would have you call it the dpkg shared
+state directory). This is always, on Debian systems, /var/lib/dpkg. However,
+the default directory name should not be hard-coded, but #define'd, so that
+alteration is possible (it is available via configure in dpkg 1.4.0.9 and
+above). Of course, in a library, code should be allowed to override the
+default directory, but the default should be part of the library (so that
+the user may change the dpkg admin dir simply by replacing the library).
+</para>
+<para>
+Dpkg keeps a variety of files in its status area. These are discussed later
+on in this document, but a quick summary of the files is here:-
+</para>
+<itemizedlist>
+<listitem>
+<para>
+available - this file contains a concatenation of control information from all
+the packages which dpkg knows about. This is updated using the dpkg commands
+"--update-avail &lt;file&gt;", "--merge-avail &lt;file&gt;", and
+"--clear-avail".
+</para>
+</listitem>
+<listitem>
+<para>
+status - this file contains information on the following things for every
+package:-
+</para>
+<itemizedlist>
+<listitem>
+<para>
+Whether it is installed, not installed, unpacked, removed, failed
+configuration, or half-installed (deconfigured in favour of another package).
+</para>
+</listitem>
+<listitem>
+<para>
+Whether it is selected as install, hold, remove, or purge.
+</para>
+</listitem>
+<listitem>
+<para>
+If it is "ok" (no installation problems), or "not-ok".
+</para>
+</listitem>
+<listitem>
+<para>
+It usually also contains the section and priority (so that dselect may classify
+packages not in available)
+</para>
+</listitem>
+<listitem>
+<para>
+For packages which did not initially appear in the "available" file when they
+were installed, the other control information for them.
+</para>
+</listitem>
+</itemizedlist>
+<para>
+The exact format for the "Status:" field is:
+</para>
+<screen>
+      Status: Want Flag Status
+</screen>
+<para>
+Where <replaceable>Want</replaceable> may be one of
+<emphasis>unknown</emphasis>, <emphasis>install</emphasis>,
+<emphasis>hold</emphasis>, <emphasis>deinstall</emphasis>,
+<emphasis>purge</emphasis>. <replaceable>Flag</replaceable> may
+be one of <emphasis>ok</emphasis>, <emphasis>reinstreq</emphasis>,
+<emphasis>hold</emphasis>,
+<emphasis>hold-reinstreq</emphasis>. <replaceable>Status</replaceable> may
+be one of <emphasis>not-installed</emphasis>, <emphasis>unpacked</emphasis>,
+<emphasis>half-configured</emphasis>, <emphasis>installed</emphasis>,
+<emphasis>half-installed</emphasis> <emphasis>config-files</emphasis>,
+<emphasis>post-inst-failed</emphasis>, <emphasis>removal-failed</emphasis>.
+The states are as follows:-
+</para>
+<variablelist>
+<varlistentry>
+<term>not-installed</term>
+<listitem>
+<para>
+No files are installed from the package, it has no config files left, it
+uninstalled cleanly if it ever was installed.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>unpacked</term>
+<listitem>
+<para>
+The basic files have been unpacked (and are listed in
+/var/lib/dpkg/info/[package].list. There are config files present, but the
+postinst script has _NOT_ been run.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>half-configured</term>
+<listitem>
+<para>
+The package was installed and unpacked, but the postinst script failed in some
+way.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>installed</term>
+<listitem>
+<para>
+All files for the package are installed, and the configuration was also
+successful.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>half-installed</term>
+<listitem>
+<para>
+An attempt was made to remove the packagem but there was a failure in the
+prerm script.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>config-files</term>
+<listitem>
+<para>
+The package was "removed", not "purged". The config files are left, but
+nothing else.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>post-inst-failed</term>
+<listitem>
+<para>
+Old name for half-configured. Do not use.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>removal-failed</term>
+<listitem>
+<para>
+Old name for half-installed. Do not use.
+</para>
+</listitem>
+</varlistentry>
+</variablelist>
+<para>
+The two last items are only left in dpkg for compatibility - they are
+understood by it, but never written out in this form.
+</para>
+<para>
+Please see the dpkg source code, <literal>lib/parshelp.c</literal>,
+<emphasis>statusinfos</emphasis>, <emphasis>eflaginfos</emphasis> and
+<emphasis>wantinfos</emphasis> for more details.
+</para>
+</listitem>
+<listitem>
+<para>
+info - this directory contains files from the control archive of every
+package currently installed. They are installed with a prefix of
+"&lt;packagename&gt;.". In addition to this, it also contains a file
+called &lt;package&gt;.list for every package, which contains a list
+of files. Note also that the control file is not copied into here; it
+is instead found as part of status or available.
+</para>
+</listitem>
+<listitem>
+<para>
+methods - this directory is reserved for "method"-specific files - each
+"method" has a subdirectory underneath this directory (or at least,
+it can have). In addition, there is another subdirectory "mnt", where
+misc. filesystems (floppies, CD-ROMs, etc.) are mounted.
+</para>
+</listitem>
+<listitem>
+<para>
+alternatives - directory used by the "update-alternatives" program. It
+contains one file for each "alternatives" interface, which contains
+information about all the needed symlinked files for each alternative.
+</para>
+</listitem>
+<listitem>
+<para>
+diversions - file used by the "dpkg-divert" program. Each diversion takes
+three lines. The first is the package name (or ":" for user diversion), the
+second the original filename, and the third the diverted filename.
+</para>
+</listitem>
+<listitem>
+<para>
+updates - directory used internally by dpkg. This is discussed later, in the
+section <xref linkend="updates"/>.
+</para>
+</listitem>
+<listitem>
+<para>
+parts - temporary directory used by dpkg-split
+</para>
+</listitem>
+</itemizedlist>
+</section>
+
+<section id="s1.3"><title>The dpkg library files</title>
+<para>
+These files are installed under /usr/lib/dpkg (usually), but
+/usr/local/lib/dpkg is also a possibility (as Debian policy dictates). Under
+this directory, there is a "methods" subdirectory. The methods subdirectory in
+turn contains any number of subdirectories for each general method processor
+(note that one set of method scripts can, and is, used for more than one of
+the methods listed under dselect).
+</para>
+<para>
+The following files may be found in each of these subdirectories:-
+</para>
+<itemizedlist>
+<listitem>
+<para>
+names - One line per method, two-digit priority to appear on menu at
+beginning, followed by a space, the name, and then another space and
+the short description.
+</para>
+</listitem>
+<listitem>
+<para>
+desc.&lt;name&gt; - Contains the long description displayed by dselect
+when the cursor is put over the &lt;name&gt; method.
+</para>
+</listitem>
+<listitem>
+<para>
+setup - Script or program which sets up the initial values to be used
+by this method. Called with first argument as the status area directory
+(/var/lib/dpkg), second argument as the name of the method (as in the
+directory name), and the third argument as the option (as in the names file).
+</para>
+</listitem>
+<listitem>
+<para>
+install - Script/program called when the "install" option of dselect is run
+with this method. Same arguments as for setup.
+</para>
+</listitem>
+<listitem>
+<para>
+update - Script/program called when the "update" option of dselect is
+run. Same arguments as for setup/install.
+</para>
+</listitem>
+</itemizedlist>
+</section>
+
+<section id="s1.4"><title>The "dpkg" command-line utility</title>
+
+<section id="s1.4.1"><title>"Documented" command-line interfaces</title>
+<para>
+As yet unwritten. You can refer to the other manuals for now. See
+<citerefentry><refentrytitle>dpkg</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
+</para>
+</section>
+
+<section id="s1.4.2"><title>Environment variables which dpkg responds to</title>
+<itemizedlist>
+<listitem>
+<para>
+DPKG_NO_TSTP - if set to a non-null value, this variable causes dpkg to run a
+child shell process instead of sending itself a SIGTSTP, when the user selects
+to background the dpkg process when it asks about conffiles.
+</para>
+</listitem>
+<listitem>
+<para>
+SHELL - used to determine which shell to run in the case when DPKG_NO_TSTP
+is set.
+</para>
+</listitem>
+<listitem>
+<para>
+CC - used as the C compiler to call to determine the target architecture. The
+default is "gcc".
+</para>
+</listitem>
+<listitem>
+<para>
+PATH - dpkg checks that it can find at least the following files in the path
+when it wants to run package installation scripts, and gives an error if it
+cannot find all of them:-
+</para>
+<itemizedlist>
+<listitem>
+<para>
+ldconfig
+</para>
+</listitem>
+<listitem>
+<para>
+start-stop-daemon
+</para>
+</listitem>
+<listitem>
+<para>
+install-info
+</para>
+</listitem>
+<listitem>
+<para>
+update-rc.d
+</para>
+</listitem>
+</itemizedlist>
+</listitem>
+</itemizedlist>
+</section>
+
+<section id="s1.4.3"><title>Assertions</title>
+<para>
+The dpkg utility itself is required for quite a number of packages, even if
+they have been installed with a tool totally separate from dpkg. The reason
+for this is that some packages, in their pre-installation scripts, check that
+your version of dpkg supports certain features. This was broken from the
+start, and it should have actually been a control file header "Dpkg-requires",
+or similar. What happens is that the configuration scripts will abort or
+continue according to the exit code of a call to dpkg, which will stop them
+from being wrongly configured.
+</para>
+<para>
+These special command-line options, which simply return as true or false are
+all prefixed with "--assert-". Here is a list of them (without the prefix):-
+</para>
+<itemizedlist>
+<listitem>
+<para>
+support-predepends - Returns success or failure according to whether a version
+of dpkg which supports predepends properly (1.1.0 or above) is installed,
+according to the database.
+</para>
+</listitem>
+<listitem>
+<para>
+working-epoch - Return success or failure according to whether a version of
+dpkg which supports epochs in version properly (1.4.0.7 or above) is installed,
+according to the database.
+</para>
+</listitem>
+</itemizedlist>
+<para>
+Both these options check the status database to see what version of the
+"dpkg" package is installed, and check it against a known working version.
+</para>
+</section>
+
+<section id="s1.4.4"><title>--predep-package</title>
+<para>
+This strange option is described as follows in the source code:
+</para>
+<screen>
+/* Print a single package which:
+ *  (a) is the target of one or more relevant predependencies.
+ *  (b) has itself no unsatisfied pre-dependencies.
+ * If such a package is present output is the Packages file entry,
+ *  which can be massaged as appropriate.
+ * Exit status:
+ *  0 = a package printed, OK
+ *  1 = no suitable package available
+ *  2 = error
+ */
+</screen>
+<para>
+On further inspection of the source code, it appears that what is does is
+this:-
+</para>
+<itemizedlist>
+<listitem>
+<para>
+Looks at the packages in the database which are selected as "install",
+and are installed.
+</para>
+</listitem>
+<listitem>
+<para>
+It then looks at the Pre-Depends information for each of these packages
+from the available file. When it find a package for which any of the
+pre-dependencies are not satisfied, it breaks from the loop through the
+packages.
+</para>
+</listitem>
+<listitem>
+<para>
+It then looks through the unsatisfied pre-dependencies, and looks for
+packages which would satisfy this pre-dependency, stopping on the first
+it finds. If it finds none, it bombs out with an error.
+</para>
+</listitem>
+<listitem>
+<para>
+It then continues this for every dependency of the initial package.
+</para>
+</listitem>
+</itemizedlist>
+<para>
+Eventually, it writes out the record of all the packages to satisfy the
+pre-dependencies. This is used by the disk method to make sure that its
+dependency ordering is correct. What happens is that all pre-depending
+packages are first installed, then it runs dpkg -iGROEB on the directory,
+which installs in the order package files are found. Since pre-dependencies
+mean that a package may not even be unpacked unless they are satisfied, it
+is necessary to do this (usually, since all the package files are unpacked
+in one phase, the configured in another, this is not needed).
+</para>
+</section>
+
+</section>
+
+</chapter>
+
+<chapter id="ch2"><title>dpkg-deb and .deb file internals</title>
+<para>
+This chapter describes the internals to the "dpkg-deb" tool, which is used by
+"dpkg" as a back-end. dpkg-deb has its own tar extraction functions, which is
+the source of many problems, as it does not support long filenames, using
+extension blocks.
+</para>
+
+<section id="s2.1"><title>The .deb archive format</title>
+<para>
+The main principal of the new-format Debian archive (I won't describe the old
+format - for that have a look at deb-old.5), is that the archive really is an
+archive - as used by "ar" and friends. However, dpkg-deb uses this format
+internally, rather than calling "ar". Inside this archive, there are usually
+the following members:-
+</para>
+<itemizedlist>
+<listitem>
+<para>
+debian-binary
+</para>
+</listitem>
+<listitem>
+<para>
+control.tar.gz
+</para>
+</listitem>
+<listitem>
+<para>
+data.tar.gz
+</para>
+</listitem>
+</itemizedlist>
+<para>
+The debian-binary member consists simply of the string "2.0", indicating
+the format version. control.tar.gz contains the control files (and scripts),
+and the data.tar.gz contains the actual files to populate the filesystem
+with. Both tarfiles extract straight into the current directory. Information
+on the tar formats can be found in the GNU tar info page. Since dpkg-deb
+calls "tar -cf" to build packages, the Debian packages use the GNU extensions.
+</para>
+</section>
+
+<section id="s2.2"><title>The dpkg-deb command-line</title>
+<para>
+dpkg-deb documents itself thoroughly with its '--help' command-line
+option. However, I am including a reference to these for
+completeness. dpkg-deb supports the following options:-
+</para>
+<itemizedlist>
+<listitem>
+<para>
+--build (-b) &lt;dir&gt; - builds a .deb archive, takes a directory which
+contains all the files as an argument. Note that the directory
+&lt;dir&gt;/DEBIAN will be packed separately into the control archive.
+</para>
+</listitem>
+<listitem>
+<para>
+--contents (-c) &lt;debfile&gt; - Lists the contents of the "data.tar.gz"
+member.
+</para>
+</listitem>
+<listitem>
+<para>
+--control (-e) &lt;debfile&gt; - Extracts the control archive into a directory
+called DEBIAN. Alternatively, with another argument, it will extract it into a
+different directory.
+</para>
+</listitem>
+<listitem>
+<para>
+--info (-I) &lt;debfile&gt; - Prints the contents of the "control" file in the
+control archive to stdout. Alternatively, giving it other arguments will cause
+it to print the contents of those files instead.
+</para>
+</listitem>
+<listitem>
+<para>
+--field (-f) &lt;debfile&gt; &lt;field&gt; ... - Prints any number of fields
+from the "control" file. Giving it extra arguments limits the fields it prints
+to only those specified. With no command-line arguments other than a filename,
+it is equivalent to -I and just the .deb filename.
+</para>
+</listitem>
+<listitem>
+<para>
+--extract (-x) &lt;debfile&gt; &lt;dir&gt; - Extracts the data archive of a
+debian package under the directory &lt;dir&gt;.
+</para>
+</listitem>
+<listitem>
+<para>
+--vextract (-X) &lt;debfile&gt; &lt;dir&gt; - Same as --extract, except it
+is equivalent of giving tar the '-v' option - it prints the filenames as it
+extracts them.
+</para>
+</listitem>
+<listitem>
+<para>
+--fsys-tarfile &lt;debfile&gt; - This option outputs a gunzip'd version of
+data.tar.gz to stdout.
+</para>
+</listitem>
+<listitem>
+<para>
+--new - sets the archive format to be used to the new Debian format
+</para>
+</listitem>
+<listitem>
+<para>
+--old - sets the archive format to be used to the old Debian format
+</para>
+</listitem>
+<listitem>
+<para>
+--debug - Tells dpkg-deb to produce debugging output
+</para>
+</listitem>
+<listitem>
+<para>
+--nocheck - Tells dpkg-deb not to check the sanity of the control file
+</para>
+</listitem>
+<listitem>
+<para>
+--help (-h) - Gives a help message
+</para>
+</listitem>
+<listitem>
+<para>
+--version - Shows the version number
+</para>
+</listitem>
+<listitem>
+<para>
+--licence/--license (UK/US spellings) - Shows a brief outline of the GPL
+</para>
+</listitem>
+</itemizedlist>
+
+<section id="s2.2.1"><title>Internal checks used by dpkg-deb when building packages</title>
+<para>
+Here is a list of the internal checks used by dpkg-deb when building
+packages. It is in the order they are done.
+</para>
+<itemizedlist>
+<listitem>
+<para>
+First, the output Debian archive argument, if it is given, is checked using
+stat. If it is a directory, an internal flag is set. This check is only made
+if the archive name is specified explicitly on the command-line. If the
+argument was not given, the default is the directory name, with ".deb"
+appended.
+</para>
+</listitem>
+<listitem>
+<para>
+Next, the control file is checked, unless the --nocheck flag was specified on
+the command-line. dpkg-deb will bomb out if the second argument to --build was
+a directory, and --nocheck was specified. Note that dpkg-deb will not be able
+to determine the name of the package in this case. In the control file, the
+following things are checked:-
+</para>
+<itemizedlist>
+<listitem>
+<para>
+The package name is checked to see if it contains any invalid characters (see
+<xref linkend="control"/> for this).
+</para>
+</listitem>
+<listitem>
+<para>
+The priority field is checked to see if it uses standard values, and
+user-defined values are warned against. However, note that this check is now
+redundant, since the control file no longer contains the priority - the
+changes file now does this.
+</para>
+</listitem>
+<listitem>
+<para>
+The control file fields are then checked against the standard list of fields
+which appear in control files, and any "user-defined" fields are reported as
+warnings.
+</para>
+</listitem>
+<listitem>
+<para>
+dpkg-deb then checks that the control file contains a valid version number.
+</para>
+</listitem>
+</itemizedlist>
+</listitem>
+<listitem>
+<para>
+After this, in the case where a directory was specified to build the .deb file
+in, the filename is created as "directory/pkg_ver.deb" or
+"directory/pkg_ver_arch.deb", depending on whether the control file contains
+an architecture field.
+</para>
+</listitem>
+<listitem>
+<para>
+Next, dpkg-deb checks for the &lt;dir&gt;/DEBIAN directory. It complains if it
+doesn't exist, or if it has permissions &lt; 0755, or &gt; 0775.
+</para>
+</listitem>
+<listitem>
+<para>
+It then checks that all the files in this subdir are either symlinks or plain
+files, and have permissions between 0555 and 0775.
+</para>
+</listitem>
+<listitem>
+<para>
+The conffiles file is then checked to see if the filenames are too
+long. Warnings are produced for each that is. After this, it checks
+that the package provides initial copies of each of these conffiles,
+and that they are all plain files.
+</para>
+</listitem>
+</itemizedlist>
+</section>
+
+</section>
+
+</chapter>
+
+<chapter id="ch3"><title>dpkg internals</title>
+<para>
+This chapter describes the internals of dpkg itself. Although the low-level
+formats are quite simple, what dpkg does in certain cases often does not make
+sense.
+</para>
+
+<section id="updates"><title>Updates</title>
+<para>
+This describes the /var/lib/dpkg/updates directory. The function of this
+directory is somewhat strange, and seems only to be used internally. A
+function called cleanupdates is called whenever the database is scanned. This
+function in turn uses
+<citerefentry><refentrytitle>scandir</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+to sort the files in this directory. Files who names do not consist entirely
+of digits are discarded. dpkg also causes a fatal error if any of the
+filenames are different lengths.
+</para>
+<para>
+After having scanned the directory, dpkg in turn parses each file the same way
+it parses the status file (they are sorted by the scandir to be in numerical
+order). After having done this, it then writes the status information back to
+the "status" file, and removes all the "updates" files.
+</para>
+<para>
+These files are created internally by dpkg's "checkpoint" function, and are
+cleaned up when dpkg exits cleanly.
+</para>
+<para>
+Juding by the use of the updates directory I would call it a Journal. Inorder
+to efficiently ensure the complete integrity of the status file dpkg will
+"checkpoint" or journal all of it's activities in the updates directory. By
+merging the contents of the updates directory (in order!!) against the original
+status file it can get the precise current state of the system, even in the
+event of a system failure while dpkg is running.
+</para>
+<para>
+The other option would be to sync-rewrite the status file after each operation,
+which would kill performance.
+</para>
+<para>
+It is very important that any program that uses the status file abort if the
+updates directory is not empty!  The user should be informed to run dpkg
+manually (what options though??) to correct the situation.
+</para>
+</section>
+
+<section id="s3.2"><title>What happens when dpkg reads the database</title>
+<para>
+First, the status file is read. This gives dpkg an initial idea of the
+packages that are there. Next, the updates files are read in, overriding the
+status file, and if necessary, the status file is re-written, and updates files
+are removed. Finally, the available file is read. The available file is read
+with flags which preclude dpkg from updating any status information from it,
+though - installed version, etc., and is also told to record that the packages
+it reads this time are available, not installed.
+</para>
+<para>
+More information on updates is given above.
+</para>
+</section>
+
+<section id="s3.3"><title>How dpkg compares version numbers</title>
+<para>
+Version numbers consist of three parts: the epoch, the upstream version, and
+the Debian revision. Dpkg compares these parts in that order. If the epochs
+are different, it returns immediately, and so on.
+</para>
+<para>
+However, the important part is how it compares the versions which are
+essentially stored as just strings. These are compared in two distinct
+parts: those consisting of numerical characters (which are evaluated, and
+then compared), and those consisting of other characters. When comparing
+non-numerical parts, they are compared as the character values (ASCII),
+but non-alphabetical characters are considered "greater than" alphabetical
+ones. Also note that longer strings (after excluding differences where
+numerical values are equal) are considered "greater than" shorter ones.
+</para>
+<para>
+Here are a few examples of how these rules apply:-
+</para>
+<screen>
+15 &gt; 10
+0010 == 10
+
+d.r &gt; dsr
+32.d.r == 0032.d.r
+d.rnr &lt; d.rnrn
+</screen>
+</section>
+
+</chapter>
+
+</book>
diff --git a/doc/dpkg-tech.sgml b/doc/dpkg-tech.sgml
deleted file mode 100644
index ce0c5fa8..00000000
--- a/doc/dpkg-tech.sgml
+++ /dev/null
@@ -1,511 +0,0 @@
-<!doctype debiandoc  PUBLIC  "-//DebianDoc//DTD DebianDoc//EN">
-<book>
-<title>dpkg technical manual</title>
-
-<author>Tom Lees <email>tom@lpsg.demon.co.uk</email></author>
-<version>$Id: dpkg-tech.sgml,v 1.3 2003/02/12 15:05:45 doogie Exp $</version>
-
-<abstract>
-This document describes the minimum necessary workings for the APT dselect
-replacement. It gives an overall specification of what its external interface
-must look like for compatibility, and also gives details of some internal
-quirks.
-</abstract>
-
-<copyright>
-Copyright &copy; Tom Lees, 1997.
-<p>
-APT and this document are free software; you can redistribute them and/or
-modify them under the terms of the GNU General Public License as published
-by the Free Software Foundation; either version 2 of the License, or (at your
-option) any later version.
-
-<p>
-For more details, on Debian systems, see the file
-/usr/share/common-licenses/GPL for the full license.
-</copyright>
-
-<toc sect>
-
-<chapt>Quick summary of dpkg's external interface
-<sect id="control">Control files
-
-<p>
-The basic dpkg package control file supports the following major features:-
-
-<list>
-<item>5 types of dependencies:-
-	<list>
-	<item>Pre-Depends, which must be satisfied before a package may be
-	unpacked
-	<item>Depends, which must be satisfied before a package may be
-	configured
-	<item>Recommends, to specify a package which if not installed may
-	severely limit the usefulness of the package
-	<item>Suggests, to specify a package which may increase the
-	productivity of the package
-	<item>Conflicts, to specify a package which must NOT be installed
-	in order for the package to be configured
-	<item>Breaks, to specify a package which is broken by the
-	package and which should therefore not be configured while broken
-	</list>
-Each of these dependencies can specify a version and a depedency on that
-version, for example "<= 0.5-1", "== 2.7.2-1", etc. The comparators available
-are:-
-	<list>
-	<item>"&lt;&lt;" - less than
-	<item>"&lt;=" - less than or equal to
-	<item>"&gt;&gt;" - greater than
-	<item>"&gt;=" - greater than or equal to
-	<item>"==" - equal to
-	</list>
-<item>The concept of "virtual packages", which many other packages may provide,
-using the Provides mechanism. An example of this is the "httpd" virtual package,
-which all web servers should provide. Virtual package names may be used in
-dependency headers. However, current policy is that virtual packages do not
-support version numbers, so dependencies on virtual packages with versions
-will always fail.
-<item>Several other control fields, such as Package, Version, Description,
-Section, Priority, etc., which are mainly for classification purposes. The
-package name must consist entirely of lowercase characters, plus the characters
-'+', '-', and '.'. Fields can extend across multiple lines - on the second
-and subsequent lines, there is a space at the beginning instead of a field
-name and a ':'. Empty lines must consist of the text " .", which will be
-ignored, as will the initial space for other continuation lines. This feature
-is usually only used in the Description field.
-</list>
-
-<sect>The dpkg status area
-
-<p>
-The "dpkg status area" is the term used to refer to the directory where dpkg
-keeps its various status files (GNU would have you call it the dpkg shared
-state directory). This is always, on Debian systems, /var/lib/dpkg. However,
-the default directory name should not be hard-coded, but #define'd, so that
-alteration is possible (it is available via configure in dpkg 1.4.0.9 and
-above). Of course, in a library, code should be allowed to override the
-default directory, but the default should be part of the library (so that
-the user may change the dpkg admin dir simply by replacing the library).
-
-<p>
-Dpkg keeps a variety of files in its status area. These are discussed later
-on in this document, but a quick summary of the files is here:-
-
-<list>
-<item>available - this file contains a concatenation of control information
-from all the packages which dpkg knows about. This is updated using the dpkg
-commands "--update-avail &lt;file&gt;", "--merge-avail &lt;file&gt;", and
-"--clear-avail".
-<item>status - this file contains information on the following things for
-every package:-
-	<list>
-	<item>Whether it is installed, not installed, unpacked, removed,
-		failed configuration, or half-installed (deconfigured in
-		favour of another package).
-	<item>Whether it is selected as install, hold, remove, or purge.
-	<item>If it is "ok" (no installation problems), or "not-ok".
-	<item>It usually also contains the section and priority (so that
-		dselect may classify packages not in available)
-	<item>For packages which did not initially appear in the "available"
-		file when they were installed, the other control information
-		for them.
-	</list>
-   <p>
-   The exact format for the "Status:" field is:
-   <example>
-      Status: Want Flag Status
-   </example>
-   Where <var>Want</> may be one of <em>unknown</>, <em>install</>,
-   <em>hold</>, <em>deinstall</>, <em>purge</>. <var>Flag</>
-   may be one of <em>ok</>, <em>reinstreq</>, <em>hold</>,
-   <em>hold-reinstreq</>.
-   <var>Status</> may be one of <em>not-installed</>, <em>unpacked</>, 
-   <em>half-configured</>, <em>installed</>, <em>half-installed</>
-   <em>config-files</>, <em>post-inst-failed</>, <em>removal-failed</>.
-   The states are as follows:-
-   <taglist>
-     <tag>not-installed
-     <item>No files are installed from the package, it has no config files
-        left, it uninstalled cleanly if it ever was installed.
-     <tag>unpacked
-     <item>The basic files have been unpacked (and are listed in
-        /var/lib/dpkg/info/[package].list. There are config files present,
-        but the postinst script has _NOT_ been run.
-     <tag>half-configured
-     <item>The package was installed and unpacked, but the postinst script
-        failed in some way.
-     <tag>installed
-     <item>All files for the package are installed, and the configuration
-        was also successful.
-     <tag>half-installed
-     <item>An attempt was made to remove the packagem but there was a failure
-        in the prerm script.
-     <tag>config-files
-     <item>The package was "removed", not "purged". The config files are left,
-        but nothing else.
-     <tag>post-inst-failed
-     <item>Old name for half-configured. Do not use.
-     <tag>removal-failed
-     <item>Old name for half-installed. Do not use.
-   </taglist>
-   The two last items are only left in dpkg for compatibility - they are
-   understood by it, but never written out in this form.
-
-   <p>
-   Please see the dpkg source code, <tt>lib/parshelp.c</tt>, 
-   <em>statusinfos</>, <em>eflaginfos</> and <em>wantinfos</> for more 
-   details.
-   
-<item>info - this directory contains files from the control archive of every
-package currently installed. They are installed with a prefix of "&lt;packagename&gt;.".
-In addition to this, it also contains a file called &lt;package&gt;.list for every
-package, which contains a list of files. Note also that the control file is
-not copied into here; it is instead found as part of status or available.
-<item>methods - this directory is reserved for "method"-specific files - each
-"method" has a subdirectory underneath this directory (or at least, it can
-have). In addition, there is another subdirectory "mnt", where misc.
-filesystems (floppies, CD-ROMs, etc.) are mounted.
-<item>alternatives - directory used by the "update-alternatives" program. It
-contains one file for each "alternatives" interface, which contains information
-about all the needed symlinked files for each alternative.
-<item>diversions - file used by the "dpkg-divert" program. Each diversion takes
-three lines. The first is the package name (or ":" for user diversion), the
-second the original filename, and the third the diverted filename.
-<item>updates - directory used internally by dpkg. This is discussed later,
-in the section <ref id="updates">.
-<item>parts - temporary directory used by dpkg-split
-</list>
-
-<sect>The dpkg library files
-
-<p>
-These files are installed under /usr/lib/dpkg (usually), but
-/usr/local/lib/dpkg is also a possibility (as Debian policy dictates). Under
-this directory, there is a "methods" subdirectory. The methods subdirectory
-in turn contains any number of subdirectories for each general method
-processor (note that one set of method scripts can, and is, used for more than
-one of the methods listed under dselect).
-
-<p>
-The following files may be found in each of these subdirectories:-
-
-<list>
-<item>names - One line per method, two-digit priority to appear on menu
-at beginning, followed by a space, the name, and then another space and the
-short description.
-<item>desc.&lt;name&gt; - Contains the long description displayed by dselect
-when the cursor is put over the &lt;name&gt; method.
-<item>setup - Script or program which sets up the initial values to be used
-by this method. Called with first argument as the status area directory
-(/var/lib/dpkg), second argument as the name of the method (as in the directory
-name), and the third argument as the option (as in the names file).
-<item>install - Script/program called when the "install" option of dselect is
-run with this method. Same arguments as for setup.
-<item>update - Script/program called when the "update" option of dselect is
-run. Same arguments as for setup/install.
-</list>
-
-<sect>The "dpkg" command-line utility
-
-<sect1>"Documented" command-line interfaces
-
-<p>
-As yet unwritten. You can refer to the other manuals for now. See
-<manref name="dpkg" section="8">.
-
-<sect1>Environment variables which dpkg responds to
-
-<p>
-<list>
-<item>DPKG_NO_TSTP - if set to a non-null value, this variable causes dpkg to
-run a child shell process instead of sending itself a SIGTSTP, when the user
-selects to background the dpkg process when it asks about conffiles.
-<item>SHELL - used to determine which shell to run in the case when
-DPKG_NO_TSTP is set.
-<item>CC - used as the C compiler to call to determine the target architecture.
-The default is "gcc".
-<item>PATH - dpkg checks that it can find at least the following files in the
-path when it wants to run package installation scripts, and gives an error if
-it cannot find all of them:-
-	<list>
-	<item>ldconfig
-	<item>start-stop-daemon
-	<item>install-info
-	<item>update-rc.d
-	</list>
-</list>
-
-<sect1>Assertions
-
-<p>
-The dpkg utility itself is required for quite a number of packages, even if
-they have been installed with a tool totally separate from dpkg. The reason for
-this is that some packages, in their pre-installation scripts, check that your
-version of dpkg supports certain features. This was broken from the start, and
-it should have actually been a control file header "Dpkg-requires", or similar.
-What happens is that the configuration scripts will abort or continue according
-to the exit code of a call to dpkg, which will stop them from being wrongly
-configured.
-
-<p>
-These special command-line options, which simply return as true or false are
-all prefixed with "--assert-". Here is a list of them (without the prefix):-
-
-<list>
-<item>support-predepends - Returns success or failure according to whether
-a version of dpkg which supports predepends properly (1.1.0 or above) is
-installed, according to the database.
-<item>working-epoch - Return success or failure according to whether a version
-of dpkg which supports epochs in version properly (1.4.0.7 or above) is
-installed, according to the database.
-</list>
-
-<p>
-Both these options check the status database to see what version of the "dpkg"
-package is installed, and check it against a known working version.
-
-<sect1>--predep-package
-
-<p>
-This strange option is described as follows in the source code:
-
-<example>
-/* Print a single package which:
- *  (a) is the target of one or more relevant predependencies.
- *  (b) has itself no unsatisfied pre-dependencies.
- * If such a package is present output is the Packages file entry,
- *  which can be massaged as appropriate.
- * Exit status:
- *  0 = a package printed, OK
- *  1 = no suitable package available
- *  2 = error
- */
-</example>
-
-<p>
-On further inspection of the source code, it appears that what is does is
-this:-
-
-<list>
-<item>Looks at the packages in the database which are selected as "install",
-and are installed.
-<item>It then looks at the Pre-Depends information for each of these packages
-from the available file. When it find a package for which any of the
-pre-dependencies are not satisfied, it breaks from the loop through the packages.
-<item>It then looks through the unsatisfied pre-dependencies, and looks for
-packages which would satisfy this pre-dependency, stopping on the first it
-finds. If it finds none, it bombs out with an error.
-<item>It then continues this for every dependency of the initial package.
-</list>
-
-Eventually, it writes out the record of all the packages to satisfy the
-pre-dependencies. This is used by the disk method to make sure that its
-dependency ordering is correct. What happens is that all pre-depending
-packages are first installed, then it runs dpkg -iGROEB on the directory,
-which installs in the order package files are found. Since pre-dependencies
-mean that a package may not even be unpacked unless they are satisfied, it is
-necessary to do this (usually, since all the package files are unpacked in one
-phase, the configured in another, this is not needed).
-
-<chapt>dpkg-deb and .deb file internals
-
-<p>
-This chapter describes the internals to the "dpkg-deb" tool, which is used
-by "dpkg" as a back-end. dpkg-deb has its own tar extraction functions, which
-is the source of many problems, as it does not support long filenames, using
-extension blocks.
-
-<sect>The .deb archive format
-
-<p>
-The main principal of the new-format Debian archive (I won't describe the old
-format - for that have a look at deb-old.5), is that the archive really is
-an archive - as used by "ar" and friends. However, dpkg-deb uses this format
-internally, rather than calling "ar". Inside this archive, there are usually
-the following members:-
-
-<list>
-<item>debian-binary
-<item>control.tar.gz
-<item>data.tar.gz
-</list>
-
-<p>
-The debian-binary member consists simply of the string "2.0", indicating the
-format version. control.tar.gz contains the control files (and scripts), and
-the data.tar.gz contains the actual files to populate the filesystem with.
-Both tarfiles extract straight into the current directory. Information on the
-tar formats can be found in the GNU tar info page. Since dpkg-deb calls
-"tar -cf" to build packages, the Debian packages use the GNU extensions.
-
-<sect>The dpkg-deb command-line 
-
-<p>
-dpkg-deb documents itself thoroughly with its '--help' command-line option.
-However, I am including a reference to these for completeness. dpkg-deb
-supports the following options:-
-
-<list>
-<item>--build (-b) &lt;dir&gt; - builds a .deb archive, takes a directory which
-contains all the files as an argument. Note that the directory
-&lt;dir&gt;/DEBIAN will be packed separately into the control archive.
-<item>--contents (-c) &lt;debfile&gt; - Lists the contents of the "data.tar.gz"
-member.
-<item>--control (-e) &lt;debfile&gt; - Extracts the control archive into a
-directory called DEBIAN. Alternatively, with another argument, it will extract
-it into a different directory.
-<item>--info (-I) &lt;debfile&gt; - Prints the contents of the "control" file
-in the control archive to stdout. Alternatively, giving it other arguments will
-cause it to print the contents of those files instead.
-<item>--field (-f) &lt;debfile&gt; &lt;field&gt; ... - Prints any number of
-fields from the "control" file. Giving it extra arguments limits the fields it
-prints to only those specified. With no command-line arguments other than a
-filename, it is equivalent to -I and just the .deb filename.
-<item>--extract (-x) &lt;debfile&gt; &lt;dir&gt; - Extracts the data archive
-of a debian package under the directory &lt;dir&gt;.
-<item>--vextract (-X) &lt;debfile&gt; &lt;dir&gt; - Same as --extract, except
-it is equivalent of giving tar the '-v' option - it prints the filenames as
-it extracts them.
-<item>--fsys-tarfile &lt;debfile&gt; - This option outputs a gunzip'd version
-of data.tar.gz to stdout.
-<item>--new - sets the archive format to be used to the new Debian format
-<item>--old - sets the archive format to be used to the old Debian format
-<item>--debug - Tells dpkg-deb to produce debugging output
-<item>--nocheck - Tells dpkg-deb not to check the sanity of the control file
-<item>--help (-h) - Gives a help message
-<item>--version - Shows the version number
-<item>--licence/--license (UK/US spellings) - Shows a brief outline of the GPL
-</list>
-
-<sect1>Internal checks used by dpkg-deb when building packages
-
-<p>
-Here is a list of the internal checks used by dpkg-deb when building packages.
-It is in the order they are done.
-
-<list>
-<item>First, the output Debian archive argument, if it is given, is checked
-using stat. If it is a directory, an internal flag is set. This check is only
-made if the archive name is specified explicitly on the command-line. If the
-argument was not given, the default is the directory name, with ".deb"
-appended.
-<item>Next, the control file is checked, unless the --nocheck flag was
-specified on the command-line. dpkg-deb will bomb out if the second argument
-to --build was a directory, and --nocheck was specified. Note that dpkg-deb
-will not be able to determine the name of the package in this case. In the
-control file, the following things are checked:-
-	<list>
-	<item>The package name is checked to see if it contains any invalid
-	characters (see <ref id="control"> for this).
-	<item>The priority field is checked to see if it uses standard values,
-	and user-defined values are warned against. However, note that this
-	check is now redundant, since the control file no longer contains
-	the priority - the changes file now does this.
-	<item>The control file fields are then checked against the standard
-	list of fields which appear in control files, and any "user-defined"
-	fields are reported as warnings.
-	<item>dpkg-deb then checks that the control file contains a valid
-	version number.
-	</list>
-<item>After this, in the case where a directory was specified to build the
-.deb file in, the filename is created as "directory/pkg_ver.deb" or
-"directory/pkg_ver_arch.deb", depending on whether the control file contains
-an architecture field.
-<item>Next, dpkg-deb checks for the &lt;dir&gt;/DEBIAN directory. It complains
-if it doesn't exist, or if it has permissions &lt; 0755, or &gt; 0775.
-<item>It then checks that all the files in this subdir are either symlinks
-or plain files, and have permissions between 0555 and 0775.
-<item>The conffiles file is then checked to see if the filenames are too
-long. Warnings are produced for each that is. After this, it checks that
-the package provides initial copies of each of these conffiles, and that
-they are all plain files.
-</list>
-
-<chapt>dpkg internals
-
-<p>
-This chapter describes the internals of dpkg itself. Although the low-level
-formats are quite simple, what dpkg does in certain cases often does not
-make sense.
-
-<sect id="updates">Updates
-
-<p>
-This describes the /var/lib/dpkg/updates directory. The function of this
-directory is somewhat strange, and seems only to be used internally. A function
-called cleanupdates is called whenever the database is scanned. This function
-in turn uses <manref name="scandir" section="3">, to sort the files in this
-directory. Files who names do not consist entirely of digits are discarded.
-dpkg also causes a fatal error if any of the filenames are different lengths.
-
-<p>
-After having scanned the directory, dpkg in turn parses each file the same way
-it parses the status file (they are sorted by the scandir to be in numerical
-order). After having done this, it then writes the status information back
-to the "status" file, and removes all the "updates" files.
-
-<p>
-These files are created internally by dpkg's "checkpoint" function, and are
-cleaned up when dpkg exits cleanly.
-
-<p>
-Juding by the use of the updates directory I would call it a Journal. Inorder
-to efficiently ensure the complete integrity of the status file dpkg will
-"checkpoint" or journal all of it's activities in the updates directory. By
-merging the contents of the updates directory (in order!!) against the 
-original status file it can get the precise current state of the system,
-even in the event of a system failure while dpkg is running.
-
-<p> 
-The other option would be to sync-rewrite the status file after each 
-operation, which would kill performance.
-
-<p>
-It is very important that any program that uses the status file abort if
-the updates directory is not empty! The user should be informed to run dpkg
-manually (what options though??) to correct the situation.
-
-<sect>What happens when dpkg reads the database
-
-<p>
-First, the status file is read. This gives dpkg an initial idea of the packages
-that are there. Next, the updates files are read in, overriding the status
-file, and if necessary, the status file is re-written, and updates files are
-removed. Finally, the available file is read. The available file is read
-with flags which preclude dpkg from updating any status information from it,
-though - installed version, etc., and is also told to record that the packages
-it reads this time are available, not installed.
-
-<p>
-More information on updates is given above.
-
-<sect>How dpkg compares version numbers
-
-<p>
-Version numbers consist of three parts: the epoch, the upstream version, and
-the Debian revision. Dpkg compares these parts in that order. If the epochs
-are different, it returns immediately, and so on.
-
-<p>
-However, the important part is how it compares the versions which are
-essentially stored as just strings. These are compared in two distinct parts:
-those consisting of numerical characters (which are evaluated, and then
-compared), and those consisting of other characters. When comparing
-non-numerical parts, they are compared as the character values (ASCII), but
-non-alphabetical characters are considered "greater than" alphabetical ones.
-Also note that longer strings (after excluding differences where numerical
-values are equal) are considered "greater than" shorter ones.
-
-<p>
-Here are a few examples of how these rules apply:-
-
-<example>
-15 > 10
-0010 == 10
-
-d.r > dsr
-32.d.r == 0032.d.r
-d.rnr < d.rnrn
-</example>
-
-</book>
diff --git a/doc/external-dependency-solver-protocol.txt b/doc/external-dependency-solver-protocol.txt
index 7a124d8f..14e9528c 100644
--- a/doc/external-dependency-solver-protocol.txt
+++ b/doc/external-dependency-solver-protocol.txt
@@ -1,10 +1,18 @@
-# APT External Dependency Solver Protocol (EDSP) - version 0.4
+# APT External Dependency Solver Protocol (EDSP) - version 0.5
 
 This document describes the communication protocol between APT and
 external dependency solvers. The protocol is called APT EDSP, for "APT
 External Dependency Solver Protocol".
 
 
+## Terminology
+
+In the following we use the term **architecture qualified package name**
+(or *arch-qualified package names* for short) to refer to package
+identifiers of the form "package:arch" where "package" is a package name
+and "arch" a dpkg architecture.
+
+
 ## Components
 
 - **APT**: we know this one.
@@ -62,6 +70,7 @@ configuration documentation for more, and more up to date, information.
 - **Dir::Bin::Solvers**: absolute path of the directory where to look for
   external solvers. Defaults to `/usr/lib/apt/solvers`.
 
+
 ## Protocol
 
 When configured to use an external solver, APT will resort to it to
@@ -110,23 +119,31 @@ Within a dependency solving scenario, a request represents the action on
 installed packages requested by the user.
 
 A request is a single Deb 822 stanza opened by a mandatory Request field
-and followed by a mixture of action and preference fields.
+and followed by a mixture of action, preference, and global
+configuration fields.
 
 The value of the **Request:** field is a string describing the EDSP
 protocol which will be used to communicate. At present, the string must
-be `EDSP 0.4`.
+be `EDSP 0.5`. Request fields are mainly used to identify the beginning
+of a request stanza; their actual values are otherwise not used by the
+EDSP protocol.
 
-a unique request identifier, such as an
-UUID. Request fields are mainly used to identify the beginning of a
-request stanza; their actual values are otherwise not used by the EDSP
-protocol.
+The following **configuration fields** are supported in request stanzas:
+
+- **Architecture:** (mandatory) The name of the *native* architecture on
+  the user machine (see also: `dpkg --print-architecture`)
+
+- **Architectures:** (optional, defaults to the native architecture) A
+  space separated list of *all* architectures known to APT (this is
+  roughly equivalent to the union of `dpkg --print-architecture` and
+  `dpkg --print-foreign-architectures`)
 
 The following **action fields** are supported in request stanzas:
 
 - **Install:** (optional, defaults to the empty string) A space
-  separated list of package names, with *no version attached*, to
-  install. This field denotes a list of packages that the user wants to
-  install, usually via an APT `install` request.
+  separated list of arch-qualified package names, with *no version
+  attached*, to install. This field denotes a list of packages that the
+  user wants to install, usually via an APT `install` request.
 
 - **Remove:** (optional, defaults to the empty string) Same syntax of
   Install. This field denotes a list of packages that the user wants to
@@ -193,7 +210,7 @@ field. The following fields are supported in package stanzas:
 - **APT-Candidate:** (optional, defaults to `no`). Allowed values:
   `yes`, `no`. When set to `yes`, the corresponding package is the APT
   candidate for installation among all available packages with the same
-  name.
+  name and architecture.
 
 - **APT-Automatic:** (optional, defaults to `no`). Allowed values:
   `yes`, `no`. When set to `yes`, the corresponding package is marked by
@@ -201,6 +218,16 @@ field. The following fields are supported in package stanzas:
   should be removed by the solver only when the Autoremove action is
   requested (see Request section).
 
+- **APT-Release:** (optional) The releases the package belongs to, according to
+  APT. The format of this field is multiline with one value per line and the
+  first line (the one containing the field name) empty. Each subsequent line
+  corresponds to one of the releases the package belongs to and looks like
+  this: `o=Debian,a=unstable,n=sid,l=Debian,c=main`. That is, each release line
+  is a comma-separated list of "key=value" pairs, each of which denotes a
+  Release file entry (Origin, Label, Codename, etc.) in the format of
+  APT_PREFERENCES(5).
+
+
 ### Answer
 
 An answer from the external solver to APT is either a *solution* or an
@@ -209,11 +236,11 @@ An answer from the external solver to APT is either a *solution* or an
 The following invariant on **exit codes** must hold true. When the
 external solver is *able to find a solution*, it will write the solution
 to standard output and then exit with an exit code of 0. When the
-external solver is *unable to find a solution* (and s aware of that), it
-will write an error to standard output and then exit with an exit code
-of 0. An exit code other than 0 will be interpreted as a solver crash
-with no meaningful error about dependency resolution to convey to the
-user.
+external solver is *unable to find a solution* (and is aware of that),
+it will write an error to standard output and then exit with an exit
+code of 0. An exit code other than 0 will be interpreted as a solver
+crash with no meaningful error about dependency resolution to convey to
+the user.
 
 
 #### Solution
diff --git a/doc/files.dbk b/doc/files.dbk
new file mode 100644
index 00000000..675c9266
--- /dev/null
+++ b/doc/files.dbk
@@ -0,0 +1,392 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- -*- DocBook -*- -->
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent"> %aptverbatiment;
+]>
+
+<book lang="en">
+
+<title>APT Files</title>
+
+<bookinfo>
+
+<authorgroup>
+  <author>
+    <personname>Jason Gunthorpe</personname><email>jgg@debian.org</email>
+  </author>
+</authorgroup>
+
+<releaseinfo>Version &apt-product-version;</releaseinfo>
+
+<abstract>
+<para>
+This document describes the complete implementation and format of the installed
+APT directory structure. It also serves as guide to how APT views the Debian
+archive.
+</para>
+</abstract>
+
+<copyright><year>1998-1999</year><holder>Jason Gunthorpe</holder></copyright>
+
+<legalnotice>
+<title>License Notice</title>
+<para>
+"APT" and this document are free software; you can redistribute them and/or
+modify them under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or (at your
+option) any later version.
+</para>
+<para>
+For more details, on Debian systems, see the file
+/usr/share/common-licenses/GPL for the full license.
+</para>
+</legalnotice>
+
+</bookinfo>
+
+<chapter id="ch1"><title>Introduction</title>
+
+<section id="s1.1"><title>General</title>
+<para>
+This document serves two purposes. The first is to document the installed
+directory structure and the format and purpose of each file. The second
+purpose is to document how APT views the Debian archive and deals with multiple
+package files.
+</para>
+<para>
+The var directory structure is as follows:
+</para>
+<screen>
+  /var/lib/apt/
+		lists/
+		       partial/
+		periodic/
+		extended_states
+		cdroms.list
+  /var/cache/apt/
+		  archives/
+		          partial/
+		  pkgcache.bin
+		  srcpkgcache.bin
+  /etc/apt/
+	    sources.list.d/
+	    apt.conf.d/
+	    preferences.d/
+	    trusted.gpg.d/
+	    sources.list
+	    apt.conf
+	    apt_preferences
+	    trusted.gpg
+  /usr/lib/apt/
+	        methods/
+			 bzip2
+			 cdrom
+			 copy
+			 file
+			 ftp
+			 gpgv
+			 gzip
+			 http
+			 https
+			 lzma
+			 rred
+			 rsh
+			 ssh
+</screen>
+<para>
+As is specified in the FHS 2.1 /var/lib/apt is used for application data that
+is not expected to be user modified. /var/cache/apt is used for regeneratable
+data and is where the package cache and downloaded .debs go. /etc/apt is the
+place where configuration should happen and /usr/lib/apt is the place where the
+apt and other packages can place binaries which can be used by the acquire
+system of APT.
+</para>
+</section>
+
+</chapter>
+
+<chapter id="ch2"><title>Files</title>
+
+<section id="s2.1"><title>Files and fragment directories in /etc/apt</title>
+<para>
+All files in /etc/apt are used to modify specific aspects of APT. To enable
+other packages to ship needed configuration herself all these files have a
+fragment directory packages can place their files in instead of mangling with
+the main files. The main files are therefore considered to be only used by the
+user and not by a package. The documentation omits this directories most of
+the time to be easier readable, so every time the documentation includes a
+reference to a main file it really means the file or the fragment directories.
+</para>
+</section>
+
+<section id="s2.2"><title>Distribution Source list (sources.list)</title>
+<para>
+The distribution source list is used to locate archives of the debian
+distribution. It is designed to support any number of active sources and to
+support a mix of source media. The file lists one source per line, with the
+fastest source listed first. The format of each line is:
+</para>
+<para>
+<replaceable>type uri args</replaceable>
+</para>
+<para>
+The first item, <replaceable>type</replaceable>, indicates the format for the
+remainder of the line. It is designed to indicate the structure of the
+distribution the line is talking about. Currently the only defined values are
+<emphasis>deb</emphasis> and <emphasis>deb-src</emphasis> which indicate a
+standard debian (source) archive with a dists directory. More about these
+types and the URI specification can be found in the sources.list manpage.
+</para>
+
+<section id="s2.2.1"><title>Hashing the URI</title>
+<para>
+All permanent information acquired from any of the sources is stored in the
+lists directory. Thus, there must be a way to relate the filename in the lists
+directory to a line in the sourcelist. To simplify things this is done by
+quoting the URI and treating _'s as quoteable characters and converting /
+to _. The URI spec says this is done by converting a sensitive character
+into %xx where xx is the hexadecimal representation from the ASCII character
+set. Examples:
+</para>
+<screen>
+http://www.debian.org/archive/dists/stable/binary-i386/Packages
+/var/lib/apt/lists/www.debian.org_archive_dists_stable_binary-i386_Packages
+
+cdrom:Debian 1.3/debian/Packages
+/var/lib/apt/info/Debian%201.3_debian_Packages
+</screen>
+<para>
+The other alternative that was considered was to use a deep directory structure
+but this poses two problems, it makes it very difficult to prune directories
+back when sources are no longer used and complicates the handling of the
+partial directory. This gives a very simple way to deal with all of the
+situations that can arise. Also note that the same rules described in the
+<emphasis>Archive Directory</emphasis> section regarding the partial sub dir
+apply here as well.
+</para>
+</section>
+
+</section>
+
+<section id="s2.3"><title>Extended States File (extended_states)</title>
+<para>
+The extended_states file serves the same purpose as the normal dpkg status
+file (/var/lib/dpkg/status) except that it stores information unique to
+apt. This includes currently only the autoflag but is open to store more
+unique data that come up over time. It duplicates nothing from the normal
+dpkg status file. Please see other APT documentation for a discussion of
+the exact internal behavior of these fields. The Package and the Architecture
+field are placed directly before the new fields to indicate which package
+they apply to. The new fields are as follows:
+</para>
+<variablelist>
+<varlistentry>
+<term>Auto-Installed</term>
+<listitem>
+<para>
+The Auto flag can be 1 (Yes) or 0 (No) and controls whether the package was
+automatical installed to satisfy a dependency or if the user requested the
+installation
+</para>
+</listitem>
+</varlistentry>
+</variablelist>
+</section>
+
+<section id="s2.4"><title>Binary Package Cache (srcpkgcache.bin and pkgcache.bin)</title>
+<para>
+Please see cache.sgml for a complete description of what this file
+is. The cache file is updated whenever the contents of the lists
+directory changes. If the cache is erased, corrupted or of a non-matching
+version it will be automatically rebuilt by all of the tools that need
+it. <emphasis>srcpkgcache.bin</emphasis> contains a cache of all of the
+package files in the source list. This allows regeneration of the cache
+when the status files change to use a prebuilt version for greater speed.
+</para>
+</section>
+
+<section id="s2.5"><title>Downloads Directory (archives)</title>
+<para>
+The archives directory is where all downloaded .deb archives go. When the file
+transfer is initiated the deb is placed in partial. Once the file is fully
+downloaded and its MD5 hash and size are verified it is moved from partial
+into archives/. Any files found in archives/ can be assumed to be verified.
+</para>
+<para>
+No directory structure is transferred from the receiving site and all .deb file
+names conform to debian conventions. No short (msdos) filename should be
+placed in archives. If the need arises .debs should be unpacked, scanned and
+renamed to their correct internal names. This is mostly to prevent file name
+conflicts but other programs may depend on this if convenient. A conforming
+.deb is one of the form, name_version_arch.deb. Our archive scripts do not
+handle epochs, but they are necessary and should be re-inserted. If necessary
+_'s and :'s in the fields should be quoted using the % convention. It must be
+possible to extract all 3 fields by examining the file name. Downloaded .debs
+must be found in one of the package lists with an exact name + version match..
+</para>
+</section>
+
+<section id="s2.6"><title>The Methods Directory (/usr/lib/apt/methods)</title>
+<para>
+The Methods directory is more fully described in the APT Methods interface
+document.
+</para>
+</section>
+
+<section id="s2.7"><title>The Configuration File (/etc/apt/apt.conf)</title>
+<para>
+The configuration file (and the associated fragments directory
+/etc/apt/apt.conf.d/) is described in the apt.conf manpage.
+</para>
+</section>
+
+<section id="s2.8"><title>The trusted.gpg File (/etc/apt/trusted.gpg)</title>
+<para>
+The trusted.gpg file (and the files in the associated fragments directory
+/etc/apt/trusted.gpg.d/) is a binary file including the keyring used by apt to
+validate that the information (e.g. the Release file) it downloads are really
+from the distributor it clams to be and is unmodified and is therefore the last
+step in the chain of trust between the archive and the end user. This security
+system is described in the apt-secure manpage.
+</para>
+</section>
+
+<section id="s2.9"><title>The Release File</title>
+<para>
+This file plays an important role in how APT presents the archive to the
+user. Its main purpose is to present a descriptive name for the source of
+each version of each package. It also is used to detect when new versions
+of debian are released. It augments the package file it is associated with
+by providing meta information about the entire archive which the Packages
+file describes.
+</para>
+<para>
+The full name of the distribution for presentation to the user is formed as
+'label version archive', with a possible extended name being 'label version
+archive component'.
+</para>
+<para>
+The file is formed as the package file (RFC-822) with the following tags
+defined:
+</para>
+<variablelist>
+<varlistentry>
+<term>Archive</term>
+<listitem>
+<para>
+This is the common name we give our archives, such as
+<emphasis>stable</emphasis> or <emphasis>unstable</emphasis>.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Component</term>
+<listitem>
+<para>
+Refers to the sub-component of the archive, <emphasis>main</emphasis>,
+<emphasis>contrib</emphasis> etc. Component may be omitted if there are no
+components for this archive.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Version</term>
+<listitem>
+<para>
+This is a version string with the same properties as in the Packages file. It
+represents the release level of the archive.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Origin</term>
+<listitem>
+<para>
+This specifies who is providing this archive. In the case of Debian the string
+will read 'Debian'. Other providers may use their own string
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Label</term>
+<listitem>
+<para>
+This carries the encompassing name of the distribution. For Debian proper this
+field reads 'Debian'. For derived distributions it should contain their proper
+name.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Architecture</term>
+<listitem>
+<para>
+When the archive has packages for a single architecture then the Architecture
+is listed here. If a mixed set of systems are represented then this should
+contain the keyword <emphasis>mixed</emphasis>.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>NotAutomatic</term>
+<listitem>
+<para>
+A Yes/No flag indicating that the archive is extremely unstable and its
+version's should never be automatically selected. This is to be used by
+experimental.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Description</term>
+<listitem>
+<para>
+Description is used to describe the release. For instance experimental would
+contain a warning that the packages have problems.
+</para>
+</listitem>
+</varlistentry>
+</variablelist>
+<para>
+The location of the Release file in the archive is very important, it must be
+located in the same location as the packages file so that it can be located in
+all situations. The following is an example for the current stable release,
+1.3.1r6
+</para>
+<screen>
+Archive: stable
+Component: main
+Version: 1.3.1r6
+Origin: Debian
+Label: Debian
+Architecture: i386
+</screen>
+<para>
+This is an example of experimental,
+</para>
+<screen>
+Archive: experimental
+Version: 0
+Origin: Debian
+Label: Debian
+Architecture: mixed
+NotAutomatic: Yes
+</screen>
+<para>
+And unstable,
+</para>
+<screen>
+Archive: unstable
+Component: main
+Version: 2.1
+Origin: Debian
+Label: Debian
+Architecture: i386
+</screen>
+</section>
+
+</chapter>
+
+
+</book>
diff --git a/doc/files.sgml b/doc/files.sgml
deleted file mode 100644
index 56c7f574..00000000
--- a/doc/files.sgml
+++ /dev/null
@@ -1,345 +0,0 @@
-<!-- -*- mode: sgml; mode: fold -*- -->
-<!doctype debiandoc  PUBLIC  "-//DebianDoc//DTD DebianDoc//EN">
-<book>
-<title>APT Files</title>
-
-<author>Jason Gunthorpe <email>jgg@debian.org</email></author>
-<version>$Id: files.sgml,v 1.12 2003/04/26 23:26:13 doogie Exp $</version>
-
-<abstract>
-This document describes the complete implementation and format of the 
-installed APT directory structure. It also serves as guide to how APT 
-views the Debian archive.
-</abstract>
-
-<copyright>
-Copyright &copy; Jason Gunthorpe, 1998-1999.
-<p>
-"APT" and this document are free software; you can redistribute them and/or
-modify them under the terms of the GNU General Public License as published
-by the Free Software Foundation; either version 2 of the License, or (at your
-option) any later version.
-
-<p>
-For more details, on Debian systems, see the file
-/usr/share/common-licenses/GPL for the full license.
-</copyright>
-
-<toc sect>
-
-<chapt>Introduction
-<!-- General		                                               {{{ -->
-<!-- ===================================================================== -->
-<sect>General
-
-<p>
-This document serves two purposes. The first is to document the installed
-directory structure and the format and purpose of each file. The second
-purpose is to document how APT views the Debian archive and deals with 
-multiple package files.
-
-<p>
-The var directory structure is as follows:
-<example>
-  /var/lib/apt/
-		lists/
-		       partial/
-		periodic/
-		extended_states
-		cdroms.list
-  /var/cache/apt/
-		  archives/
-		          partial/
-		  pkgcache.bin
-		  srcpkgcache.bin
-  /etc/apt/
-	    sources.list.d/
-	    apt.conf.d/
-	    preferences.d/
-	    trusted.gpg.d/
-	    sources.list
-	    apt.conf
-	    apt_preferences
-	    trusted.gpg
-  /usr/lib/apt/
-	        methods/
-			 bzip2
-			 cdrom
-			 copy
-			 file
-			 ftp
-			 gpgv
-			 gzip
-			 http
-			 https
-			 lzma
-			 rred
-			 rsh
-			 ssh
-</example>
-
-<p>
-As is specified in the FHS 2.1 /var/lib/apt is used for application 
-data that is not expected to be user modified. /var/cache/apt is used
-for regeneratable data and is where the package cache and downloaded .debs
-go. /etc/apt is the place where configuration should happen and
-/usr/lib/apt is the place where the apt and other packages can place
-binaries which can be used by the acquire system of APT.
-</sect>
-                                                                  <!-- }}} -->
-
-<chapt>Files
-<!-- Distribution Source List					       {{{ -->
-<!-- ===================================================================== -->
-<sect>Files and fragment directories in /etc/apt
-
-<p>
-All files in /etc/apt are used to modify specific aspects of APT. To enable
-other packages to ship needed configuration herself all these files have
-a fragment directory packages can place their files in instead of mangling
-with the main files. The main files are therefore considered to be only
-used by the user and not by a package. The documentation omits this directories
-most of the time to be easier readable, so every time the documentation includes
-a reference to a main file it really means the file or the fragment directories.
-
-</sect>
-
-<sect>Distribution Source list (sources.list)
-
-<p>
-The distribution source list is used to locate archives of the debian
-distribution. It is designed to support any number of active sources and to
-support a mix of source media. The file lists one source per line, with the 
-fastest source listed first. The format of each line is:
-
-<p>
-<var>type uri args</var>
-
-<p>
-The first item, <var>type</var>, indicates the format for the remainder 
-of the line. It is designed to indicate the structure of the distribution
-the line is talking about. Currently the only defined values are <em>deb</em>
-and <em>deb-src</em> which indicate a standard debian (source) archive with a
-dists directory. More about these types and the URI specification can be found
-in the sources.list manpage.
-
-<sect1>Hashing the URI
-<p>
-All permanent information acquired from any of the sources is stored in the
-lists directory. Thus, there must be a way to relate the filename in the
-lists directory to a line in the sourcelist. To simplify things this is
-done by quoting the URI and treating _'s as quoteable characters and
-converting / to _. The URI spec says this is done by converting a 
-sensitive character into %xx where xx is the hexadecimal representation 
-from the ASCII character set. Examples:
-
-<example>
-http://www.debian.org/archive/dists/stable/binary-i386/Packages 
-/var/lib/apt/lists/www.debian.org_archive_dists_stable_binary-i386_Packages
-
-cdrom:Debian 1.3/debian/Packages
-/var/lib/apt/info/Debian%201.3_debian_Packages
-</example>
-
-<p> 
-The other alternative that was considered was to use a deep directory 
-structure but this poses two problems, it makes it very difficult to prune
-directories back when sources are no longer used and complicates the handling
-of the partial directory. This gives a very simple way to deal with all
-of the situations that can arise. Also note that the same rules described in 
-the <em>Archive Directory</> section regarding the partial sub dir apply 
-here as well.
-</sect1>
-
-</sect>
-                                                                  <!-- }}} -->
-<!-- Extended Status						       {{{ -->
-<!-- ===================================================================== -->
-<sect>Extended States File (extended_states)
-
-<p>
-The extended_states file serves the same purpose as the normal dpkg status file
-(/var/lib/dpkg/status) except that it stores information unique to apt.
-This includes currently only the autoflag but is open to store more
-unique data that come up over time. It duplicates nothing from the normal
-dpkg status file.  Please see other APT documentation for a discussion
-of the exact internal behavior of these fields. The Package and the
-Architecture field are placed directly before the new fields to indicate
-which package they apply to. The new fields are as follows:
-
-<taglist>
-<tag>Auto-Installed<item>
-   The Auto flag can be 1 (Yes) or 0 (No) and controls whether the package
-   was automatical installed to satisfy a dependency or if the user requested
-   the installation
-</taglist>
-</sect>
-                                                                  <!-- }}} -->
-<!-- Binary Package Cache					       {{{ -->
-<!-- ===================================================================== -->
-<sect>Binary Package Cache (srcpkgcache.bin and pkgcache.bin)
-
-<p>
-Please see cache.sgml for a complete description of what this file is. The 
-cache file is updated whenever the contents of the lists directory changes.
-If the cache is erased, corrupted or of a non-matching version it will
-be automatically rebuilt by all of the tools that need it. 
-<em>srcpkgcache.bin</> contains a cache of all of the package files in the 
-source list. This allows regeneration of the cache when the status files 
-change to use a prebuilt version for greater speed.
-</sect>
-                                                                  <!-- }}} -->
-<!-- Downloads Directory					       {{{ -->
-<!-- ===================================================================== -->
-<sect>Downloads Directory (archives)
-
-<p>
-The archives directory is where all downloaded .deb archives go. When the
-file transfer is initiated the deb is placed in partial. Once the file
-is fully downloaded and its MD5 hash and size are verified it is moved
-from partial into archives/. Any files found in archives/ can be assumed 
-to be verified.
-
-<p>
-No directory structure is transferred from the receiving site and all .deb
-file names conform to debian conventions. No short (msdos) filename should
-be placed in archives. If the need arises .debs should be unpacked, scanned
-and renamed to their correct internal names. This is mostly to prevent
-file name conflicts but other programs may depend on this if convenient. 
-A conforming .deb is one of the form, name_version_arch.deb. Our archive
-scripts do not handle epochs, but they are necessary and should be re-inserted.
-If necessary _'s and :'s in the fields should be quoted using the % convention.
-It must be possible to extract all 3 fields by examining the file name.
-Downloaded .debs must be found in one of the package lists with an exact
-name + version match..
-</sect>
-                                                                  <!-- }}} -->
-<!-- The Methods Directory					       {{{ -->
-<!-- ===================================================================== -->
-<sect> The Methods Directory (/usr/lib/apt/methods)
-
-<p>
-The Methods directory is more fully described in the APT Methods interface
-document.
-</sect>
-                                                                  <!-- }}} -->
-<!-- The Configuration File					       {{{ -->
-<!-- ===================================================================== -->
-<sect> The Configuration File (/etc/apt/apt.conf)
-
-<p>
-The configuration file (and the associated fragments directory
-/etc/apt/apt.conf.d/) is described in the apt.conf manpage.
-</sect>
-                                                                  <!-- }}} -->
-<!-- The trusted.gpg File					       {{{ -->
-<!-- ===================================================================== -->
-<sect> The trusted.gpg File (/etc/apt/trusted.gpg)
-
-<p>
-The trusted.gpg file (and the files in the associated fragments directory
-/etc/apt/trusted.gpg.d/) is a binary file including the keyring used
-by apt to validate that the information (e.g. the Release file) it
-downloads are really from the distributor it clams to be and is
-unmodified and is therefore the last step in the chain of trust between
-the archive and the end user. This security system is described in the
-apt-secure manpage.
-</sect>
-                                                                  <!-- }}} -->
-<!-- The Release File						       {{{ -->
-<!-- ===================================================================== -->
-<sect> The Release File
-
-<p>
-This file plays an important role in how APT presents the archive to the 
-user. Its main purpose is to present a descriptive name for the source
-of each version of each package. It also is used to detect when new versions
-of debian are released. It augments the package file it is associated with 
-by providing meta information about the entire archive which the Packages
-file describes.
-
-<p>
-The full name of the distribution for presentation to the user is formed
-as 'label version archive', with a possible extended name being 
-'label version archive component'.
-
-<p>
-The file is formed as the package file (RFC-822) with the following tags
-defined:
-
-<taglist>
-<tag>Archive<item>
-This is the common name we give our archives, such as <em>stable</> or
-<em>unstable</>.
-
-<tag>Component<item>
-Refers to the sub-component of the archive, <em>main</>, <em>contrib</>
-etc. Component may be omitted if there are no components for this archive.
-
-<tag>Version<item>
-This is a version string with the same properties as in the Packages file.
-It represents the release level of the archive.
-
-<tag>Origin<item>
-This specifies who is providing this archive. In the case of Debian the
-string will read 'Debian'. Other providers may use their own string
-
-<tag>Label<item>
-This carries the encompassing name of the distribution. For Debian proper
-this field reads 'Debian'. For derived distributions it should contain their 
-proper name.
-
-<tag>Architecture<item>
-When the archive has packages for a single architecture then the Architecture
-is listed here. If a mixed set of systems are represented then this should
-contain the keyword <em>mixed</em>.
-
-<tag>NotAutomatic<item>
-A Yes/No flag indicating that the archive is extremely unstable and its
-version's should never be automatically selected. This is to be used by 
-experimental.
-
-<tag>Description<item>
-Description is used to describe the release. For instance experimental would
-contain a warning that the packages have problems.
-</taglist>
-
-<p>
-The location of the Release file in the archive is very important, it must 
-be located in the same location as the packages file so that it can be 
-located in all situations. The following is an example for the current stable
-release, 1.3.1r6 
-
-<example>
-Archive: stable
-Component: main
-Version: 1.3.1r6
-Origin: Debian
-Label: Debian
-Architecture: i386
-</example>
-
-This is an example of experimental,
-<example>
-Archive: experimental
-Version: 0
-Origin: Debian
-Label: Debian
-Architecture: mixed
-NotAutomatic: Yes
-</example>
-
-And unstable,
-<example>
-Archive: unstable
-Component: main
-Version: 2.1
-Origin: Debian
-Label: Debian
-Architecture: i386
-</example>
-
-</sect>
-                                                                  <!-- }}} -->
-
-</book>
diff --git a/doc/guide.dbk b/doc/guide.dbk
new file mode 100644
index 00000000..e8a8ae27
--- /dev/null
+++ b/doc/guide.dbk
@@ -0,0 +1,560 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- -*- DocBook -*- -->
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent"> %aptverbatiment;
+]>
+
+<book lang="en">
+
+<title>APT User's Guide</title>
+
+<bookinfo>
+
+<authorgroup>
+  <author>
+    <personname>Jason Gunthorpe</personname><email>jgg@debian.org</email>
+  </author>
+</authorgroup>
+
+<releaseinfo>Version &apt-product-version;</releaseinfo>
+
+<abstract>
+<para>
+This document provides an overview of how to use the the APT package manager.
+</para>
+</abstract>
+
+<copyright><year>1998</year><holder>Jason Gunthorpe</holder></copyright>
+
+<legalnotice>
+<title>License Notice</title>
+<para>
+"APT" and this document are free software; you can redistribute them and/or
+modify them under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or (at your
+option) any later version.
+</para>
+</legalnotice>
+
+<legalnotice>
+<para>
+For more details, on Debian systems, see the file
+/usr/share/common-licenses/GPL for the full license.
+</para>
+</legalnotice>
+
+</bookinfo>
+
+<chapter id="ch1"><title>General</title>
+<para>
+The APT package currently contains two sections, the APT
+<command>dselect</command> method and the <command>apt-get</command> command
+line user interface. Both provide a way to install and remove packages as well
+as download new packages from the Internet.
+</para>
+
+<section id="s1.1"><title>Anatomy of the Package System</title>
+<para>
+The Debian packaging system has a large amount of information associated with
+each package to help assure that it integrates cleanly and easily into the
+system. The most prominent of its features is the dependency system.
+</para>
+<para>
+The dependency system allows individual programs to make use of shared elements
+in the system such as libraries. It simplifies placing infrequently used
+portions of a program in separate packages to reduce the number of things the
+average user is required to install. Also, it allows for choices in mail
+transport agents, X servers and so on.
+</para>
+<para>
+The first step to understanding the dependency system is to grasp the concept
+of a simple dependency. The meaning of a simple dependency is that a package
+requires another package to be installed at the same time to work properly.
+</para>
+<para>
+For instance, mailcrypt is an emacs extension that aids in encrypting email
+with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a
+simple dependency on GPG. Also, because it is an emacs extension it has a
+simple dependency on emacs, without emacs it is completely useless.
+</para>
+<para>
+The other important dependency to understand is a conflicting dependency. It
+means that a package, when installed with another package, will not work and
+may possibly be extremely harmful to the system. As an example consider a mail
+transport agent such as sendmail, exim or qmail. It is not possible to have
+two mail transport agents installed because both need to listen to the network
+to receive mail. Attempting to install two will seriously damage the system so
+all mail transport agents have a conflicting dependency with all other mail
+transport agents.
+</para>
+<para>
+As an added complication there is the possibility for a package to pretend to
+be another package. Consider that exim and sendmail for many intents are
+identical, they both deliver mail and understand a common interface. Hence,
+the package system has a way for them to declare that they are both
+mail-transport-agents. So, exim and sendmail both declare that they provide a
+mail-transport-agent and other packages that need a mail transport agent depend
+on mail-transport-agent. This can add a great deal of confusion when trying to
+manually fix packages.
+</para>
+<para>
+At any given time a single dependency may be met by packages that are already
+installed or it may not be. APT attempts to help resolve dependency issues by
+providing a number of automatic algorithms that help in selecting packages for
+installation.
+</para>
+</section>
+
+</chapter>
+
+<chapter id="ch2"><title>apt-get</title>
+<para>
+<command>apt-get</command> provides a simple way to install packages from the
+command line. Unlike <command>dpkg</command>, <command>apt-get</command> does
+not understand .deb files, it works with the package's proper name and can only
+install .deb archives from a <emphasis>Source</emphasis>.
+</para>
+<para>
+The first <footnote><para> If you are using an http proxy server you must set
+the http_proxy environment variable first, see sources.list(5) </para>
+</footnote> thing that should be done before using <command>apt-get</command>
+is to fetch the package lists from the <emphasis>Sources</emphasis> so that it
+knows what packages are available. This is done with <literal>apt-get
+update</literal>. For instance,
+</para>
+<screen>
+# apt-get update
+Get http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages
+Get http://llug.sep.bnl.gov/debian/ testing/contrib Packages
+Reading Package Lists... Done
+Building Dependency Tree... Done
+</screen>
+<para>
+Once updated there are several commands that can be used:
+</para>
+<variablelist>
+<varlistentry>
+<term>upgrade</term>
+<listitem>
+<para>
+Upgrade will attempt to gently upgrade the whole system. Upgrade will never
+install a new package or remove an existing package, nor will it ever upgrade a
+package that might cause some other package to break. This can be used daily
+to relatively safely upgrade the system. Upgrade will list all of the packages
+that it could not upgrade, this usually means that they depend on new packages
+or conflict with some other package. <command>dselect</command> or
+<literal>apt-get install</literal> can be used to force these packages to
+install.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>install</term>
+<listitem>
+<para>
+Install is used to install packages by name. The package is automatically
+fetched and installed. This can be useful if you already know the name of the
+package to install and do not want to go into a GUI to select it. Any number
+of packages may be passed to install, they will all be fetched. Install
+automatically attempts to resolve dependency problems with the listed packages
+and will print a summary and ask for confirmation if anything other than its
+arguments are changed.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>dist-upgrade</term>
+<listitem>
+<para>
+Dist-upgrade is a complete upgrader designed to simplify upgrading between
+releases of Debian. It uses a sophisticated algorithm to determine the best
+set of packages to install, upgrade and remove to get as much of the system to
+the newest release. In some situations it may be desired to use dist-upgrade
+rather than spend the time manually resolving dependencies in
+<command>dselect</command>. Once dist-upgrade has completed then
+<command>dselect</command> can be used to install any packages that may have
+been left out.
+</para>
+<para>
+It is important to closely look at what dist-upgrade is going to do, its
+decisions may sometimes be quite surprising.
+</para>
+</listitem>
+</varlistentry>
+</variablelist>
+<para>
+<command>apt-get</command> has several command line options that are detailed
+in its man page,
+<citerefentry><refentrytitle>apt-get</refentrytitle><manvolnum>8</manvolnum></citerefentry>. The
+most useful option is <literal>-d</literal> which does not install the
+fetched files. If the system has to download a large number of package it
+would be undesired to start installing them in case something goes wrong. When
+<literal>-d</literal> is used the downloaded archives can be installed by
+simply running the command that caused them to be downloaded again without
+<literal>-d</literal>.
+</para>
+</chapter>
+
+<chapter id="ch3"><title>DSelect</title>
+<para>
+The APT <command>dselect</command> method provides the complete
+APT system with the <command>dselect</command> package selection
+GUI. <command>dselect</command> is used to select the packages to be
+installed or removed and APT actually installs them.
+</para>
+<para>
+To enable the APT method you need to select [A]ccess in
+<command>dselect</command> and then choose the APT method. You will be
+prompted for a set of <emphasis>Sources</emphasis> which are places to fetch
+archives from. These can be remote Internet sites, local Debian mirrors or
+CD-ROMs. Each source can provide a fragment of the total Debian archive, APT
+will automatically combine them to form a complete set of packages. If you
+have a CD-ROM then it is a good idea to specify it first and then specify a
+mirror so that you have access to the latest bug fixes. APT will automatically
+use packages on your CD-ROM before downloading from the Internet.
+</para>
+<screen>
+   Set up a list of distribution source locations
+
+ Please give the base URL of the debian distribution.
+ The access schemes I know about are: http file
+
+ For example:
+      file:/mnt/debian,
+      ftp://ftp.debian.org/debian,
+      http://ftp.de.debian.org/debian,
+
+
+ URL [http://llug.sep.bnl.gov/debian]:
+</screen>
+<para>
+The <emphasis>Sources</emphasis> setup starts by asking for the base of the
+Debian archive, defaulting to a HTTP mirror. Next it asks for the distribution
+to get.
+</para>
+<screen>
+ Please give the distribution tag to get or a path to the
+ package file ending in a /. The distribution
+ tags are typically something like: stable unstable testing non-US
+
+ Distribution [stable]:
+</screen>
+<para>
+The distribution refers to the Debian version in the archive,
+<emphasis>stable</emphasis> refers to the latest released version
+and <emphasis>unstable</emphasis> refers to the developmental
+version. <emphasis>non-US</emphasis> is only available on some mirrors
+and refers to packages that contain encryption technology or other
+things that cannot be exported from the United States. Importing these
+packages into the US is legal however.
+</para>
+<screen>
+ Please give the components to get
+ The components are typically something like: main contrib non-free
+
+ Components [main contrib non-free]:
+</screen>
+<para>
+The components list refers to the list of sub distributions to fetch. The
+distribution is split up based on software licenses, main being DFSG free
+packages while contrib and non-free contain things that have various
+restrictions placed on their use and distribution.
+</para>
+<para>
+Any number of sources can be added, the setup script will continue to prompt
+until you have specified all that you want.
+</para>
+<para>
+Before starting to use <command>dselect</command> it is necessary to update
+the available list by selecting [U]pdate from the menu. This is a superset of
+<literal>apt-get update</literal> that makes the fetched information available
+to <command>dselect</command>. [U]pdate must be performed even if
+<literal>apt-get update</literal> has been run before.
+</para>
+<para>
+You can then go on and make your selections using [S]elect and then perform
+the installation using [I]nstall. When using the APT method the [C]onfig and
+[R]emove commands have no meaning, the [I]nstall command performs both of
+them together.
+</para>
+<para>
+By default APT will automatically remove the package (.deb) files once they
+have been successfully installed. To change this behavior place
+<literal>Dselect::clean "prompt";</literal> in /etc/apt/apt.conf.
+</para>
+</chapter>
+
+<chapter id="ch4"><title>The Interface</title>
+<para>
+Both that APT <command>dselect</command> method and <command>apt-get</command>
+share the same interface. It is a simple system that generally tells you what
+it will do and then goes and does it. <footnote><para> The
+<command>dselect</command> method actually is a set of wrapper scripts to
+<command>apt-get</command>. The method actually provides more functionality
+than is present in <command>apt-get</command> alone. </para> </footnote> After
+printing out a summary of what will happen APT then will print out some
+informative status messages so that you can estimate how far along it is and
+how much is left to do.
+</para>
+
+<section id="s4.1"><title>Startup</title>
+<para>
+Before all operations except update, APT performs a number of actions
+to prepare its internal state. It also does some checks of the system's
+state. At any time these operations can be performed by running
+<literal>apt-get check</literal>.
+</para>
+<screen>
+# apt-get check
+Reading Package Lists... Done
+Building Dependency Tree... Done
+</screen>
+<para>
+The first thing it does is read all the package files into memory. APT uses a
+caching scheme so this operation will be faster the second time it is run. If
+some of the package files are not found then they will be ignored and a
+warning will be printed when apt-get exits.
+</para>
+<para>
+The final operation performs a detailed analysis of the system's
+dependencies. It checks every dependency of every installed or unpacked
+package and considers if it is OK. Should this find a problem then a report
+will be printed out and <command>apt-get</command> will refuse to run.
+</para>
+<screen>
+# apt-get check
+Reading Package Lists... Done
+Building Dependency Tree... Done
+You might want to run apt-get -f install' to correct these.
+Sorry, but the following packages have unmet dependencies:
+  9fonts: Depends: xlib6g but it is not installed
+  uucp: Depends: mailx but it is not installed
+  blast: Depends: xlib6g (&gt;= 3.3-5) but it is not installed
+  adduser: Depends: perl-base but it is not installed
+  aumix: Depends: libgpmg1 but it is not installed
+  debiandoc-sgml: Depends: sgml-base but it is not installed
+  bash-builtins: Depends: bash (&gt;= 2.01) but 2.0-3 is installed
+  cthugha: Depends: svgalibg1 but it is not installed
+           Depends: xlib6g (&gt;= 3.3-5) but it is not installed
+  libreadlineg2: Conflicts:libreadline2 (&lt;&lt; 2.1-2.1)
+</screen>
+<para>
+In this example the system has many problems, including a serious problem with
+libreadlineg2. For each package that has unmet dependencies a line is printed
+out indicating the package with the problem and the dependencies that are
+unmet. A short explanation of why the package has a dependency problem is also
+included.
+</para>
+<para>
+There are two ways a system can get into a broken state like this. The
+first is caused by <command>dpkg</command> missing some subtle relationships
+between packages when performing upgrades. <footnote><para> APT however
+considers all known dependencies and attempts to prevent broken
+packages </para> </footnote>. The second is if a package installation
+fails during an operation. In this situation a package may have been
+unpacked without its dependents being installed.
+</para>
+<para>
+The second situation is much less serious than the first because APT places
+certain constraints on the order that packages are installed. In both cases
+supplying the <literal>-f</literal> option to <command>apt-get</command>
+will cause APT to deduce a possible solution to the problem and then
+continue on. The APT <command>dselect</command> method always supplies
+the <literal>-f</literal> option to allow for easy continuation of failed
+maintainer scripts.
+</para>
+<para>
+However, if the <literal>-f</literal> option is used to correct a seriously
+broken system caused by the first case then it is possible that it will either
+fail immediately or the installation sequence will fail. In either case it is
+necessary to manually use dpkg (possibly with forcing options) to correct the
+situation enough to allow APT to proceed.
+</para>
+</section>
+
+<section id="s4.2"><title>The Status Report</title>
+<para>
+Before proceeding <command>apt-get</command> will present a report on what will
+happen. Generally the report reflects the type of operation being performed
+but there are several common elements. In all cases the lists reflect the
+final state of things, taking into account the <literal>-f</literal> option
+and any other relevant activities to the command being executed.
+</para>
+
+<section id="s4.2.1"><title>The Extra Package list</title>
+<screen>
+The following extra packages will be installed:
+  libdbd-mysql-perl xlib6 zlib1 xzx libreadline2 libdbd-msql-perl
+  mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base
+  bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy
+  squake pgp-i python-base debmake ldso perl libreadlineg2
+  ssh
+</screen>
+<para>
+The Extra Package list shows all of the packages that will be installed or
+upgraded in excess of the ones mentioned on the command line. It is only
+generated for an <literal>install</literal> command. The listed packages are
+often the result of an Auto Install.
+</para>
+</section>
+
+<section id="s4.2.2"><title>The Packages to Remove</title>
+<screen>
+The following packages will be REMOVED:
+  xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix
+  xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel
+  xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid
+  nas xpilot xfig
+</screen>
+<para>
+The Packages to Remove list shows all of the packages that will be removed
+from the system. It can be shown for any of the operations and should be given
+a careful inspection to ensure nothing important is to be taken off. The
+<literal>-f</literal> option is especially good at generating packages to
+remove so extreme care should be used in that case. The list may contain
+packages that are going to be removed because they are only partially
+installed, possibly due to an aborted installation.
+</para>
+</section>
+
+<section id="s4.2.3"><title>The New Packages list</title>
+<screen>
+The following NEW packages will installed:
+  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base
+</screen>
+<para>
+The New Packages list is simply a reminder of what will happen. The packages
+listed are not presently installed in the system but will be when APT is done.
+</para>
+</section>
+
+<section id="s4.2.4"><title>The Kept Back list</title>
+<screen>
+The following packages have been kept back
+  compface man-db tetex-base msql libpaper svgalib1
+  gs snmp arena lynx xpat2 groff xscreensaver
+</screen>
+<para>
+Whenever the whole system is being upgraded there is the possibility that new
+versions of packages cannot be installed because they require new things or
+conflict with already installed things. In this case the package will appear
+in the Kept Back list. The best way to convince packages listed there to
+install is with <literal>apt-get install</literal> or by using
+<command>dselect</command> to resolve their problems.
+</para>
+</section>
+
+<section id="s4.2.5"><title>Held Packages warning</title>
+<screen>
+The following held packages will be changed:
+  cvs
+</screen>
+<para>
+Sometimes you can ask APT to install a package that is on hold, in such a case
+it prints out a warning that the held package is going to be changed. This
+should only happen during dist-upgrade or install.
+</para>
+</section>
+
+<section id="s4.2.6"><title>Final summary</title>
+<para>
+Finally, APT will print out a summary of all the changes that will occur.
+</para>
+<screen>
+206 packages upgraded, 8 newly installed, 23 to remove and 51 not upgraded.
+12 packages not fully installed or removed.
+Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used.
+</screen>
+<para>
+The first line of the summary simply is a reduced version of all of the lists
+and includes the number of upgrades - that is packages already installed that
+have new versions available. The second line indicates the number of poorly
+configured packages, possibly the result of an aborted installation. The final
+line shows the space requirements that the installation needs. The first pair
+of numbers refer to the size of the archive files. The first number indicates
+the number of bytes that must be fetched from remote locations and the second
+indicates the total size of all the archives required. The next number
+indicates the size difference between the presently installed packages and the
+newly installed packages. It is roughly equivalent to the space required in
+/usr after everything is done. If a large number of packages are being removed
+then the value may indicate the amount of space that will be freed.
+</para>
+<para>
+Some other reports can be generated by using the -u option to show packages to
+upgrade, they are similar to the previous examples.
+</para>
+</section>
+
+</section>
+
+<section id="s4.3"><title>The Status Display</title>
+<para>
+During the download of archives and package files APT prints out a series of
+status messages.
+</para>
+<screen>
+# apt-get update
+Get:1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages
+Get:2 http://llug.sep.bnl.gov/debian/ testing/contrib Packages
+Hit http://llug.sep.bnl.gov/debian/ testing/main Packages
+Get:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages
+Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages
+11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s
+</screen>
+<para>
+The lines starting with <emphasis>Get</emphasis> are printed out when APT
+begins to fetch a file while the last line indicates the progress of the
+download. The first percent value on the progress line indicates the total
+percent done of all files. Unfortunately since the size of the Package files
+is unknown <literal>apt-get update</literal> estimates the percent done which
+causes some inaccuracies.
+</para>
+<para>
+The next section of the status line is repeated once for each download
+thread and indicates the operation being performed and some useful
+information about what is happening. Sometimes this section will simply
+read <emphasis>Forking</emphasis> which means the OS is loading the download
+module. The first word after the [ is the fetch number as shown on the
+history lines. The next word is the short form name of the object being
+downloaded. For archives it will contain the name of the package that is
+being fetched.
+</para>
+<para>
+Inside of the single quote is an informative string indicating the progress of
+the negotiation phase of the download. Typically it progresses from
+<emphasis>Connecting</emphasis> to <emphasis>Waiting for file</emphasis> to
+<emphasis>Downloading</emphasis> or <emphasis>Resuming</emphasis>. The final
+value is the number of bytes downloaded from the remote site. Once the
+download begins this is represented as <literal>102/10.2k</literal> indicating
+that 102 bytes have been fetched and 10.2 kilobytes is expected. The total
+size is always shown in 4 figure notation to preserve space. After the size
+display is a percent meter for the file itself. The second last element is the
+instantaneous average speed. This values is updated every 5 seconds and
+reflects the rate of data transfer for that period. Finally is shown the
+estimated transfer time. This is updated regularly and reflects the time to
+complete everything at the shown transfer rate.
+</para>
+<para>
+The status display updates every half second to provide a constant feedback on
+the download progress while the Get lines scroll back whenever a new file is
+started. Since the status display is constantly updated it is unsuitable for
+logging to a file, use the <literal>-q</literal> option to remove the status
+display.
+</para>
+</section>
+
+<section id="s4.4"><title>Dpkg</title>
+<para>
+APT uses <command>dpkg</command> for installing the archives and will
+switch over to the <command>dpkg</command> interface once downloading is
+completed. <command>dpkg</command> will also ask a number of questions as
+it processes the packages and the packages themselves may also ask several
+questions. Before each question there is usually a description of what it
+is asking and the questions are too varied to discuss completely here.
+</para>
+</section>
+
+</chapter>
+
+</book>
diff --git a/doc/guide.sgml b/doc/guide.sgml
deleted file mode 100644
index 747c5718..00000000
--- a/doc/guide.sgml
+++ /dev/null
@@ -1,547 +0,0 @@
-<!-- -*- mode: sgml; mode: fold -*- -->
-<!doctype debiandoc  PUBLIC  "-//DebianDoc//DTD DebianDoc//EN">
-<book>
-<title>APT User's Guide</title>
-
-<author>Jason Gunthorpe <email>jgg@debian.org</email></author>
-<version>$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $</version>
-
-<abstract>
-This document provides an overview of how to use the the APT package manager.
-</abstract>
-
-<copyright>
-Copyright &copy; Jason Gunthorpe, 1998.
-<p>
-"APT" and this document are free software; you can redistribute them and/or
-modify them under the terms of the GNU General Public License as published
-by the Free Software Foundation; either version 2 of the License, or (at your
-option) any later version.
-
-<p>
-For more details, on Debian systems, see the file
-/usr/share/common-licenses/GPL for the full license.
-</copyright>
-
-<toc sect>
-
-<!-- General		                                               {{{ -->
-<!-- ===================================================================== -->
-<chapt>General
-
-<p>
-The APT package currently contains two sections, the APT <prgn>dselect</>
-method and the <prgn>apt-get</> command line user interface. Both provide 
-a way to install and remove packages as well as download new packages from 
-the Internet. 
-
-<sect>Anatomy of the Package System
-<p>
-The Debian packaging system has a large amount of information associated with
-each package to help assure that it integrates cleanly and easily into
-the system. The most prominent of its features is the dependency system.
-
-<p>
-The dependency system allows individual programs to make use of shared 
-elements in the system such as libraries. It simplifies placing infrequently 
-used portions of a program in separate packages to reduce the
-number of things the average user is required to install. Also, it allows
-for choices in mail transport agents, X servers and 
-so on.
-
-<p>
-The first step to understanding the dependency system is to grasp the concept
-of a simple dependency. The meaning of a simple dependency is that a package
-requires another package to be installed at the same time to work properly.
-
-<p>
-For instance, mailcrypt is an emacs extension that aids in encrypting email
-with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a
-simple dependency on GPG. Also, because it is an emacs extension it has a 
-simple dependency on emacs, without emacs it is completely useless.
-
-<p>
-The other important dependency to understand is a conflicting dependency. It
-means that a package, when installed with another package, will not work and
-may possibly be extremely harmful to the system. As an example consider a
-mail transport agent such as sendmail, exim or qmail. It is not possible
-to have two mail transport agents installed because both need to listen to
-the network to receive mail. Attempting to install two will seriously
-damage the system so all mail transport agents have a conflicting dependency
-with all other mail transport agents.
-
-<p>
-As an added complication there is the possibility for a package to pretend
-to be another package. Consider that exim and sendmail for many intents are
-identical, they both deliver mail and understand a common interface. Hence,
-the package system has a way for them to declare that they are both
-mail-transport-agents. So, exim and sendmail both declare that they provide a
-mail-transport-agent and other packages that need a mail transport agent
-depend on mail-transport-agent. This can add a great deal of confusion when 
-trying to manually fix packages.
-
-<p>
-At any given time a single dependency may be met by packages that are already
-installed or it may not be. APT attempts to help resolve dependency issues
-by providing a number of automatic algorithms that help in selecting packages
-for installation.
-</sect>
-
-</chapt>
-                                                                  <!-- }}} -->
-<!-- apt-get		                                               {{{ -->
-<!-- ===================================================================== -->
-<chapt>apt-get
-
-<p>
-<prgn>apt-get</> provides a simple way to install packages from the command 
-line. Unlike <prgn>dpkg</>, <prgn>apt-get</> does not understand .deb files, 
-it works with the package's proper name and can only install .deb archives from 
-a <em>Source</>.
-
-<p>
-The first <footnote>If you are using an http proxy server you must set the
-http_proxy environment variable first, see sources.list(5)</footnote> thing that 
-should be done before using <prgn>apt-get</> is to fetch the package lists
-from the <em>Sources</> so that it knows what packages are 
-available. This is done with <tt>apt-get update</>. For instance,
-
-<p>
-<example>
-# apt-get update
-Get http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages
-Get http://llug.sep.bnl.gov/debian/ testing/contrib Packages
-Reading Package Lists... Done
-Building Dependency Tree... Done
-</example>
-
-<p>
-Once updated there are several commands that can be used:
-<taglist>
-<tag>upgrade<item>
-Upgrade will attempt to gently upgrade the whole system. Upgrade will
-never install a new package or remove an existing package, nor will it
-ever upgrade a package that might cause some other package to break.
-This can be used daily to relatively safely upgrade the system. Upgrade
-will list all of the packages that it could not upgrade, this usually
-means that they depend on new packages or conflict with some other package.
-<prgn>dselect</> or <tt>apt-get install</> can be used to force these
-packages to install.
-
-<tag>install<item>
-Install is used to install packages by name. The package is 
-automatically fetched and installed. This can be useful if you already
-know the name of the package to install and do not want to go into a GUI
-to select it. Any number of packages may be passed to install, they will
-all be fetched. Install automatically attempts to resolve dependency problems
-with the listed packages and will print a summary and ask for confirmation
-if anything other than its arguments are changed.
-
-<tag>dist-upgrade<item>
-Dist-upgrade is a complete upgrader designed to simplify upgrading between
-releases of Debian. It uses a sophisticated algorithm to determine the best
-set of packages to install, upgrade and remove to get as much of the system
-to the newest release. In some situations it may be desired to use dist-upgrade
-rather than spend the time manually resolving dependencies in <prgn>dselect</>.
-Once dist-upgrade has completed then <prgn>dselect</> can be used to install
-any packages that may have been left out.
-
-<p>
-It is important to closely look at what dist-upgrade is going to do, its
-decisions may sometimes be quite surprising.
-</taglist>
-
-<p>
-<prgn>apt-get</> has several command line options that are detailed in its
-man page, <manref name="apt-get" section="8">. The most useful option is 
-<tt>-d</> which does not install the fetched files. If the system has to
-download a large number of package it would be undesired to start installing
-them in case something goes wrong. When <tt>-d</> is used the downloaded
-archives can be installed by simply running the command that caused them to
-be downloaded again without <tt>-d</>.
-
-</chapt>
-                                                                  <!-- }}} -->
-<!-- DSelect		                                               {{{ -->
-<!-- ===================================================================== -->
-<chapt>DSelect
-<p>
-The APT <prgn>dselect</> method provides the complete APT system with 
-the <prgn>dselect</> package selection GUI. <prgn>dselect</> is used to
-select the packages to be installed or removed and APT actually installs them.
-
-<p>
-To enable the APT method you need to select [A]ccess in <prgn>dselect</> 
-and then choose the APT method. You will be prompted for a set of 
-<em>Sources</> which are places to fetch archives from. These can be remote
-Internet sites, local Debian mirrors or CD-ROMs. Each source can provide
-a fragment of the total Debian archive, APT will automatically combine them
-to form a complete set of packages. If you have a CD-ROM then it is a good idea
-to specify it first and then specify a mirror so that you have access to
-the latest bug fixes. APT will automatically use packages on your CD-ROM before
-downloading from the Internet.
-
-<p>
-<example>
-   Set up a list of distribution source locations
-	 
- Please give the base URL of the debian distribution.
- The access schemes I know about are: http file
-	   
- For example:
-      file:/mnt/debian,
-      ftp://ftp.debian.org/debian,
-      http://ftp.de.debian.org/debian,
-      
-      
- URL [http://llug.sep.bnl.gov/debian]: 
-</example>
-
-<p>
-The <em>Sources</> setup starts by asking for the base of the Debian
-archive, defaulting to a HTTP mirror. Next it asks for the distribution to
-get.
-
-<p>
-<example>
- Please give the distribution tag to get or a path to the
- package file ending in a /. The distribution
- tags are typically something like: stable unstable testing non-US
-   
- Distribution [stable]: 
-</example>
-
-<p>
-The distribution refers to the Debian version in the archive, <em>stable</>
-refers to the latest released version and <em>unstable</> refers to the
-developmental version. <em>non-US</> is only available on some mirrors and
-refers to packages that contain encryption technology or other things that
-cannot be exported from the United States. Importing these packages into the
-US is legal however. 
-
-<p>
-<example>
- Please give the components to get
- The components are typically something like: main contrib non-free
-  
- Components [main contrib non-free]:
-</example>
-
-<p>
-The components list refers to the list of sub distributions to fetch. The
-distribution is split up based on software licenses, main being DFSG free
-packages while contrib and non-free contain things that have various 
-restrictions placed on their use and distribution.
-
-<p>
-Any number of sources can be added, the setup script will continue to
-prompt until you have specified all that you want.
-
-<p>
-Before starting to use <prgn>dselect</> it is necessary to update the 
-available list by selecting [U]pdate from the menu. This is a superset of 
-<tt>apt-get update</> that makes the fetched information available to
-<prgn>dselect</>. [U]pdate must be performed even if <tt>apt-get update</>
-has been run before.
-
-<p>
-You can then go on and make your selections using [S]elect and then 
-perform the installation using [I]nstall. When using the APT method
-the [C]onfig and [R]emove commands have no meaning, the [I]nstall command
-performs both of them together. 
-
-<p>
-By default APT will automatically remove the package (.deb) files once they have been
-successfully installed. To change this behavior place <tt>Dselect::clean 
-"prompt";</> in /etc/apt/apt.conf.
-
-</chapt>
-                                                                  <!-- }}} -->
-<!-- The Interfaces						       {{{ -->
-<!-- ===================================================================== -->
-<chapt>The Interface
-
-<p>
-Both that APT <prgn>dselect</> method and <prgn>apt-get</> share the same
-interface. It is a simple system that generally tells you what it will do
-and then goes and does it. 
-<footnote>
-The <prgn>dselect</> method actually is a set of wrapper scripts
-to <prgn>apt-get</>. The method actually provides more functionality than
-is present in <prgn>apt-get</> alone.
-</footnote>
-After printing out a summary of what will happen APT then will print out some
-informative status messages so that you can estimate how far along it is and
-how much is left to do.
-
-<!-- ===================================================================== -->
-<sect>Startup
-
-<p>
-Before all operations except update, APT performs a number of actions to
-prepare its internal state. It also does some checks of the system's state.
-At any time these operations can be performed by running <tt>apt-get check</>.
-<p>
-<example>
-# apt-get check
-Reading Package Lists... Done
-Building Dependency Tree... Done
-</example>
-
-<p>
-The first thing it does is read all the package files into memory. APT
-uses a caching scheme so this operation will be faster the second time it
-is run. If some of the package files are not found then they will be ignored
-and a warning will be printed when apt-get exits. 
-
-<p>
-The final operation performs a detailed analysis of the system's dependencies.
-It checks every dependency of every installed or unpacked package and considers
-if it is OK. Should this find a problem then a report will be printed out and
-<prgn>apt-get</> will refuse to run.
-
-<p>
-<example>
-# apt-get check
-Reading Package Lists... Done
-Building Dependency Tree... Done
-You might want to run apt-get -f install' to correct these.
-Sorry, but the following packages have unmet dependencies:
-  9fonts: Depends: xlib6g but it is not installed
-  uucp: Depends: mailx but it is not installed
-  blast: Depends: xlib6g (>= 3.3-5) but it is not installed
-  adduser: Depends: perl-base but it is not installed
-  aumix: Depends: libgpmg1 but it is not installed
-  debiandoc-sgml: Depends: sgml-base but it is not installed
-  bash-builtins: Depends: bash (>= 2.01) but 2.0-3 is installed
-  cthugha: Depends: svgalibg1 but it is not installed
-           Depends: xlib6g (>= 3.3-5) but it is not installed
-  libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)
-</example>
-
-<p>
-In this example the system has many problems, including a serious problem
-with libreadlineg2. For each package that has unmet dependencies a line
-is printed out indicating the package with the problem and the dependencies
-that are unmet. A short explanation of why the package has a dependency
-problem is also included.
-
-<p>
-There are two ways a system can get into a broken state like this. The
-first is caused by <prgn>dpkg</> missing some subtle relationships between 
-packages when performing upgrades. <footnote>APT however considers all known 
-dependencies and attempts to prevent broken packages</footnote>. The second is 
-if a package installation fails during an operation. In this situation a 
-package may have been unpacked without its dependents being installed.
-
-<p>
-The second situation is much less serious than the first because APT places
-certain constraints on the order that packages are installed. In both cases
-supplying the <tt>-f</> option to <prgn>apt-get</> will cause APT to deduce a
-possible solution to the problem and then continue on. The APT <prgn>dselect</> 
-method always supplies the <tt>-f</> option to allow for easy continuation
-of failed maintainer scripts.
-
-<p>
-However, if the <tt>-f</> option is used to correct a seriously broken system
-caused by the first case then it is possible that it will either fail 
-immediately or the installation sequence will fail. In either case it is
-necessary to manually use dpkg (possibly with forcing options) to correct
-the situation enough to allow APT to proceed.
-</sect>
-
-<!-- ===================================================================== -->
-<sect>The Status Report
-
-<p>
-Before proceeding <prgn>apt-get</> will present a report on what will happen.
-Generally the report reflects the type of operation being performed but there
-are several common elements. In all cases the lists reflect the final state
-of things, taking into account the <tt>-f</> option and any other relevant
-activities to the command being executed.
-
-<sect1>The Extra Package list
-<p>
-<example>
-The following extra packages will be installed:
-  libdbd-mysql-perl xlib6 zlib1 xzx libreadline2 libdbd-msql-perl
-  mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base
-  bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy
-  squake pgp-i python-base debmake ldso perl libreadlineg2
-  ssh
-</example>
-
-<p>
-The Extra Package list shows all of the packages that will be installed 
-or upgraded in excess of the ones mentioned on the command line. It is
-only generated for an <tt>install</> command. The listed packages are
-often the result of an Auto Install.
-</sect1>
-
-<sect1>The Packages to Remove
-<p>
-<example>
-The following packages will be REMOVED:
-  xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix
-  xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel
-  xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid
-  nas xpilot xfig 
-</example>
-
-<p>
-The Packages to Remove list shows all of the packages that will be
-removed from the system. It can be shown for any of the operations and 
-should be given a careful inspection to ensure nothing important is to 
-be taken off. The <tt>-f</> option is especially good at generating packages
-to remove so extreme care should be used in that case. The list may contain
-packages that are going to be removed because they are only 
-partially installed, possibly due to an aborted installation.
-</sect1>
-
-<sect1>The New Packages list
-<p>
-<example>
-The following NEW packages will installed:
-  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base
-</example>
-
-<p>
-The New Packages list is simply a reminder of what will happen. The packages
-listed are not presently installed in the system but will be when APT is done.
-</sect1>
-
-<sect1>The Kept Back list
-<p>
-<example>
-The following packages have been kept back
-  compface man-db tetex-base msql libpaper svgalib1
-  gs snmp arena lynx xpat2 groff xscreensaver
-</example>
-
-<p>
-Whenever the whole system is being upgraded there is the possibility that
-new versions of packages cannot be installed because they require new things
-or conflict with already installed things. In this case the package will 
-appear in the Kept Back list. The best way to convince packages listed
-there to install is with <tt>apt-get install</> or by using <prgn>dselect</>
-to resolve their problems.
-</sect1>
-
-<sect1>Held Packages warning
-<p>
-<example>
-The following held packages will be changed:
-  cvs 
-</example>
-
-<p>
-Sometimes you can ask APT to install a package that is on hold, in such a 
-case it prints out a warning that the held package is going to be
-changed. This should only happen during dist-upgrade or install.
-</sect1>
-
-<sect1>Final summary
-<p>
-Finally, APT will print out a summary of all the changes that will occur.
-
-<p>
-<example>
-206 packages upgraded, 8 newly installed, 23 to remove and 51 not upgraded.
-12 packages not fully installed or removed.
-Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used. 
-</example>
-
-<p>
-The first line of the summary simply is a reduced version of all of the
-lists and includes the number of upgrades - that is packages already 
-installed that have new versions available. The second line indicates the
-number of poorly configured packages, possibly the result of an aborted
-installation. The final line shows the space requirements that the
-installation needs. The first pair of numbers refer to the size of
-the archive files. The first number indicates the number of bytes that
-must be fetched from remote locations and the second indicates the
-total size of all the archives required. The next number indicates the
-size difference between the presently installed packages and the newly
-installed packages. It is roughly equivalent to the space required in 
-/usr after everything is done. If a large number of packages are being
-removed then the value may indicate the amount of space that will be
-freed.
-
-<p>
-Some other reports can be generated by using the -u option to show packages
-to upgrade, they are similar to the previous examples.
-</sect>
-
-<!-- ===================================================================== -->
-<sect>The Status Display
-<p>
-During the download of archives and package files APT prints out a series of
-status messages.
-
-<p>
-<example>
-# apt-get update
-Get:1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages
-Get:2 http://llug.sep.bnl.gov/debian/ testing/contrib Packages
-Hit http://llug.sep.bnl.gov/debian/ testing/main Packages
-Get:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages
-Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages
-11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s
-</example>
-
-<p>
-The lines starting with <em>Get</> are printed out when APT begins to fetch 
-a file while the last line indicates the progress of the download. The first 
-percent  value on the progress line indicates the total percent done of all 
-files. Unfortunately since the size of the Package files is unknown 
-<tt>apt-get update</> estimates the percent done which causes some 
-inaccuracies.
-
-<p>
-The next section of the status line is repeated once for each download thread
-and indicates the operation being performed and some useful information
-about what is happening. Sometimes this section will simply read <em>Forking</>
-which means the OS is loading the download module. The first word after the [
-is the fetch number as shown on the history lines. The next word
-is the short form name of the object being downloaded. For archives it will
-contain the name of the package that is being fetched.
-
-<p>
-Inside of the single quote is an informative string indicating the progress
-of the negotiation phase of the download. Typically it progresses from 
-<em>Connecting</> to <em>Waiting for file</> to <em>Downloading</> or
-<em>Resuming</>. The final value is the number of bytes downloaded from the
-remote site. Once the download begins this is represented as <tt>102/10.2k</>
-indicating that 102 bytes have been fetched and 10.2 kilobytes is expected.
-The total size is always shown in 4 figure notation to preserve space. After
-the size display is a percent meter for the file itself.
-The second last element is the instantaneous average speed. This values is 
-updated every 5 seconds and reflects the rate of data transfer for that 
-period. Finally is shown the estimated transfer time. This is updated
-regularly and reflects the time to complete everything at the shown 
-transfer rate.
-
-<p> 
-The status display updates every half second to provide a constant feedback 
-on the download progress while the Get lines scroll back whenever a new
-file is started. Since the status display is constantly updated it is
-unsuitable for logging to a file, use the <tt>-q</> option to remove the
-status display.
-</sect>
-
-<!-- ===================================================================== -->
-<sect>Dpkg
-
-<p>
-APT uses <prgn>dpkg</> for installing the archives and will switch
-over to the <prgn>dpkg</> interface once downloading is completed.
-<prgn>dpkg</> will also ask a number of questions as it processes the packages
-and the packages themselves may also ask several questions. Before each 
-question there is usually a description of what it is asking and the
-questions are too varied to discuss completely here.
-</sect>
-
-</chapt>
-                                                                  <!-- }}} -->
-
-</book>
diff --git a/doc/manpage-style.xsl b/doc/manpage-style.xsl
index 5cb6a58c..a780bad1 100644
--- a/doc/manpage-style.xsl
+++ b/doc/manpage-style.xsl
@@ -5,7 +5,6 @@
 <xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl" />
 
 <xsl:param name="man.output.encoding" select="'UTF-8'" />
-<!-- LANGUAGE -->
 
 <xsl:template match="email">&lt;<xsl:apply-templates/>&gt;</xsl:template>
 
diff --git a/doc/method.dbk b/doc/method.dbk
new file mode 100644
index 00000000..d2eb04df
--- /dev/null
+++ b/doc/method.dbk
@@ -0,0 +1,712 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- -*- DocBook -*- -->
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent"> %aptverbatiment;
+]>
+
+<book lang="en">
+
+<title>APT Method Interface</title>
+
+<bookinfo>
+
+<authorgroup>
+  <author>
+    <personname>Jason Gunthorpe</personname><email>jgg@debian.org</email>
+  </author>
+</authorgroup>
+
+<releaseinfo>Version &apt-product-version;</releaseinfo>
+
+<abstract>
+<para>
+This document describes the interface that APT uses to the archive access
+methods.
+</para>
+</abstract>
+
+<copyright><year>1998</year><holder>Jason Gunthorpe</holder></copyright>
+
+<legalnotice>
+<title>License Notice</title>
+<para>
+"APT" and this document are free software; you can redistribute them and/or
+modify them under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or (at your
+option) any later version.
+</para>
+<para>
+For more details, on Debian systems, see the file
+/usr/share/common-licenses/GPL for the full license.
+</para>
+</legalnotice>
+
+</bookinfo>
+
+<chapter id="ch1"><title>Introduction</title>
+
+<section id="s1.1"><title>General</title>
+<para>
+The APT method interface allows APT to acquire archive files (.deb), index
+files (Packages, Release, Mirrors) and source files (.tar.gz, .diff). It is a
+general, extensible system designed to satisfy all of these requirements:
+</para>
+<orderedlist numeration="arabic">
+<listitem>
+<para>
+Remote methods that download files from a distant site
+</para>
+</listitem>
+<listitem>
+<para>
+Resume of aborted downloads
+</para>
+</listitem>
+<listitem>
+<para>
+Progress reporting
+</para>
+</listitem>
+<listitem>
+<para>
+If-Modified-Since (IMS) checking for index files
+</para>
+</listitem>
+<listitem>
+<para>
+In-Line MD5 generation
+</para>
+</listitem>
+<listitem>
+<para>
+No-copy in-filesystem methods
+</para>
+</listitem>
+<listitem>
+<para>
+Multi-media methods (like CD's)
+</para>
+</listitem>
+<listitem>
+<para>
+Dynamic source selection for failure recovery
+</para>
+</listitem>
+<listitem>
+<para>
+User interaction for user/password requests and media swaps
+</para>
+</listitem>
+<listitem>
+<para>
+Global configuration
+</para>
+</listitem>
+</orderedlist>
+<para>
+Initial releases of APT (0.1.x) used a completely different method interface
+that only supported the first 6 items. This new interface deals with the
+remainder.
+</para>
+</section>
+
+<section id="s1.2"><title>Terms</title>
+<para>
+Several terms are used through out the document, they have specific meanings
+which may not be immediately evident. To clarify they are summarized here.
+</para>
+<variablelist>
+<varlistentry>
+<term>source</term>
+<listitem>
+<para>
+Refers to an item in source list. More specifically it is the broken down
+item, that is each source maps to exactly one index file. Archive sources map
+to Package files and Source Code sources map to Source files.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>archive file</term>
+<listitem>
+<para>
+Refers to a binary package archive (.deb, .rpm, etc).
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>source file</term>
+<listitem>
+<para>
+Refers to one of the files making up the source code of a package. In debian
+it is one of .diff.gz, .dsc. or .tar.gz.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>URI</term>
+<listitem>
+<para>
+Universal Resource Identifier (URI) is a super-set of the familiar URL
+syntax used by web browsers. It consists of an access specification
+followed by a specific location in that access space. The form is
+&lt;access&gt;:&lt;location&gt;. Network addresses are given with the form
+&lt;access&gt;://[&lt;user&gt;[:&lt;pas&gt;]@]hostname[:port]/&lt;location&gt;.
+Some examples:
+</para>
+<screen>
+file:/var/mirrors/debian/
+ftp://ftp.debian.org/debian
+ftp://jgg:MooCow@localhost:21/debian
+nfs://bigred/var/mirrors/debian
+rsync://debian.midco.net/debian
+cdrom:Debian 2.0r1 Disk 1/
+</screen>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>method</term>
+<listitem>
+<para>
+There is a one to one mapping of URI access specifiers to methods. A method is
+a program that knows how to handle a URI access type and operates according to
+the specifications in this file.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>method instance</term>
+<listitem>
+<para>
+A specific running method. There can be more than one instance of each method
+as APT is capable of concurrent method handling.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>message</term>
+<listitem>
+<para>
+A series of lines terminated by a blank line sent down one of the communication
+lines. The first line should have the form xxx TAG where xxx are digits
+forming the status code and TAG is an informational string
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>acquire</term>
+<listitem>
+<para>
+The act of bring a URI into the local pathname space. This may simply be
+verifying the existence of the URI or actually downloading it from a remote
+site.
+</para>
+</listitem>
+</varlistentry>
+</variablelist>
+</section>
+
+</chapter>
+
+<chapter id="ch2"><title>Specification</title>
+
+<section id="s2.1"><title>Overview</title>
+<para>
+All methods operate as a sub process of a main controlling parent. 3 FD's are
+opened for use by the method allowing two way communication and emergency error
+reporting. The FD's correspond to the well known unix FD's, stdin, stdout and
+stderr.
+</para>
+<para>
+Through operation of the method communication is done via http style plain
+text. Specifically RFC-822 (like the Package file) fields are used to describe
+items and a numeric-like header is used to indicate what is happening. Each of
+these distinct communication messages should be sent quickly and without pause.
+</para>
+<para>
+In some instances APT may pre-invoke a method to allow things like file URI's
+to determine how many files are available locally.
+</para>
+</section>
+
+<section id="s2.2"><title>Message Overview</title>
+<para>
+The first line of each message is called the message header. The first 3
+digits (called the Status Code) have the usual meaning found in the http
+protocol. 1xx is informational, 2xx is successful and 4xx is failure. The 6xx
+series is used to specify things sent to the method. After the status code is
+an informational string provided for visual debugging.
+</para>
+<itemizedlist>
+<listitem>
+<para>
+100 Capabilities - Method capabilities
+</para>
+</listitem>
+<listitem>
+<para>
+101 Log - General Logging
+</para>
+</listitem>
+<listitem>
+<para>
+102 Status - Inter-URI status reporting (login progress)
+</para>
+</listitem>
+<listitem>
+<para>
+200 URI Start - URI is starting acquire
+</para>
+</listitem>
+<listitem>
+<para>
+201 URI Done - URI is finished acquire
+</para>
+</listitem>
+<listitem>
+<para>
+400 URI Failure - URI has failed to acquire
+</para>
+</listitem>
+<listitem>
+<para>
+401 General Failure - Method did not like something sent to it
+</para>
+</listitem>
+<listitem>
+<para>
+402 Authorization Required - Method requires authorization to access the URI.
+Authorization is User/Pass
+</para>
+</listitem>
+<listitem>
+<para>
+403 Media Failure - Method requires a media change
+</para>
+</listitem>
+<listitem>
+<para>
+600 URI Acquire - Request a URI be acquired
+</para>
+</listitem>
+<listitem>
+<para>
+601 Configuration - Sends the configuration space
+</para>
+</listitem>
+<listitem>
+<para>
+602 Authorization Credentials - Response to the 402 message
+</para>
+</listitem>
+<listitem>
+<para>
+603 Media Changed - Response to the 403 message
+</para>
+</listitem>
+</itemizedlist>
+<para>
+Only the 6xx series of status codes is sent TO the method. Furthermore the
+method may not emit status codes in the 6xx range. The Codes 402 and 403
+require that the method continue reading all other 6xx codes until the proper
+602/603 code is received. This means the method must be capable of handling an
+unlimited number of 600 messages.
+</para>
+<para>
+The flow of messages starts with the method sending out a <emphasis>100
+Capabilities</emphasis> and APT sending out a <emphasis>601
+Configuration</emphasis>. After that APT begins sending <emphasis>600 URI
+Acquire</emphasis> and the method sends out <emphasis>200 URI Start</emphasis>,
+<emphasis>201 URI Done</emphasis> or <emphasis>400 URI Failure</emphasis>. No
+synchronization is performed, it is expected that APT will send <emphasis>600
+URI Acquire</emphasis> messages at -any- time and that the method should queue
+the messages. This allows methods like http to pipeline requests to the remote
+server. It should be noted however that APT will buffer messages so it is not
+necessary for the method to be constantly ready to receive them.
+</para>
+</section>
+
+<section id="s2.3"><title>Header Fields</title>
+<para>
+The following is a short index of the header fields that are supported
+</para>
+<variablelist>
+<varlistentry>
+<term>URI</term>
+<listitem>
+<para>
+URI being described by the message
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Filename</term>
+<listitem>
+<para>
+Location in the filesystem
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Last-Modified</term>
+<listitem>
+<para>
+A time stamp in RFC1123 notation for use by IMS checks
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>IMS-Hit</term>
+<listitem>
+<para>
+The already existing item is valid
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Size</term>
+<listitem>
+<para>
+Size of the file in bytes
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Resume-Point</term>
+<listitem>
+<para>
+Location that transfer was started
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>MD5-Hash</term>
+<listitem>
+<para>
+Computed MD5 hash for the file
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Message</term>
+<listitem>
+<para>
+String indicating some displayable message
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Media</term>
+<listitem>
+<para>
+String indicating the media name required
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Site</term>
+<listitem>
+<para>
+String indicating the site authorization is required for
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>User</term>
+<listitem>
+<para>
+Username for authorization
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Password</term>
+<listitem>
+<para>
+Password for authorization
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Fail</term>
+<listitem>
+<para>
+Operation failed
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Drive</term>
+<listitem>
+<para>
+Drive the media should be placed in
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Config-Item</term>
+<listitem>
+<para>
+A string of the form
+<replaceable>item</replaceable>=<replaceable>value</replaceable> derived from
+the APT configuration space. These may include method specific values and
+general values not related to the method. It is up to the method to filter out
+the ones it wants.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Single-Instance</term>
+<listitem>
+<para>
+Requires that only one instance of the method be run This is a yes/no value.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Pipeline</term>
+<listitem>
+<para>
+The method is capable of pipelining.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Local</term>
+<listitem>
+<para>
+The method only returns Filename: fields.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Send-Config</term>
+<listitem>
+<para>
+Send configuration to the method.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Needs-Cleanup</term>
+<listitem>
+<para>
+The process is kept around while the files it returned are being used. This is
+primarily intended for CD-ROM and File URIs that need to unmount filesystems.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Version</term>
+<listitem>
+<para>
+Version string for the method
+</para>
+</listitem>
+</varlistentry>
+</variablelist>
+<para>
+This is a list of which headers each status code can use
+</para>
+<variablelist>
+<varlistentry>
+<term>100 Capabilities</term>
+<listitem>
+<para>
+Displays the capabilities of the method. Methods should set the pipeline bit
+if their underlying protocol supports pipelining. The only known method that
+does support pipelining is http. Fields: Version, Single-Instance, Pre-Scan,
+Pipeline, Send-Config, Needs-Cleanup
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>101 Log</term>
+<listitem>
+<para>
+A log message may be printed to the screen if debugging is enabled. This is
+only for debugging the method. Fields: Message
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>102 Status</term>
+<listitem>
+<para>
+Message gives a progress indication for the method. It can be used to show
+pre-transfer status for Internet type methods. Fields: Message
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>200 URI Start</term>
+<listitem>
+<para>
+Indicates the URI is starting to be transferred. The URI is specified along
+with stats about the file itself. Fields: URI, Size, Last-Modified,
+Resume-Point
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>201 URI Done</term>
+<listitem>
+<para>
+Indicates that a URI has completed being transferred. It is possible to
+specify a <emphasis>201 URI Done</emphasis> without a <emphasis>URI
+Start</emphasis> which would mean no data was transferred but the file is now
+available. A Filename field is specified when the URI is directly available in
+the local pathname space. APT will either directly use that file or copy it
+into another location. It is possible to return Alt-* fields to indicate that
+another possibility for the URI has been found in the local pathname space.
+This is done if a decompressed version of a .gz file is found. Fields: URI,
+Size, Last-Modified, Filename, MD5-Hash
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>400 URI Failure</term>
+<listitem>
+<para>
+Indicates a fatal URI failure. The URI is not retrievable from this source. As
+with <emphasis>201 URI Done</emphasis> <emphasis>200 URI Start</emphasis> is
+not required to precede this message Fields: URI, Message
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>401 General Failure</term>
+<listitem>
+<para>
+Indicates that some unspecific failure has occurred and the method is unable
+to  continue. The method should terminate after sending this message. It
+is intended to check for invalid configuration options or other severe
+conditions. Fields: Message
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>402 Authorization Required</term>
+<listitem>
+<para>
+The method requires a Username and Password pair to continue. After sending
+this message the method will expect APT to send a <emphasis>602 Authorization
+Credentials</emphasis> message with the required information. It is possible
+for a method to send this multiple times. Fields: Site
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>403 Media Failure</term>
+<listitem>
+<para>
+A method that deals with multiple media requires that a new media be
+inserted. The Media field contains the name of the media to be
+inserted. Fields: Media, Drive
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>600 URI Acquire</term>
+<listitem>
+<para>
+APT is requesting that a new URI be added to the acquire list. Last-Modified
+has the time stamp of the currently cache file if applicable. Filename is the
+name of the file that the acquired URI should be written to. Fields: URI,
+Filename Last-Modified
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>601 Configuration</term>
+<listitem>
+<para>
+APT is sending the configuration space to the method. A series of Config-Item
+fields will be part of this message, each containing an entry from the
+configuration space. Fields: Config-Item.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>602 Authorization Credentials</term>
+<listitem>
+<para>
+This is sent in response to a <emphasis>402 Authorization Required</emphasis>
+message. It contains the entered username and password. Fields: Site, User,
+Password
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>603 Media Changed</term>
+<listitem>
+<para>
+This is sent in response to a <emphasis>403 Media Failure</emphasis>
+message. It indicates that the user has changed media and it is safe
+to proceed. Fields: Media, Fail
+</para>
+</listitem>
+</varlistentry>
+</variablelist>
+</section>
+
+<section id="s2.4"><title>Notes</title>
+<para>
+The methods supplied by the stock apt are:
+</para>
+<orderedlist numeration="arabic">
+<listitem>
+<para>
+cdrom - For Multi-Disc CD-ROMs
+</para>
+</listitem>
+<listitem>
+<para>
+copy - (internal) For copying files around the filesystem
+</para>
+</listitem>
+<listitem>
+<para>
+file - For local files
+</para>
+</listitem>
+<listitem>
+<para>
+gzip - (internal) For decompression
+</para>
+</listitem>
+<listitem>
+<para>
+http - For HTTP servers
+</para>
+</listitem>
+</orderedlist>
+<para>
+The two internal methods, copy and gzip, are used by the acquire code to
+parallize and simplify the automatic decompression of package files as well as
+copying package files around the file system. Both methods can be seen to act
+the same except that one decompresses on the fly. APT uses them by generating
+a copy URI that is formed identically to a file URI. The destination file is
+send as normal. The method then takes the file specified by the URI and writes
+it to the destination file. A typical set of operations may be:
+</para>
+<screen>
+http://foo.com/Packages.gz -&gt; /bar/Packages.gz
+gzip:/bar/Packages.gz -&gt; /bar/Packages.decomp
+rename Packages.decomp to /final/Packages
+</screen>
+<para>
+The http method implements a fully featured HTTP/1.1 client that supports
+deep pipelining and reget. It works best when coupled with an apache 1.3
+server. The file method simply generates failures or success responses
+with the filename field set to the proper location. The cdrom method acts
+the same except that it checks that the mount point has a valid cdrom in
+it. It does this by (effectively) computing a md5 hash of 'ls -l' on the
+mountpoint.
+</para>
+</section>
+
+</chapter>
+
+</book>
diff --git a/doc/method.sgml b/doc/method.sgml
deleted file mode 100644
index 5aa7b52e..00000000
--- a/doc/method.sgml
+++ /dev/null
@@ -1,354 +0,0 @@
-<!-- -*- mode: sgml; mode: fold -*- -->
-<!doctype debiandoc  PUBLIC  "-//DebianDoc//DTD DebianDoc//EN">
-<book>
-<title>APT Method Interface </title>
-
-<author>Jason Gunthorpe <email>jgg@debian.org</email></author>
-<version>$Id: method.sgml,v 1.10 2003/02/12 15:05:46 doogie Exp $</version>
-
-<abstract>
-This document describes the interface that APT uses to the archive
-access methods.
-</abstract>
-
-<copyright>
-Copyright &copy; Jason Gunthorpe, 1998.
-<p>
-"APT" and this document are free software; you can redistribute them and/or
-modify them under the terms of the GNU General Public License as published
-by the Free Software Foundation; either version 2 of the License, or (at your
-option) any later version.
-
-<p>
-For more details, on Debian systems, see the file
-/usr/share/common-licenses/GPL for the full license.
-</copyright>
-
-<toc sect>
-
-<chapt>Introduction
-<!-- General		                                               {{{ -->
-<!-- ===================================================================== -->
-<sect>General
-
-<p>
-The APT method interface allows APT to acquire archive files (.deb), index
-files (Packages, Release, Mirrors) and source files (.tar.gz, .diff). It
-is a general, extensible system designed to satisfy all of these
-requirements:
-
-<enumlist>
-<item>Remote methods that download files from a distant site
-<item>Resume of aborted downloads
-<item>Progress reporting
-<item>If-Modified-Since (IMS) checking for index files
-<item>In-Line MD5 generation
-<item>No-copy in-filesystem methods
-<item>Multi-media methods (like CD's)
-<item>Dynamic source selection for failure recovery
-<item>User interaction for user/password requests and media swaps
-<item>Global configuration
-</enumlist>
-
-Initial releases of APT (0.1.x) used a completely different method
-interface that only supported the first 6 items. This new interface
-deals with the remainder.
-</sect>
-                                                                  <!-- }}} -->
-<!-- Terms		                                               {{{ -->
-<!-- ===================================================================== -->
-<sect>Terms
-
-<p>
-Several terms are used through out the document, they have specific
-meanings which may not be immediately evident. To clarify they are summarized
-here.
-
-<taglist>
-<tag>source<item>
-Refers to an item in source list. More specifically it is the broken down
-item, that is each source maps to exactly one index file. Archive sources
-map to Package files and Source Code sources map to Source files.
-
-<tag>archive file<item>
-Refers to a binary package archive (.deb, .rpm, etc). 
-
-<tag>source file<item>
-Refers to one of the files making up the source code of a package. In
-debian it is one of .diff.gz, .dsc. or .tar.gz.
-
-<tag>URI<item>
-Universal Resource Identifier (URI) is a super-set of the familiar URL
-syntax used by web browsers. It consists of an access specification
-followed by a specific location in that access space. The form is
-&lt;access&gt;:&lt;location&gt;. Network addresses are given with the form 
-&lt;access&gt;://[&lt;user&gt;[:&lt;pas&gt;]@]hostname[:port]/&lt;location&gt;. 
-Some examples:
-<example>
-file:/var/mirrors/debian/
-ftp://ftp.debian.org/debian
-ftp://jgg:MooCow@localhost:21/debian
-nfs://bigred/var/mirrors/debian
-rsync://debian.midco.net/debian
-cdrom:Debian 2.0r1 Disk 1/
-</example>
-
-<tag>method<item>
-There is a one to one mapping of URI access specifiers to methods. A method
-is a program that knows how to handle a URI access type and operates according
-to the specifications in this file.
-
-<tag>method instance<item>
-A specific running method. There can be more than one instance of each method
-as APT is capable of concurrent method handling.
-
-<tag>message<item>
-A series of lines terminated by a blank line sent down one of the
-communication lines. The first line should have the form xxx TAG
-where xxx are digits forming the status code and TAG is an informational
-string
-
-<tag>acquire<item>
-The act of bring a URI into the local pathname space. This may simply
-be verifying the existence of the URI or actually downloading it from
-a remote site.
-
-</taglist>
-
-</sect>
-                                                                  <!-- }}} -->
-<chapt>Specification
-<!-- Overview		                                               {{{ -->
-<!-- ===================================================================== -->
-<sect>Overview
-
-<p>
-All methods operate as a sub process of a main controlling parent. 3 FD's
-are opened for use by the method allowing two way communication and
-emergency error reporting. The FD's correspond to the well known unix FD's, 
-stdin, stdout and stderr.
-
-<p>
-Through operation of the method communication is done via http 
-style plain text. Specifically RFC-822 (like the Package file) fields
-are used to describe items and a numeric-like header is used to indicate
-what is happening. Each of these distinct communication messages should be
-sent quickly and without pause.
-
-<p> 
-In some instances APT may pre-invoke a method to allow things like file
-URI's to determine how many files are available locally.
-</sect>
-                                                                  <!-- }}} -->
-<!-- Message Overview	                                               {{{ -->
-<!-- ===================================================================== -->
-<sect>Message Overview
-
-<p>
-The first line of each message is called the message header. The first
-3 digits (called the Status Code) have the usual meaning found in the 
-http protocol. 1xx is informational, 2xx is successful and 4xx is failure. 
-The 6xx series is used to specify things sent to the method. After the 
-status code is an informational string provided for visual debugging.
-
-<list>
-<item>100 Capabilities - Method capabilities
-<item>101 Log - General Logging
-<item>102 Status - Inter-URI status reporting (login progress)
-<item>200 URI Start - URI is starting acquire
-<item>201 URI Done - URI is finished acquire
-<item>400 URI Failure - URI has failed to acquire
-<item>401 General Failure - Method did not like something sent to it
-<item>402 Authorization Required - Method requires authorization
-        to access the URI. Authorization is User/Pass
-<item>403 Media Failure - Method requires a media change	
-<item>600 URI Acquire - Request a URI be acquired
-<item>601 Configuration - Sends the configuration space
-<item>602 Authorization Credentials - Response to the 402 message
-<item>603 Media Changed - Response to the 403 message
-</list>
-
-Only the 6xx series of status codes is sent TO the method. Furthermore
-the method may not emit status codes in the 6xx range. The Codes 402
-and 403 require that the method continue reading all other 6xx codes
-until the proper 602/603 code is received. This means the method must be
-capable of handling an unlimited number of 600 messages.
-
-<p>
-The flow of messages starts with the method sending out a 
-<em>100 Capabilities</> and APT sending out a <em>601 Configuration</>.
-After that APT begins sending <em>600 URI Acquire</> and the method
-sends out <em>200 URI Start</>, <em>201 URI Done</> or 
-<em>400 URI Failure</>. No synchronization is performed, it is expected
-that APT will send <em>600 URI Acquire</> messages at -any- time and
-that the method should queue the messages. This allows methods like http
-to pipeline requests to the remote server. It should be noted however
-that APT will buffer messages so it is not necessary for the method
-to be constantly ready to receive them.
-</sect>
-                                                                  <!-- }}} -->
-<!-- Header Fields	                                               {{{ -->
-<!-- ===================================================================== -->
-<sect>Header Fields
-
-<p> 
-The following is a short index of the header fields that are supported
-
-<taglist>
-<tag>URI<item>URI being described by the message
-<tag>Filename<item>Location in the filesystem
-<tag>Last-Modified<item>A time stamp in RFC1123 notation for use by IMS checks
-<tag>IMS-Hit<item>The already existing item is valid
-<tag>Size<item>Size of the file in bytes
-<tag>Resume-Point<item>Location that transfer was started
-<tag>MD5-Hash<item>Computed MD5 hash for the file
-<tag>Message<item>String indicating some displayable message
-<tag>Media<item>String indicating the media name required
-<tag>Site<item>String indicating the site authorization is required for
-<tag>User<item>Username for authorization
-<tag>Password<item>Password for authorization
-<tag>Fail<item>Operation failed
-<tag>Drive<item>Drive the media should be placed in
-<tag>Config-Item<item>
-A string of the form <var>item</>=<var>value</> derived from the APT 
-configuration space. These may include method specific values and general
-values not related to the method. It is up to the method to filter out
-the ones it wants.
-<tag>Single-Instance<item>Requires that only one instance of the method be run
-                          This is a yes/no value.
-<tag>Pipeline<item>The method is capable of pipelining.
-<tag>Local<item>The method only returns Filename: fields.
-<tag>Send-Config<item>Send configuration to the method.
-<tag>Needs-Cleanup<item>The process is kept around while the files it returned
-are being used. This is primarily intended for CD-ROM and File URIs that need
-to unmount filesystems.
-<tag>Version<item>Version string for the method
-</taglist>
-
-This is a list of which headers each status code can use
-
-<taglist>
-<tag>100 Capabilities<item>
-Displays the capabilities of the method. Methods should set the
-pipeline bit if their underlying protocol supports pipelining. The
-only known method that does support pipelining is http.
-Fields: Version, Single-Instance, Pre-Scan, Pipeline, Send-Config, 
-Needs-Cleanup
-
-<tag>101 Log<item>
-A log message may be printed to the screen if debugging is enabled. This
-is only for debugging the method.
-Fields: Message
-
-<tag>102 Status<item>
-Message gives a progress indication for the method. It can be used to show
-pre-transfer status for Internet type methods.
-Fields: Message
-
-<tag>200 URI Start<item>
-Indicates the URI is starting to be transferred. The URI is specified
-along with stats about the file itself.
-Fields: URI, Size, Last-Modified, Resume-Point
-
-<tag>201 URI Done<item>
-Indicates that a URI has completed being transferred. It is possible
-to specify a <em>201 URI Done</> without a <em>URI Start</> which would
-mean no data was transferred but the file is now available. A Filename
-field is specified when the URI is directly available in the local 
-pathname space. APT will either directly use that file or copy it into 
-another location. It is possible to return Alt-* fields to indicate that
-another possibility for the URI has been found in the local pathname space.
-This is done if a decompressed version of a .gz file is found.
-Fields: URI, Size, Last-Modified, Filename, MD5-Hash
-
-<tag>400 URI Failure<item>
-Indicates a fatal URI failure. The URI is not retrievable from this source.
-As with <em>201 URI Done</> <em>200 URI Start</> is not required to precede
-this message
-Fields: URI, Message
-
-<tag>401 General Failure<item>
-Indicates that some unspecific failure has occurred and the method is unable
-to continue. The method should terminate after sending this message. It 
-is intended to check for invalid configuration options or other severe
-conditions.
-Fields: Message
-
-<tag>402 Authorization Required<item>
-The method requires a Username and Password pair to continue. After sending
-this message the method will expect APT to send a <em>602 Authorization 
-Credentials</> message with the required information. It is possible for
-a method to send this multiple times.
-Fields: Site
-
-<tag>403 Media Failure<item>
-A method that deals with multiple media requires that a new media be inserted.
-The Media field contains the name of the media to be inserted.
-Fields: Media, Drive
-
-<tag>600 URI Acquire<item>
-APT is requesting that a new URI be added to the acquire list. Last-Modified
-has the time stamp of the currently cache file if applicable. Filename
-is the name of the file that the acquired URI should be written to.
-Fields: URI, Filename Last-Modified
-
-<tag>601 Configuration<item>
-APT is sending the configuration space to the method. A series of
-Config-Item fields will be part of this message, each containing an entry
-from the configuration space.
-Fields: Config-Item.
-
-<tag>602 Authorization Credentials<item>
-This is sent in response to a <em>402 Authorization Required</> message. 
-It contains the entered username and password.
-Fields: Site, User, Password
-
-<tag>603 Media Changed<item>
-This is sent in response to a <em>403 Media Failure</> message. It
-indicates that the user has changed media and it is safe to proceed.
-Fields: Media, Fail
-</taglist>
-
-</sect>
-                                                                  <!-- }}} -->
-<!-- Method Notes		                                       {{{ -->
-<!-- ===================================================================== -->
-<sect>Notes
-
-<p>
-The methods supplied by the stock apt are:
-<enumlist>
-<item>cdrom - For Multi-Disc CD-ROMs
-<item>copy - (internal) For copying files around the filesystem
-<item>file - For local files
-<item>gzip - (internal) For decompression
-<item>http - For HTTP servers
-</enumlist>
-
-<p>
-The two internal methods, copy and gzip, are used by the acquire code to
-parallize and simplify the automatic decompression of package files as well 
-as copying package files around the file system. Both methods can be seen to 
-act the same except that one decompresses on the fly. APT uses them by
-generating a copy URI that is formed identically to a file URI. The destination
-file is send as normal. The method then takes the file specified by the 
-URI and writes it to the destination file. A typical set of operations may
-be:
-<example>
-http://foo.com/Packages.gz -> /bar/Packages.gz
-gzip:/bar/Packages.gz -> /bar/Packages.decomp
-rename Packages.decomp to /final/Packages
-</example>
-
-<p>
-The http method implements a fully featured HTTP/1.1 client that supports
-deep pipelining and reget. It works best when coupled with an apache 1.3
-server. The file method simply generates failures or success responses with
-the filename field set to the proper location. The cdrom method acts the same
-except that it checks that the mount point has a valid cdrom in it. It does 
-this by (effectively) computing a md5 hash of 'ls -l' on the mountpoint.
-
-</sect>
-                                                                  <!-- }}} -->
-
-</book>
diff --git a/doc/offline.sgml b/doc/offline.dbk
index 659ca314..7163f8bd 100644
--- a/doc/offline.sgml
+++ b/doc/offline.dbk
@@ -1,74 +1,89 @@
-<!-- -*- mode: sgml; mode: fold -*- -->
-<!doctype debiandoc  PUBLIC  "-//DebianDoc//DTD DebianDoc//EN">
-<book>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- -*- DocBook -*- -->
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent"> %aptverbatiment;
+]>
+
+<book lang="en">
+
 <title>Using APT Offline</title>
 
-<author>Jason Gunthorpe <email>jgg@debian.org</email></author>
-<version>$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $</version>
+<bookinfo>
+
+<authorgroup>
+  <author>
+    <personname>Jason Gunthorpe</personname><email>jgg@debian.org</email>
+  </author>
+</authorgroup>
+
+<releaseinfo>Version &apt-product-version;</releaseinfo>
 
 <abstract>
-This document describes how to use APT in a non-networked environment, 
+<para>
+This document describes how to use APT in a non-networked environment,
 specifically a 'sneaker-net' approach for performing upgrades.
+</para>
 </abstract>
 
-<copyright>
-Copyright &copy; Jason Gunthorpe, 1999.
-<p>
+<copyright><year>1999</year><holder>Jason Gunthorpe</holder></copyright>
+
+<legalnotice>
+<title>License Notice</title>
+<para>
 "APT" and this document are free software; you can redistribute them and/or
-modify them under the terms of the GNU General Public License as published
-by the Free Software Foundation; either version 2 of the License, or (at your
+modify them under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or (at your
 option) any later version.
-
-<p>
+</para>
+<para>
 For more details, on Debian systems, see the file
 /usr/share/common-licenses/GPL for the full license.
-</copyright>
+</para>
+</legalnotice>
 
-<toc sect>
+</bookinfo>
 
-<chapt>Introduction
-<!-- Overview		                                               {{{ -->
-<!-- ===================================================================== -->
-<sect>Overview
+<chapter id="ch1"><title>Introduction</title>
 
-<p>
+<section id="s1.1"><title>Overview</title>
+<para>
 Normally APT requires direct access to a Debian archive, either from a local
 media or through a network. Another common complaint is that a Debian machine
-is on a slow link, such as a modem and another machine has a very fast 
+is on a slow link, such as a modem and another machine has a very fast
 connection but they are physically distant.
-
-<p>
-The solution to this is to use large removable media such as a Zip disc or a 
+</para>
+<para>
+The solution to this is to use large removable media such as a Zip disc or a
 SuperDisk disc. These discs are not large enough to store the entire Debian
-archive but can easily fit a subset large enough for most users. The idea
-is to use APT to generate a list of packages that are required and then fetch
-them onto the disc using another machine with good connectivity. It is 
-even possible to use another Debian machine with APT or to use a completely 
-different OS and a download tool like wget. Let <em>remote host</em> mean the
-machine downloading the packages, and <em>target host</em> the one with bad or
-no connection.
-
-<p>
+archive but can easily fit a subset large enough for most users. The idea is
+to use APT to generate a list of packages that are required and then fetch them
+onto the disc using another machine with good connectivity. It is even
+possible to use another Debian machine with APT or to use a completely
+different OS and a download tool like wget. Let <emphasis>remote
+host</emphasis> mean the machine downloading the packages, and <emphasis>target
+host</emphasis> the one with bad or no connection.
+</para>
+<para>
 This is achieved by creatively manipulating the APT configuration file. The
 essential premise to tell APT to look on a disc for it's archive files. Note
 that the disc should be formated with a filesystem that can handle long file
 names such as ext2, fat32 or vfat.
+</para>
+</section>
 
-</sect>
-                                                                  <!-- }}} -->
+</chapter>
 
-<chapt>Using APT on both machines
-<!-- Overview		                                               {{{ -->
-<!-- ===================================================================== -->
-<sect>Overview
+<chapter id="ch2"><title>Using APT on both machines</title>
 
-<p>
-APT being available on both machines gives the simplest configuration. The 
-basic idea is to place a copy of the status file on the disc and use the 
-remote machine to fetch the latest package files and decide which packages to 
+<section id="s2.1"><title>Overview</title>
+<para>
+APT being available on both machines gives the simplest configuration. The
+basic idea is to place a copy of the status file on the disc and use the remote
+machine to fetch the latest package files and decide which packages to
 download. The disk directory structure should look like:
-
-<example>
+</para>
+<screen>
   /disc/
     archives/
        partial/
@@ -77,36 +92,32 @@ download. The disk directory structure should look like:
     status
     sources.list
     apt.conf
-</example>
-
-</sect>
-                                                                  <!-- }}} -->
-<!-- The configuartion file                                            {{{ -->
-<!-- ===================================================================== -->
-<sect>The configuration file
-
-<p>
-The configuration file should tell APT to store its files on the disc and
-to use the configuration files on the disc as well. The sources.list should
-contain the proper sites that you wish to use from the remote machine, and
-the status file should be a copy of <em>/var/lib/dpkg/status</em> from the
-<em>target host</em>. Please note, if you are using a local archive you must use
-copy URIs, the syntax is identical to file URIs.
-
-<p>
-<em>apt.conf</em> must contain the necessary information to make APT use the 
-disc:
-
-<example>
+</screen>
+</section>
+
+<section id="s2.2"><title>The configuration file</title>
+<para>
+The configuration file should tell APT to store its files on the disc and to
+use the configuration files on the disc as well. The sources.list should
+contain the proper sites that you wish to use from the remote machine, and the
+status file should be a copy of <emphasis>/var/lib/dpkg/status</emphasis> from
+the <emphasis>target host</emphasis>. Please note, if you are using a local
+archive you must use copy URIs, the syntax is identical to file URIs.
+</para>
+<para>
+<emphasis>apt.conf</emphasis> must contain the necessary information to make
+APT use the disc:
+</para>
+<screen>
  APT
  {
    /* This is not necessary if the two machines are the same arch, it tells
       the remote APT what architecture the target machine is */
    Architecture "i386";
-   
+
    Get::Download-Only "true";
  };
- 
+
  Dir
  {
    /* Use the disc for state information and redirect the status file from
@@ -117,120 +128,120 @@ disc:
    // Binary caches will be stored locally
    Cache::archives "/disc/archives/";
    Cache "/tmp/";
-   
+
    // Location of the source list.
    Etc "/disc/";
- }; 
-</example>
-
+ };
+</screen>
+<para>
 More details can be seen by examining the apt.conf man page and the sample
-configuration file in <em>/usr/share/doc/apt/examples/apt.conf</em>.
-
-<p>
-On the target machine the first thing to do is mount the disc and copy 
-<em>/var/lib/dpkg/status</em> to it. You will also need to create the directories
-outlined in the Overview, <em>archives/partial/</em> and <em>lists/partial/</em>.
-Then take the disc to the remote machine and configure the sources.list. 
-On the remote machine execute the following:
-
-<example>
+configuration file in
+<emphasis>/usr/share/doc/apt/examples/apt.conf</emphasis>.
+</para>
+<para>
+On the target machine the first thing to do is mount the disc and copy
+<emphasis>/var/lib/dpkg/status</emphasis> to it. You will also need
+to create the directories outlined in the Overview,
+<emphasis>archives/partial/</emphasis> and
+<emphasis>lists/partial/</emphasis>. Then take the disc to the
+remote machine and configure the sources.list. On the remote
+machine execute the following:
+</para>
+<screen>
  # export APT_CONFIG="/disc/apt.conf"
  # apt-get update
  [ APT fetches the package files ]
  # apt-get dist-upgrade
  [ APT fetches all the packages needed to upgrade the target machine ]
-</example>
-
+</screen>
+<para>
 The dist-upgrade command can be replaced with any other standard APT commands,
-particularly dselect-upgrade. You can even use an APT front end such as 
-<em>dselect</em>. However this presents a problem in communicating your 
-selections back to the local computer.
-
-<p>
-Now the disc contains all of the index files and archives needed to upgrade
-the target machine. Take the disc back and run:
-
-<example>
+particularly dselect-upgrade. You can even use an APT front end such as
+<emphasis>dselect</emphasis>. However this presents a problem in communicating
+your selections back to the local computer.
+</para>
+<para>
+Now the disc contains all of the index files and archives needed to upgrade the
+target machine. Take the disc back and run:
+</para>
+<screen>
   # export APT_CONFIG="/disc/apt.conf"
   # apt-get check
   [ APT generates a local copy of the cache files ]
   # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade
   [ Or any other APT command ]
-</example>
-
-<p> 
-It is necessary for proper function to re-specify the status file to be the 
+</screen>
+<para>
+It is necessary for proper function to re-specify the status file to be the
 local one. This is very important!
-
-<p>
-If you are using dselect you can do the very risky operation of copying 
+</para>
+<para>
+If you are using dselect you can do the very risky operation of copying
 disc/status to /var/lib/dpkg/status so that any selections you made on the
-remote machine are updated. I highly recommend that people only make selections
-on the local machine - but this may not always be possible. DO NOT copy
-the status file if dpkg or APT have been run in the mean time!!
-
-</sect>
-                                                                  <!-- }}} -->
-
-<chapt>Using APT and wget
-<!-- Overview		                                               {{{ -->
-<!-- ===================================================================== -->
-<sect>Overview
-
-<p>
-<em>wget</em> is a popular and portable download tool that can run on nearly
-any machine. Unlike the method above this requires that the Debian machine
-already has a list of available packages.
-
-<p>
+remote machine are updated. I highly recommend that people only make
+selections on the local machine - but this may not always be possible. DO NOT
+copy the status file if dpkg or APT have been run in the mean time!!
+</para>
+</section>
+
+</chapter>
+
+<chapter id="ch3"><title>Using APT and wget</title>
+
+<section id="s3.1"><title>Overview</title>
+<para>
+<emphasis>wget</emphasis> is a popular and portable download tool that can run
+on nearly any machine. Unlike the method above this requires that the Debian
+machine already has a list of available packages.
+</para>
+<para>
 The basic idea is to create a disc that has only the archive files downloaded
 from the remote site. This is done by using the --print-uris option to apt-get
 and then preparing a wget script to actually fetch the packages.
+</para>
+</section>
 
-</sect>
-                                                                  <!-- }}} -->
-<!-- Operation		                                               {{{ -->
-<!-- ===================================================================== -->
-<sect>Operation
-
-<p>
+<section id="s3.2"><title>Operation</title>
+<para>
 Unlike the previous technique no special configuration files are required. We
 merely use the standard APT commands to generate the file list.
-
-<example>
- # apt-get dist-upgrade 
+</para>
+<screen>
+ # apt-get dist-upgrade
  [ Press no when prompted, make sure you are happy with the actions ]
- # apt-get -qq --print-uris dist-upgrade > uris
- # awk '{print "wget -O " $2 " " $1}' < uris > /disc/wget-script
-</example>
-
-Any command other than dist-upgrade could be used here, including 
+ # apt-get -qq --print-uris dist-upgrade &gt; uris
+ # awk '{print "wget -O " $2 " " $1}' &lt; uris &gt; /disc/wget-script
+</screen>
+<para>
+Any command other than dist-upgrade could be used here, including
 dselect-upgrade.
-
-<p>
-The /disc/wget-script file will now contain a list of wget commands to execute 
+</para>
+<para>
+The /disc/wget-script file will now contain a list of wget commands to execute
 in order to fetch the necessary archives. This script should be run with the
-current directory as the disc's mount point so as to save the output on the 
+current directory as the disc's mount point so as to save the output on the
 disc.
-
-<p>
+</para>
+<para>
 The remote machine would do something like
-
-<example>
+</para>
+<screen>
   # cd /disc
   # sh -x ./wget-script
   [ wait.. ]
-</example>
-
+</screen>
+<para>
 Once the archives are downloaded and the disc returned to the Debian machine
 installation can proceed using,
-
-<example>
+</para>
+<screen>
   # apt-get -o dir::cache::archives="/disc/" dist-upgrade
-</example>
-
+</screen>
+<para>
 Which will use the already fetched archives on the disc.
+</para>
+</section>
+
+</chapter>
 
-</sect>
-                                                                  <!-- }}} -->
 </book>
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 524b1afd..b17bde1e 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: apt-doc 0.9.16.1\n"
+"Project-Id-Version: apt-doc 1.0.6\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-04-01 15:51+0200\n"
+"POT-Creation-Date: 2014-07-10 10:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -636,13 +636,13 @@ msgstr ""
 #: apt.8.xml:145
 msgid ""
 "The <command>apt</command> command is meant to be pleasant for end users and "
-"does not need to be backward compatilbe like &apt-get;. Therefore some "
+"does not need to be backward compatible like &apt-get;. Therefore some "
 "options are different:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: apt.8.xml:151
-msgid "The option <literal>DPkgPM::Progress-Fancy</literal> is enabled."
+msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
@@ -665,7 +665,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:174 apt-get.8.xml:558 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133 apt-secure.8.xml:193 apt-cdrom.8.xml:154 apt-config.8.xml:111 apt.conf.5.xml:1227 apt_preferences.5.xml:707 sources.list.5.xml:280 apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65 apt-ftparchive.1.xml:609
+#: apt.8.xml:174 apt-get.8.xml:558 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133 apt-secure.8.xml:193 apt-cdrom.8.xml:154 apt-config.8.xml:111 apt.conf.5.xml:1228 apt_preferences.5.xml:707 sources.list.5.xml:280 apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65 apt-ftparchive.1.xml:609
 msgid "See Also"
 msgstr ""
 
@@ -1280,12 +1280,12 @@ msgid ""
 "Show user friendly progress information in the terminal window when packages "
 "are installed, upgraded or removed. For a machine parsable version of this "
 "data see README.progress-reporting in the apt doc directory.  Configuration "
-"Item: <literal>DpkgPM::Progress</literal> and "
+"Item: <literal>Dpkg::Progress</literal> and "
 "<literal>Dpkg::Progress-Fancy</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:548 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127 apt.conf.5.xml:1221 apt_preferences.5.xml:700
+#: apt-get.8.xml:548 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127 apt.conf.5.xml:1222 apt_preferences.5.xml:700
 msgid "Files"
 msgstr ""
 
@@ -2153,7 +2153,7 @@ msgstr ""
 #: apt-secure.8.xml:195
 msgid ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -3215,14 +3215,15 @@ msgid ""
 "information, such as the two package caches <literal>srcpkgcache</literal> "
 "and <literal>pkgcache</literal> as well as the location to place downloaded "
 "archives, <literal>Dir::Cache::archives</literal>. Generation of caches can "
-"be turned off by setting their names to the empty string. This will slow "
+"be turned off by setting <literal>pkgcache</literal> or "
+"<literal>srcpkgcache</literal> to <literal>\"\"</literal>.  This will slow "
 "down startup but save disk space. It is probably preferable to turn off the "
-"pkgcache rather than the srcpkgcache. Like <literal>Dir::State</literal> the "
-"default directory is contained in <literal>Dir::Cache</literal>"
+"pkgcache rather than the srcpkgcache.  Like <literal>Dir::State</literal> "
+"the default directory is contained in <literal>Dir::Cache</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:616
+#: apt.conf.5.xml:617
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -3232,7 +3233,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:622
+#: apt.conf.5.xml:623
 msgid ""
 "The <literal>Dir::Parts</literal> setting reads in all the config fragments "
 "in lexical order from the directory specified. After this is done then the "
@@ -3240,7 +3241,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:626
+#: apt.conf.5.xml:627
 msgid ""
 "Binary programs are pointed to by "
 "<literal>Dir::Bin</literal>. <literal>Dir::Bin::Methods</literal> specifies "
@@ -3252,7 +3253,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:634
+#: apt.conf.5.xml:635
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -3265,7 +3266,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:647
+#: apt.conf.5.xml:648
 msgid ""
 "The <literal>Ignore-Files-Silently</literal> list can be used to specify "
 "which files APT should silently ignore while parsing the files in the "
@@ -3276,12 +3277,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:656
+#: apt.conf.5.xml:657
 msgid "APT in DSelect"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:658
+#: apt.conf.5.xml:659
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behavior. These are in the <literal>DSelect</literal> "
@@ -3289,7 +3290,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:663
+#: apt.conf.5.xml:664
 msgid ""
 "Cache Clean mode; this value may be one of <literal>always</literal>, "
 "<literal>prompt</literal>, <literal>auto</literal>, "
@@ -3303,40 +3304,40 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:677
+#: apt.conf.5.xml:678
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the install phase."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:682
+#: apt.conf.5.xml:683
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the update phase."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:687
+#: apt.conf.5.xml:688
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:693
+#: apt.conf.5.xml:694
 msgid "How APT calls &dpkg;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:694
+#: apt.conf.5.xml:695
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:699
+#: apt.conf.5.xml:700
 msgid ""
 "This is a list of options to pass to &dpkg;. The options must be specified "
 "using the list notation and each list item is passed as a single argument to "
@@ -3344,7 +3345,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:705
+#: apt.conf.5.xml:706
 msgid ""
 "This is a list of shell commands to run before/after invoking &dpkg;.  Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -3353,7 +3354,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:712
+#: apt.conf.5.xml:713
 msgid ""
 "This is a list of shell commands to run before invoking &dpkg;. Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -3364,7 +3365,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:719
+#: apt.conf.5.xml:720
 msgid ""
 "Version 2 of this protocol dumps more information, including the protocol "
 "version, the APT configuration space and the packages, files and versions "
@@ -3373,7 +3374,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:724
+#: apt.conf.5.xml:725
 msgid ""
 "The version of the protocol to be used for the command "
 "<literal><replaceable>cmd</replaceable></literal> can be chosen by setting "
@@ -3384,7 +3385,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:731
+#: apt.conf.5.xml:732
 msgid ""
 "The file descriptor to be used to send the information can be requested with "
 "<literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::InfoFD</literal> "
@@ -3395,26 +3396,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:741
+#: apt.conf.5.xml:742
 msgid ""
 "APT chdirs to this directory before invoking &dpkg;, the default is "
 "<filename>/</filename>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:746
+#: apt.conf.5.xml:747
 msgid ""
 "These options are passed to &dpkg-buildpackage; when compiling packages; the "
 "default is to disable signing and produce all binaries."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:751
+#: apt.conf.5.xml:752
 msgid "dpkg trigger usage (and related options)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:752
+#: apt.conf.5.xml:753
 msgid ""
 "APT can call &dpkg; in such a way as to let it make aggressive use of "
 "triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
@@ -3429,7 +3430,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:767
+#: apt.conf.5.xml:768
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -3439,7 +3440,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:761
+#: apt.conf.5.xml:762
 msgid ""
 "Note that it is not guaranteed that APT will support these options or that "
 "these options will not cause (big) trouble in the future. If you have "
@@ -3453,7 +3454,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:774
+#: apt.conf.5.xml:775
 msgid ""
 "Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
 "call).  See &dpkg; if you are interested in what this actually means. In "
@@ -3466,7 +3467,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:782
+#: apt.conf.5.xml:783
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  The default value is "
@@ -3484,7 +3485,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:797
+#: apt.conf.5.xml:798
 msgid ""
 "If this option is set APT will call <command>dpkg --configure "
 "--pending</command> to let &dpkg; handle all required configurations and "
@@ -3496,7 +3497,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:804
+#: apt.conf.5.xml:805
 msgid ""
 "Useful for the <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal>, and "
@@ -3507,7 +3508,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:817
+#: apt.conf.5.xml:818
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -3519,7 +3520,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:810
+#: apt.conf.5.xml:811
 msgid ""
 "Essential packages (and their dependencies) should be configured immediately "
 "after unpacking. It is a good idea to do this quite early in the upgrade "
@@ -3533,12 +3534,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:830
+#: apt.conf.5.xml:831
 msgid "Periodic and Archives options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:831
+#: apt.conf.5.xml:832
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by the "
@@ -3547,12 +3548,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:839
+#: apt.conf.5.xml:840
 msgid "Debug options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:841
+#: apt.conf.5.xml:842
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -3563,7 +3564,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:852
+#: apt.conf.5.xml:853
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, "
@@ -3571,7 +3572,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:860
+#: apt.conf.5.xml:861
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s "
@@ -3579,7 +3580,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:869
+#: apt.conf.5.xml:870
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -3589,65 +3590,65 @@ msgstr ""
 #. 	   motivating example, except I haven't a clue why you'd want
 #. 	   to do this. 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:877
+#: apt.conf.5.xml:878
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CD-ROM IDs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:887
+#: apt.conf.5.xml:888
 msgid "A full list of debugging options to apt follows."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:896
+#: apt.conf.5.xml:897
 msgid "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:907
+#: apt.conf.5.xml:908
 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:918
+#: apt.conf.5.xml:919
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:929
+#: apt.conf.5.xml:930
 msgid "Print information related to downloading packages using HTTPS."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:940
+#: apt.conf.5.xml:941
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:951
+#: apt.conf.5.xml:952
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:961
+#: apt.conf.5.xml:962
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:971
+#: apt.conf.5.xml:972
 msgid ""
 "Output each cryptographic hash that is generated by the "
 "<literal>apt</literal> libraries."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:981
+#: apt.conf.5.xml:982
 msgid ""
 "Do not include information from <literal>statfs</literal>, namely the number "
 "of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -3655,52 +3656,52 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:992
+#: apt.conf.5.xml:993
 msgid ""
 "Disable all file locking.  For instance, this will allow two instances of "
 "<quote><literal>apt-get update</literal></quote> to run at the same time."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1004
+#: apt.conf.5.xml:1005
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1014
+#: apt.conf.5.xml:1015
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1024
+#: apt.conf.5.xml:1025
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1036
+#: apt.conf.5.xml:1037
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1047
+#: apt.conf.5.xml:1048
 msgid "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1058
+#: apt.conf.5.xml:1059
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1068
+#: apt.conf.5.xml:1069
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial "
@@ -3710,7 +3711,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1082
+#: apt.conf.5.xml:1083
 msgid ""
 "Generate debug messages describing which packages are marked as "
 "keep/install/remove while the ProblemResolver does his work.  Each addition "
@@ -3728,45 +3729,45 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1103
+#: apt.conf.5.xml:1104
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1114
+#: apt.conf.5.xml:1115
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1125
+#: apt.conf.5.xml:1126
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1137
+#: apt.conf.5.xml:1138
 msgid "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1148
+#: apt.conf.5.xml:1149
 msgid "Output the priority of each package list on startup."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1158
+#: apt.conf.5.xml:1159
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1169
+#: apt.conf.5.xml:1170
 msgid ""
 "Display a list of all installed packages with their calculated score used by "
 "the pkgProblemResolver. The description of the package is the same as "
@@ -3774,14 +3775,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1181
+#: apt.conf.5.xml:1182
 msgid ""
 "Print information about the vendors read from "
 "<filename>/etc/apt/vendors.list</filename>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1191
+#: apt.conf.5.xml:1192
 msgid ""
 "Display the external commands that are called by apt hooks.  This includes "
 "e.g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or "
@@ -3789,12 +3790,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1215 apt_preferences.5.xml:547 sources.list.5.xml:239 apt-ftparchive.1.xml:598
+#: apt.conf.5.xml:1216 apt_preferences.5.xml:547 sources.list.5.xml:239 apt-ftparchive.1.xml:598
 msgid "Examples"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1216
+#: apt.conf.5.xml:1217
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -3802,7 +3803,7 @@ msgstr ""
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1228
+#: apt.conf.5.xml:1229
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr ""
 
@@ -6005,35 +6006,50 @@ msgid ""
 "100 on error."
 msgstr ""
 
-#. type: <title></title>
-#: guide.sgml:4
+#. type: Attribute 'lang' of: <book>
+#: guide.dbk:8 offline.dbk:8
+msgid "en"
+msgstr ""
+
+#. type: Content of: <book><title>
+#: guide.dbk:10
 msgid "APT User's Guide"
 msgstr ""
 
-#. type: <author></author>
-#: guide.sgml:6 offline.sgml:6
-msgid "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
+#. type: Content of: <book><bookinfo><authorgroup><author><personname>
+#: guide.dbk:16 offline.dbk:16
+msgid "Jason Gunthorpe"
+msgstr ""
+
+#. type: Content of: <book><bookinfo><authorgroup><author><email>
+#: guide.dbk:16 offline.dbk:16
+msgid "jgg@debian.org"
 msgstr ""
 
-#. type: <version></version>
-#: guide.sgml:7
-msgid "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
+#. type: Content of: <book><bookinfo><releaseinfo>
+#: guide.dbk:20 offline.dbk:20
+msgid "Version &apt-product-version;"
 msgstr ""
 
-#. type: <abstract></abstract>
-#: guide.sgml:11
+#. type: Content of: <book><bookinfo><abstract><para>
+#: guide.dbk:24
 msgid ""
 "This document provides an overview of how to use the the APT package "
 "manager."
 msgstr ""
 
-#. type: <copyrightsummary></copyrightsummary>
-#: guide.sgml:15
-msgid "Copyright &copy; Jason Gunthorpe, 1998."
+#. type: Content of: <book><bookinfo>
+#: guide.dbk:28
+msgid "<copyright><year>1998</year><holder>Jason Gunthorpe</holder></copyright>"
+msgstr ""
+
+#. type: Content of: <book><bookinfo><legalnotice><title>
+#: guide.dbk:31 offline.dbk:32
+msgid "License Notice"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:21 offline.sgml:22
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: guide.dbk:33 offline.dbk:34
 msgid ""
 "\"APT\" and this document are free software; you can redistribute them "
 "and/or modify them under the terms of the GNU General Public License as "
@@ -6041,42 +6057,42 @@ msgid ""
 "or (at your option) any later version."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:24 offline.sgml:25
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: guide.dbk:42 offline.dbk:40
 msgid ""
 "For more details, on Debian systems, see the file "
 "/usr/share/common-licenses/GPL for the full license."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:32
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:49
 msgid "General"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:38
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:51
 msgid ""
 "The APT package currently contains two sections, the APT "
-"<prgn>dselect</prgn> method and the <prgn>apt-get</prgn> command line user "
-"interface. Both provide a way to install and remove packages as well as "
-"download new packages from the Internet."
+"<command>dselect</command> method and the <command>apt-get</command> command "
+"line user interface. Both provide a way to install and remove packages as "
+"well as download new packages from the Internet."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:39
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:57
 msgid "Anatomy of the Package System"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:44
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:59
 msgid ""
 "The Debian packaging system has a large amount of information associated "
 "with each package to help assure that it integrates cleanly and easily into "
 "the system. The most prominent of its features is the dependency system."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:52
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:64
 msgid ""
 "The dependency system allows individual programs to make use of shared "
 "elements in the system such as libraries. It simplifies placing infrequently "
@@ -6085,8 +6101,8 @@ msgid ""
 "in mail transport agents, X servers and so on."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:57
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:71
 msgid ""
 "The first step to understanding the dependency system is to grasp the "
 "concept of a simple dependency. The meaning of a simple dependency is that a "
@@ -6094,8 +6110,8 @@ msgid ""
 "properly."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:63
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:76
 msgid ""
 "For instance, mailcrypt is an emacs extension that aids in encrypting email "
 "with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a "
@@ -6103,8 +6119,8 @@ msgid ""
 "simple dependency on emacs, without emacs it is completely useless."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:73
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:82
 msgid ""
 "The other important dependency to understand is a conflicting dependency. It "
 "means that a package, when installed with another package, will not work and "
@@ -6116,8 +6132,8 @@ msgid ""
 "other mail transport agents."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:83
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:92
 msgid ""
 "As an added complication there is the possibility for a package to pretend "
 "to be another package. Consider that exim and sendmail for many intents are "
@@ -6129,8 +6145,8 @@ msgid ""
 "trying to manually fix packages."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:88
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:102
 msgid ""
 "At any given time a single dependency may be met by packages that are "
 "already installed or it may not be. APT attempts to help resolve dependency "
@@ -6138,71 +6154,78 @@ msgid ""
 "packages for installation."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:96
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:111
 msgid "apt-get"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:102
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:113
 msgid ""
-"<prgn>apt-get</prgn> provides a simple way to install packages from the "
-"command line. Unlike <prgn>dpkg</prgn>, <prgn>apt-get</prgn> does not "
-"understand .deb files, it works with the package's proper name and can only "
-"install .deb archives from a <em>Source</em>."
+"<command>apt-get</command> provides a simple way to install packages from "
+"the command line. Unlike <command>dpkg</command>, <command>apt-get</command> "
+"does not understand .deb files, it works with the package's proper name and "
+"can only install .deb archives from a <emphasis>Source</emphasis>."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:109
+#. type: Content of: <book><chapter><para><footnote><para>
+#: guide.dbk:119
 msgid ""
-"The first <footnote><p>If you are using an http proxy server you must set "
-"the http_proxy environment variable first, see "
-"sources.list(5)</p></footnote> thing that should be done before using "
-"<prgn>apt-get</prgn> is to fetch the package lists from the <em>Sources</em> "
-"so that it knows what packages are available. This is done with <tt>apt-get "
-"update</tt>. For instance,"
+"If you are using an http proxy server you must set the http_proxy "
+"environment variable first, see sources.list(5)"
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:116
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:119
+msgid ""
+"The first <placeholder type=\"footnote\" id=\"0\"/> thing that should be "
+"done before using <command>apt-get</command> is to fetch the package lists "
+"from the <emphasis>Sources</emphasis> so that it knows what packages are "
+"available. This is done with <literal>apt-get update</literal>. For "
+"instance,"
+msgstr ""
+
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:127
 #, no-wrap
 msgid ""
 "# apt-get update\n"
 "Get http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
 "Get http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 msgstr ""
 
-#. type: <p><taglist>
-#: guide.sgml:120
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:134
 msgid "Once updated there are several commands that can be used:"
 msgstr ""
 
-#. type: <tag></tag>
-#: guide.sgml:121
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:138
 msgid "upgrade"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:131
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:141
 msgid ""
 "Upgrade will attempt to gently upgrade the whole system. Upgrade will never "
 "install a new package or remove an existing package, nor will it ever "
 "upgrade a package that might cause some other package to break. This can be "
 "used daily to relatively safely upgrade the system. Upgrade will list all of "
 "the packages that it could not upgrade, this usually means that they depend "
-"on new packages or conflict with some other package. <prgn>dselect</prgn> or "
-"<tt>apt-get install</tt> can be used to force these packages to install."
+"on new packages or conflict with some other "
+"package. <command>dselect</command> or <literal>apt-get install</literal> "
+"can be used to force these packages to install."
 msgstr ""
 
-#. type: <tag></tag>
-#: guide.sgml:131
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:153
 msgid "install"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:140
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:156
 msgid ""
 "Install is used to install packages by name. The package is automatically "
 "fetched and installed. This can be useful if you already know the name of "
@@ -6213,131 +6236,135 @@ msgid ""
 "anything other than its arguments are changed."
 msgstr ""
 
-#. type: <tag></tag>
-#: guide.sgml:140
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:167
 msgid "dist-upgrade"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:149
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:170
 msgid ""
 "Dist-upgrade is a complete upgrader designed to simplify upgrading between "
 "releases of Debian. It uses a sophisticated algorithm to determine the best "
 "set of packages to install, upgrade and remove to get as much of the system "
 "to the newest release. In some situations it may be desired to use "
 "dist-upgrade rather than spend the time manually resolving dependencies in "
-"<prgn>dselect</prgn>. Once dist-upgrade has completed then "
-"<prgn>dselect</prgn> can be used to install any packages that may have been "
-"left out."
+"<command>dselect</command>. Once dist-upgrade has completed then "
+"<command>dselect</command> can be used to install any packages that may have "
+"been left out."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:152
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:180
 msgid ""
 "It is important to closely look at what dist-upgrade is going to do, its "
 "decisions may sometimes be quite surprising."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:163
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:187
 msgid ""
-"<prgn>apt-get</prgn> has several command line options that are detailed in "
-"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful "
-"option is <tt>-d</tt> which does not install the fetched files. If the "
-"system has to download a large number of package it would be undesired to "
-"start installing them in case something goes wrong. When <tt>-d</tt> is used "
-"the downloaded archives can be installed by simply running the command that "
-"caused them to be downloaded again without <tt>-d</tt>."
+"<command>apt-get</command> has several command line options that are "
+"detailed in its man page, "
+"<citerefentry><refentrytitle>apt-get</refentrytitle><manvolnum>8</manvolnum></citerefentry>. "
+"The most useful option is <literal>-d</literal> which does not install the "
+"fetched files. If the system has to download a large number of package it "
+"would be undesired to start installing them in case something goes "
+"wrong. When <literal>-d</literal> is used the downloaded archives can be "
+"installed by simply running the command that caused them to be downloaded "
+"again without <literal>-d</literal>."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:168
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:199
 msgid "DSelect"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:173
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:201
 msgid ""
-"The APT <prgn>dselect</prgn> method provides the complete APT system with "
-"the <prgn>dselect</prgn> package selection GUI. <prgn>dselect</prgn> is used "
-"to select the packages to be installed or removed and APT actually installs "
-"them."
+"The APT <command>dselect</command> method provides the complete APT system "
+"with the <command>dselect</command> package selection "
+"GUI. <command>dselect</command> is used to select the packages to be "
+"installed or removed and APT actually installs them."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:184
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:207
 msgid ""
-"To enable the APT method you need to select [A]ccess in <prgn>dselect</prgn> "
-"and then choose the APT method. You will be prompted for a set of "
-"<em>Sources</em> which are places to fetch archives from. These can be "
-"remote Internet sites, local Debian mirrors or CD-ROMs. Each source can "
-"provide a fragment of the total Debian archive, APT will automatically "
-"combine them to form a complete set of packages. If you have a CD-ROM then "
-"it is a good idea to specify it first and then specify a mirror so that you "
-"have access to the latest bug fixes. APT will automatically use packages on "
-"your CD-ROM before downloading from the Internet."
+"To enable the APT method you need to select [A]ccess in "
+"<command>dselect</command> and then choose the APT method. You will be "
+"prompted for a set of <emphasis>Sources</emphasis> which are places to fetch "
+"archives from. These can be remote Internet sites, local Debian mirrors or "
+"CD-ROMs. Each source can provide a fragment of the total Debian archive, APT "
+"will automatically combine them to form a complete set of packages. If you "
+"have a CD-ROM then it is a good idea to specify it first and then specify a "
+"mirror so that you have access to the latest bug fixes. APT will "
+"automatically use packages on your CD-ROM before downloading from the "
+"Internet."
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:198
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:218
 #, no-wrap
 msgid ""
 "   Set up a list of distribution source locations\n"
-"\t \n"
+"\n"
 " Please give the base URL of the debian distribution.\n"
 " The access schemes I know about are: http file\n"
-"\t   \n"
+"\n"
 " For example:\n"
 "      file:/mnt/debian,\n"
 "      ftp://ftp.debian.org/debian,\n"
 "      http://ftp.de.debian.org/debian,\n"
-"      \n"
-"      \n"
-" URL [http://llug.sep.bnl.gov/debian]:"
+"\n"
+"\n"
+" URL [http://llug.sep.bnl.gov/debian]:\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:205
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:232
 msgid ""
-"The <em>Sources</em> setup starts by asking for the base of the Debian "
-"archive, defaulting to a HTTP mirror. Next it asks for the distribution to "
-"get."
+"The <emphasis>Sources</emphasis> setup starts by asking for the base of the "
+"Debian archive, defaulting to a HTTP mirror. Next it asks for the "
+"distribution to get."
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:212
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:237
 #, no-wrap
 msgid ""
 " Please give the distribution tag to get or a path to the\n"
 " package file ending in a /. The distribution\n"
 " tags are typically something like: stable unstable testing non-US\n"
-"   \n"
-" Distribution [stable]:"
+"\n"
+" Distribution [stable]:\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:222
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:244
 msgid ""
 "The distribution refers to the Debian version in the archive, "
-"<em>stable</em> refers to the latest released version and <em>unstable</em> "
-"refers to the developmental version. <em>non-US</em> is only available on "
-"some mirrors and refers to packages that contain encryption technology or "
-"other things that cannot be exported from the United States. Importing these "
-"packages into the US is legal however."
+"<emphasis>stable</emphasis> refers to the latest released version and "
+"<emphasis>unstable</emphasis> refers to the developmental "
+"version. <emphasis>non-US</emphasis> is only available on some mirrors and "
+"refers to packages that contain encryption technology or other things that "
+"cannot be exported from the United States. Importing these packages into the "
+"US is legal however."
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:228
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:253
 #, no-wrap
 msgid ""
 " Please give the components to get\n"
 " The components are typically something like: main contrib non-free\n"
-"  \n"
-" Components [main contrib non-free]:"
+"\n"
+" Components [main contrib non-free]:\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:236
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:259
 msgid ""
 "The components list refers to the list of sub distributions to fetch. The "
 "distribution is split up based on software licenses, main being DFSG free "
@@ -6345,25 +6372,25 @@ msgid ""
 "restrictions placed on their use and distribution."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:240
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:265
 msgid ""
 "Any number of sources can be added, the setup script will continue to prompt "
 "until you have specified all that you want."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:247
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:269
 msgid ""
-"Before starting to use <prgn>dselect</prgn> it is necessary to update the "
-"available list by selecting [U]pdate from the menu. This is a superset of "
-"<tt>apt-get update</tt> that makes the fetched information available to "
-"<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get "
-"update</tt> has been run before."
+"Before starting to use <command>dselect</command> it is necessary to update "
+"the available list by selecting [U]pdate from the menu. This is a superset "
+"of <literal>apt-get update</literal> that makes the fetched information "
+"available to <command>dselect</command>. [U]pdate must be performed even if "
+"<literal>apt-get update</literal> has been run before."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:253
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:276
 msgid ""
 "You can then go on and make your selections using [S]elect and then perform "
 "the installation using [I]nstall. When using the APT method the [C]onfig and "
@@ -6371,57 +6398,63 @@ msgid ""
 "them together."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:258
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:282
 msgid ""
 "By default APT will automatically remove the package (.deb) files once they "
 "have been successfully installed. To change this behavior place "
-"<tt>Dselect::clean \"prompt\";</tt> in /etc/apt/apt.conf."
+"<literal>Dselect::clean \"prompt\";</literal> in /etc/apt/apt.conf."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:264
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:288
 msgid "The Interface"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:278
+#. type: Content of: <book><chapter><para><footnote><para>
+#: guide.dbk:292
 msgid ""
-"Both that APT <prgn>dselect</prgn> method and <prgn>apt-get</prgn> share the "
-"same interface. It is a simple system that generally tells you what it will "
-"do and then goes and does it. <footnote><p>The <prgn>dselect</prgn> method "
-"actually is a set of wrapper scripts to <prgn>apt-get</prgn>. The method "
-"actually provides more functionality than is present in <prgn>apt-get</prgn> "
-"alone.</p></footnote> After printing out a summary of what will happen APT "
-"then will print out some informative status messages so that you can "
-"estimate how far along it is and how much is left to do."
+"The <command>dselect</command> method actually is a set of wrapper scripts "
+"to <command>apt-get</command>. The method actually provides more "
+"functionality than is present in <command>apt-get</command> alone."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:280
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:290
+msgid ""
+"Both that APT <command>dselect</command> method and "
+"<command>apt-get</command> share the same interface. It is a simple system "
+"that generally tells you what it will do and then goes and does "
+"it. <placeholder type=\"footnote\" id=\"0\"/> After printing out a summary "
+"of what will happen APT then will print out some informative status messages "
+"so that you can estimate how far along it is and how much is left to do."
+msgstr ""
+
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:301
 msgid "Startup"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:284
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:303
 msgid ""
 "Before all operations except update, APT performs a number of actions to "
 "prepare its internal state. It also does some checks of the system's "
-"state. At any time these operations can be performed by running <tt>apt-get "
-"check</tt>."
+"state. At any time these operations can be performed by running "
+"<literal>apt-get check</literal>."
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:289
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:309
 #, no-wrap
 msgid ""
 "# apt-get check\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:297
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:314
 msgid ""
 "The first thing it does is read all the package files into memory. APT uses "
 "a caching scheme so this operation will be faster the second time it is "
@@ -6429,17 +6462,17 @@ msgid ""
 "and a warning will be printed when apt-get exits."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:303
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:320
 msgid ""
 "The final operation performs a detailed analysis of the system's "
 "dependencies. It checks every dependency of every installed or unpacked "
 "package and considers if it is OK. Should this find a problem then a report "
-"will be printed out and <prgn>apt-get</prgn> will refuse to run."
+"will be printed out and <command>apt-get</command> will refuse to run."
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:320
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:326
 #, no-wrap
 msgid ""
 "# apt-get check\n"
@@ -6449,18 +6482,18 @@ msgid ""
 "Sorry, but the following packages have unmet dependencies:\n"
 "  9fonts: Depends: xlib6g but it is not installed\n"
 "  uucp: Depends: mailx but it is not installed\n"
-"  blast: Depends: xlib6g (>= 3.3-5) but it is not installed\n"
+"  blast: Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
 "  adduser: Depends: perl-base but it is not installed\n"
 "  aumix: Depends: libgpmg1 but it is not installed\n"
 "  debiandoc-sgml: Depends: sgml-base but it is not installed\n"
-"  bash-builtins: Depends: bash (>= 2.01) but 2.0-3 is installed\n"
+"  bash-builtins: Depends: bash (&gt;= 2.01) but 2.0-3 is installed\n"
 "  cthugha: Depends: svgalibg1 but it is not installed\n"
-"           Depends: xlib6g (>= 3.3-5) but it is not installed\n"
-"  libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)"
+"           Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
+"  libreadlineg2: Conflicts:libreadline2 (&lt;&lt; 2.1-2.1)\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:329
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:343
 msgid ""
 "In this example the system has many problems, including a serious problem "
 "with libreadlineg2. For each package that has unmet dependencies a line is "
@@ -6469,61 +6502,69 @@ msgid ""
 "problem is also included."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:337
+#. type: Content of: <book><chapter><section><para><footnote><para>
+#: guide.dbk:352
+msgid ""
+"APT however considers all known dependencies and attempts to prevent broken "
+"packages"
+msgstr ""
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:350
 msgid ""
 "There are two ways a system can get into a broken state like this. The first "
-"is caused by <prgn>dpkg</prgn> missing some subtle relationships between "
-"packages when performing upgrades. <footnote><p>APT however considers all "
-"known dependencies and attempts to prevent broken "
-"packages</p></footnote>. The second is if a package installation fails "
-"during an operation. In this situation a package may have been unpacked "
-"without its dependents being installed."
+"is caused by <command>dpkg</command> missing some subtle relationships "
+"between packages when performing upgrades. <placeholder type=\"footnote\" "
+"id=\"0\"/>. The second is if a package installation fails during an "
+"operation. In this situation a package may have been unpacked without its "
+"dependents being installed."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:345
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:359
 msgid ""
 "The second situation is much less serious than the first because APT places "
 "certain constraints on the order that packages are installed. In both cases "
-"supplying the <tt>-f</tt> option to <prgn>apt-get</prgn> will cause APT to "
-"deduce a possible solution to the problem and then continue on. The APT "
-"<prgn>dselect</prgn> method always supplies the <tt>-f</tt> option to allow "
-"for easy continuation of failed maintainer scripts."
+"supplying the <literal>-f</literal> option to <command>apt-get</command> "
+"will cause APT to deduce a possible solution to the problem and then "
+"continue on. The APT <command>dselect</command> method always supplies the "
+"<literal>-f</literal> option to allow for easy continuation of failed "
+"maintainer scripts."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:351
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:368
 msgid ""
-"However, if the <tt>-f</tt> option is used to correct a seriously broken "
-"system caused by the first case then it is possible that it will either fail "
-"immediately or the installation sequence will fail. In either case it is "
-"necessary to manually use dpkg (possibly with forcing options) to correct "
-"the situation enough to allow APT to proceed."
+"However, if the <literal>-f</literal> option is used to correct a seriously "
+"broken system caused by the first case then it is possible that it will "
+"either fail immediately or the installation sequence will fail. In either "
+"case it is necessary to manually use dpkg (possibly with forcing options) to "
+"correct the situation enough to allow APT to proceed."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:356
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:376
 msgid "The Status Report"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:363
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:378
 msgid ""
-"Before proceeding <prgn>apt-get</prgn> will present a report on what will "
-"happen. Generally the report reflects the type of operation being performed "
-"but there are several common elements. In all cases the lists reflect the "
-"final state of things, taking into account the <tt>-f</tt> option and any "
-"other relevant activities to the command being executed."
+"Before proceeding <command>apt-get</command> will present a report on what "
+"will happen. Generally the report reflects the type of operation being "
+"performed but there are several common elements. In all cases the lists "
+"reflect the final state of things, taking into account the "
+"<literal>-f</literal> option and any other relevant activities to the "
+"command being executed."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:364
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:385
 msgid "The Extra Package list"
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:372
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:387
 #, no-wrap
 msgid ""
 "The following extra packages will be installed:\n"
@@ -6531,135 +6572,135 @@ msgid ""
 "  mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
 "  bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
 "  squake pgp-i python-base debmake ldso perl libreadlineg2\n"
-"  ssh"
+"  ssh\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:379
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:395
 msgid ""
 "The Extra Package list shows all of the packages that will be installed or "
 "upgraded in excess of the ones mentioned on the command line. It is only "
-"generated for an <tt>install</tt> command. The listed packages are often the "
-"result of an Auto Install."
+"generated for an <literal>install</literal> command. The listed packages are "
+"often the result of an Auto Install."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:382
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:402
 msgid "The Packages to Remove"
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:389
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:404
 #, no-wrap
 msgid ""
 "The following packages will be REMOVED:\n"
 "  xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
 "  xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
 "  xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
-"  nas xpilot xfig"
+"  nas xpilot xfig\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:399
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:411
 msgid ""
 "The Packages to Remove list shows all of the packages that will be removed "
 "from the system. It can be shown for any of the operations and should be "
 "given a careful inspection to ensure nothing important is to be taken "
-"off. The <tt>-f</tt> option is especially good at generating packages to "
-"remove so extreme care should be used in that case. The list may contain "
-"packages that are going to be removed because they are only partially "
-"installed, possibly due to an aborted installation."
+"off. The <literal>-f</literal> option is especially good at generating "
+"packages to remove so extreme care should be used in that case. The list may "
+"contain packages that are going to be removed because they are only "
+"partially installed, possibly due to an aborted installation."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:402
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:421
 msgid "The New Packages list"
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:406
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:423
 #, no-wrap
 msgid ""
 "The following NEW packages will installed:\n"
-"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
+"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:411
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:427
 msgid ""
 "The New Packages list is simply a reminder of what will happen. The packages "
 "listed are not presently installed in the system but will be when APT is "
 "done."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:414
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:432
 msgid "The Kept Back list"
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:419
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:434
 #, no-wrap
 msgid ""
 "The following packages have been kept back\n"
 "  compface man-db tetex-base msql libpaper svgalib1\n"
-"  gs snmp arena lynx xpat2 groff xscreensaver"
+"  gs snmp arena lynx xpat2 groff xscreensaver\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:428
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:439
 msgid ""
 "Whenever the whole system is being upgraded there is the possibility that "
 "new versions of packages cannot be installed because they require new things "
 "or conflict with already installed things. In this case the package will "
 "appear in the Kept Back list. The best way to convince packages listed there "
-"to install is with <tt>apt-get install</tt> or by using <prgn>dselect</prgn> "
-"to resolve their problems."
+"to install is with <literal>apt-get install</literal> or by using "
+"<command>dselect</command> to resolve their problems."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:431
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:448
 msgid "Held Packages warning"
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:435
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:450
 #, no-wrap
 msgid ""
 "The following held packages will be changed:\n"
-"  cvs"
+"  cvs\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:441
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:454
 msgid ""
 "Sometimes you can ask APT to install a package that is on hold, in such a "
 "case it prints out a warning that the held package is going to be "
 "changed. This should only happen during dist-upgrade or install."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:444
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:460
 msgid "Final summary"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:447
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:462
 msgid "Finally, APT will print out a summary of all the changes that will occur."
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:452
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:465
 #, no-wrap
 msgid ""
 "206 packages upgraded, 8 newly installed, 23 to remove and 51 not "
 "upgraded.\n"
 "12 packages not fully installed or removed.\n"
-"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used."
+"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used.\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:470
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:470
 msgid ""
 "The first line of the summary simply is a reduced version of all of the "
 "lists and includes the number of upgrades - that is packages already "
@@ -6676,27 +6717,27 @@ msgid ""
 "indicate the amount of space that will be freed."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:473
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:484
 msgid ""
 "Some other reports can be generated by using the -u option to show packages "
 "to upgrade, they are similar to the previous examples."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:477
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:491
 msgid "The Status Display"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:481
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:493
 msgid ""
 "During the download of archives and package files APT prints out a series of "
 "status messages."
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:490
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:497
 #, no-wrap
 msgid ""
 "# apt-get update\n"
@@ -6706,111 +6747,107 @@ msgid ""
 "Get:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ "
 "Packages\n"
 "Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
-"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s"
+"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:500
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:506
 msgid ""
-"The lines starting with <em>Get</em> are printed out when APT begins to "
-"fetch a file while the last line indicates the progress of the download. The "
-"first percent value on the progress line indicates the total percent done of "
-"all files. Unfortunately since the size of the Package files is unknown "
-"<tt>apt-get update</tt> estimates the percent done which causes some "
-"inaccuracies."
+"The lines starting with <emphasis>Get</emphasis> are printed out when APT "
+"begins to fetch a file while the last line indicates the progress of the "
+"download. The first percent value on the progress line indicates the total "
+"percent done of all files. Unfortunately since the size of the Package files "
+"is unknown <literal>apt-get update</literal> estimates the percent done "
+"which causes some inaccuracies."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:509
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:514
 msgid ""
 "The next section of the status line is repeated once for each download "
 "thread and indicates the operation being performed and some useful "
 "information about what is happening. Sometimes this section will simply read "
-"<em>Forking</em> which means the OS is loading the download module. The "
-"first word after the [ is the fetch number as shown on the history "
-"lines. The next word is the short form name of the object being "
+"<emphasis>Forking</emphasis> which means the OS is loading the download "
+"module. The first word after the [ is the fetch number as shown on the "
+"history lines. The next word is the short form name of the object being "
 "downloaded. For archives it will contain the name of the package that is "
 "being fetched."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:524
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:524
 msgid ""
 "Inside of the single quote is an informative string indicating the progress "
 "of the negotiation phase of the download. Typically it progresses from "
-"<em>Connecting</em> to <em>Waiting for file</em> to <em>Downloading</em> or "
-"<em>Resuming</em>. The final value is the number of bytes downloaded from "
-"the remote site. Once the download begins this is represented as "
-"<tt>102/10.2k</tt> indicating that 102 bytes have been fetched and 10.2 "
-"kilobytes is expected. The total size is always shown in 4 figure notation "
-"to preserve space. After the size display is a percent meter for the file "
-"itself. The second last element is the instantaneous average speed. This "
-"values is updated every 5 seconds and reflects the rate of data transfer for "
-"that period. Finally is shown the estimated transfer time. This is updated "
+"<emphasis>Connecting</emphasis> to <emphasis>Waiting for file</emphasis> to "
+"<emphasis>Downloading</emphasis> or <emphasis>Resuming</emphasis>. The final "
+"value is the number of bytes downloaded from the remote site. Once the "
+"download begins this is represented as <literal>102/10.2k</literal> "
+"indicating that 102 bytes have been fetched and 10.2 kilobytes is "
+"expected. The total size is always shown in 4 figure notation to preserve "
+"space. After the size display is a percent meter for the file itself. The "
+"second last element is the instantaneous average speed. This values is "
+"updated every 5 seconds and reflects the rate of data transfer for that "
+"period. Finally is shown the estimated transfer time. This is updated "
 "regularly and reflects the time to complete everything at the shown transfer "
 "rate."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:530
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:539
 msgid ""
 "The status display updates every half second to provide a constant feedback "
 "on the download progress while the Get lines scroll back whenever a new file "
 "is started. Since the status display is constantly updated it is unsuitable "
-"for logging to a file, use the <tt>-q</tt> option to remove the status "
-"display."
+"for logging to a file, use the <literal>-q</literal> option to remove the "
+"status display."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:535
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:547
 msgid "Dpkg"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:542
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:549
 msgid ""
-"APT uses <prgn>dpkg</prgn> for installing the archives and will switch over "
-"to the <prgn>dpkg</prgn> interface once downloading is "
-"completed. <prgn>dpkg</prgn> will also ask a number of questions as it "
+"APT uses <command>dpkg</command> for installing the archives and will switch "
+"over to the <command>dpkg</command> interface once downloading is "
+"completed. <command>dpkg</command> will also ask a number of questions as it "
 "processes the packages and the packages themselves may also ask several "
 "questions. Before each question there is usually a description of what it is "
 "asking and the questions are too varied to discuss completely here."
 msgstr ""
 
-#. type: <title></title>
-#: offline.sgml:4
+#. type: Content of: <book><title>
+#: offline.dbk:10
 msgid "Using APT Offline"
 msgstr ""
 
-#. type: <version></version>
-#: offline.sgml:7
-msgid "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
-msgstr ""
-
-#. type: <abstract></abstract>
-#: offline.sgml:12
+#. type: Content of: <book><bookinfo><abstract><para>
+#: offline.dbk:24
 msgid ""
 "This document describes how to use APT in a non-networked environment, "
 "specifically a 'sneaker-net' approach for performing upgrades."
 msgstr ""
 
-#. type: <copyrightsummary></copyrightsummary>
-#: offline.sgml:16
-msgid "Copyright &copy; Jason Gunthorpe, 1999."
+#. type: Content of: <book><bookinfo>
+#: offline.dbk:29
+msgid "<copyright><year>1999</year><holder>Jason Gunthorpe</holder></copyright>"
 msgstr ""
 
-#. type: <heading></heading>
-#: offline.sgml:32
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:47
 msgid "Introduction"
 msgstr ""
 
-#. type: <heading></heading>
-#: offline.sgml:34 offline.sgml:65 offline.sgml:180
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:49 offline.dbk:79 offline.dbk:191
 msgid "Overview"
 msgstr ""
 
-#. type: <p></p>
-#: offline.sgml:40
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:51
 msgid ""
 "Normally APT requires direct access to a Debian archive, either from a local "
 "media or through a network. Another common complaint is that a Debian "
@@ -6818,8 +6855,8 @@ msgid ""
 "fast connection but they are physically distant."
 msgstr ""
 
-#. type: <p></p>
-#: offline.sgml:51
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:57
 msgid ""
 "The solution to this is to use large removable media such as a Zip disc or a "
 "SuperDisk disc. These discs are not large enough to store the entire Debian "
@@ -6827,13 +6864,13 @@ msgid ""
 "to use APT to generate a list of packages that are required and then fetch "
 "them onto the disc using another machine with good connectivity. It is even "
 "possible to use another Debian machine with APT or to use a completely "
-"different OS and a download tool like wget. Let <em>remote host</em> mean "
-"the machine downloading the packages, and <em>target host</em> the one with "
-"bad or no connection."
+"different OS and a download tool like wget. Let <emphasis>remote "
+"host</emphasis> mean the machine downloading the packages, and "
+"<emphasis>target host</emphasis> the one with bad or no connection."
 msgstr ""
 
-#. type: <p></p>
-#: offline.sgml:57
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:68
 msgid ""
 "This is achieved by creatively manipulating the APT configuration file. The "
 "essential premise to tell APT to look on a disc for it's archive files. Note "
@@ -6841,13 +6878,13 @@ msgid ""
 "names such as ext2, fat32 or vfat."
 msgstr ""
 
-#. type: <heading></heading>
-#: offline.sgml:63
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:77
 msgid "Using APT on both machines"
 msgstr ""
 
-#. type: <p><example>
-#: offline.sgml:71
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:81
 msgid ""
 "APT being available on both machines gives the simplest configuration. The "
 "basic idea is to place a copy of the status file on the disc and use the "
@@ -6855,8 +6892,8 @@ msgid ""
 "to download. The disk directory structure should look like:"
 msgstr ""
 
-#. type: <example></example>
-#: offline.sgml:80
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:87
 #, no-wrap
 msgid ""
 "  /disc/\n"
@@ -6866,34 +6903,35 @@ msgid ""
 "       partial/\n"
 "    status\n"
 "    sources.list\n"
-"    apt.conf"
+"    apt.conf\n"
 msgstr ""
 
-#. type: <heading></heading>
-#: offline.sgml:88
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:98
 msgid "The configuration file"
 msgstr ""
 
-#. type: <p></p>
-#: offline.sgml:96
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:100
 msgid ""
 "The configuration file should tell APT to store its files on the disc and to "
 "use the configuration files on the disc as well. The sources.list should "
 "contain the proper sites that you wish to use from the remote machine, and "
-"the status file should be a copy of <em>/var/lib/dpkg/status</em> from the "
-"<em>target host</em>. Please note, if you are using a local archive you must "
-"use copy URIs, the syntax is identical to file URIs."
+"the status file should be a copy of "
+"<emphasis>/var/lib/dpkg/status</emphasis> from the <emphasis>target "
+"host</emphasis>. Please note, if you are using a local archive you must use "
+"copy URIs, the syntax is identical to file URIs."
 msgstr ""
 
-#. type: <p><example>
-#: offline.sgml:100
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:108
 msgid ""
-"<em>apt.conf</em> must contain the necessary information to make APT use the "
-"disc:"
+"<emphasis>apt.conf</emphasis> must contain the necessary information to make "
+"APT use the disc:"
 msgstr ""
 
-#. type: <example></example>
-#: offline.sgml:124
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:112
 #, no-wrap
 msgid ""
 " APT\n"
@@ -6902,10 +6940,10 @@ msgid ""
 "tells\n"
 "      the remote APT what architecture the target machine is */\n"
 "   Architecture \"i386\";\n"
-"   \n"
+"\n"
 "   Get::Download-Only \"true\";\n"
 " };\n"
-" \n"
+"\n"
 " Dir\n"
 " {\n"
 "   /* Use the disc for state information and redirect the status file from\n"
@@ -6916,76 +6954,79 @@ msgid ""
 "   // Binary caches will be stored locally\n"
 "   Cache::archives \"/disc/archives/\";\n"
 "   Cache \"/tmp/\";\n"
-"   \n"
+"\n"
 "   // Location of the source list.\n"
 "   Etc \"/disc/\";\n"
-" };"
+" };\n"
 msgstr ""
 
-#. type: </example></p>
-#: offline.sgml:129
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:137
 msgid ""
 "More details can be seen by examining the apt.conf man page and the sample "
-"configuration file in <em>/usr/share/doc/apt/examples/apt.conf</em>."
+"configuration file in "
+"<emphasis>/usr/share/doc/apt/examples/apt.conf</emphasis>."
 msgstr ""
 
-#. type: <p><example>
-#: offline.sgml:136
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:142
 msgid ""
 "On the target machine the first thing to do is mount the disc and copy "
-"<em>/var/lib/dpkg/status</em> to it. You will also need to create the "
-"directories outlined in the Overview, <em>archives/partial/</em> and "
-"<em>lists/partial/</em>. Then take the disc to the remote machine and "
-"configure the sources.list. On the remote machine execute the following:"
+"<emphasis>/var/lib/dpkg/status</emphasis> to it. You will also need to "
+"create the directories outlined in the Overview, "
+"<emphasis>archives/partial/</emphasis> and "
+"<emphasis>lists/partial/</emphasis>. Then take the disc to the remote "
+"machine and configure the sources.list. On the remote machine execute the "
+"following:"
 msgstr ""
 
-#. type: <example></example>
-#: offline.sgml:142
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:151
 #, no-wrap
 msgid ""
 " # export APT_CONFIG=\"/disc/apt.conf\"\n"
 " # apt-get update\n"
 " [ APT fetches the package files ]\n"
 " # apt-get dist-upgrade\n"
-" [ APT fetches all the packages needed to upgrade the target machine ]"
+" [ APT fetches all the packages needed to upgrade the target machine ]\n"
 msgstr ""
 
-#. type: </example></p>
-#: offline.sgml:149
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:158
 msgid ""
 "The dist-upgrade command can be replaced with any other standard APT "
 "commands, particularly dselect-upgrade. You can even use an APT front end "
-"such as <em>dselect</em>. However this presents a problem in communicating "
-"your selections back to the local computer."
+"such as <emphasis>dselect</emphasis>. However this presents a problem in "
+"communicating your selections back to the local computer."
 msgstr ""
 
-#. type: <p><example>
-#: offline.sgml:153
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:164
 msgid ""
 "Now the disc contains all of the index files and archives needed to upgrade "
 "the target machine. Take the disc back and run:"
 msgstr ""
 
-#. type: <example></example>
-#: offline.sgml:159
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:168
 #, no-wrap
 msgid ""
 "  # export APT_CONFIG=\"/disc/apt.conf\"\n"
 "  # apt-get check\n"
 "  [ APT generates a local copy of the cache files ]\n"
 "  # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
-"  [ Or any other APT command ]"
+"  [ Or any other APT command ]\n"
 msgstr ""
 
-#. type: <p></p>
-#: offline.sgml:165
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:175
 msgid ""
 "It is necessary for proper function to re-specify the status file to be the "
 "local one. This is very important!"
 msgstr ""
 
-#. type: <p></p>
-#: offline.sgml:172
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:179
 msgid ""
 "If you are using dselect you can do the very risky operation of copying "
 "disc/status to /var/lib/dpkg/status so that any selections you made on the "
@@ -6994,21 +7035,21 @@ msgid ""
 "NOT copy the status file if dpkg or APT have been run in the mean time!!"
 msgstr ""
 
-#. type: <heading></heading>
-#: offline.sgml:178
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:189
 msgid "Using APT and wget"
 msgstr ""
 
-#. type: <p></p>
-#: offline.sgml:185
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:193
 msgid ""
-"<em>wget</em> is a popular and portable download tool that can run on nearly "
-"any machine. Unlike the method above this requires that the Debian machine "
-"already has a list of available packages."
+"<emphasis>wget</emphasis> is a popular and portable download tool that can "
+"run on nearly any machine. Unlike the method above this requires that the "
+"Debian machine already has a list of available packages."
 msgstr ""
 
-#. type: <p></p>
-#: offline.sgml:190
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:198
 msgid ""
 "The basic idea is to create a disc that has only the archive files "
 "downloaded from the remote site. This is done by using the --print-uris "
@@ -7016,37 +7057,37 @@ msgid ""
 "packages."
 msgstr ""
 
-#. type: <heading></heading>
-#: offline.sgml:196
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:204
 msgid "Operation"
 msgstr ""
 
-#. type: <p><example>
-#: offline.sgml:200
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:206
 msgid ""
 "Unlike the previous technique no special configuration files are "
 "required. We merely use the standard APT commands to generate the file list."
 msgstr ""
 
-#. type: <example></example>
-#: offline.sgml:205
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:210
 #, no-wrap
 msgid ""
-" # apt-get dist-upgrade \n"
+" # apt-get dist-upgrade\n"
 " [ Press no when prompted, make sure you are happy with the actions ]\n"
-" # apt-get -qq --print-uris dist-upgrade > uris\n"
-" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
+" # apt-get -qq --print-uris dist-upgrade &gt; uris\n"
+" # awk '{print \"wget -O \" $2 \" \" $1}' &lt; uris &gt; /disc/wget-script\n"
 msgstr ""
 
-#. type: </example></p>
-#: offline.sgml:210
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:216
 msgid ""
 "Any command other than dist-upgrade could be used here, including "
 "dselect-upgrade."
 msgstr ""
 
-#. type: <p></p>
-#: offline.sgml:216
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:220
 msgid ""
 "The /disc/wget-script file will now contain a list of wget commands to "
 "execute in order to fetch the necessary archives. This script should be run "
@@ -7054,34 +7095,34 @@ msgid ""
 "output on the disc."
 msgstr ""
 
-#. type: <p><example>
-#: offline.sgml:219
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:226
 msgid "The remote machine would do something like"
 msgstr ""
 
-#. type: <example></example>
-#: offline.sgml:223
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:229
 #, no-wrap
 msgid ""
 "  # cd /disc\n"
 "  # sh -x ./wget-script\n"
-"  [ wait.. ]"
+"  [ wait.. ]\n"
 msgstr ""
 
-#. type: </example><example>
-#: offline.sgml:228
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:234
 msgid ""
 "Once the archives are downloaded and the disc returned to the Debian machine "
 "installation can proceed using,"
 msgstr ""
 
-#. type: <example></example>
-#: offline.sgml:230
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:238
 #, no-wrap
-msgid "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
+msgid "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 msgstr ""
 
-#. type: </example></p>
-#: offline.sgml:234
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:241
 msgid "Which will use the already fetched archives on the disc."
 msgstr ""
diff --git a/doc/po/de.po b/doc/po/de.po
index 46d6d629..463b1d93 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -1,14 +1,14 @@
-# Translation of apt-doc to German
+# Translation of apt/doc to German
 # Copyright (C) 1997, 1998, 1999 Jason Gunthorpe and others.
-# This file is distributed under the same license as the apt-doc package.
+# This file is distributed under the same license as the apt package.
 # Chris Leick <c.leick@vollbio.de>, 2009-2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: apt-doc 0.9.16\n"
+"Project-Id-Version: apt-doc 1.0.4\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-04-01 14:24+0200\n"
-"PO-Revision-Date: 2014-04-01 14:00+0200\n"
+"POT-Creation-Date: 2014-07-10 10:52+0200\n"
+"PO-Revision-Date: 2014-07-04 00:34+0200\n"
 "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
 "Language: de\n"
@@ -633,7 +633,7 @@ msgstr "APT"
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt.8.xml:32
 msgid "command-line interface"
-msgstr ""
+msgstr "Befehlszeilenschnittstelle"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.8.xml:37 apt-get.8.xml:40 apt-cache.8.xml:40 apt-key.8.xml:39
@@ -652,6 +652,10 @@ msgid ""
 "management of the system.  See also &apt-get; and &apt-cache; for more low-"
 "level command options."
 msgstr ""
+"<command>apt</command> (Advanced Package Tool) ist das Befehlszeilenwerkzeug "
+"für den Umgang mit Paketen. Es stellt eine Befehlszeilenschnittstelle zur "
+"Verwaltung von Paketen auf dem System bereit. Tiefer ansetzende "
+"Befehlsoptionen finden sie unter &apt-get; und &apt-cache;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml:47
@@ -661,6 +665,10 @@ msgid ""
 "<option>--installed</option>, <option>--upgradable</option>, <option>--all-"
 "versions</option> are supported."
 msgstr ""
+"<literal>list</literal> wird benutzt, um eine Paketliste anzuzeigen. Es "
+"unterstützt Shell-Muster zur Beschränkung auf passende Paketnamen. Die "
+"folgenden Optionen werden unterstützt: <option>--installed</option>, "
+"<option>--upgradable</option>, <option>--all-versions</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml:58
@@ -668,19 +676,17 @@ msgid ""
 "<literal>search</literal> searches for the given term(s) and display "
 "matching packages."
 msgstr ""
+"<literal>search</literal> sucht nach angegebenen Begriffen und zeigt "
+"passende Pakete an."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml:64
-#, fuzzy
-#| msgid ""
-#| "<literal>rdepends</literal> shows a listing of each reverse dependency a "
-#| "package has."
 msgid ""
 "<literal>show</literal> shows the package information for the given "
 "package(s)."
 msgstr ""
-"<literal>rdepends</literal> zeigt eine Liste von jeder "
-"Rückwärtsabhängigkeit, die ein Paket hat."
+"<literal>show</literal> zeigt die Paketinformationen für die angegebenen "
+"Pakete."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml:71
@@ -688,6 +694,8 @@ msgid ""
 "<literal>install</literal> is followed by one or more package names desired "
 "for installation or upgrading."
 msgstr ""
+"<literal>install</literal> wird ergänzt mit einem oder mehreren Paketnamen, "
+"von denen eine Installation oder ein Upgrade gewünscht wird."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml:75 apt-get.8.xml:118
@@ -717,7 +725,7 @@ msgid ""
 "installed instead of removed."
 msgstr ""
 "<literal>remove</literal> ist identisch mit <literal>install</literal>, mit "
-"der Ausnahme, dass Pakte entfernt anstatt installiert werden. Beachten Sie, "
+"der Ausnahme, dass Pakete entfernt anstatt installiert werden. Beachten Sie, "
 "dass das Entfernen von Paketen deren Konfigurationsdateien im System "
 "belässt. Wenn ein Pluszeichen an den Paketnamen angehängt wird (ohne "
 "Leerzeichen dazwischen) wird das erkannte Paket installiert anstatt entfernt."
@@ -728,19 +736,17 @@ msgid ""
 "<literal>edit-sources</literal> lets you edit your sources.list file and "
 "provides basic sanity checks."
 msgstr ""
+"<literal>edit-sources</literal> ermöglicht die Bearbeitung Ihrer »sources."
+"list«-Datei und stellt grundlegende Plausibilitätsprüfungen bereit."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml:99
-#, fuzzy
-#| msgid ""
-#| "<literal>showhold</literal> is used to print a list of packages on hold "
-#| "in the same way as for the other show commands."
 msgid ""
 "<literal>update</literal> is used to resynchronize the package index files "
 "from their sources."
 msgstr ""
-"<literal>showhold</literal> wird benutzt, um eine Liste auf »hold« gesetzter "
-"Pakete auf die gleiche Art wie für andere Anzeigebefehle auszugeben."
+"<literal>update</literal> wird benutzt, um die Paketindexdateien wieder mit "
+"ihren Quellen in Einklang zu bringen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml:105
@@ -750,6 +756,10 @@ msgid ""
 "<filename>/etc/apt/sources.list</filename>. New package will be installed, "
 "but existing package will never removed."
 msgstr ""
+"<literal>upgrade</literal> wird verwendet, um die neuesten Versionen aller "
+"derzeit auf Ihrem System installierten Pakete von den in <filename>/etc/apt/"
+"sources.list</filename> aufgezählten Quellen zu installieren. Dabei werden "
+"neue Pakete installiert, existierende jedoch nicht entfernt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml:114
@@ -758,6 +768,9 @@ msgid ""
 "also remove installed packages if that is required in order to resolve a "
 "package conflict."
 msgstr ""
+"<literal>full-upgrade</literal> verrichtet die Funktion von »upgrade«, kann "
+"aber auch installierte Pakete entfernen, falls dies zum Auflösen eines "
+"Paketkonflikts nötig ist."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.8.xml:124 apt-get.8.xml:257 apt-cache.8.xml:250 apt-mark.8.xml:110
@@ -769,7 +782,7 @@ msgstr "Optionen"
 #. type: Content of: <refentry><refsect1><title>
 #: apt.8.xml:134
 msgid "Script usage"
-msgstr ""
+msgstr "Skriptaufruf"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml:136
@@ -780,33 +793,38 @@ msgid ""
 "&apt-cache; and &apt-get; via APT options. Please prefer using these "
 "commands in your scripts."
 msgstr ""
+"Die &apt;-Befehlszeile wurde als Endanwenderwerkzeug entworfen und kann bei "
+"Versionswechseln die Ausgabe ändern. Obwohl es versucht, nicht die "
+"Abwärtskompatibilität zu unterbrechen, kann sie nicht garantiert werden. "
+"Alle Funktionalitäten von &apt; sind in &apt-cache; und &apt-get; über APT-"
+"Optionen verfügbar. Bitte benutzen Sie vorzugsweise diese Befehle in Ihren "
+"Skripten."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.8.xml:144
 msgid "Differences to &apt-get;"
-msgstr ""
+msgstr "Unterschiede zu &apt-get;"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml:145
 msgid ""
 "The <command>apt</command> command is meant to be pleasant for end users and "
-"does not need to be backward compatilbe like &apt-get;. Therefore some "
+"does not need to be backward compatible like &apt-get;. Therefore some "
 "options are different:"
 msgstr ""
+"Der Befehl <command>apt</command> ist dazu gedacht, dem Endanwender die "
+"Arbeit zu erleichtern und benötigt keine Abwärtskompatibilität wie &apt-"
+"get;. Daher unterscheiden sich einige Optionen:"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: apt.8.xml:151
-#, fuzzy
-#| msgid "the <literal>Package:</literal> line"
-msgid "The option <literal>DPkgPM::Progress-Fancy</literal> is enabled."
-msgstr "die <literal>Package:</literal>-Zeile"
+msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
+msgstr "Die Option <literal>DPkg::Progress-Fancy</literal> ist aktiviert."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: apt.8.xml:155
-#, fuzzy
-#| msgid "the <literal>Component:</literal> line"
 msgid "The option <literal>APT::Color</literal> is enabled."
-msgstr "die <literal>Component:</literal>-Zeile"
+msgstr "Die Option <literal>APT::Color</literal> ist aktiviert."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: apt.8.xml:159
@@ -814,20 +832,22 @@ msgid ""
 "A new <literal>list</literal> command is available similar to <literal>dpkg "
 "--list</literal>."
 msgstr ""
+"Ein neuer <literal>list</literal>-Befehl ist verfügbar. Er ist <literal>dpkg "
+"--list</literal> ähnlich."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: apt.8.xml:164
-#, fuzzy
-#| msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
 msgid ""
 "The option <literal>upgrade</literal> has <literal>--with-new-pkgs</literal> "
 "enabled by default."
-msgstr "die <literal>Archive:</literal>- oder <literal>Suite:</literal>-Zeile"
+msgstr ""
+"Bei der Option <literal>upgrade</literal> ist standardmäßig <literal>--with-"
+"new-pkgs</literal> aktiviert."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.8.xml:174 apt-get.8.xml:558 apt-cache.8.xml:352 apt-key.8.xml:197
 #: apt-mark.8.xml:133 apt-secure.8.xml:193 apt-cdrom.8.xml:154
-#: apt-config.8.xml:111 apt.conf.5.xml:1227 apt_preferences.5.xml:707
+#: apt-config.8.xml:111 apt.conf.5.xml:1228 apt_preferences.5.xml:707
 #: sources.list.5.xml:280 apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65
 #: apt-ftparchive.1.xml:609
 msgid "See Also"
@@ -835,18 +855,12 @@ msgstr "Siehe auch"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml:175
-#, fuzzy
-#| msgid ""
-#| "&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-"
-#| "config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
-#| "preferences;, the APT Howto."
 msgid ""
 "&apt-get;, &apt-cache;, &sources-list;, &apt-conf;, &apt-config;, The APT "
 "User's guide in &guidesdir;, &apt-preferences;, the APT Howto."
 msgstr ""
-"&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-config;, "
-"&apt-secure;, die APT-Benutzeranleitung in &guidesdir;, &apt-preferences;, "
-"das APT-Howto."
+"&apt-get;, &apt-cache;, &sources-list;, &apt-conf;, &apt-config;, die APT-"
+"Benutzeranleitung in &guidesdir;, &apt-preferences;, das APT-Howto."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.8.xml:180 apt-get.8.xml:564 apt-cache.8.xml:357 apt-mark.8.xml:137
@@ -857,16 +871,12 @@ msgstr "Diagnose"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml:181
-#, fuzzy
-#| msgid ""
-#| "<command>apt-get</command> returns zero on normal operation, decimal 100 "
-#| "on error."
 msgid ""
 "<command>apt</command> returns zero on normal operation, decimal 100 on "
 "error."
 msgstr ""
-"<command>apt-get</command> gibt bei normalen Operationen 0 zurück, dezimal "
-"100 bei Fehlern."
+"<command>apt</command> gibt bei normalen Operationen 0 zurück, dezimal 100 "
+"bei Fehlern."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-get.8.xml:35
@@ -1039,7 +1049,7 @@ msgid ""
 "you wish to upgrade, and if a newer version is available, it (and its "
 "dependencies, as described above) will be downloaded and installed."
 msgstr ""
-"Dies ist außerdem die bevorzugt zu benutzende Art, wenn Sie Sie ein Upgrade "
+"Dies ist außerdem die bevorzugt zu benutzende Art, wenn Sie ein Upgrade "
 "eines oder mehrerer bereits installierter Pakete durchführen möchten, ohne "
 "ein Upgrade aller Pakete, die Sie auf Ihrem System haben, durchzuführen. "
 "Anders als das Ziel von »upgrade«, das die neusten Versionen aller aktuell "
@@ -1770,19 +1780,19 @@ msgid ""
 "Show user friendly progress information in the terminal window when packages "
 "are installed, upgraded or removed. For a machine parsable version of this "
 "data see README.progress-reporting in the apt doc directory.  Configuration "
-"Item: <literal>DpkgPM::Progress</literal> and <literal>Dpkg::Progress-Fancy</"
+"Item: <literal>Dpkg::Progress</literal> and <literal>Dpkg::Progress-Fancy</"
 "literal>."
 msgstr ""
 "zeigt benutzerfreundliche Fortschrittsinformationen im Terminalfenster, wenn "
 "Pakete installiert beziehungsweise entfernt werden oder ein Upgrade "
 "durchgeführt wird. Informationen über eine maschinell auswertbare Version "
-"dieser Daten finden Sie in README.progress-reporting im Apt-doc-Verzeichnis. "
-"Konfigurationselemente: <literal>DpkgPM::Progress</literal> und "
-"<literal>Dpkg::Progress-Fancy</literal>."
+"dieser Daten finden Sie in README.progress-reporting im Verzeichnis apt/doc. "
+"Konfigurationselemente: <literal>Dpkg::Progress</literal> und <literal>Dpkg::"
+"Progress-Fancy</literal>."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml:548 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127
-#: apt.conf.5.xml:1221 apt_preferences.5.xml:700
+#: apt.conf.5.xml:1222 apt_preferences.5.xml:700
 msgid "Files"
 msgstr "Dateien"
 
@@ -2998,10 +3008,10 @@ msgstr ""
 #: apt-secure.8.xml:195
 msgid ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
 msgstr ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml:199
@@ -4575,15 +4585,27 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:607
+#, fuzzy
+#| msgid ""
+#| "<literal>Dir::Cache</literal> contains locations pertaining to local "
+#| "cache information, such as the two package caches <literal>srcpkgcache</"
+#| "literal> and <literal>pkgcache</literal> as well as the location to place "
+#| "downloaded archives, <literal>Dir::Cache::archives</literal>. Generation "
+#| "of caches can be turned off by setting their names to the empty string. "
+#| "This will slow down startup but save disk space. It is probably "
+#| "preferable to turn off the pkgcache rather than the srcpkgcache. Like "
+#| "<literal>Dir::State</literal> the default directory is contained in "
+#| "<literal>Dir::Cache</literal>"
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
 "and <literal>pkgcache</literal> as well as the location to place downloaded "
 "archives, <literal>Dir::Cache::archives</literal>. Generation of caches can "
-"be turned off by setting their names to the empty string. This will slow "
+"be turned off by setting <literal>pkgcache</literal> or "
+"<literal>srcpkgcache</literal> to <literal>\"\"</literal>.  This will slow "
 "down startup but save disk space. It is probably preferable to turn off the "
-"pkgcache rather than the srcpkgcache. Like <literal>Dir::State</literal> the "
-"default directory is contained in <literal>Dir::Cache</literal>"
+"pkgcache rather than the srcpkgcache.  Like <literal>Dir::State</literal> "
+"the default directory is contained in <literal>Dir::Cache</literal>"
 msgstr ""
 "<literal>Dir::Cache</literal> enthält Orte, die zu lokalen "
 "Zwischenspeicherinformationen gehören, so wie die beiden "
@@ -4597,7 +4619,7 @@ msgstr ""
 "Standardverzeichnis in <literal>Dir::Cache</literal> enthalten."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:616
+#: apt.conf.5.xml:617
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4612,7 +4634,7 @@ msgstr ""
 "Konfigurationsdatei erfolgt)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:622
+#: apt.conf.5.xml:623
 msgid ""
 "The <literal>Dir::Parts</literal> setting reads in all the config fragments "
 "in lexical order from the directory specified. After this is done then the "
@@ -4624,7 +4646,7 @@ msgstr ""
 "geladen."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:626
+#: apt.conf.5.xml:627
 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4642,7 +4664,7 @@ msgstr ""
 "Programms an."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:634
+#: apt.conf.5.xml:635
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4662,7 +4684,7 @@ msgstr ""
 "<filename>/tmp/staging/var/lib/dpkg/status</filename> nachgesehen."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:647
+#: apt.conf.5.xml:648
 msgid ""
 "The <literal>Ignore-Files-Silently</literal> list can be used to specify "
 "which files APT should silently ignore while parsing the files in the "
@@ -4680,12 +4702,12 @@ msgstr ""
 "diese Muster verwandt werden."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:656
+#: apt.conf.5.xml:657
 msgid "APT in DSelect"
 msgstr "APT in DSelect"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:658
+#: apt.conf.5.xml:659
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behavior. These are in the <literal>DSelect</literal> "
@@ -4696,7 +4718,7 @@ msgstr ""
 "<literal>DSelect</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:663
+#: apt.conf.5.xml:664
 msgid ""
 "Cache Clean mode; this value may be one of <literal>always</literal>, "
 "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -4719,7 +4741,7 @@ msgstr ""
 "vor dem Herunterladen neuer Pakete durch."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:677
+#: apt.conf.5.xml:678
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the install phase."
@@ -4728,7 +4750,7 @@ msgstr ""
 "übermittelt, wenn es für die Installationsphase durchlaufen wird."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:682
+#: apt.conf.5.xml:683
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the update phase."
@@ -4737,7 +4759,7 @@ msgstr ""
 "übermittelt, wenn es für die Aktualisierungsphase durchlaufen wird."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:687
+#: apt.conf.5.xml:688
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
@@ -4746,12 +4768,12 @@ msgstr ""
 "nachfragen, um fortzufahren. Vorgabe ist es, nur bei Fehlern nachzufragen."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:693
+#: apt.conf.5.xml:694
 msgid "How APT calls &dpkg;"
 msgstr "Wie APT &dpkg; aufruft"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:694
+#: apt.conf.5.xml:695
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
@@ -4760,7 +4782,7 @@ msgstr ""
 "stehen im Abschnitt <literal>DPkg</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:699
+#: apt.conf.5.xml:700
 msgid ""
 "This is a list of options to pass to &dpkg;. The options must be specified "
 "using the list notation and each list item is passed as a single argument to "
@@ -4771,7 +4793,7 @@ msgstr ""
 "jedes Listenelement wird als einzelnes Argument an &dpkg; übermittelt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:705
+#: apt.conf.5.xml:706
 msgid ""
 "This is a list of shell commands to run before/after invoking &dpkg;.  Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -4785,7 +4807,7 @@ msgstr ""
 "APT abgebrochen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:712
+#: apt.conf.5.xml:713
 msgid ""
 "This is a list of shell commands to run before invoking &dpkg;. Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -4804,7 +4826,7 @@ msgstr ""
 "übergeben."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:719
+#: apt.conf.5.xml:720
 msgid ""
 "Version 2 of this protocol dumps more information, including the protocol "
 "version, the APT configuration space and the packages, files and versions "
@@ -4817,7 +4839,7 @@ msgstr ""
 "Version die Architektur und den <literal>MultiArch</literal>-Schalter hinzu."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:724
+#: apt.conf.5.xml:725
 msgid ""
 "The version of the protocol to be used for the command "
 "<literal><replaceable>cmd</replaceable></literal> can be chosen by setting "
@@ -4835,7 +4857,7 @@ msgstr ""
 "bietet."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:731
+#: apt.conf.5.xml:732
 msgid ""
 "The file descriptor to be used to send the information can be requested with "
 "<literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::InfoFD</"
@@ -4853,7 +4875,7 @@ msgstr ""
 "verwendeten Dateideskriptors als eine Bestätigung."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:741
+#: apt.conf.5.xml:742
 msgid ""
 "APT chdirs to this directory before invoking &dpkg;, the default is "
 "<filename>/</filename>."
@@ -4862,7 +4884,7 @@ msgstr ""
 "die Vorgabe ist <filename>/</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:746
+#: apt.conf.5.xml:747
 msgid ""
 "These options are passed to &dpkg-buildpackage; when compiling packages; the "
 "default is to disable signing and produce all binaries."
@@ -4872,12 +4894,12 @@ msgstr ""
 "Programme werden erstellt."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:751
+#: apt.conf.5.xml:752
 msgid "dpkg trigger usage (and related options)"
 msgstr "Dpkd-Trigger-Benutzung (und zugehörige Optionen)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:752
+#: apt.conf.5.xml:753
 msgid ""
 "APT can call &dpkg; in such a way as to let it make aggressive use of "
 "triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
@@ -4904,7 +4926,7 @@ msgstr ""
 "Pakete konfiguriert werden."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:767
+#: apt.conf.5.xml:768
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -4918,7 +4940,7 @@ msgstr ""
 "DPkg::TriggersPending \"true\";"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:761
+#: apt.conf.5.xml:762
 msgid ""
 "Note that it is not guaranteed that APT will support these options or that "
 "these options will not cause (big) trouble in the future. If you have "
@@ -4943,7 +4965,7 @@ msgstr ""
 "Optionenkombination wäre <placeholder type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:774
+#: apt.conf.5.xml:775
 msgid ""
 "Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
 "call).  See &dpkg; if you are interested in what this actually means. In "
@@ -4966,7 +4988,7 @@ msgstr ""
 "anhängen."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:782
+#: apt.conf.5.xml:783
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
@@ -4996,7 +5018,7 @@ msgstr ""
 "enden könnte und möglicherweise nicht mehr startbar ist."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:797
+#: apt.conf.5.xml:798
 msgid ""
 "If this option is set APT will call <command>dpkg --configure --pending</"
 "command> to let &dpkg; handle all required configurations and triggers. This "
@@ -5015,7 +5037,7 @@ msgstr ""
 "deaktivieren."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:804
+#: apt.conf.5.xml:805
 msgid ""
 "Useful for the <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal>, and "
@@ -5031,7 +5053,7 @@ msgstr ""
 "benötigt werden."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:817
+#: apt.conf.5.xml:818
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -5049,7 +5071,7 @@ msgstr ""
 "};"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:810
+#: apt.conf.5.xml:811
 msgid ""
 "Essential packages (and their dependencies) should be configured immediately "
 "after unpacking. It is a good idea to do this quite early in the upgrade "
@@ -5073,12 +5095,12 @@ msgstr ""
 "mit ihren Vorgabewerten. <placeholder type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:830
+#: apt.conf.5.xml:831
 msgid "Periodic and Archives options"
 msgstr "Periodische- und Archivoptionen"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:831
+#: apt.conf.5.xml:832
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by the "
@@ -5092,12 +5114,12 @@ msgstr ""
 "Dokumentation dieser Optionen zu erhalten."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:839
+#: apt.conf.5.xml:840
 msgid "Debug options"
 msgstr "Fehlersuchoptionen"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:841
+#: apt.conf.5.xml:842
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -5115,7 +5137,7 @@ msgstr ""
 "könnten es sein:"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:852
+#: apt.conf.5.xml:853
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -5126,7 +5148,7 @@ msgstr ""
 "getroffenen Entscheidungen ein."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:860
+#: apt.conf.5.xml:861
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"
@@ -5137,7 +5159,7 @@ msgstr ""
 "<literal>apt-get -s install</literal>) als nicht root-Anwender auszuführen."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:869
+#: apt.conf.5.xml:870
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -5149,7 +5171,7 @@ msgstr ""
 #. 	   motivating example, except I haven't a clue why you'd want
 #. 	   to do this. 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:877
+#: apt.conf.5.xml:878
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CD-ROM IDs."
@@ -5158,12 +5180,12 @@ msgstr ""
 "Daten in CD-ROM-IDs aus."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:887
+#: apt.conf.5.xml:888
 msgid "A full list of debugging options to apt follows."
 msgstr "Eine vollständige Liste der Fehlersuchoptionen von APT folgt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:896
+#: apt.conf.5.xml:897
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
@@ -5171,28 +5193,28 @@ msgstr ""
 "literal>-Quellen beziehen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:907
+#: apt.conf.5.xml:908
 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 "gibt Informationen aus, die sich auf das Herunterladen von Paketen per FTP "
 "beziehen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:918
+#: apt.conf.5.xml:919
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 "gibt Informationen aus, die sich auf das Herunterladen von Paketen per HTTP "
 "beziehen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:929
+#: apt.conf.5.xml:930
 msgid "Print information related to downloading packages using HTTPS."
 msgstr ""
 "gibt Informationen aus, die sich auf das Herunterladen von Paketen per HTTPS "
 "beziehen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:940
+#: apt.conf.5.xml:941
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
@@ -5201,7 +5223,7 @@ msgstr ""
 "mittels <literal>gpg</literal> beziehen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:951
+#: apt.conf.5.xml:952
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
@@ -5210,13 +5232,13 @@ msgstr ""
 "CD-ROMs gespeichert sind."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:961
+#: apt.conf.5.xml:962
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 "beschreibt den Prozess der Auflösung von Bauabhängigkeiten in &apt-get;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:971
+#: apt.conf.5.xml:972
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
@@ -5225,7 +5247,7 @@ msgstr ""
 "Bibliotheken generiert wurde."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:981
+#: apt.conf.5.xml:982
 msgid ""
 "Do not include information from <literal>statfs</literal>, namely the number "
 "of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -5236,7 +5258,7 @@ msgstr ""
 "ID für eine CD-ROM generiert wird."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:992
+#: apt.conf.5.xml:993
 msgid ""
 "Disable all file locking.  For instance, this will allow two instances of "
 "<quote><literal>apt-get update</literal></quote> to run at the same time."
@@ -5246,14 +5268,14 @@ msgstr ""
 "gleichen Zeit laufen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1004
+#: apt.conf.5.xml:1005
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 "protokolliert, wenn Elemente aus der globalen Warteschlange zum "
 "Herunterladen hinzugefügt oder entfernt werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1014
+#: apt.conf.5.xml:1015
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
@@ -5262,7 +5284,7 @@ msgstr ""
 "und kryptografischen Signaturen von heruntergeladenen Dateien beziehen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1024
+#: apt.conf.5.xml:1025
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
@@ -5271,7 +5293,7 @@ msgstr ""
 "Diffs und Fehler, die die Paketindexlisten-Diffs betreffen, aus."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1036
+#: apt.conf.5.xml:1037
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
@@ -5281,7 +5303,7 @@ msgstr ""
 "werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1047
+#: apt.conf.5.xml:1048
 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
@@ -5289,7 +5311,7 @@ msgstr ""
 "durchführen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1058
+#: apt.conf.5.xml:1059
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
@@ -5299,7 +5321,7 @@ msgstr ""
 "beziehen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1068
+#: apt.conf.5.xml:1069
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
@@ -5315,7 +5337,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1082
+#: apt.conf.5.xml:1083
 msgid ""
 "Generate debug messages describing which packages are marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
@@ -5348,7 +5370,7 @@ msgstr ""
 "dem das Paket erscheint."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1103
+#: apt.conf.5.xml:1104
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
@@ -5358,7 +5380,7 @@ msgstr ""
 "sind, aus."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1114
+#: apt.conf.5.xml:1115
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
@@ -5367,7 +5389,7 @@ msgstr ""
 "und alle während deren Auswertung gefundenen Fehler aus."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1125
+#: apt.conf.5.xml:1126
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
@@ -5377,7 +5399,7 @@ msgstr ""
 "soll."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1137
+#: apt.conf.5.xml:1138
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""
@@ -5385,12 +5407,12 @@ msgstr ""
 "von &dpkg; ausgeführt werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1148
+#: apt.conf.5.xml:1149
 msgid "Output the priority of each package list on startup."
 msgstr "gibt die Priorität jeder Paketliste beim Start aus."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1158
+#: apt.conf.5.xml:1159
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
@@ -5400,7 +5422,7 @@ msgstr ""
 "aufgetreten ist)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1169
+#: apt.conf.5.xml:1170
 msgid ""
 "Display a list of all installed packages with their calculated score used by "
 "the pkgProblemResolver. The description of the package is the same as "
@@ -5412,7 +5434,7 @@ msgstr ""
 "Marker</literal> beschrieben."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1181
+#: apt.conf.5.xml:1182
 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
@@ -5421,21 +5443,24 @@ msgstr ""
 "filename> gelesenen Anbieter aus."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1191
+#: apt.conf.5.xml:1192
 msgid ""
 "Display the external commands that are called by apt hooks.  This includes e."
 "g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or "
 "<literal>APT::Update::{Pre,Post}-Invoke</literal>."
 msgstr ""
+"zeigt die externen Befehle, die durch APT-Hooks aufgerufen werden. Dies "
+"schließt z.B. die Konfigurationsoptionen <literal>DPkg::{Pre,Post}-Invoke</"
+"literal> oder <literal>APT::Update::{Pre,Post}-Invoke</literal> mit ein."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1215 apt_preferences.5.xml:547 sources.list.5.xml:239
+#: apt.conf.5.xml:1216 apt_preferences.5.xml:547 sources.list.5.xml:239
 #: apt-ftparchive.1.xml:598
 msgid "Examples"
 msgstr "Beispiele"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1216
+#: apt.conf.5.xml:1217
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -5445,7 +5470,7 @@ msgstr ""
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1228
+#: apt.conf.5.xml:1229
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
 
@@ -8495,36 +8520,53 @@ msgstr ""
 "<command>apt-ftparchive</command> gibt bei normalen Operationen 0 zurück, "
 "dezimal 100 bei Fehlern."
 
-#. type: <title></title>
-#: guide.sgml:4
+#. type: Attribute 'lang' of: <book>
+#: guide.dbk:8 offline.dbk:8
+msgid "en"
+msgstr "de"
+
+#. type: Content of: <book><title>
+#: guide.dbk:10
 msgid "APT User's Guide"
 msgstr "APT-Benutzerhandbuch"
 
-#. type: <author></author>
-#: guide.sgml:6 offline.sgml:6
-msgid "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
-msgstr "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
+#. type: Content of: <book><bookinfo><authorgroup><author><personname>
+#: guide.dbk:16 offline.dbk:16
+msgid "Jason Gunthorpe"
+msgstr "Jason Gunthorpe"
+
+#. type: Content of: <book><bookinfo><authorgroup><author><email>
+#: guide.dbk:16 offline.dbk:16
+msgid "jgg@debian.org"
+msgstr "jgg@debian.org"
 
-#. type: <version></version>
-#: guide.sgml:7
-msgid "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
-msgstr "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
+#. type: Content of: <book><bookinfo><releaseinfo>
+#: guide.dbk:20 offline.dbk:20
+msgid "Version &apt-product-version;"
+msgstr ""
 
-#. type: <abstract></abstract>
-#: guide.sgml:11
+#. type: Content of: <book><bookinfo><abstract><para>
+#: guide.dbk:24
 msgid ""
 "This document provides an overview of how to use the the APT package manager."
 msgstr ""
 "Dieses Dokument stellt eine Übersicht bereit, wie das APT-"
 "Paketverwaltungsprogramm benutzt wird."
 
-#. type: <copyrightsummary></copyrightsummary>
-#: guide.sgml:15
-msgid "Copyright &copy; Jason Gunthorpe, 1998."
-msgstr "Copyright &copy; Jason Gunthorpe, 1998."
+#. type: Content of: <book><bookinfo>
+#: guide.dbk:28
+msgid ""
+"<copyright><year>1998</year><holder>Jason Gunthorpe</holder></copyright>"
+msgstr ""
+"<copyright><year>1998</year><holder>Jason Gunthorpe</holder></copyright>"
+
+#. type: Content of: <book><bookinfo><legalnotice><title>
+#: guide.dbk:31 offline.dbk:32
+msgid "License Notice"
+msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:21 offline.sgml:22
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: guide.dbk:33 offline.dbk:34
 msgid ""
 "\"APT\" and this document are free software; you can redistribute them and/"
 "or modify them under the terms of the GNU General Public License as "
@@ -8536,8 +8578,8 @@ msgstr ""
 "sie von der Free Software Foundation veröffentlicht wird; entweder Version 2 "
 "der Lizenz oder (optional) jeder späteren Version."
 
-#. type: <p></p>
-#: guide.sgml:24 offline.sgml:25
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: guide.dbk:42 offline.dbk:40
 msgid ""
 "For more details, on Debian systems, see the file /usr/share/common-licenses/"
 "GPL for the full license."
@@ -8545,31 +8587,32 @@ msgstr ""
 "Siehe für weitere Details auf Debian-Systemen die Datei /usr/share/common-"
 "licenses/GPL, die die vollständige Lizenz enthält."
 
-#. type: <heading></heading>
-#: guide.sgml:32
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:49
 msgid "General"
 msgstr "Allgemein"
 
-#. type: <p></p>
-#: guide.sgml:38
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:51
 msgid ""
-"The APT package currently contains two sections, the APT <prgn>dselect</"
-"prgn> method and the <prgn>apt-get</prgn> command line user interface. Both "
-"provide a way to install and remove packages as well as download new "
-"packages from the Internet."
+"The APT package currently contains two sections, the APT <command>dselect</"
+"command> method and the <command>apt-get</command> command line user "
+"interface. Both provide a way to install and remove packages as well as "
+"download new packages from the Internet."
 msgstr ""
-"Das Paket APT enthält derzeit zwei Abschnitte, die APT-<prgn>dselect</prgn>-"
-"Methode und die Anwenderschnittstelle <prgn>apt-get</prgn> für die "
-"Befehlszeile. Beide stellen eine Möglichkeit bereit, Pakete zu installieren, "
-"zu entfernen, sowie neue Pakete aus dem Internet herunterzuladen."
+"Das Paket APT enthält derzeit zwei Abschnitte, die APT-<command>dselect</"
+"command>-Methode und die Anwenderschnittstelle <command>apt-get</command> "
+"für die Befehlszeile. Beide stellen eine Möglichkeit bereit, Pakete zu "
+"installieren, zu entfernen, sowie neue Pakete aus dem Internet "
+"herunterzuladen."
 
-#. type: <heading></heading>
-#: guide.sgml:39
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:57
 msgid "Anatomy of the Package System"
 msgstr "Anatomie des Paketsystems"
 
-#. type: <p></p>
-#: guide.sgml:44
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:59
 msgid ""
 "The Debian packaging system has a large amount of information associated "
 "with each package to help assure that it integrates cleanly and easily into "
@@ -8580,8 +8623,8 @@ msgstr ""
 "ordentlich und leicht in das System integriert wird. Das bekannteste seiner "
 "Funktionen ist das Abhängigkeitssystem."
 
-#. type: <p></p>
-#: guide.sgml:52
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:64
 msgid ""
 "The dependency system allows individual programs to make use of shared "
 "elements in the system such as libraries. It simplifies placing infrequently "
@@ -8596,8 +8639,8 @@ msgstr ""
 "Durchschnittsanwender installieren sollte. Außerdem erlaubt es die Auswahl "
 "von Mail-Transport-Agenten, X-Servern und so weiter."
 
-#. type: <p></p>
-#: guide.sgml:57
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:71
 msgid ""
 "The first step to understanding the dependency system is to grasp the "
 "concept of a simple dependency. The meaning of a simple dependency is that a "
@@ -8610,8 +8653,8 @@ msgstr ""
 "benötigt, das zu gleichen Zeit installiert sein muss, um ordentlich zu "
 "funktionieren."
 
-#. type: <p></p>
-#: guide.sgml:63
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:76
 msgid ""
 "For instance, mailcrypt is an emacs extension that aids in encrypting email "
 "with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a "
@@ -8624,8 +8667,8 @@ msgstr ""
 "eine Emacs-Erweiterung ist, hat es ebenfalls eine einfache Abhängigkeit von "
 "Emacs. Ohne Emacs ist es komplett unbenutzbar."
 
-#. type: <p></p>
-#: guide.sgml:73
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:82
 msgid ""
 "The other important dependency to understand is a conflicting dependency. It "
 "means that a package, when installed with another package, will not work and "
@@ -8647,8 +8690,8 @@ msgstr ""
 "in Konflikt stehende Abhängigkeiten mit allen anderen Mail-Transport-Agenten "
 "haben."
 
-#. type: <p></p>
-#: guide.sgml:83
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:92
 msgid ""
 "As an added complication there is the possibility for a package to pretend "
 "to be another package. Consider that exim and sendmail for many intents are "
@@ -8669,8 +8712,8 @@ msgstr ""
 "dass sie von einem Mail-Transport-Agenten abhängen. Die kann zu großer "
 "Verwirrung führen, wenn manuell versucht wird, Pakete zu reparieren."
 
-#. type: <p></p>
-#: guide.sgml:88
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:102
 msgid ""
 "At any given time a single dependency may be met by packages that are "
 "already installed or it may not be. APT attempts to help resolve dependency "
@@ -8683,77 +8726,85 @@ msgstr ""
 "Algorithmen bereitstellt, die bei der Auswahl von Paketen zur Installation "
 "helfen."
 
-#. type: <heading></heading>
-#: guide.sgml:96
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:111
 msgid "apt-get"
 msgstr "apt-get"
 
-#. type: <p></p>
-#: guide.sgml:102
-msgid ""
-"<prgn>apt-get</prgn> provides a simple way to install packages from the "
-"command line. Unlike <prgn>dpkg</prgn>, <prgn>apt-get</prgn> does not "
-"understand .deb files, it works with the package's proper name and can only "
-"install .deb archives from a <em>Source</em>."
-msgstr ""
-"<prgn>apt-get</prgn> stellt eine einfache Möglichkeit zu Verfügung, Pakete "
-"auf der Befehlszeile zu installieren. Anders als <prgn>dpkg</prgn> versteht "
-"<prgn>apt-get</prgn> keine .deb-Dateien. Es arbeitet mit dem Eigennamen des "
-"Pakets und kann .deb-Archive nur aus einer <em>Quelle</em> installieren."
-
-#. type: <p></p>
-#: guide.sgml:109
-msgid ""
-"The first <footnote><p>If you are using an http proxy server you must set "
-"the http_proxy environment variable first, see sources.list(5)</p></"
-"footnote> thing that should be done before using <prgn>apt-get</prgn> is to "
-"fetch the package lists from the <em>Sources</em> so that it knows what "
-"packages are available. This is done with <tt>apt-get update</tt>. For "
-"instance,"
-msgstr ""
-"Das Erste <footnote><p>Falls Sie einen HTTP-Proxy-Server benutzen, müssen "
-"Sie zuerst die Umgebungsvariable »http_proxy« setzen, siehe sources.list(5)</"
-"p></footnote>, das Sie vor der Benutzung von <prgn>apt-get</prgn> tun "
-"sollten, ist es, die Paketlisten von der <em>Quelle</em> herunterzuladen, so "
-"dass es weiß, welche Pakete verfügbar sind. Dies wird mit <tt>apt-get "
-"update</tt> erledigt. Zum Beispiel,"
-
-#. type: <example></example>
-#: guide.sgml:116
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:113
+msgid ""
+"<command>apt-get</command> provides a simple way to install packages from "
+"the command line. Unlike <command>dpkg</command>, <command>apt-get</command> "
+"does not understand .deb files, it works with the package's proper name and "
+"can only install .deb archives from a <emphasis>Source</emphasis>."
+msgstr ""
+"<command>apt-get</command> stellt eine einfache Möglichkeit zu Verfügung, "
+"Pakete auf der Befehlszeile zu installieren. Anders als <command>dpkg</"
+"command> versteht <command>apt-get</command> keine .deb-Dateien. Es arbeitet "
+"mit dem Eigennamen des Pakets und kann .deb-Archive nur aus einer "
+"<emphasis>Quelle</emphasis> installieren."
+
+#. type: Content of: <book><chapter><para><footnote><para>
+#: guide.dbk:119
+msgid ""
+"If you are using an http proxy server you must set the http_proxy "
+"environment variable first, see sources.list(5)"
+msgstr ""
+"Falls Sie einen HTTP-Proxy-Server benutzen, müssen Sie zuerst die "
+"Umgebungsvariable »http_proxy« setzen, siehe sources.list(5)"
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:119
+msgid ""
+"The first <placeholder type=\"footnote\" id=\"0\"/> thing that should be "
+"done before using <command>apt-get</command> is to fetch the package lists "
+"from the <emphasis>Sources</emphasis> so that it knows what packages are "
+"available. This is done with <literal>apt-get update</literal>. For instance,"
+msgstr ""
+"Das Erste <placeholder type=\"footnote\" id=\"0\"/>, das Sie vor der "
+"Benutzung von <command>apt-get</command> tun sollten, ist es, die "
+"Paketlisten von der <emphasis>Quelle</emphasis> herunterzuladen, so dass es "
+"weiß, welche Pakete verfügbar sind. Dies wird mit <literal>apt-get update</"
+"literal> erledigt. Zum Beispiel,"
+
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:127
 #, no-wrap
 msgid ""
 "# apt-get update\n"
 "Get http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
 "Get http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 msgstr ""
 "# apt-get update\n"
 "OK   http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
 "OK   http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
 "Paketlisten werden gelesen … Fertig\n"
-"Abhängigkeitsbaum wird aufgebaut … Fertig"
+"Abhängigkeitsbaum wird aufgebaut … Fertig\n"
 
-#. type: <p><taglist>
-#: guide.sgml:120
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:134
 msgid "Once updated there are several commands that can be used:"
 msgstr "Einmal aktualisiert stehen mehrere Befehl zur Benutzung zur Verfügung:"
 
-#. type: <tag></tag>
-#: guide.sgml:121
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:138
 msgid "upgrade"
 msgstr "upgrade"
 
-#. type: <p></p>
-#: guide.sgml:131
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:141
 msgid ""
 "Upgrade will attempt to gently upgrade the whole system. Upgrade will never "
 "install a new package or remove an existing package, nor will it ever "
 "upgrade a package that might cause some other package to break. This can be "
 "used daily to relatively safely upgrade the system. Upgrade will list all of "
 "the packages that it could not upgrade, this usually means that they depend "
-"on new packages or conflict with some other package. <prgn>dselect</prgn> or "
-"<tt>apt-get install</tt> can be used to force these packages to install."
+"on new packages or conflict with some other package. <command>dselect</"
+"command> or <literal>apt-get install</literal> can be used to force these "
+"packages to install."
 msgstr ""
 "»Upgrade« wird versuchen, ein behutsames Upgrade des ganzen Systems "
 "durchzuführen. »Upgrade« wird niemals ein neues Paket installieren oder "
@@ -8762,17 +8813,17 @@ msgstr ""
 "ein relativ sicheres Upgrade des Systems durchzuführen. »Upgrade« wird alle "
 "Pakete auflisten, von denen es kein Upgrade durchführen kann, was "
 "üblicherweise bedeutet, dass sie von neuen Paketen abhängen oder Konflikte "
-"mit anderen Paketen haben. <prgn>dselect</prgn> oder <tt>apt-get install</"
-"tt> können benutzt werden, um die Installation von diesen Paketen zu "
-"erzwingen."
+"mit anderen Paketen haben. <command>dselect</command> oder <literal>apt-get "
+"install</literal> können benutzt werden, um die Installation von diesen "
+"Paketen zu erzwingen."
 
-#. type: <tag></tag>
-#: guide.sgml:131
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:153
 msgid "install"
 msgstr "install"
 
-#. type: <p></p>
-#: guide.sgml:140
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:156
 msgid ""
 "Install is used to install packages by name. The package is automatically "
 "fetched and installed. This can be useful if you already know the name of "
@@ -8791,21 +8842,22 @@ msgstr ""
 "aufzulösen, wird eine Zusammenfassung ausgeben und nach einer Bestätigung "
 "fragen, wenn sich etwas anderes als dessen Argumente ändert."
 
-#. type: <tag></tag>
-#: guide.sgml:140
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:167
 msgid "dist-upgrade"
 msgstr "dist-upgrade"
 
-#. type: <p></p>
-#: guide.sgml:149
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:170
 msgid ""
 "Dist-upgrade is a complete upgrader designed to simplify upgrading between "
 "releases of Debian. It uses a sophisticated algorithm to determine the best "
 "set of packages to install, upgrade and remove to get as much of the system "
 "to the newest release. In some situations it may be desired to use dist-"
 "upgrade rather than spend the time manually resolving dependencies in "
-"<prgn>dselect</prgn>. Once dist-upgrade has completed then <prgn>dselect</"
-"prgn> can be used to install any packages that may have been left out."
+"<command>dselect</command>. Once dist-upgrade has completed then "
+"<command>dselect</command> can be used to install any packages that may have "
+"been left out."
 msgstr ""
 "»Dist-upgrade« führt vollständige Upgrades durch. Es wurde entworfen, um "
 "Upgrades zwischen Releases von Debian zu vereinfachen. Es benutzt einen "
@@ -8813,13 +8865,13 @@ msgstr ""
 "Installieren, für das Upgrade oder zum Entfernen festzulegen, um soviel wie "
 "möglich vom System auf das neuste Release zu bekommen. In einigen "
 "Situationen könnte es eher gewünscht sein, »dist-upgrade« zu benutzen, als "
-"Zeit in das manuelle Auflösen von Abhängigkeiten in <prgn>dselect</prgn> zu "
-"investieren. Ist »Dist-upgrade« erst vollständig, dann kann <prgn>dselect</"
-"prgn> benutzt werden, um einige Pakete zu installieren, die außen vor "
-"geblieben sind."
+"Zeit in das manuelle Auflösen von Abhängigkeiten in <command>dselect</"
+"command> zu investieren. Ist »Dist-upgrade« erst vollständig, dann kann "
+"<command>dselect</command> benutzt werden, um einige Pakete zu installieren, "
+"die außen vor geblieben sind."
 
-#. type: <p></p>
-#: guide.sgml:152
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:180
 msgid ""
 "It is important to closely look at what dist-upgrade is going to do, its "
 "decisions may sometimes be quite surprising."
@@ -8827,159 +8879,167 @@ msgstr ""
 "Es ist wichtig, genau zu schauen, was »Dist-upgrade« tun wird, seine "
 "Entscheidungen können manchmal ziemlich überraschend sein."
 
-#. type: <p></p>
-#: guide.sgml:163
-msgid ""
-"<prgn>apt-get</prgn> has several command line options that are detailed in "
-"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful "
-"option is <tt>-d</tt> which does not install the fetched files. If the "
-"system has to download a large number of package it would be undesired to "
-"start installing them in case something goes wrong. When <tt>-d</tt> is used "
-"the downloaded archives can be installed by simply running the command that "
-"caused them to be downloaded again without <tt>-d</tt>."
-msgstr ""
-"<prgn>apt-get</prgn> hat mehrere Befehlszeilenoptionen, die sich detailliert "
-"in dessen Handbuchseite, <manref name=\"apt-get\" section=\"8\"> finden. Die "
-"nützlichste Option ist <tt>-d</tt>, die die heruntergeladenen Dateien nicht "
-"installiert. Falls das System eine große Anzahl Pakete herunterladen soll, "
-"würde es nicht erwünscht sein, wenn die Installation in dem Fall gestartet "
-"würde, wenn etwas schief läuft. Falls <tt>-d</tt> benutzt wird, können die "
-"heruntergeladenen Archive dadurch installiert werden, indem einfach der "
-"Befehl, der das Herunterladen veranlasste, erneut ohne <tt>-d</tt> ausführt "
-"wird."
-
-#. type: <heading></heading>
-#: guide.sgml:168
+# s/package/packages/
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:187
+msgid ""
+"<command>apt-get</command> has several command line options that are "
+"detailed in its man page, <citerefentry><refentrytitle>apt-get</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>. The most useful "
+"option is <literal>-d</literal> which does not install the fetched files. If "
+"the system has to download a large number of package it would be undesired "
+"to start installing them in case something goes wrong. When <literal>-d</"
+"literal> is used the downloaded archives can be installed by simply running "
+"the command that caused them to be downloaded again without <literal>-d</"
+"literal>."
+msgstr ""
+"<command>apt-get</command> hat mehrere Befehlszeilenoptionen, die sich "
+"detailliert in seiner Handbuchseite, <citerefentry><refentrytitle>apt-get</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry> finden. Die "
+"nützlichste Option ist <literal>-d</literal>, die die heruntergeladenen "
+"Dateien nicht installiert. Falls das System eine große Anzahl Pakete "
+"herunterladen soll, würde es nicht erwünscht sein, wenn die Installation "
+"auch in dem Fall gestartet würde, dass etwas schief läuft. Falls <literal>-"
+"d</literal> benutzt wird, können die heruntergeladenen Archive dadurch "
+"installiert werden, indem einfach der Befehl, der das Herunterladen "
+"veranlasste, erneut ohne <literal>-d</literal> ausgeführt wird."
+
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:199
 msgid "DSelect"
 msgstr "DSelect"
 
-#. type: <p></p>
-#: guide.sgml:173
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:201
 msgid ""
-"The APT <prgn>dselect</prgn> method provides the complete APT system with "
-"the <prgn>dselect</prgn> package selection GUI. <prgn>dselect</prgn> is used "
-"to select the packages to be installed or removed and APT actually installs "
-"them."
+"The APT <command>dselect</command> method provides the complete APT system "
+"with the <command>dselect</command> package selection GUI. <command>dselect</"
+"command> is used to select the packages to be installed or removed and APT "
+"actually installs them."
 msgstr ""
-"Die APT-<prgn>dselect</prgn>-Methode stellt das komplette APT-System mit dem "
-"<prgn>dselect</prgn>-Paketauswahl-GUI bereit. <prgn>dselect</prgn> wird "
-"benutzt, um Pakete zum Installieren oder Entfernen auszuwählen und APT "
-"installiert sie tatsächlich."
+"Die APT-<command>dselect</command>-Methode stellt das komplette APT-System "
+"mit dem <command>dselect</command>-Paketauswahl-GUI bereit. "
+"<command>dselect</command> wird benutzt, um Pakete zum Installieren oder "
+"Entfernen auszuwählen und APT installiert sie tatsächlich."
 
-#. type: <p></p>
-#: guide.sgml:184
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:207
 msgid ""
-"To enable the APT method you need to select [A]ccess in <prgn>dselect</prgn> "
-"and then choose the APT method. You will be prompted for a set of "
-"<em>Sources</em> which are places to fetch archives from. These can be "
-"remote Internet sites, local Debian mirrors or CD-ROMs. Each source can "
-"provide a fragment of the total Debian archive, APT will automatically "
+"To enable the APT method you need to select [A]ccess in <command>dselect</"
+"command> and then choose the APT method. You will be prompted for a set of "
+"<emphasis>Sources</emphasis> which are places to fetch archives from. These "
+"can be remote Internet sites, local Debian mirrors or CD-ROMs. Each source "
+"can provide a fragment of the total Debian archive, APT will automatically "
 "combine them to form a complete set of packages. If you have a CD-ROM then "
 "it is a good idea to specify it first and then specify a mirror so that you "
 "have access to the latest bug fixes. APT will automatically use packages on "
 "your CD-ROM before downloading from the Internet."
 msgstr ""
-"Um die APT-Methode einzuschalten, müssen Sie [Z]ugriff in <prgn>dselect</"
-"prgn> auswählen und dann die APT-Methode wählen. Sie werden nach einer "
-"Zusammenstellung von <em>Quellen</em> gefragt. Dies sind Plätze, von denen "
-"Archive heruntergeladen werden. Dies können ferne Internetsites, lokale "
-"Debian-Spiegel oder CD-ROMs sein. Jede Quelle kann einen Ausschnitt des "
-"gesamten Debian-Archives bereitstellen. APT wird sie automatisch "
+"Um die APT-Methode einzuschalten, müssen Sie [Z]ugriff in <command>dselect</"
+"command> auswählen und dann die APT-Methode wählen. Sie werden nach einer "
+"Zusammenstellung von <emphasis>Quellen</emphasis> gefragt. Dies sind Plätze, "
+"von denen Archive heruntergeladen werden. Dies können ferne Internetsites, "
+"lokale Debian-Spiegel oder CD-ROMs sein. Jede Quelle kann einen Ausschnitt "
+"des gesamten Debian-Archives bereitstellen. APT wird sie automatisch "
 "kombinieren, um eine komplette Zusammenstellung von Paketen zu formen. Falls "
 "Sie eine CD-ROM haben, ist es eine gute Idee, sie als erstes und dann den "
 "Spiegel anzugeben, so dass Sie Zugriff auf die neusten Fehlerbehebungen "
 "haben. APT wird automatisch Pakete auf der CD-ROM benutzen, bevor es sie aus "
 "dem Internet herunterlädt."
 
-#. type: <example></example>
-#: guide.sgml:198
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:218
 #, no-wrap
 msgid ""
 "   Set up a list of distribution source locations\n"
-"\t \n"
+"\n"
 " Please give the base URL of the debian distribution.\n"
 " The access schemes I know about are: http file\n"
-"\t   \n"
+"\n"
 " For example:\n"
 "      file:/mnt/debian,\n"
 "      ftp://ftp.debian.org/debian,\n"
 "      http://ftp.de.debian.org/debian,\n"
-"      \n"
-"      \n"
-" URL [http://llug.sep.bnl.gov/debian]:"
+"\n"
+"\n"
+" URL [http://llug.sep.bnl.gov/debian]:\n"
 msgstr ""
 "   eine Liste mit Orten von Distributionsquellen einrichten\n"
-"\t \n"
+"\n"
 " Bitte geben Sie die Basis-URL der Debian-Distribution an.\n"
 " Die bekannten Zugriffsschemata dafür sind: http file\n"
-"\t   \n"
+"\n"
 " Zum Beispiel:\n"
 "      file:/mnt/debian,\n"
 "      ftp://ftp.debian.org/debian,\n"
 "      http://ftp.de.debian.org/debian,\n"
-"      \n"
-"      \n"
-" URL [http://llug.sep.bnl.gov/debian]:"
+"\n"
+"\n"
+" URL [http://llug.sep.bnl.gov/debian]:\n"
 
-#. type: <p></p>
-#: guide.sgml:205
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:232
 msgid ""
-"The <em>Sources</em> setup starts by asking for the base of the Debian "
-"archive, defaulting to a HTTP mirror. Next it asks for the distribution to "
-"get."
+"The <emphasis>Sources</emphasis> setup starts by asking for the base of the "
+"Debian archive, defaulting to a HTTP mirror. Next it asks for the "
+"distribution to get."
 msgstr ""
-"Das Einrichten der <em>Quellen</em> beginnt durch das Erfragen der Basis des "
-"Debian-Archives, vorgegeben ist ein HTTP-Spiegel. Als nächstes wird nach der "
-"zu erhaltenden Distribution gefragt."
+"Das Einrichten der <emphasis>Quellen</emphasis> beginnt durch das Erfragen "
+"der Basis des Debian-Archives, vorgegeben ist ein HTTP-Spiegel. Als nächstes "
+"wird nach der zu erhaltenden Distribution gefragt."
 
-#. type: <example></example>
-#: guide.sgml:212
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:237
 #, no-wrap
 msgid ""
 " Please give the distribution tag to get or a path to the\n"
 " package file ending in a /. The distribution\n"
 " tags are typically something like: stable unstable testing non-US\n"
-"   \n"
-" Distribution [stable]:"
-msgstr ""
-" Bitte geben Sie die zu erhaltende Distributionskennzeichnung oder den mit  einem / endenden Pfad zum Paket an. Die Distributionskennzeichnungen sind  normalerweise etwas wie: stable unstable testing non-US\n"
-"   \n"
-" Distribution [stable]:"
-
-#. type: <p></p>
-#: guide.sgml:222
-msgid ""
-"The distribution refers to the Debian version in the archive, <em>stable</"
-"em> refers to the latest released version and <em>unstable</em> refers to "
-"the developmental version. <em>non-US</em> is only available on some mirrors "
-"and refers to packages that contain encryption technology or other things "
-"that cannot be exported from the United States. Importing these packages "
-"into the US is legal however."
-msgstr ""
-"Die Distribution bezieht sich auf die Debian-Version im Archiv, <em>stable</"
-"em> bezieht sich auf die zuletzt veröffentlichte Version und <em>unstable</"
-"em> bezieht sich auf die Entwicklungsversion. <em>non-US</em> ist nur auf "
-"einigen Spiegeln verfügbar und bezieht sich auf Pakete, die "
+"\n"
+" Distribution [stable]:\n"
+msgstr ""
+" Bitte geben Sie die zu erhaltende Distributionskennzeichnung oder den mit\n"
+" einem / endenden Pfad zum Paket an. Die Distributionskennzeichnungen sind\n"
+" normalerweise etwas wie: stable unstable testing non-US\n"
+"\n"
+" Distribution [stable]:\n"
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:244
+msgid ""
+"The distribution refers to the Debian version in the archive, "
+"<emphasis>stable</emphasis> refers to the latest released version and "
+"<emphasis>unstable</emphasis> refers to the developmental version. "
+"<emphasis>non-US</emphasis> is only available on some mirrors and refers to "
+"packages that contain encryption technology or other things that cannot be "
+"exported from the United States. Importing these packages into the US is "
+"legal however."
+msgstr ""
+"Die Distribution bezieht sich auf die Debian-Version im Archiv, "
+"<emphasis>stable</emphasis> bezieht sich auf die zuletzt veröffentlichte "
+"Version und <emphasis>unstable</emphasis> bezieht sich auf die "
+"Entwicklungsversion. <emphasis>non-US</emphasis> ist nur auf einigen "
+"Spiegeln verfügbar und bezieht sich auf Pakete, die "
 "Verschlüsselungstechnologie oder andere Dinge enthalten, die nicht aus den "
 "Vereinigten Staaten exportiert werden können. Diese Pakete in die USA zu "
 "importieren ist jedoch legal."
 
-#. type: <example></example>
-#: guide.sgml:228
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:253
 #, no-wrap
 msgid ""
 " Please give the components to get\n"
 " The components are typically something like: main contrib non-free\n"
-"  \n"
-" Components [main contrib non-free]:"
+"\n"
+" Components [main contrib non-free]:\n"
 msgstr ""
 " Bitte geben Sie die Komponenten an, die Sie erhalten möchten\n"
 " Die Komponenten sind normalerweise etwas wie: »main« »contrib« »non-free«\n"
-"  \n"
-" Komponenten [main contrib non-free]:"
+"\n"
+" Komponenten [main contrib non-free]:\n"
 
-#. type: <p></p>
-#: guide.sgml:236
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:259
 msgid ""
 "The components list refers to the list of sub distributions to fetch. The "
 "distribution is split up based on software licenses, main being DFSG free "
@@ -8992,8 +9052,8 @@ msgstr ""
 "»Contrib« und »Non-free« Dinge enthalten, die verschiedene Einschränkungen "
 "in ihrer Benutzung und ihren Vertrieb haben."
 
-#. type: <p></p>
-#: guide.sgml:240
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:265
 msgid ""
 "Any number of sources can be added, the setup script will continue to prompt "
 "until you have specified all that you want."
@@ -9002,24 +9062,24 @@ msgstr ""
 "wird mit Nachfragen fortfahren, bis Sie alles angegeben haben, was Sie "
 "möchten."
 
-#. type: <p></p>
-#: guide.sgml:247
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:269
 msgid ""
-"Before starting to use <prgn>dselect</prgn> it is necessary to update the "
-"available list by selecting [U]pdate from the menu. This is a superset of "
-"<tt>apt-get update</tt> that makes the fetched information available to "
-"<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get update</"
-"tt> has been run before."
+"Before starting to use <command>dselect</command> it is necessary to update "
+"the available list by selecting [U]pdate from the menu. This is a superset "
+"of <literal>apt-get update</literal> that makes the fetched information "
+"available to <command>dselect</command>. [U]pdate must be performed even if "
+"<literal>apt-get update</literal> has been run before."
 msgstr ""
-"Bevor sie beginnen, <prgn>dselect</prgn> zu benutzen, ist es notwendig, die "
-"Verfügbarkeitsliste zu aktualisieren, indem sie aus dem Menü [E]rneuern "
-"auswählen. Dies ist eine Obermenge von <tt>apt-get update</tt>, das "
-"<prgn>dselect</prgn> heruntergeladene Informationen zur Verfügung stellt. "
-"[E]rneuern muss auch dann durchgeführt werden, wenn vorher <tt>apt-get "
-"update</tt> ausgeführt wurde."
+"Bevor sie beginnen, <command>dselect</command> zu benutzen, ist es "
+"notwendig, die Verfügbarkeitsliste zu aktualisieren, indem sie aus dem Menü "
+"[E]rneuern auswählen. Dies ist eine Obermenge von <literal>apt-get update</"
+"literal>, das <command>dselect</command> heruntergeladene Informationen zur "
+"Verfügung stellt. [E]rneuern muss auch dann durchgeführt werden, wenn vorher "
+"<literal>apt-get update</literal> ausgeführt wurde."
 
-#. type: <p></p>
-#: guide.sgml:253
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:276
 msgid ""
 "You can then go on and make your selections using [S]elect and then perform "
 "the installation using [I]nstall. When using the APT method the [C]onfig and "
@@ -9031,76 +9091,84 @@ msgstr ""
 "benutzen, haben die Befehle Kon[f]ig. und [L]öschen keine Bedeutung, der "
 "Befehl [I]nstall. führt beides gleichermaßen aus."
 
-#. type: <p></p>
-#: guide.sgml:258
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:282
 msgid ""
 "By default APT will automatically remove the package (.deb) files once they "
-"have been successfully installed. To change this behavior place <tt>Dselect::"
-"clean \"prompt\";</tt> in /etc/apt/apt.conf."
+"have been successfully installed. To change this behavior place "
+"<literal>Dselect::clean \"prompt\";</literal> in /etc/apt/apt.conf."
 msgstr ""
 "Standardmäßig wird APT automatisch die Paketdateien (.deb) entfernen, sobald "
 "sie erfolgreich installiert sind. Um dieses Verhalten zu ändern, platzieren "
-"Sie <tt>Dselect::clean \"prompt\";</tt> in /etc/apt/apt.conf."
+"Sie <literal>Dselect::clean \"prompt\";</literal> in /etc/apt/apt.conf."
 
-#. type: <heading></heading>
-#: guide.sgml:264
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:288
 msgid "The Interface"
 msgstr "Die Schnittstelle"
 
-#. type: <p></p>
-#: guide.sgml:278
+#. type: Content of: <book><chapter><para><footnote><para>
+#: guide.dbk:292
+msgid ""
+"The <command>dselect</command> method actually is a set of wrapper scripts "
+"to <command>apt-get</command>. The method actually provides more "
+"functionality than is present in <command>apt-get</command> alone."
+msgstr ""
+"Die Methode <command>dselect</command> ist tatsächlich eine Zusammenstellung "
+"von Wrapper-Skripten für <command>apt-get</command>. Die Methode stellt "
+"tatsächlich mehr Funktionalitäten bereit, als in <command>apt-get</command> "
+"allein vorhanden sind."
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:290
 msgid ""
-"Both that APT <prgn>dselect</prgn> method and <prgn>apt-get</prgn> share the "
-"same interface. It is a simple system that generally tells you what it will "
-"do and then goes and does it. <footnote><p>The <prgn>dselect</prgn> method "
-"actually is a set of wrapper scripts to <prgn>apt-get</prgn>. The method "
-"actually provides more functionality than is present in <prgn>apt-get</prgn> "
-"alone.</p></footnote> After printing out a summary of what will happen APT "
+"Both that APT <command>dselect</command> method and <command>apt-get</"
+"command> share the same interface. It is a simple system that generally "
+"tells you what it will do and then goes and does it. <placeholder type="
+"\"footnote\" id=\"0\"/> After printing out a summary of what will happen APT "
 "then will print out some informative status messages so that you can "
 "estimate how far along it is and how much is left to do."
 msgstr ""
-"Sowohl die APT-Methode <prgn>dselect</prgn>, als auch <prgn>apt-get</prgn> "
-"teilen sich die gleiche Schnittstelle. Es ist ein einfaches System, das "
-"üblicherweise mitteilt, was es tun wird und es dann tut. <footnote><p>Die "
-"Methode <prgn>dselect</prgn> ist tatsächlich eine Zusammenstellung von "
-"Wrapper-Skripten für <prgn>apt-get</prgn>. Die Methode stellt tatsächlich "
-"mehr Funktionalitäten bereit, als in <prgn>apt-get</prgn> allein vorhanden "
-"sind.</p></footnote> Nach der Ausgabe einer Zusammenfassung was passieren "
-"wird, gibt APT einige informative Statusmeldungen aus, so dass Sie "
-"abschätzen können, wie weit es ist und wieviel noch zu tun ist."
-
-#. type: <heading></heading>
-#: guide.sgml:280
+"Sowohl die APT-Methode <command>dselect</command>, als auch <command>apt-"
+"get</command> teilen sich die gleiche Schnittstelle. Es ist ein einfaches "
+"System, das üblicherweise mitteilt, was es tun wird und es dann tut. "
+"<placeholder type=\"footnote\" id=\"0\"/> Nach der Ausgabe einer "
+"Zusammenfassung was passieren wird, gibt APT einige informative "
+"Statusmeldungen aus, so dass Sie abschätzen können, wie weit es ist und "
+"wieviel noch zu tun ist."
+
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:301
 msgid "Startup"
 msgstr "Anfang"
 
-#. type: <p></p>
-#: guide.sgml:284
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:303
 msgid ""
 "Before all operations except update, APT performs a number of actions to "
 "prepare its internal state. It also does some checks of the system's state. "
-"At any time these operations can be performed by running <tt>apt-get check</"
-"tt>."
+"At any time these operations can be performed by running <literal>apt-get "
+"check</literal>."
 msgstr ""
 "Vor allen Operationen, ausgenommen »update«, führt APT eine Reihe von "
 "Aktionen durch, um seinen internen Status vorzubereiten. Es macht außerdem "
 "einige Prüfungen des Systemstatus. Diese Operationen können jederzeit durch "
-"Ausführung von <tt>apt-get check</tt> durchgeführt werden."
+"Ausführung von <literal>apt-get check</literal> durchgeführt werden."
 
-#. type: <example></example>
-#: guide.sgml:289
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:309
 #, no-wrap
 msgid ""
 "# apt-get check\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 msgstr ""
 "# apt-get check\n"
 "Paketlisten werden gelesen … Fertig\n"
-"Abhängigkeitsbaum wird aufgebaut … Fertig"
+"Abhängigkeitsbaum wird aufgebaut … Fertig\n"
 
-#. type: <p></p>
-#: guide.sgml:297
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:314
 msgid ""
 "The first thing it does is read all the package files into memory. APT uses "
 "a caching scheme so this operation will be faster the second time it is run. "
@@ -9113,22 +9181,22 @@ msgstr ""
 "gefunden werden, werden sie ignoriert und beim Beenden von Apt-get wird eine "
 "Warnung ausgegeben."
 
-#. type: <p></p>
-#: guide.sgml:303
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:320
 msgid ""
 "The final operation performs a detailed analysis of the system's "
 "dependencies. It checks every dependency of every installed or unpacked "
 "package and considers if it is OK. Should this find a problem then a report "
-"will be printed out and <prgn>apt-get</prgn> will refuse to run."
+"will be printed out and <command>apt-get</command> will refuse to run."
 msgstr ""
 "Die letzte Operation führt eine detaillierte Analyse der Abhängigkeiten des "
 "Systems durch. Sie prüft jede Abhängigkeit jedes installierten oder "
 "entpackten Pakets und berücksichtigt, ob es in Ordnung ist. Sollte sie ein "
-"Problem finden, dann wird eine Meldung ausgegeben und <prgn>apt-get</prgn> "
-"wird die Ausführung verweigern."
+"Problem finden, dann wird eine Meldung ausgegeben und <command>apt-get</"
+"command> wird die Ausführung verweigern."
 
-#. type: <example></example>
-#: guide.sgml:320
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:326
 #, no-wrap
 msgid ""
 "# apt-get check\n"
@@ -9138,14 +9206,14 @@ msgid ""
 "Sorry, but the following packages have unmet dependencies:\n"
 "  9fonts: Depends: xlib6g but it is not installed\n"
 "  uucp: Depends: mailx but it is not installed\n"
-"  blast: Depends: xlib6g (>= 3.3-5) but it is not installed\n"
+"  blast: Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
 "  adduser: Depends: perl-base but it is not installed\n"
 "  aumix: Depends: libgpmg1 but it is not installed\n"
 "  debiandoc-sgml: Depends: sgml-base but it is not installed\n"
-"  bash-builtins: Depends: bash (>= 2.01) but 2.0-3 is installed\n"
+"  bash-builtins: Depends: bash (&gt;= 2.01) but 2.0-3 is installed\n"
 "  cthugha: Depends: svgalibg1 but it is not installed\n"
-"           Depends: xlib6g (>= 3.3-5) but it is not installed\n"
-"  libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)"
+"           Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
+"  libreadlineg2: Conflicts:libreadline2 (&lt;&lt; 2.1-2.1)\n"
 msgstr ""
 "# apt-get check\n"
 "Paketlisten werden gelesen … Fertig Fertig\n"
@@ -9155,17 +9223,17 @@ msgstr ""
 "Die folgenden Pakete haben nichterfüllte Abhängigkeiten:\n"
 "  9fonts: Hängt ab: xlib6g ist aber nicht installiert\n"
 "  uucp: Hängt ab: mailx ist aber nicht installiert\n"
-"  blast: Hängt ab: xlib6g (>= 3.3-5) ist aber nicht installiert\n"
+"  blast: Hängt ab: xlib6g (&gt;= 3.3-5) ist aber nicht installiert\n"
 "  adduser: Hängt ab: perl-base ist aber nicht installiert\n"
 "  aumix: Hängt ab: libgpmg1 ist aber nicht installiert\n"
 "  debiandoc-sgml: Hängt ab: sgml-base ist aber nicht installiert\n"
-"  bash-builtins: Hängt ab: bash (>= 2.01) but 2.0-3 ist installiert\n"
+"  bash-builtins: Hängt ab: bash (&gt;= 2.01) but 2.0-3 ist installiert\n"
 "  cthugha: Hängt ab: svgalibg1 ist aber nicht installiert\n"
-"           Hängt ab: xlib6g (>= 3.3-5) ist aber nicht installiert\n"
-"  libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)"
+"           Hängt ab: xlib6g (&gt;= 3.3-5) ist aber nicht installiert\n"
+"  libreadlineg2: Conflicts:libreadline2 (&lt;&lt; 2.1-2.1)\n"
 
-#. type: <p></p>
-#: guide.sgml:329
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:343
 msgid ""
 "In this example the system has many problems, including a serious problem "
 "with libreadlineg2. For each package that has unmet dependencies a line is "
@@ -9179,87 +9247,98 @@ msgstr ""
 "Problem anzeigt und die Abhängigkeiten, die nicht erfüllt sind. Eine kurze "
 "Erklärung, warum das Paket ein Abhängigkeitsproblem hat, ist inbegriffen."
 
-#. type: <p></p>
-#: guide.sgml:337
+#. type: Content of: <book><chapter><section><para><footnote><para>
+#: guide.dbk:352
+msgid ""
+"APT however considers all known dependencies and attempts to prevent broken "
+"packages"
+msgstr ""
+"APT berücksichtigt jedoch alle bekannten Abhängigkeiten und versucht, "
+"kaputte Pakete zu vermeiden"
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:350
 msgid ""
 "There are two ways a system can get into a broken state like this. The first "
-"is caused by <prgn>dpkg</prgn> missing some subtle relationships between "
-"packages when performing upgrades. <footnote><p>APT however considers all "
-"known dependencies and attempts to prevent broken packages</p></footnote>. "
-"The second is if a package installation fails during an operation. In this "
-"situation a package may have been unpacked without its dependents being "
-"installed."
+"is caused by <command>dpkg</command> missing some subtle relationships "
+"between packages when performing upgrades. <placeholder type=\"footnote\" id="
+"\"0\"/>. The second is if a package installation fails during an operation. "
+"In this situation a package may have been unpacked without its dependents "
+"being installed."
 msgstr ""
 "Es gibt zwei Möglichkeiten, wie ein System in einen kaputten Status wie "
-"diesen kommen kann. Die erste wird dadurch verursacht, dass <prgn>dpkg</"
-"prgn> einige feine Beziehungen zwischen Paketen übersieht, wenn Upgrades "
-"durchgeführt werden. <footnote><p>APT berücksichtigt jedoch alle bekannten "
-"Abhängigkeiten und versucht, kaputte Pakete zu vermeiden</p></footnote>. Die "
-"zweite tritt auf, falls eine Paketinstallation während der Ausführung "
-"fehlschlägt. In dieser Situation könnte ein Paket entpackt worden sein, ohne "
-"dass die von ihm Abhängigen installiert sind."
+"diesen kommen kann. Die erste wird dadurch verursacht, dass <command>dpkg</"
+"command> einige feine Beziehungen zwischen Paketen übersieht, wenn Upgrades "
+"durchgeführt werden. <placeholder type=\"footnote\" id=\"0\"/>. Die zweite "
+"tritt auf, falls eine Paketinstallation während der Ausführung fehlschlägt. "
+"In dieser Situation könnte ein Paket entpackt worden sein, ohne dass die von "
+"ihm Abhängigen installiert sind."
 
-#. type: <p></p>
-#: guide.sgml:345
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:359
 msgid ""
 "The second situation is much less serious than the first because APT places "
 "certain constraints on the order that packages are installed. In both cases "
-"supplying the <tt>-f</tt> option to <prgn>apt-get</prgn> will cause APT to "
-"deduce a possible solution to the problem and then continue on. The APT "
-"<prgn>dselect</prgn> method always supplies the <tt>-f</tt> option to allow "
-"for easy continuation of failed maintainer scripts."
+"supplying the <literal>-f</literal> option to <command>apt-get</command> "
+"will cause APT to deduce a possible solution to the problem and then "
+"continue on. The APT <command>dselect</command> method always supplies the "
+"<literal>-f</literal> option to allow for easy continuation of failed "
+"maintainer scripts."
 msgstr ""
 "Die zweite Situation ist weit weniger ernst als die erste, weil APT "
 "bestimmte Beschränkungen in der Reihenfolge setzt, in der Pakete installiert "
-"werden. In beiden Fällen veranlasst die Option <tt>-f</tt> <prgn>apt-get</"
-"prgn>, eine mögliche Lösung für das Problem zu folgern und dann "
-"fortzufahren. Die APT-Methode <prgn>dselect</prgn> liefert immer die Option "
-"<tt>-f</tt>, zum einfachen Fortfahren von gescheiterten Betreuerskripten."
-
-#. type: <p></p>
-#: guide.sgml:351
-msgid ""
-"However, if the <tt>-f</tt> option is used to correct a seriously broken "
-"system caused by the first case then it is possible that it will either fail "
-"immediately or the installation sequence will fail. In either case it is "
-"necessary to manually use dpkg (possibly with forcing options) to correct "
-"the situation enough to allow APT to proceed."
-msgstr ""
-"Falls jedoch die Option <tt>-f</tt> benutzt wird, um ein ernsthaft kaputtes "
-"System zu korrigieren, das vom ersten Fall verursacht wurde, dann ist es "
-"möglich, dass es entweder sofort fehlschlägt oder die Installationsabfolge "
-"fehlschlagen wird. In beiden Fällen ist es nötig, Dpkg (möglicherweise mit "
-"erzwingenden Optionen) manuell zu benutzen, um die Situation ausreichend zu "
-"korrigieren, so dass es APT ermöglicht wird, fortzufahren."
-
-#. type: <heading></heading>
-#: guide.sgml:356
+"werden. In beiden Fällen veranlasst die Option <literal>-f</literal> "
+"<command>apt-get</command>, eine mögliche Lösung für das Problem zu folgern "
+"und dann fortzufahren. Die APT-Methode <command>dselect</command> liefert "
+"immer die Option <literal>-f</literal>, zum einfachen Fortfahren von "
+"gescheiterten Betreuerskripten."
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:368
+msgid ""
+"However, if the <literal>-f</literal> option is used to correct a seriously "
+"broken system caused by the first case then it is possible that it will "
+"either fail immediately or the installation sequence will fail. In either "
+"case it is necessary to manually use dpkg (possibly with forcing options) to "
+"correct the situation enough to allow APT to proceed."
+msgstr ""
+"Falls jedoch die Option <literal>-f</literal> benutzt wird, um ein ernsthaft "
+"kaputtes System zu korrigieren, das vom ersten Fall verursacht wurde, dann "
+"ist es möglich, dass es entweder sofort fehlschlägt oder die "
+"Installationsabfolge fehlschlagen wird. In beiden Fällen ist es nötig, Dpkg "
+"(möglicherweise mit erzwingenden Optionen) manuell zu benutzen, um die "
+"Situation ausreichend zu korrigieren, so dass es APT ermöglicht wird, "
+"fortzufahren."
+
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:376
 msgid "The Status Report"
 msgstr "Der Statusbericht"
 
-#. type: <p></p>
-#: guide.sgml:363
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:378
 msgid ""
-"Before proceeding <prgn>apt-get</prgn> will present a report on what will "
-"happen. Generally the report reflects the type of operation being performed "
-"but there are several common elements. In all cases the lists reflect the "
-"final state of things, taking into account the <tt>-f</tt> option and any "
-"other relevant activities to the command being executed."
+"Before proceeding <command>apt-get</command> will present a report on what "
+"will happen. Generally the report reflects the type of operation being "
+"performed but there are several common elements. In all cases the lists "
+"reflect the final state of things, taking into account the <literal>-f</"
+"literal> option and any other relevant activities to the command being "
+"executed."
 msgstr ""
-"Bevor es fortfährt, wird <prgn>apt-get</prgn> einen Bericht darüber "
+"Bevor es fortfährt, wird <command>apt-get</command> einen Bericht darüber "
 "präsentieren, was geschehen wird. Im Allgemeinen spiegelt der Bericht den "
 "Typ der Operation, die ausgeführt wird, wider, aber es gibt auch mehrere "
 "geläufige Elemente. Auf jeden Fall spiegelt die Liste den Endstatus der "
-"Dinge wider, bezieht die Option <tt>-f</tt> in Betracht und alle andere "
-"relevante Aktivitäten zum Befehl, der ausgeführt wird."
+"Dinge wider, bezieht die Option <literal>-f</literal> in Betracht und alle "
+"andere relevante Aktivitäten zum Befehl, der ausgeführt wird."
 
-#. type: <heading></heading>
-#: guide.sgml:364
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:385
 msgid "The Extra Package list"
 msgstr "Die zusätzliche Paketliste"
 
-#. type: <example></example>
-#: guide.sgml:372
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:387
 #, no-wrap
 msgid ""
 "The following extra packages will be installed:\n"
@@ -9267,87 +9346,87 @@ msgid ""
 "  mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
 "  bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
 "  squake pgp-i python-base debmake ldso perl libreadlineg2\n"
-"  ssh"
+"  ssh\n"
 msgstr ""
 "Die folgenden Pakete werden zusätzlich installiert:\n"
 "  libdbd-mysql-perl xlib6 zlib1 xzx libreadline2 libdbd-msql-perl\n"
 "  mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
 "  bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
 "  squake pgp-i python-base debmake ldso perl libreadlineg2\n"
-"  ssh"
+"  ssh\n"
 
-#. type: <p></p>
-#: guide.sgml:379
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:395
 msgid ""
 "The Extra Package list shows all of the packages that will be installed or "
 "upgraded in excess of the ones mentioned on the command line. It is only "
-"generated for an <tt>install</tt> command. The listed packages are often the "
-"result of an Auto Install."
+"generated for an <literal>install</literal> command. The listed packages are "
+"often the result of an Auto Install."
 msgstr ""
 "Die zusätzliche Paketliste zeigt alle Pakete, die installiert werden oder "
 "von denen ein Upgrade durchgeführt wird, zusätzlich zu den auf der "
-"Befehlszeile angegebenen. Sie wird nur für einen <tt>install</tt>-Befehl "
-"generiert. Die aufgelisteten Pakete sind häufig das Ergebnis einer "
+"Befehlszeile angegebenen. Sie wird nur für einen <literal>install</literal>-"
+"Befehl generiert. Die aufgelisteten Pakete sind häufig das Ergebnis einer "
 "automatischen Installation."
 
-#. type: <heading></heading>
-#: guide.sgml:382
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:402
 msgid "The Packages to Remove"
 msgstr "Die zu entfernenden Pakete"
 
-#. type: <example></example>
-#: guide.sgml:389
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:404
 #, no-wrap
 msgid ""
 "The following packages will be REMOVED:\n"
 "  xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
 "  xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
 "  xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
-"  nas xpilot xfig"
+"  nas xpilot xfig\n"
 msgstr ""
 "Die folgenden Pakete werden ENTFERNT:\n"
 "  xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
 "  xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
 "  xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
-"  nas xpilot xfig"
+"  nas xpilot xfig\n"
 
-#. type: <p></p>
-#: guide.sgml:399
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:411
 msgid ""
 "The Packages to Remove list shows all of the packages that will be removed "
 "from the system. It can be shown for any of the operations and should be "
 "given a careful inspection to ensure nothing important is to be taken off. "
-"The <tt>-f</tt> option is especially good at generating packages to remove "
-"so extreme care should be used in that case. The list may contain packages "
-"that are going to be removed because they are only partially installed, "
-"possibly due to an aborted installation."
+"The <literal>-f</literal> option is especially good at generating packages "
+"to remove so extreme care should be used in that case. The list may contain "
+"packages that are going to be removed because they are only partially "
+"installed, possibly due to an aborted installation."
 msgstr ""
 "Die Liste der zu entfernenden Pakete zeigt all die Pakete, die vom System "
 "entfernt werden. Sie kann für jede der Operationen angezeigt werden und "
 "sollte einer sorgfältige Überprüfung unterzogen werden, um sicherzustellen, "
-"dass nichts Wichtiges weggenommen wird. Die Option <tt>-f</tt> ist "
+"dass nichts Wichtiges weggenommen wird. Die Option <literal>-f</literal> ist "
 "insbesondere gut darin, Pakete zum Entfernen vorzumerken, so dass in diesem "
 "Fall mit extremer Vorsicht vorgegangen werden sollte. Die Liste könnte "
 "Pakete enthalten, die entfernt werden, weil sie nur teilweise installiert "
 "sind, möglicherweise aufgrund einer abgebrochenen Installation."
 
-#. type: <heading></heading>
-#: guide.sgml:402
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:421
 msgid "The New Packages list"
 msgstr "Die Liste neuer Pakete"
 
-#. type: <example></example>
-#: guide.sgml:406
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:423
 #, no-wrap
 msgid ""
 "The following NEW packages will installed:\n"
-"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
+"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base\n"
 msgstr ""
 "Die folgenden NEUEN Pakete werden zusätzlich installiert:\n"
-"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
+"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base\n"
 
-#. type: <p></p>
-#: guide.sgml:411
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:427
 msgid ""
 "The New Packages list is simply a reminder of what will happen. The packages "
 "listed are not presently installed in the system but will be when APT is "
@@ -9357,58 +9436,58 @@ msgstr ""
 "aufgelisteten Pakete sind zurzeit nicht auf dem System installiert, werden "
 "es aber sein, wenn APT fertig ist."
 
-#. type: <heading></heading>
-#: guide.sgml:414
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:432
 msgid "The Kept Back list"
 msgstr "Die Liste zurückgehaltener Pakete"
 
-#. type: <example></example>
-#: guide.sgml:419
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:434
 #, no-wrap
 msgid ""
 "The following packages have been kept back\n"
 "  compface man-db tetex-base msql libpaper svgalib1\n"
-"  gs snmp arena lynx xpat2 groff xscreensaver"
+"  gs snmp arena lynx xpat2 groff xscreensaver\n"
 msgstr ""
 "Die folgenden Pakete werden zurückgehalten:\n"
 "  compface man-db tetex-base msql libpaper svgalib1\n"
-"  gs snmp arena lynx xpat2 groff xscreensaver"
+"  gs snmp arena lynx xpat2 groff xscreensaver\n"
 
-#. type: <p></p>
-#: guide.sgml:428
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:439
 msgid ""
 "Whenever the whole system is being upgraded there is the possibility that "
 "new versions of packages cannot be installed because they require new things "
 "or conflict with already installed things. In this case the package will "
 "appear in the Kept Back list. The best way to convince packages listed there "
-"to install is with <tt>apt-get install</tt> or by using <prgn>dselect</prgn> "
-"to resolve their problems."
+"to install is with <literal>apt-get install</literal> or by using "
+"<command>dselect</command> to resolve their problems."
 msgstr ""
 "Jedesmal, wenn ein Upgrade des ganzen Systems durchgeführt wird, besteht die "
 "Möglichkeit, dass neue Versionen von Paketen nicht installiert werden "
 "können, weil sie neue Dinge benötigen oder einen Konflikt mit bereits "
 "installierten Dingen haben. In diesem Fall wird das Paket auf der Liste "
 "zurückgehaltener Pakete erscheinen. Der beste Weg dort aufgeführte Pakete "
-"zur Installation zu bewegen, ist per <tt>apt-get install</tt> oder indem "
-"<prgn>dselect</prgn> zum Lösen ihrer Probleme benutzt wird."
+"zur Installation zu bewegen, ist per <literal>apt-get install</literal> oder "
+"indem <command>dselect</command> zum Lösen ihrer Probleme benutzt wird."
 
-#. type: <heading></heading>
-#: guide.sgml:431
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:448
 msgid "Held Packages warning"
 msgstr "Warnung wegen zurückgehaltener Pakete"
 
-#. type: <example></example>
-#: guide.sgml:435
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:450
 #, no-wrap
 msgid ""
 "The following held packages will be changed:\n"
-"  cvs"
+"  cvs\n"
 msgstr ""
 "Die folgenden zurückgehaltenen Pakete werden geändert:\n"
-"  cvs"
+"  cvs\n"
 
-#. type: <p></p>
-#: guide.sgml:441
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:454
 msgid ""
 "Sometimes you can ask APT to install a package that is on hold, in such a "
 "case it prints out a warning that the held package is going to be changed. "
@@ -9419,33 +9498,33 @@ msgstr ""
 "zurückgehaltene Paket geändert wird. Dies sollte nur während »Dist-upgrade« "
 "oder »Install« vorkommen."
 
-#. type: <heading></heading>
-#: guide.sgml:444
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:460
 msgid "Final summary"
 msgstr "Abschließende Zusammenfassung"
 
-#. type: <p></p>
-#: guide.sgml:447
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:462
 msgid ""
 "Finally, APT will print out a summary of all the changes that will occur."
 msgstr ""
 "Abschließend wird APT eine Zusammenfassung aller Änderungen ausgeben, die "
 "auftreten werden."
 
-#. type: <example></example>
-#: guide.sgml:452
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:465
 #, no-wrap
 msgid ""
 "206 packages upgraded, 8 newly installed, 23 to remove and 51 not upgraded.\n"
 "12 packages not fully installed or removed.\n"
-"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used."
+"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used.\n"
 msgstr ""
 "206 Pakete aktualisiert, 8 zusätzlich installiert, 23 werden entfernt und 51 nicht aktualisiert.\n"
 "12 Pakete nicht vollständig installiert oder entfernt.\n"
-"Muss 65,7MB/66,7MB an Archiven herunterladen. Nach dem Entpacken werden 26,5MB zusätzlich belegt sein."
+"Muss 65,7MB/66,7MB an Archiven herunterladen. Nach dem Entpacken werden 26,5MB zusätzlich belegt sein.\n"
 
-#. type: <p></p>
-#: guide.sgml:470
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:470
 msgid ""
 "The first line of the summary simply is a reduced version of all of the "
 "lists and includes the number of upgrades - that is packages already "
@@ -9475,8 +9554,8 @@ msgstr ""
 "Speicher nachdem alles erledigt ist. Wenn eine große Anzahl Pakete entfernt "
 "wird, dann kann der Wert den Betrag des freiwerdenden Speichers anzeigen."
 
-#. type: <p></p>
-#: guide.sgml:473
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:484
 msgid ""
 "Some other reports can be generated by using the -u option to show packages "
 "to upgrade, they are similar to the previous examples."
@@ -9485,13 +9564,13 @@ msgstr ""
 "werden, um Pakete anzuzeigen, von denen ein Upgrade durchgeführt werden "
 "soll. Dies ist den vorherigen Beispielen ähnlich."
 
-#. type: <heading></heading>
-#: guide.sgml:477
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:491
 msgid "The Status Display"
 msgstr "Der Anzeigestatus"
 
-#. type: <p></p>
-#: guide.sgml:481
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:493
 msgid ""
 "During the download of archives and package files APT prints out a series of "
 "status messages."
@@ -9499,8 +9578,8 @@ msgstr ""
 "Während des Herunterladens von Archiven und Paketdateien gibt APT eine Reihe "
 "von Statusmeldungen aus."
 
-#. type: <example></example>
-#: guide.sgml:490
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:497
 #, no-wrap
 msgid ""
 "# apt-get update\n"
@@ -9509,7 +9588,7 @@ msgid ""
 "Hit http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
 "Get:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
 "Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
-"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s"
+"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s\n"
 msgstr ""
 "# apt-get update\n"
 "Hole:1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages\n"
@@ -9517,69 +9596,71 @@ msgstr ""
 "Treffer http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
 "Hole:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
 "Hole:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
-"11% [5 testing/non-free 'Warte auf Datei' 0/32.1k 0%] 2203b/s 1m52s"
+"11% [5 testing/non-free 'Warte auf Datei' 0/32.1k 0%] 2203b/s 1m52s\n"
 
-#. type: <p></p>
-#: guide.sgml:500
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:506
 msgid ""
-"The lines starting with <em>Get</em> are printed out when APT begins to "
-"fetch a file while the last line indicates the progress of the download. The "
-"first percent value on the progress line indicates the total percent done of "
-"all files. Unfortunately since the size of the Package files is unknown "
-"<tt>apt-get update</tt> estimates the percent done which causes some "
-"inaccuracies."
+"The lines starting with <emphasis>Get</emphasis> are printed out when APT "
+"begins to fetch a file while the last line indicates the progress of the "
+"download. The first percent value on the progress line indicates the total "
+"percent done of all files. Unfortunately since the size of the Package files "
+"is unknown <literal>apt-get update</literal> estimates the percent done "
+"which causes some inaccuracies."
 msgstr ""
-"Die Zeilen, die mit <em>Hole</em> beginnen, werden ausgegeben, wenn APT "
-"anfängt, eine Datei herunterzuladen, während die letzte Zeile den "
+"Die Zeilen, die mit <emphasis>Hole</emphasis> beginnen, werden ausgegeben, "
+"wenn APT anfängt, eine Datei herunterzuladen, während die letzte Zeile den "
 "Fortschritt des Herunterladens anzeigt. Die erste Prozentzahl der "
 "Fortschrittszeile zeigt die gesamt erledigte Prozentzahl aller Dateien an. "
-"Unglücklicherweise schätzt <tt>apt-get update</tt> die erledigte "
+"Unglücklicherweise schätzt <literal>apt-get update</literal> die erledigte "
 "Prozentzahl, da die Größe der Pakete unbekannt ist, was einige "
 "Ungenauigkeiten bewirkt."
 
-#. type: <p></p>
-#: guide.sgml:509
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:514
 msgid ""
 "The next section of the status line is repeated once for each download "
 "thread and indicates the operation being performed and some useful "
 "information about what is happening. Sometimes this section will simply read "
-"<em>Forking</em> which means the OS is loading the download module. The "
-"first word after the [ is the fetch number as shown on the history lines. "
-"The next word is the short form name of the object being downloaded. For "
-"archives it will contain the name of the package that is being fetched."
+"<emphasis>Forking</emphasis> which means the OS is loading the download "
+"module. The first word after the [ is the fetch number as shown on the "
+"history lines. The next word is the short form name of the object being "
+"downloaded. For archives it will contain the name of the package that is "
+"being fetched."
 msgstr ""
 "Der nächste Abschnitt der Statuszeile wird für jeden Download-Thread "
 "wiederholt und zeigt die durchgeführte Operation, sowie einige nützliche "
 "Informationen darüber an was geschieht. Manchmal wird dieser Abschnitt "
-"einfach nur <em>Forking</em> darstellen, was bedeutet, dass das "
+"einfach nur <emphasis>Forking</emphasis> darstellen, was bedeutet, dass das "
 "Betriebssystem das Download-Modul am Laden ist. Das erste Wort nach dem »[« "
 "ist die Ladenummer, wie sie auf den Verlaufszeilen angezeigt wird. Das "
 "nächste Wort ist Name in Kurzform des Ojektes, das heruntergeladen wird. Für "
 "Archive wird es den Namen des Paketes enthalten, das heruntergeladen wird."
 
-#. type: <p></p>
-#: guide.sgml:524
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:524
 msgid ""
 "Inside of the single quote is an informative string indicating the progress "
 "of the negotiation phase of the download. Typically it progresses from "
-"<em>Connecting</em> to <em>Waiting for file</em> to <em>Downloading</em> or "
-"<em>Resuming</em>. The final value is the number of bytes downloaded from "
-"the remote site. Once the download begins this is represented as "
-"<tt>102/10.2k</tt> indicating that 102 bytes have been fetched and 10.2 "
-"kilobytes is expected. The total size is always shown in 4 figure notation "
-"to preserve space. After the size display is a percent meter for the file "
-"itself. The second last element is the instantaneous average speed. This "
-"values is updated every 5 seconds and reflects the rate of data transfer for "
-"that period. Finally is shown the estimated transfer time. This is updated "
-"regularly and reflects the time to complete everything at the shown transfer "
-"rate."
+"<emphasis>Connecting</emphasis> to <emphasis>Waiting for file</emphasis> to "
+"<emphasis>Downloading</emphasis> or <emphasis>Resuming</emphasis>. The final "
+"value is the number of bytes downloaded from the remote site. Once the "
+"download begins this is represented as <literal>102/10.2k</literal> "
+"indicating that 102 bytes have been fetched and 10.2 kilobytes is expected. "
+"The total size is always shown in 4 figure notation to preserve space. After "
+"the size display is a percent meter for the file itself. The second last "
+"element is the instantaneous average speed. This values is updated every 5 "
+"seconds and reflects the rate of data transfer for that period. Finally is "
+"shown the estimated transfer time. This is updated regularly and reflects "
+"the time to complete everything at the shown transfer rate."
 msgstr ""
 "Innerhalb von einzelnen Anführungszeichen folgt eine informative "
 "Zeichenkette, die den Fortschritt der Übertragungsphase des Downloads "
-"anzeigt. Normalerweise schreitet sie fort von <em>Verbinde</em> zu <em>Warte "
-"auf Datei</em> zu <em>Lade herunter</em> oder <em>Nehme wieder auf</em>. Der "
-"letzte Wert ist die Anzahl der von der fernen Site heruntergeladenen Bytes. "
-"Sobald der Download beginnt, zeigt sich dies wie <tt>102/10.2k</tt> was "
+"anzeigt. Normalerweise schreitet sie fort von <emphasis>Verbinde</emphasis> "
+"zu <emphasis>Warte auf Datei</emphasis> zu <emphasis>Lade herunter</"
+"emphasis> oder <emphasis>Nehme wieder auf</emphasis>. Der letzte Wert ist "
+"die Anzahl der von der fernen Site heruntergeladenen Bytes. Sobald der "
+"Download beginnt, zeigt sich dies wie <literal>102/10.2k</literal> was "
 "anzeigt, dass 102 Bytes heruntergeladen und 10,2 Kilobytes erwartet werden. "
 "Die Gesamtgröße wird immer in vierstelliger Schreibweise dargestellt, um "
 "Platz zu sparen. Nach der Größenanzeige ist eine Prozentangabe für die Datei "
@@ -9590,57 +9671,52 @@ msgstr ""
 "wird regelmäßig aktualisiert und spiegelt die Zeit zum Vervollständigen bei "
 "der angezeigten Datenübertragungsgeschwindigkeit wider."
 
-#. type: <p></p>
-#: guide.sgml:530
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:539
 msgid ""
 "The status display updates every half second to provide a constant feedback "
 "on the download progress while the Get lines scroll back whenever a new file "
 "is started. Since the status display is constantly updated it is unsuitable "
-"for logging to a file, use the <tt>-q</tt> option to remove the status "
-"display."
+"for logging to a file, use the <literal>-q</literal> option to remove the "
+"status display."
 msgstr ""
 "Die Statusanzeige aktualisiert sich alle halbe Sekunde, um eine gleichmäßige "
 "Rückmeldung über den Download-Fortschritt bereitzustellen, während die "
 "»Hole«-Zeilen bei jeder gestarteten neuen Datei zurückscrollen. Da die "
 "Statusanzeige ständig aktualisiert wird, ist sie für die Protokollierung in "
-"eine Datei ungeeignet. Benutzen Sie die Option <tt>-q</tt>, um die "
+"eine Datei ungeeignet. Benutzen Sie die Option <literal>-q</literal>, um die "
 "Statusanzeige zu entfernen."
 
-#. type: <heading></heading>
-#: guide.sgml:535
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:547
 msgid "Dpkg"
 msgstr "Dpkg"
 
-#. type: <p></p>
-#: guide.sgml:542
-msgid ""
-"APT uses <prgn>dpkg</prgn> for installing the archives and will switch over "
-"to the <prgn>dpkg</prgn> interface once downloading is completed. "
-"<prgn>dpkg</prgn> will also ask a number of questions as it processes the "
-"packages and the packages themselves may also ask several questions. Before "
-"each question there is usually a description of what it is asking and the "
-"questions are too varied to discuss completely here."
-msgstr ""
-"APT benutzt <prgn>dpkg</prgn>, um die Archive zu installieren und wird zu "
-"der <prgn>dpkg</prgn>-Schnittstelle herüberschalten, sobald der Download "
-"vollständig ist. <prgn>dpkg</prgn> wird außerdem eine Reihe von Fragen "
-"stellen, während es die Pakete abarbeitet und die Pakete können auch mehrere "
-"Fragen stellen . Vor jeder Frage ist üblicherweise eine Beschreibung des "
-"Gefragten und die Fragen sind zu vielfältig, um sie vollständig hier zu "
-"besprechen."
-
-#. type: <title></title>
-#: offline.sgml:4
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:549
+msgid ""
+"APT uses <command>dpkg</command> for installing the archives and will switch "
+"over to the <command>dpkg</command> interface once downloading is completed. "
+"<command>dpkg</command> will also ask a number of questions as it processes "
+"the packages and the packages themselves may also ask several questions. "
+"Before each question there is usually a description of what it is asking and "
+"the questions are too varied to discuss completely here."
+msgstr ""
+"APT benutzt <command>dpkg</command>, um die Archive zu installieren und wird "
+"zu der <command>dpkg</command>-Schnittstelle herüberschalten, sobald der "
+"Download vollständig ist. <command>dpkg</command> wird außerdem eine Reihe "
+"von Fragen stellen, während es die Pakete abarbeitet und die Pakete können "
+"auch mehrere Fragen stellen . Vor jeder Frage ist üblicherweise eine "
+"Beschreibung des Gefragten und die Fragen sind zu vielfältig, um sie "
+"vollständig hier zu besprechen."
+
+#. type: Content of: <book><title>
+#: offline.dbk:10
 msgid "Using APT Offline"
 msgstr "APT offline verwenden"
 
-#. type: <version></version>
-#: offline.sgml:7
-msgid "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
-msgstr "$Id: offline.sgml,v 1.8 12.02.2003 15:06:41 doogie Exp $"
-
-#. type: <abstract></abstract>
-#: offline.sgml:12
+#. type: Content of: <book><bookinfo><abstract><para>
+#: offline.dbk:24
 msgid ""
 "This document describes how to use APT in a non-networked environment, "
 "specifically a 'sneaker-net' approach for performing upgrades."
@@ -9649,23 +9725,25 @@ msgstr ""
 "speziell einem »Turnschuhnetzwerk«, an die Durchführung von Upgrades "
 "herangeht."
 
-#. type: <copyrightsummary></copyrightsummary>
-#: offline.sgml:16
-msgid "Copyright &copy; Jason Gunthorpe, 1999."
-msgstr "Copyright &copy; Jason Gunthorpe, 1999."
+#. type: Content of: <book><bookinfo>
+#: offline.dbk:29
+msgid ""
+"<copyright><year>1999</year><holder>Jason Gunthorpe</holder></copyright>"
+msgstr ""
+"<copyright><year>1999</year><holder>Jason Gunthorpe</holder></copyright>"
 
-#. type: <heading></heading>
-#: offline.sgml:32
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:47
 msgid "Introduction"
 msgstr "Einleitung"
 
-#. type: <heading></heading>
-#: offline.sgml:34 offline.sgml:65 offline.sgml:180
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:49 offline.dbk:79 offline.dbk:191
 msgid "Overview"
 msgstr "Übersicht"
 
-#. type: <p></p>
-#: offline.sgml:40
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:51
 msgid ""
 "Normally APT requires direct access to a Debian archive, either from a local "
 "media or through a network. Another common complaint is that a Debian "
@@ -9678,8 +9756,8 @@ msgstr ""
 "wie einem Modem, hängt und eine andere Maschine eine sehr schnelle "
 "Verbindung hat, sie jedoch physisch fern sind."
 
-#. type: <p></p>
-#: offline.sgml:51
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:57
 msgid ""
 "The solution to this is to use large removable media such as a Zip disc or a "
 "SuperDisk disc. These discs are not large enough to store the entire Debian "
@@ -9687,9 +9765,9 @@ msgid ""
 "to use APT to generate a list of packages that are required and then fetch "
 "them onto the disc using another machine with good connectivity. It is even "
 "possible to use another Debian machine with APT or to use a completely "
-"different OS and a download tool like wget. Let <em>remote host</em> mean "
-"the machine downloading the packages, and <em>target host</em> the one with "
-"bad or no connection."
+"different OS and a download tool like wget. Let <emphasis>remote host</"
+"emphasis> mean the machine downloading the packages, and <emphasis>target "
+"host</emphasis> the one with bad or no connection."
 msgstr ""
 "Die Lösung dazu besteht darin, große Wechselmedien, wie eine Zip-Platte oder "
 "eine SuperDisk zu benutzen. Diese Platten sind nicht groß genug, um ein "
@@ -9700,11 +9778,11 @@ msgstr ""
 "herunterzuladen. Es ist sogar möglich, eine andere Debian-Maschine mit APT "
 "oder ein komplett unterschiedliches Betriebssystem und ein Download-Werkzeug "
 "wie Wget zu benutzen. Nennen wir die Maschine, die die Pakete herunterlädt "
-"<em>ferner Rechner</em> und die mit der schlechten oder fehlenden Verbindung "
-"<em>Zielrechner</em>."
+"<emphasis>ferner Rechner</emphasis> und die mit der schlechten oder "
+"fehlenden Verbindung <emphasis>Zielrechner</emphasis>."
 
-#. type: <p></p>
-#: offline.sgml:57
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:68
 msgid ""
 "This is achieved by creatively manipulating the APT configuration file. The "
 "essential premise to tell APT to look on a disc for it's archive files. Note "
@@ -9717,13 +9795,13 @@ msgstr ""
 "Platte mit einem Dateisystem formatiert sein sollte, das mit langen "
 "Dateinamen umgehen kann, so wie ext2, fat32 oder vfat."
 
-#. type: <heading></heading>
-#: offline.sgml:63
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:77
 msgid "Using APT on both machines"
 msgstr "APT auf beiden Maschinen benutzen"
 
-#. type: <p><example>
-#: offline.sgml:71
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:81
 msgid ""
 "APT being available on both machines gives the simplest configuration. The "
 "basic idea is to place a copy of the status file on the disc and use the "
@@ -9736,8 +9814,8 @@ msgstr ""
 "Paketdateien herunterzuladen und zu entscheiden, welche Pakete "
 "heruntergeladen werden. Die Plattenverzeichnisstruktur sollte so aussehen:"
 
-#. type: <example></example>
-#: offline.sgml:80
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:87
 #, no-wrap
 msgid ""
 "  /disc/\n"
@@ -9747,7 +9825,7 @@ msgid ""
 "       partial/\n"
 "    status\n"
 "    sources.list\n"
-"    apt.conf"
+"    apt.conf\n"
 msgstr ""
 "  /Platte/\n"
 "    Archive/\n"
@@ -9756,42 +9834,43 @@ msgstr ""
 "       partial/\n"
 "    status\n"
 "    sources.list\n"
-"    apt.conf"
+"    apt.conf\n"
 
-#. type: <heading></heading>
-#: offline.sgml:88
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:98
 msgid "The configuration file"
 msgstr "Die Konfigurationsdatei"
 
-#. type: <p></p>
-#: offline.sgml:96
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:100
 msgid ""
 "The configuration file should tell APT to store its files on the disc and to "
 "use the configuration files on the disc as well. The sources.list should "
 "contain the proper sites that you wish to use from the remote machine, and "
-"the status file should be a copy of <em>/var/lib/dpkg/status</em> from the "
-"<em>target host</em>. Please note, if you are using a local archive you must "
-"use copy URIs, the syntax is identical to file URIs."
+"the status file should be a copy of <emphasis>/var/lib/dpkg/status</"
+"emphasis> from the <emphasis>target host</emphasis>. Please note, if you are "
+"using a local archive you must use copy URIs, the syntax is identical to "
+"file URIs."
 msgstr ""
 "Die Konfigurationsdatei sollte APT mitteilen, dass es seine Dateien auf der "
 "Platte speichert und obendrein die Konfigurationsdateien auf der Platte "
 "benutzt. Die »sources.list« sollte genau die Sites enthalten, die Sie auf "
 "der fernen Maschine benutzen möchten und die Statusdatei sollte eine Kopie "
-"von <em>/var/lib/dpkg/status</em> vom <em>Zielrechner</em> sein. Bitte "
-"beachten Sie, falls Sie lokale Archive benutzen, dass Sie »copy«-URIs "
-"benutzen müssen. Die Syntax entspricht der von »file«-URIs."
+"von <emphasis>/var/lib/dpkg/status</emphasis> vom <emphasis>Zielrechner</"
+"emphasis> sein. Bitte beachten Sie, falls Sie lokale Archive benutzen, dass "
+"Sie »copy«-URIs benutzen müssen. Die Syntax entspricht der von »file«-URIs."
 
-#. type: <p><example>
-#: offline.sgml:100
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:108
 msgid ""
-"<em>apt.conf</em> must contain the necessary information to make APT use the "
-"disc:"
+"<emphasis>apt.conf</emphasis> must contain the necessary information to make "
+"APT use the disc:"
 msgstr ""
-"<em>apt.conf</em> muss die nötigen Informationen enthalten, damit APT die "
-"Platte benutzt:"
+"<emphasis>apt.conf</emphasis> muss die nötigen Informationen enthalten, "
+"damit APT die Platte benutzt:"
 
-#. type: <example></example>
-#: offline.sgml:124
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:112
 #, no-wrap
 msgid ""
 " APT\n"
@@ -9799,10 +9878,10 @@ msgid ""
 "   /* This is not necessary if the two machines are the same arch, it tells\n"
 "      the remote APT what architecture the target machine is */\n"
 "   Architecture \"i386\";\n"
-"   \n"
+"\n"
 "   Get::Download-Only \"true\";\n"
 " };\n"
-" \n"
+"\n"
 " Dir\n"
 " {\n"
 "   /* Use the disc for state information and redirect the status file from\n"
@@ -9813,10 +9892,10 @@ msgid ""
 "   // Binary caches will be stored locally\n"
 "   Cache::archives \"/disc/archives/\";\n"
 "   Cache \"/tmp/\";\n"
-"   \n"
+"\n"
 "   // Location of the source list.\n"
 "   Etc \"/disc/\";\n"
-" };"
+" };\n"
 msgstr ""
 " APT\n"
 " {\n"
@@ -9824,10 +9903,10 @@ msgstr ""
 "      Architektur haben. Es teilt dem fernen APT mit, welche Architektur die\n"
 "      Zielmaschine hat */\n"
 "   Architecture \"i386\";\n"
-"   \n"
+"\n"
 "   Get::Download-Only \"true\";\n"
 " };\n"
-" \n"
+"\n"
 " Dir\n"
 " {\n"
 "   /* Die Platte für Statusinformationen benutzen und die Statusdatei\n"
@@ -9838,68 +9917,72 @@ msgstr ""
 "   // Programmzwischenspeicher werden lokal gespeichert\n"
 "   Cache::archives \"/disc/archives/\";\n"
 "   Cache \"/tmp/\";\n"
-"   \n"
+"\n"
 "   // Ort der Quellenliste.\n"
 "   Etc \"/disc/\";\n"
-" };"
+" };\n"
 
-#. type: </example></p>
-#: offline.sgml:129
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:137
 msgid ""
 "More details can be seen by examining the apt.conf man page and the sample "
-"configuration file in <em>/usr/share/doc/apt/examples/apt.conf</em>."
+"configuration file in <emphasis>/usr/share/doc/apt/examples/apt.conf</"
+"emphasis>."
 msgstr ""
 "Weitere Details finden sich in der apt.conf-Handbuchseite und der "
-"Musterkonfigurationsdatei in <em>/usr/share/doc/apt/examples/apt.conf</em>."
+"Musterkonfigurationsdatei in <emphasis>/usr/share/doc/apt/examples/apt.conf</"
+"emphasis>."
 
-#. type: <p><example>
-#: offline.sgml:136
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:142
 msgid ""
-"On the target machine the first thing to do is mount the disc and copy <em>/"
-"var/lib/dpkg/status</em> to it. You will also need to create the directories "
-"outlined in the Overview, <em>archives/partial/</em> and <em>lists/partial/</"
-"em>. Then take the disc to the remote machine and configure the sources."
-"list. On the remote machine execute the following:"
+"On the target machine the first thing to do is mount the disc and copy "
+"<emphasis>/var/lib/dpkg/status</emphasis> to it. You will also need to "
+"create the directories outlined in the Overview, <emphasis>archives/partial/"
+"</emphasis> and <emphasis>lists/partial/</emphasis>. Then take the disc to "
+"the remote machine and configure the sources.list. On the remote machine "
+"execute the following:"
 msgstr ""
 "Das Erste, was auf der Zielmaschine getan werden muss, ist das Einhängen der "
-"Platte und das Kopieren von <em>/var/lib/dpkg/status</em> dorthin. Sie "
-"werden außerdem die in der Übersicht umrissenen Verzeichnisse <em>archives/"
-"partial/</em> und <em>lists/partial/</em> erstellen müssen. Dann bringen Sie "
-"die Platte zu der fernen Maschine und konfigurieren Sie die »sources.list«. "
-"Führen Sie das folgende aus:"
-
-#. type: <example></example>
-#: offline.sgml:142
+"Platte und das Kopieren von <emphasis>/var/lib/dpkg/status</emphasis> "
+"dorthin. Sie werden außerdem die in der Übersicht umrissenen Verzeichnisse "
+"<emphasis>archives/partial/</emphasis> und <emphasis>lists/partial/</"
+"emphasis> erstellen müssen. Dann bringen Sie die Platte zu der fernen "
+"Maschine und konfigurieren Sie die »sources.list«. Führen Sie das folgende "
+"aus:"
+
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:151
 #, no-wrap
 msgid ""
 " # export APT_CONFIG=\"/disc/apt.conf\"\n"
 " # apt-get update\n"
 " [ APT fetches the package files ]\n"
 " # apt-get dist-upgrade\n"
-" [ APT fetches all the packages needed to upgrade the target machine ]"
+" [ APT fetches all the packages needed to upgrade the target machine ]\n"
 msgstr ""
 " # export APT_CONFIG=\"/disc/apt.conf\"\n"
 " # apt-get update\n"
 " [ APT lädt die Paketdateien herunter ]\n"
 " # apt-get dist-upgrade\n"
 " [ APT lädt all die Pakete herunter, die die Zielmaschine benötigt, um ein\n"
-"   Upgrade durchzuführen ]"
+"   Upgrade durchzuführen ]\n"
 
-#. type: </example></p>
-#: offline.sgml:149
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:158
 msgid ""
 "The dist-upgrade command can be replaced with any other standard APT "
 "commands, particularly dselect-upgrade. You can even use an APT front end "
-"such as <em>dselect</em>. However this presents a problem in communicating "
-"your selections back to the local computer."
+"such as <emphasis>dselect</emphasis>. However this presents a problem in "
+"communicating your selections back to the local computer."
 msgstr ""
 "Der Befehl »dist-upgrade« kann durch alle anderen Standard-APT-Befehle "
 "ersetzt werden, insbesondere »dselect-upgrade«. Sie können sogar eine APT-"
-"Oberfläche, wie <em>dselect</em>, benutzen. Jedoch stellt dies ein Problem "
-"dar, Ihre Auswahl zurück an den lokalen Rechner zu kommunizieren."
+"Oberfläche, wie <emphasis>dselect</emphasis>, benutzen. Jedoch stellt dies "
+"ein Problem dar, Ihre Auswahl zurück an den lokalen Rechner zu kommunizieren."
 
-#. type: <p><example>
-#: offline.sgml:153
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:164
 msgid ""
 "Now the disc contains all of the index files and archives needed to upgrade "
 "the target machine. Take the disc back and run:"
@@ -9908,24 +9991,24 @@ msgstr ""
 "Upgrade der Zielmaschine druchzuführen. Bringen Sie die Platte zurück und "
 "starten Sie:"
 
-#. type: <example></example>
-#: offline.sgml:159
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:168
 #, no-wrap
 msgid ""
 "  # export APT_CONFIG=\"/disc/apt.conf\"\n"
 "  # apt-get check\n"
 "  [ APT generates a local copy of the cache files ]\n"
 "  # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
-"  [ Or any other APT command ]"
+"  [ Or any other APT command ]\n"
 msgstr ""
 "  # export APT_CONFIG=\"/disc/apt.conf\"\n"
 "  # apt-get check\n"
 "  [ APT generiert eine lokale Kopie der Zwischenspeicherdateien ]\n"
 "  # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
-"  [ Oder irgendeinen anderen APT-Befehl ]"
+"  [ Oder irgendeinen anderen APT-Befehl ]\n"
 
-#. type: <p></p>
-#: offline.sgml:165
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:175
 msgid ""
 "It is necessary for proper function to re-specify the status file to be the "
 "local one. This is very important!"
@@ -9933,8 +10016,8 @@ msgstr ""
 "Es ist für ordentliches Funktionieren notwendig, die Statusdatei erneut als "
 "die lokale anzugeben. Dies ist sehr wichtig!"
 
-#. type: <p></p>
-#: offline.sgml:172
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:179
 msgid ""
 "If you are using dselect you can do the very risky operation of copying disc/"
 "status to /var/lib/dpkg/status so that any selections you made on the remote "
@@ -9950,24 +10033,25 @@ msgstr ""
 "die Statusdatei NICHT, falls Dpkg oder APT in der Zwischenzeit benutzt "
 "wurden!"
 
-#. type: <heading></heading>
-#: offline.sgml:178
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:189
 msgid "Using APT and wget"
 msgstr "APT und Wget benutzen"
 
-#. type: <p></p>
-#: offline.sgml:185
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:193
 msgid ""
-"<em>wget</em> is a popular and portable download tool that can run on nearly "
-"any machine. Unlike the method above this requires that the Debian machine "
-"already has a list of available packages."
+"<emphasis>wget</emphasis> is a popular and portable download tool that can "
+"run on nearly any machine. Unlike the method above this requires that the "
+"Debian machine already has a list of available packages."
 msgstr ""
-"<em>wget</em> ist eine populäres und portierbares Download-Werkzeug, das auf "
-"nahezu jeder Maschine laufen kann. Anders als die Methode oben wird hierfür "
-"benötigt, dass die Debian-Maschine bereits eine Liste verfügbarer Pakete hat."
+"<emphasis>wget</emphasis> ist eine populäres und portierbares Download-"
+"Werkzeug, das auf nahezu jeder Maschine laufen kann. Anders als die Methode "
+"oben wird hierfür benötigt, dass die Debian-Maschine bereits eine Liste "
+"verfügbarer Pakete hat."
 
-#. type: <p></p>
-#: offline.sgml:190
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:198
 msgid ""
 "The basic idea is to create a disc that has only the archive files "
 "downloaded from the remote site. This is done by using the --print-uris "
@@ -9980,13 +10064,13 @@ msgstr ""
 "Vorbereiten eines Wget-Skripts getan, um die eigentlichen Pakete "
 "herunterzuladen."
 
-#. type: <heading></heading>
-#: offline.sgml:196
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:204
 msgid "Operation"
 msgstr "Betrieb"
 
-#. type: <p><example>
-#: offline.sgml:200
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:206
 msgid ""
 "Unlike the previous technique no special configuration files are required. "
 "We merely use the standard APT commands to generate the file list."
@@ -9995,23 +10079,23 @@ msgstr ""
 "Konfigurationsdateien benötigt. Es werden lediglich die Standard-APT-Befehle "
 "benutzt, um die Dateiliste zu erstellen."
 
-#. type: <example></example>
-#: offline.sgml:205
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:210
 #, no-wrap
 msgid ""
-" # apt-get dist-upgrade \n"
+" # apt-get dist-upgrade\n"
 " [ Press no when prompted, make sure you are happy with the actions ]\n"
-" # apt-get -qq --print-uris dist-upgrade > uris\n"
-" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
+" # apt-get -qq --print-uris dist-upgrade &gt; uris\n"
+" # awk '{print \"wget -O \" $2 \" \" $1}' &lt; uris &gt; /disc/wget-script\n"
 msgstr ""
 " # apt-get dist-upgrade \n"
 " [ Antworten Sie »nein« auf gestellte Fragen, wenn Sie mit den Aktionen\n"
 "   zufrieden sind ]\n"
-" # apt-get -qq --print-uris dist-upgrade > uris\n"
-" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /Platte/wget-script"
+" # apt-get -qq --print-uris dist-upgrade &gt; uris\n"
+" # awk '{print \"wget -O \" $2 \" \" $1}' &lt; uris &gt; /Platte/wget-script\n"
 
-#. type: </example></p>
-#: offline.sgml:210
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:216
 msgid ""
 "Any command other than dist-upgrade could be used here, including dselect-"
 "upgrade."
@@ -10019,8 +10103,8 @@ msgstr ""
 "Jeder andere Befehl als »dist-upgrade« könnte hier benutzt werden, "
 "einschließlich »upgrade«."
 
-#. type: <p></p>
-#: offline.sgml:216
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:220
 msgid ""
 "The /disc/wget-script file will now contain a list of wget commands to "
 "execute in order to fetch the necessary archives. This script should be run "
@@ -10032,25 +10116,25 @@ msgstr ""
 "sollte mit dem aktuellen Verzeichnis als Platteneinhängepunkt ausgeführt "
 "werden, so dass die Ausgabe auf die Platte gespeichert wird."
 
-#. type: <p><example>
-#: offline.sgml:219
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:226
 msgid "The remote machine would do something like"
 msgstr "Die ferne Maschine würde etwas wie das folgende tun"
 
-#. type: <example></example>
-#: offline.sgml:223
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:229
 #, no-wrap
 msgid ""
 "  # cd /disc\n"
 "  # sh -x ./wget-script\n"
-"  [ wait.. ]"
+"  [ wait.. ]\n"
 msgstr ""
 "  # cd /Platte\n"
 "  # sh -x ./wget-script\n"
-"  [ warten … Fertig ]"
+"  [ warten … Fertig ]\n"
 
-#. type: </example><example>
-#: offline.sgml:228
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:234
 msgid ""
 "Once the archives are downloaded and the disc returned to the Debian machine "
 "installation can proceed using,"
@@ -10058,17 +10142,35 @@ msgstr ""
 "Sobald die Archive heruntergeladen und die Platte zur Debian-Maschine "
 "zurückgekehrt ist, kann die Installation fortfahren durch Benutzung von "
 
-#. type: <example></example>
-#: offline.sgml:230
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:238
 #, no-wrap
-msgid "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
-msgstr "  # apt-get -o dir::cache::archives=\"/Platte/\" dist-upgrade"
+msgid "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
+msgstr "  # apt-get -o dir::cache::archives=\"/Platte/\" dist-upgrade\n"
 
-#. type: </example></p>
-#: offline.sgml:234
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:241
 msgid "Which will use the already fetched archives on the disc."
 msgstr "Es wird die bereits auf die Platte heruntergeladenen Archive benutzen."
 
+#~ msgid "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
+#~ msgstr "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
+
+#~ msgid "<pubdate></pubdate>"
+#~ msgstr "<pubdate></pubdate>"
+
+#~ msgid "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
+#~ msgstr "$Id: offline.sgml,v 1.8 12.02.2003 15:06:41 doogie Exp $"
+
+#~ msgid "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
+#~ msgstr "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
+
+#~ msgid "Copyright &copy; Jason Gunthorpe, 1998."
+#~ msgstr "Copyright &copy; Jason Gunthorpe, 1998."
+
+#~ msgid "Copyright &copy; Jason Gunthorpe, 1999."
+#~ msgstr "Copyright &copy; Jason Gunthorpe, 1999."
+
 #~ msgid "apt"
 #~ msgstr "apt"
 
@@ -10094,11 +10196,6 @@ msgstr "Es wird die bereits auf die Platte heruntergeladenen Archive benutzen."
 #~ msgstr "BESCHREIBUNG"
 
 #, fuzzy
-#~| msgid ""
-#~| "APT is a management system for software packages. For normal day to day "
-#~| "package management there are several frontends available, such as "
-#~| "B<aptitude>(8)  for the command line or B<synaptic>(8)  for the X Window "
-#~| "System. Some options are only implemented in B<apt-get>(8)  though."
 #~ msgid ""
 #~ "For normal day to day package management there are several frontends "
 #~ "available, such as B<aptitude>(8)  for the command line or "
@@ -10114,9 +10211,6 @@ msgstr "Es wird die bereits auf die Platte heruntergeladenen Archive benutzen."
 #~ msgstr "SIEHE AUCH"
 
 #, fuzzy
-#~| msgid ""
-#~| "B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), "
-#~| "B<apt_preferences>(5), B<apt-secure>(8)"
 #~ msgid ""
 #~ "B<apt>(8), B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources."
 #~ "list>(5), B<apt_preferences>(5), B<apt-secure>(8)"
diff --git a/doc/po/es.po b/doc/po/es.po
index 47080350..3779a446 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -38,8 +38,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.9.7.1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-04-01 14:24+0200\n"
-"PO-Revision-Date: 2014-04-01 14:00+0200\n"
+"POT-Creation-Date: 2014-07-10 10:52+0200\n"
+"PO-Revision-Date: 2014-07-04 01:31+0200\n"
 "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
 "Language: es\n"
@@ -874,7 +874,7 @@ msgstr ""
 #: apt.8.xml:145
 msgid ""
 "The <command>apt</command> command is meant to be pleasant for end users and "
-"does not need to be backward compatilbe like &apt-get;. Therefore some "
+"does not need to be backward compatible like &apt-get;. Therefore some "
 "options are different:"
 msgstr ""
 
@@ -882,7 +882,7 @@ msgstr ""
 #: apt.8.xml:151
 #, fuzzy
 #| msgid "the <literal>Package:</literal> line"
-msgid "The option <literal>DPkgPM::Progress-Fancy</literal> is enabled."
+msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
 msgstr "La línea <literal>Package:</literal>"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
@@ -911,7 +911,7 @@ msgstr "Las líneas <literal>Archive:</literal> o <literal>Suite:</literal>"
 #. type: Content of: <refentry><refsect1><title>
 #: apt.8.xml:174 apt-get.8.xml:558 apt-cache.8.xml:352 apt-key.8.xml:197
 #: apt-mark.8.xml:133 apt-secure.8.xml:193 apt-cdrom.8.xml:154
-#: apt-config.8.xml:111 apt.conf.5.xml:1227 apt_preferences.5.xml:707
+#: apt-config.8.xml:111 apt.conf.5.xml:1228 apt_preferences.5.xml:707
 #: sources.list.5.xml:280 apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65
 #: apt-ftparchive.1.xml:609
 msgid "See Also"
@@ -1883,13 +1883,13 @@ msgid ""
 "Show user friendly progress information in the terminal window when packages "
 "are installed, upgraded or removed. For a machine parsable version of this "
 "data see README.progress-reporting in the apt doc directory.  Configuration "
-"Item: <literal>DpkgPM::Progress</literal> and <literal>Dpkg::Progress-Fancy</"
+"Item: <literal>Dpkg::Progress</literal> and <literal>Dpkg::Progress-Fancy</"
 "literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml:548 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127
-#: apt.conf.5.xml:1221 apt_preferences.5.xml:700
+#: apt.conf.5.xml:1222 apt_preferences.5.xml:700
 msgid "Files"
 msgstr "Ficheros"
 
@@ -3098,10 +3098,10 @@ msgstr ""
 #: apt-secure.8.xml:195
 msgid ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
 msgstr ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml:199
@@ -4649,15 +4649,27 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:607
+#, fuzzy
+#| msgid ""
+#| "<literal>Dir::Cache</literal> contains locations pertaining to local "
+#| "cache information, such as the two package caches <literal>srcpkgcache</"
+#| "literal> and <literal>pkgcache</literal> as well as the location to place "
+#| "downloaded archives, <literal>Dir::Cache::archives</literal>. Generation "
+#| "of caches can be turned off by setting their names to the empty string. "
+#| "This will slow down startup but save disk space. It is probably "
+#| "preferable to turn off the pkgcache rather than the srcpkgcache. Like "
+#| "<literal>Dir::State</literal> the default directory is contained in "
+#| "<literal>Dir::Cache</literal>"
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
 "and <literal>pkgcache</literal> as well as the location to place downloaded "
 "archives, <literal>Dir::Cache::archives</literal>. Generation of caches can "
-"be turned off by setting their names to the empty string. This will slow "
+"be turned off by setting <literal>pkgcache</literal> or "
+"<literal>srcpkgcache</literal> to <literal>\"\"</literal>.  This will slow "
 "down startup but save disk space. It is probably preferable to turn off the "
-"pkgcache rather than the srcpkgcache. Like <literal>Dir::State</literal> the "
-"default directory is contained in <literal>Dir::Cache</literal>"
+"pkgcache rather than the srcpkgcache.  Like <literal>Dir::State</literal> "
+"the default directory is contained in <literal>Dir::Cache</literal>"
 msgstr ""
 "<literal>Dir::Cache</literal> contiene las ubicaciones que afectan a la "
 "información de la caché local, como los dos cachés de paquetes "
@@ -4670,7 +4682,7 @@ msgstr ""
 "directorio predeterminado está en <literal>Dir::Cache</literal>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:616
+#: apt.conf.5.xml:617
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4686,7 +4698,7 @@ msgstr ""
 "<envar>APT_CONFIG</envar>)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:622
+#: apt.conf.5.xml:623
 msgid ""
 "The <literal>Dir::Parts</literal> setting reads in all the config fragments "
 "in lexical order from the directory specified. After this is done then the "
@@ -4697,7 +4709,7 @@ msgstr ""
 "Al finalizar este proceso carga el fichero de configuración principal."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:626
+#: apt.conf.5.xml:627
 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4714,7 +4726,7 @@ msgstr ""
 "literal> especifican la ubicación de sus respectivos programas."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:634
+#: apt.conf.5.xml:635
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4735,7 +4747,7 @@ msgstr ""
 "staging/var/lib/dpkg/status</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:647
+#: apt.conf.5.xml:648
 msgid ""
 "The <literal>Ignore-Files-Silently</literal> list can be used to specify "
 "which files APT should silently ignore while parsing the files in the "
@@ -4753,12 +4765,12 @@ msgstr ""
 "de expresiones regulares."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:656
+#: apt.conf.5.xml:657
 msgid "APT in DSelect"
 msgstr "APT con DSelect"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:658
+#: apt.conf.5.xml:659
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behavior. These are in the <literal>DSelect</literal> "
@@ -4769,7 +4781,7 @@ msgstr ""
 "encuentran en la sección <literal>DSelect</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:663
+#: apt.conf.5.xml:664
 msgid ""
 "Cache Clean mode; this value may be one of <literal>always</literal>, "
 "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -4791,7 +4803,7 @@ msgstr ""
 "realiza esta acción antes de descargar paquetes nuevos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:677
+#: apt.conf.5.xml:678
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the install phase."
@@ -4800,7 +4812,7 @@ msgstr ""
 "la línea de ordenes al ejecutar la fase de instalación."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:682
+#: apt.conf.5.xml:683
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the update phase."
@@ -4809,7 +4821,7 @@ msgstr ""
 "la línea de ordenes al ejecutar la fase de actualización."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:687
+#: apt.conf.5.xml:688
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
@@ -4819,12 +4831,12 @@ msgstr ""
 "preguntará en caso de error."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:693
+#: apt.conf.5.xml:694
 msgid "How APT calls &dpkg;"
 msgstr "Invocación de APT a dpkg"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:694
+#: apt.conf.5.xml:695
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
@@ -4833,7 +4845,7 @@ msgstr ""
 "se encuentran en la sección <literal>DPkg</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:699
+#: apt.conf.5.xml:700
 msgid ""
 "This is a list of options to pass to &dpkg;. The options must be specified "
 "using the list notation and each list item is passed as a single argument to "
@@ -4844,7 +4856,7 @@ msgstr ""
 "introduce a &dpkg; como un sólo argumento."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:705
+#: apt.conf.5.xml:706
 msgid ""
 "This is a list of shell commands to run before/after invoking &dpkg;.  Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -4857,7 +4869,7 @@ msgstr ""
 "sh</filename>; en caso de fallo, APT cancela la acción."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:712
+#: apt.conf.5.xml:713
 #, fuzzy
 #| msgid ""
 #| "This is a list of shell commands to run before invoking &dpkg;. Like "
@@ -4881,7 +4893,7 @@ msgstr ""
 "la entrada estándar."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:719
+#: apt.conf.5.xml:720
 #, fuzzy
 #| msgid ""
 #| "Version 2 of this protocol dumps more information, including the protocol "
@@ -4903,7 +4915,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:724
+#: apt.conf.5.xml:725
 msgid ""
 "The version of the protocol to be used for the command "
 "<literal><replaceable>cmd</replaceable></literal> can be chosen by setting "
@@ -4914,7 +4926,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:731
+#: apt.conf.5.xml:732
 msgid ""
 "The file descriptor to be used to send the information can be requested with "
 "<literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::InfoFD</"
@@ -4925,7 +4937,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:741
+#: apt.conf.5.xml:742
 msgid ""
 "APT chdirs to this directory before invoking &dpkg;, the default is "
 "<filename>/</filename>."
@@ -4934,7 +4946,7 @@ msgstr ""
 "predeterminado es <filename>/</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:746
+#: apt.conf.5.xml:747
 msgid ""
 "These options are passed to &dpkg-buildpackage; when compiling packages; the "
 "default is to disable signing and produce all binaries."
@@ -4944,12 +4956,12 @@ msgstr ""
 "paquetes y a producir todos los binarios."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:751
+#: apt.conf.5.xml:752
 msgid "dpkg trigger usage (and related options)"
 msgstr "Uso del disparador de dpkg (y de las opciones relacionadas)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:752
+#: apt.conf.5.xml:753
 msgid ""
 "APT can call &dpkg; in such a way as to let it make aggressive use of "
 "triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
@@ -4976,7 +4988,7 @@ msgstr ""
 "tiempo (o más) durante la configuración de todos los paquetes."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:767
+#: apt.conf.5.xml:768
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -4990,7 +5002,7 @@ msgstr ""
 "DPkg::TriggersPending \"true\";"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:761
+#: apt.conf.5.xml:762
 msgid ""
 "Note that it is not guaranteed that APT will support these options or that "
 "these options will not cause (big) trouble in the future. If you have "
@@ -5014,7 +5026,7 @@ msgstr ""
 "type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:774
+#: apt.conf.5.xml:775
 msgid ""
 "Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
 "call).  See &dpkg; if you are interested in what this actually means. In "
@@ -5037,7 +5049,7 @@ msgstr ""
 "eliminación."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:782
+#: apt.conf.5.xml:783
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
@@ -5067,7 +5079,7 @@ msgstr ""
 "imposibilidad de arrancar el sistema. "
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:797
+#: apt.conf.5.xml:798
 msgid ""
 "If this option is set APT will call <command>dpkg --configure --pending</"
 "command> to let &dpkg; handle all required configurations and triggers. This "
@@ -5085,7 +5097,7 @@ msgstr ""
 "desactivar esta opción en todas las ejecuciones menos la última."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:804
+#: apt.conf.5.xml:805
 msgid ""
 "Useful for the <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal>, and "
@@ -5101,7 +5113,7 @@ msgstr ""
 "los disparadores necesarios para configurar este paquete."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:817
+#: apt.conf.5.xml:818
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -5119,7 +5131,7 @@ msgstr ""
 "};"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:810
+#: apt.conf.5.xml:811
 msgid ""
 "Essential packages (and their dependencies) should be configured immediately "
 "after unpacking. It is a good idea to do this quite early in the upgrade "
@@ -5144,12 +5156,12 @@ msgstr ""
 "<placeholder type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:830
+#: apt.conf.5.xml:831
 msgid "Periodic and Archives options"
 msgstr "Las opciones «Periodic» y «Archives»"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:831
+#: apt.conf.5.xml:832
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by the "
@@ -5163,12 +5175,12 @@ msgstr ""
 "documentación de estas opciones."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:839
+#: apt.conf.5.xml:840
 msgid "Debug options"
 msgstr "Opciones de depuración"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:841
+#: apt.conf.5.xml:842
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -5185,7 +5197,7 @@ msgstr ""
 "para un usuario normal, aunque unas cuantas sí son:"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:852
+#: apt.conf.5.xml:853
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -5196,7 +5208,7 @@ msgstr ""
 "purge</literal>."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:860
+#: apt.conf.5.xml:861
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"
@@ -5207,7 +5219,7 @@ msgstr ""
 "<literal>apt-get -s install</literal>) como un usuario normal."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:869
+#: apt.conf.5.xml:870
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -5219,7 +5231,7 @@ msgstr ""
 #. 	   motivating example, except I haven't a clue why you'd want
 #. 	   to do this. 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:877
+#: apt.conf.5.xml:878
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CD-ROM IDs."
@@ -5228,14 +5240,14 @@ msgstr ""
 "statfs en los identificadores de los discos ópticos."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:887
+#: apt.conf.5.xml:888
 msgid "A full list of debugging options to apt follows."
 msgstr ""
 "A continuación, se muestra la lista completa de las opciones de depuración "
 "de apt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:896
+#: apt.conf.5.xml:897
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
@@ -5243,26 +5255,26 @@ msgstr ""
 "<literal>cdrom://</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:907
+#: apt.conf.5.xml:908
 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 "Muestra la información relacionada con la descarga de paquetes mediante FTP."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:918
+#: apt.conf.5.xml:919
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 "Muestra la información relacionada con la descarga de paquetes mediante HTTP."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:929
+#: apt.conf.5.xml:930
 msgid "Print information related to downloading packages using HTTPS."
 msgstr ""
 "Muestra la información relacionada con la descarga de paquetes mediante "
 "HTTPS."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:940
+#: apt.conf.5.xml:941
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
@@ -5271,7 +5283,7 @@ msgstr ""
 "criptográficas mediante <literal>gpg</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:951
+#: apt.conf.5.xml:952
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
@@ -5280,14 +5292,14 @@ msgstr ""
 "paquetes almacenadas en CD-ROM."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:961
+#: apt.conf.5.xml:962
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 "Describe el proceso de resolución de dependencias de compilación en &apt-"
 "get;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:971
+#: apt.conf.5.xml:972
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
@@ -5296,7 +5308,7 @@ msgstr ""
 "<literal>apt</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:981
+#: apt.conf.5.xml:982
 msgid ""
 "Do not include information from <literal>statfs</literal>, namely the number "
 "of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -5307,7 +5319,7 @@ msgstr ""
 "identificador de un CD-ROM."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:992
+#: apt.conf.5.xml:993
 msgid ""
 "Disable all file locking.  For instance, this will allow two instances of "
 "<quote><literal>apt-get update</literal></quote> to run at the same time."
@@ -5317,14 +5329,14 @@ msgstr ""
 "a la vez."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1004
+#: apt.conf.5.xml:1005
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 "Registra los elementos que se añaden o se borran de la cola de descarga "
 "global."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1014
+#: apt.conf.5.xml:1015
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
@@ -5334,7 +5346,7 @@ msgstr ""
 "ficheros descargados."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1024
+#: apt.conf.5.xml:1025
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
@@ -5343,7 +5355,7 @@ msgstr ""
 "lista de índices de paquetes, y los errores relacionados con éstos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1036
+#: apt.conf.5.xml:1037
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
@@ -5353,7 +5365,7 @@ msgstr ""
 "índices completos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1047
+#: apt.conf.5.xml:1048
 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
@@ -5361,7 +5373,7 @@ msgstr ""
 "descargas."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1058
+#: apt.conf.5.xml:1059
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
@@ -5370,7 +5382,7 @@ msgstr ""
 "de los paquetes y con la eliminación de los paquetes sin usar."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1068
+#: apt.conf.5.xml:1069
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
@@ -5386,7 +5398,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1082
+#: apt.conf.5.xml:1083
 msgid ""
 "Generate debug messages describing which packages are marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
@@ -5417,7 +5429,7 @@ msgstr ""
 "la sección en la que aparece el paquete."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1103
+#: apt.conf.5.xml:1104
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
@@ -5426,7 +5438,7 @@ msgstr ""
 "invocó, con los argumentos separados por un espacio."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1114
+#: apt.conf.5.xml:1115
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
@@ -5435,7 +5447,7 @@ msgstr ""
 "estado y cualquier error encontrado durante el análisis."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1125
+#: apt.conf.5.xml:1126
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
@@ -5444,7 +5456,7 @@ msgstr ""
 "literal> debería entregar los paquetes a &dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1137
+#: apt.conf.5.xml:1138
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""
@@ -5452,12 +5464,12 @@ msgstr ""
 "&dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1148
+#: apt.conf.5.xml:1149
 msgid "Output the priority of each package list on startup."
 msgstr "Muestra la prioridad de cada lista de paquetes al iniciarse."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1158
+#: apt.conf.5.xml:1159
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
@@ -5466,7 +5478,7 @@ msgstr ""
 "lo que ocurre cuando se encuentra un problema de dependencias complejo)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1169
+#: apt.conf.5.xml:1170
 msgid ""
 "Display a list of all installed packages with their calculated score used by "
 "the pkgProblemResolver. The description of the package is the same as "
@@ -5477,7 +5489,7 @@ msgstr ""
 "misma que la descrita en <literal>Debug::pkgDepCache::Marker</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1181
+#: apt.conf.5.xml:1182
 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
@@ -5486,7 +5498,7 @@ msgstr ""
 "vendors.list</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1191
+#: apt.conf.5.xml:1192
 msgid ""
 "Display the external commands that are called by apt hooks.  This includes e."
 "g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or "
@@ -5494,13 +5506,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1215 apt_preferences.5.xml:547 sources.list.5.xml:239
+#: apt.conf.5.xml:1216 apt_preferences.5.xml:547 sources.list.5.xml:239
 #: apt-ftparchive.1.xml:598
 msgid "Examples"
 msgstr "Ejemplos"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1216
+#: apt.conf.5.xml:1217
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -5510,7 +5522,7 @@ msgstr ""
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1228
+#: apt.conf.5.xml:1229
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
 
@@ -8563,36 +8575,53 @@ msgstr ""
 "<command>apt-ftparchive</command> devuelve cero si no hay ningún error, y el "
 "valor 100 en caso de error."
 
-#. type: <title></title>
-#: guide.sgml:4
+#. type: Attribute 'lang' of: <book>
+#: guide.dbk:8 offline.dbk:8
+msgid "en"
+msgstr "es"
+
+#. type: Content of: <book><title>
+#: guide.dbk:10
 msgid "APT User's Guide"
 msgstr "Guía de usuario de APT"
 
-#. type: <author></author>
-#: guide.sgml:6 offline.sgml:6
-msgid "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
-msgstr "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
+#. type: Content of: <book><bookinfo><authorgroup><author><personname>
+#: guide.dbk:16 offline.dbk:16
+msgid "Jason Gunthorpe"
+msgstr "Jason Gunthorpe"
 
-#. type: <version></version>
-#: guide.sgml:7
-msgid "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
-msgstr "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
+#. type: Content of: <book><bookinfo><authorgroup><author><email>
+#: guide.dbk:16 offline.dbk:16
+msgid "jgg@debian.org"
+msgstr "jgg@debian.org"
 
-#. type: <abstract></abstract>
-#: guide.sgml:11
+#. type: Content of: <book><bookinfo><releaseinfo>
+#: guide.dbk:20 offline.dbk:20
+msgid "Version &apt-product-version;"
+msgstr ""
+
+#. type: Content of: <book><bookinfo><abstract><para>
+#: guide.dbk:24
 msgid ""
 "This document provides an overview of how to use the the APT package manager."
 msgstr ""
 "Este documento ofrece una introducción sobre cómo usar el gestor de paquetes "
 "APT."
 
-#. type: <copyrightsummary></copyrightsummary>
-#: guide.sgml:15
-msgid "Copyright &copy; Jason Gunthorpe, 1998."
-msgstr "Copyright &copy; Jason Gunthorpe, 1998."
+#. type: Content of: <book><bookinfo>
+#: guide.dbk:28
+msgid ""
+"<copyright><year>1998</year><holder>Jason Gunthorpe</holder></copyright>"
+msgstr ""
+"<copyright><year>1998</year><holder>Jason Gunthorpe</holder></copyright>"
+
+#. type: Content of: <book><bookinfo><legalnotice><title>
+#: guide.dbk:31 offline.dbk:32
+msgid "License Notice"
+msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:21 offline.sgml:22
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: guide.dbk:33 offline.dbk:34
 msgid ""
 "\"APT\" and this document are free software; you can redistribute them and/"
 "or modify them under the terms of the GNU General Public License as "
@@ -8604,8 +8633,8 @@ msgstr ""
 "Public License publicada por la Free Software Foundation, ya sea en su "
 "versión 2 o (a su elección) cualquier versión posterior."
 
-#. type: <p></p>
-#: guide.sgml:24 offline.sgml:25
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: guide.dbk:42 offline.dbk:40
 msgid ""
 "For more details, on Debian systems, see the file /usr/share/common-licenses/"
 "GPL for the full license."
@@ -8613,31 +8642,31 @@ msgstr ""
 "Para más detalles acerca de sistemas Debian y la licencia completa, consulte "
 "el fichero «/usr/share/common-licenses/GPL»."
 
-#. type: <heading></heading>
-#: guide.sgml:32
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:49
 msgid "General"
 msgstr "General"
 
-#. type: <p></p>
-#: guide.sgml:38
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:51
 msgid ""
-"The APT package currently contains two sections, the APT <prgn>dselect</"
-"prgn> method and the <prgn>apt-get</prgn> command line user interface. Both "
-"provide a way to install and remove packages as well as download new "
-"packages from the Internet."
+"The APT package currently contains two sections, the APT <command>dselect</"
+"command> method and the <command>apt-get</command> command line user "
+"interface. Both provide a way to install and remove packages as well as "
+"download new packages from the Internet."
 msgstr ""
-"El paquete APT contiene a día de hoy dos secciones, el método <prgn>dselect</"
-"prgn> y la interfaz de usuario para la línea de órdenes <prgn>apt-get</"
-"prgn>. Ambos ofrecen una manera de instalar y desinstalar paquetes, así como "
-"descargar paquetes nuevos de Internet."
+"El paquete APT contiene a día de hoy dos secciones, el método "
+"<command>dselect</command> y la interfaz de usuario para la línea de órdenes "
+"<command>apt-get</command>. Ambos ofrecen una manera de instalar y "
+"desinstalar paquetes, así como descargar paquetes nuevos de Internet."
 
-#. type: <heading></heading>
-#: guide.sgml:39
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:57
 msgid "Anatomy of the Package System"
 msgstr "Anatomía del sistema de paquetes"
 
-#. type: <p></p>
-#: guide.sgml:44
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:59
 msgid ""
 "The Debian packaging system has a large amount of information associated "
 "with each package to help assure that it integrates cleanly and easily into "
@@ -8647,8 +8676,8 @@ msgstr ""
 "asociada a cada paquete para asegurar una integración sencilla y limpia en "
 "el sistema. La característica más importante es el sistema de dependencias."
 
-#. type: <p></p>
-#: guide.sgml:52
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:64
 msgid ""
 "The dependency system allows individual programs to make use of shared "
 "elements in the system such as libraries. It simplifies placing infrequently "
@@ -8663,8 +8692,8 @@ msgstr ""
 "permite elegir el agente de transporte del correo electrónico, el servidor "
 "de X y demás."
 
-#. type: <p></p>
-#: guide.sgml:57
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:71
 msgid ""
 "The first step to understanding the dependency system is to grasp the "
 "concept of a simple dependency. The meaning of a simple dependency is that a "
@@ -8676,8 +8705,8 @@ msgstr ""
 "simple es que un paquete requiere que otro también esté instalado para poder "
 "funcionar correctamente."
 
-#. type: <p></p>
-#: guide.sgml:63
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:76
 msgid ""
 "For instance, mailcrypt is an emacs extension that aids in encrypting email "
 "with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a "
@@ -8689,8 +8718,8 @@ msgstr ""
 "una dependencia simple con GPG. Como también es una extensión de emacs tiene "
 "una dependencia simple con emacs, ya que sin él mailcrypt es inservible."
 
-#. type: <p></p>
-#: guide.sgml:73
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:82
 msgid ""
 "The other important dependency to understand is a conflicting dependency. It "
 "means that a package, when installed with another package, will not work and "
@@ -8711,8 +8740,8 @@ msgstr ""
 "sistema, y por ello todos los agentes de transporte de correo tienen una "
 "dependencia de conflicto con todos los demás."
 
-#. type: <p></p>
-#: guide.sgml:83
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:92
 msgid ""
 "As an added complication there is the possibility for a package to pretend "
 "to be another package. Consider that exim and sendmail for many intents are "
@@ -8732,8 +8761,8 @@ msgstr ""
 "dependerán de «mail-transport-agent». Esto puede añadir confusión al "
 "intentar arreglar paquetes manualmente."
 
-#. type: <p></p>
-#: guide.sgml:88
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:102
 msgid ""
 "At any given time a single dependency may be met by packages that are "
 "already installed or it may not be. APT attempts to help resolve dependency "
@@ -8745,94 +8774,102 @@ msgstr ""
 "asistir en la resolución de problemas de dependencias mediante un número de "
 "algoritmos automáticos que ayudan en la selección de paquetes a instalar."
 
-#. type: <heading></heading>
-#: guide.sgml:96
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:111
 msgid "apt-get"
 msgstr "apt-get"
 
-#. type: <p></p>
-#: guide.sgml:102
-msgid ""
-"<prgn>apt-get</prgn> provides a simple way to install packages from the "
-"command line. Unlike <prgn>dpkg</prgn>, <prgn>apt-get</prgn> does not "
-"understand .deb files, it works with the package's proper name and can only "
-"install .deb archives from a <em>Source</em>."
-msgstr ""
-"<prgn>apt-get</prgn> ofrece una forma sencilla de instalar paquetes desde la "
-"línea de órdenes. A diferencia de <prgn>dpkg</prgn>, <prgn>apt-get</prgn> no "
-"intenta comprender los ficheros «.deb», sino que funciona con el nombre real "
-"del paquete y sólo puede instalar ficheros «.deb» desde una <em>fuente</em>."
-
-#. type: <p></p>
-#: guide.sgml:109
-msgid ""
-"The first <footnote><p>If you are using an http proxy server you must set "
-"the http_proxy environment variable first, see sources.list(5)</p></"
-"footnote> thing that should be done before using <prgn>apt-get</prgn> is to "
-"fetch the package lists from the <em>Sources</em> so that it knows what "
-"packages are available. This is done with <tt>apt-get update</tt>. For "
-"instance,"
-msgstr ""
-"La primera <footnote><p>Si está usando un servidor proxy primero debe "
-"definir la variable de entorno http_proxy, consulte sources.list (5).</p></"
-"footnote> cosa que debería hacer antes de usar <prgn>apt-get</prgn> es "
-"obtener las listas de paquetes desde las <em>fuentes</em> para así conocer "
-"los paquetes disponibles. Puede hacer esto mediante <tt>apt-get update</tt>. "
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:113
+msgid ""
+"<command>apt-get</command> provides a simple way to install packages from "
+"the command line. Unlike <command>dpkg</command>, <command>apt-get</command> "
+"does not understand .deb files, it works with the package's proper name and "
+"can only install .deb archives from a <emphasis>Source</emphasis>."
+msgstr ""
+"<command>apt-get</command> ofrece una forma sencilla de instalar paquetes "
+"desde la línea de órdenes. A diferencia de <command>dpkg</command>, "
+"<command>apt-get</command> no intenta comprender los ficheros «.deb», sino "
+"que funciona con el nombre real del paquete y sólo puede instalar ficheros «."
+"deb» desde una <emphasis>fuente</emphasis>."
+
+#. type: Content of: <book><chapter><para><footnote><para>
+#: guide.dbk:119
+msgid ""
+"If you are using an http proxy server you must set the http_proxy "
+"environment variable first, see sources.list(5)"
+msgstr ""
+"Si está usando un servidor proxy primero debe definir la variable de entorno "
+"http_proxy, consulte sources.list (5)."
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:119
+msgid ""
+"The first <placeholder type=\"footnote\" id=\"0\"/> thing that should be "
+"done before using <command>apt-get</command> is to fetch the package lists "
+"from the <emphasis>Sources</emphasis> so that it knows what packages are "
+"available. This is done with <literal>apt-get update</literal>. For instance,"
+msgstr ""
+"La primera <placeholder type=\"footnote\" id=\"0\"/> cosa que debería hacer "
+"antes de usar <command>apt-get</command> es obtener las listas de paquetes "
+"desde las <emphasis>fuentes</emphasis> para así conocer los paquetes "
+"disponibles. Puede hacer esto mediante <literal>apt-get update</literal>. "
 "Por ejemplo,"
 
-#. type: <example></example>
-#: guide.sgml:116
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:127
 #, no-wrap
 msgid ""
 "# apt-get update\n"
 "Get http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
 "Get http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 msgstr ""
 "# apt-get update\n"
 "Des http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
 "Des http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
 "Leyendo lista de paquetes... Hecho\n"
-"Creando árbol de dependencias... Hecho"
+"Creando árbol de dependencias... Hecho\n"
 
-#. type: <p><taglist>
-#: guide.sgml:120
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:134
 msgid "Once updated there are several commands that can be used:"
 msgstr "Puede usar varias órdenes después de actualizar:"
 
-#. type: <tag></tag>
-#: guide.sgml:121
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:138
 msgid "upgrade"
 msgstr "upgrade"
 
-#. type: <p></p>
-#: guide.sgml:131
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:141
 msgid ""
 "Upgrade will attempt to gently upgrade the whole system. Upgrade will never "
 "install a new package or remove an existing package, nor will it ever "
 "upgrade a package that might cause some other package to break. This can be "
 "used daily to relatively safely upgrade the system. Upgrade will list all of "
 "the packages that it could not upgrade, this usually means that they depend "
-"on new packages or conflict with some other package. <prgn>dselect</prgn> or "
-"<tt>apt-get install</tt> can be used to force these packages to install."
+"on new packages or conflict with some other package. <command>dselect</"
+"command> or <literal>apt-get install</literal> can be used to force these "
+"packages to install."
 msgstr ""
 "«upgrade» intentará actualizar con cuidado todo el sistema. «upgrade» nunca "
 "intentará instalar un paquete nuevo o eliminar un paquete existente, y en "
 "ningún caso actualizará un paquete que pueda causar un problema de "
 "dependencias rotas a otro paquete. «upgrade» mostrará todos los paquetes que "
 "no pudo actualizar, lo cual generalmente significa que dependen de paquetes "
-"nuevos o que entran en conflicto con otro paquete. Puede usar <prgn>dselect</"
-"prgn> o <tt>apt-get install</tt> para forzar la instalación de tales "
-"paquetes."
+"nuevos o que entran en conflicto con otro paquete. Puede usar "
+"<command>dselect</command> o <literal>apt-get install</literal> para forzar "
+"la instalación de tales paquetes."
 
-#. type: <tag></tag>
-#: guide.sgml:131
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:153
 msgid "install"
 msgstr "install"
 
-#. type: <p></p>
-#: guide.sgml:140
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:156
 msgid ""
 "Install is used to install packages by name. The package is automatically "
 "fetched and installed. This can be useful if you already know the name of "
@@ -8850,33 +8887,34 @@ msgstr ""
 "dependencias con los paquetes listados, y mostrará un resumen al pedir una "
 "confirmación en caso de modificar cualquiera de los argumentos introducidos."
 
-#. type: <tag></tag>
-#: guide.sgml:140
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:167
 msgid "dist-upgrade"
 msgstr "dist-upgrade"
 
-#. type: <p></p>
-#: guide.sgml:149
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:170
 msgid ""
 "Dist-upgrade is a complete upgrader designed to simplify upgrading between "
 "releases of Debian. It uses a sophisticated algorithm to determine the best "
 "set of packages to install, upgrade and remove to get as much of the system "
 "to the newest release. In some situations it may be desired to use dist-"
 "upgrade rather than spend the time manually resolving dependencies in "
-"<prgn>dselect</prgn>. Once dist-upgrade has completed then <prgn>dselect</"
-"prgn> can be used to install any packages that may have been left out."
+"<command>dselect</command>. Once dist-upgrade has completed then "
+"<command>dselect</command> can be used to install any packages that may have "
+"been left out."
 msgstr ""
 "«dist-upgrade» es una actualizador completo diseñado para simplificar la "
 "actualización entre publicaciones de Debian. Utiliza un sofisticado "
 "algoritmo para diseñar el mejor conjunto de paquetes a instalar, actualizar "
 "y eliminar para así obtener cuanto sea posible de la última publicación. "
 "Puede que en algunas situaciones desee usar «dist-upgrade» en lugar de pasar "
-"tiempo resolviendo dependencias con <prgn>dselect</prgn>. Puede usar "
-"<prgn>dselect</prgn> para instalar cualquier paquete que se haya quedado "
-"atrás."
+"tiempo resolviendo dependencias con <command>dselect</command>. Puede usar "
+"<command>dselect</command> para instalar cualquier paquete que se haya "
+"quedado atrás."
 
-#. type: <p></p>
-#: guide.sgml:152
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:180
 msgid ""
 "It is important to closely look at what dist-upgrade is going to do, its "
 "decisions may sometimes be quite surprising."
@@ -8884,167 +8922,163 @@ msgstr ""
 "Es importante revisar lo que «dist-upgrade» planea hacer, ya que sus "
 "decisiones a veces pueden resultar sorprendentes."
 
-#. type: <p></p>
-#: guide.sgml:163
-#, fuzzy
-#| msgid ""
-#| "<prgn>apt-get</prgn> has several command line options that are detailed "
-#| "in its man page, <manref section=\"8\" name=\"apt-get\">. The most useful "
-#| "option is <tt>-d</tt> which does not install the fetched files. If the "
-#| "system has to download a large number of package it would be undesired to "
-#| "start installing them in case something goes wrong. When <tt>-d</tt> is "
-#| "used the downloaded archives can be installed by simply running the "
-#| "command that caused them to be downloaded again without <tt>-d</tt>."
-msgid ""
-"<prgn>apt-get</prgn> has several command line options that are detailed in "
-"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful "
-"option is <tt>-d</tt> which does not install the fetched files. If the "
-"system has to download a large number of package it would be undesired to "
-"start installing them in case something goes wrong. When <tt>-d</tt> is used "
-"the downloaded archives can be installed by simply running the command that "
-"caused them to be downloaded again without <tt>-d</tt>."
-msgstr ""
-"<prgn>apt-get</prgn> ofrece varias opciones de línea de órdenes detalladas "
-"en su página de manual, <manref section=\"8\" name=\"apt-get\">. La opción "
-"más útil es <tt>-d</tt>, que no instala los ficheros obtenidos. Puede que no "
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:187
+msgid ""
+"<command>apt-get</command> has several command line options that are "
+"detailed in its man page, <citerefentry><refentrytitle>apt-get</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>. The most useful "
+"option is <literal>-d</literal> which does not install the fetched files. If "
+"the system has to download a large number of package it would be undesired "
+"to start installing them in case something goes wrong. When <literal>-d</"
+"literal> is used the downloaded archives can be installed by simply running "
+"the command that caused them to be downloaded again without <literal>-d</"
+"literal>."
+msgstr ""
+"<command>apt-get</command> ofrece varias opciones de línea de órdenes "
+"detalladas en su página de manual, <citerefentry><refentrytitle>apt-get</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>. La opción más útil es "
+"<literal>-d</literal>, que no instala los ficheros obtenidos. Puede que no "
 "desee instalar los paquetes de inicio si el sistema se tiene que descargar "
-"un gran número de éstos, en caso de que algo vaya mal. Cuando usa <tt>-d</"
-"tt> puede instalar los ficheros descargados simplemente ejecutando la orden "
-"que provocó su descarga, sin <tt>-d</tt>."
+"un gran número de éstos, en caso de que algo vaya mal. Cuando usa <literal>-"
+"d</literal> puede instalar los ficheros descargados simplemente ejecutando "
+"la orden que provocó su descarga, sin <literal>-d</literal>."
 
-#. type: <heading></heading>
-#: guide.sgml:168
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:199
 msgid "DSelect"
 msgstr "DSelect"
 
-#. type: <p></p>
-#: guide.sgml:173
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:201
 msgid ""
-"The APT <prgn>dselect</prgn> method provides the complete APT system with "
-"the <prgn>dselect</prgn> package selection GUI. <prgn>dselect</prgn> is used "
-"to select the packages to be installed or removed and APT actually installs "
-"them."
+"The APT <command>dselect</command> method provides the complete APT system "
+"with the <command>dselect</command> package selection GUI. <command>dselect</"
+"command> is used to select the packages to be installed or removed and APT "
+"actually installs them."
 msgstr ""
-"El método <prgn>dselect</prgn> de APT ofrece el sistema completo de APT con "
-"la interfaz gráfica de selección de paquetes <prgn>dselect</prgn>. "
-"<prgn>dselect</prgn> se usa para seleccionar los paquetes a instalar o "
-"desinstalar que en realidad instalará APT."
+"El método <command>dselect</command> de APT ofrece el sistema completo de "
+"APT con la interfaz gráfica de selección de paquetes <command>dselect</"
+"command>. <command>dselect</command> se usa para seleccionar los paquetes a "
+"instalar o desinstalar que en realidad instalará APT."
 
-#. type: <p></p>
-#: guide.sgml:184
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:207
 msgid ""
-"To enable the APT method you need to select [A]ccess in <prgn>dselect</prgn> "
-"and then choose the APT method. You will be prompted for a set of "
-"<em>Sources</em> which are places to fetch archives from. These can be "
-"remote Internet sites, local Debian mirrors or CD-ROMs. Each source can "
-"provide a fragment of the total Debian archive, APT will automatically "
+"To enable the APT method you need to select [A]ccess in <command>dselect</"
+"command> and then choose the APT method. You will be prompted for a set of "
+"<emphasis>Sources</emphasis> which are places to fetch archives from. These "
+"can be remote Internet sites, local Debian mirrors or CD-ROMs. Each source "
+"can provide a fragment of the total Debian archive, APT will automatically "
 "combine them to form a complete set of packages. If you have a CD-ROM then "
 "it is a good idea to specify it first and then specify a mirror so that you "
 "have access to the latest bug fixes. APT will automatically use packages on "
 "your CD-ROM before downloading from the Internet."
 msgstr ""
 "Para habilitar el método APT tiene que seleccionar [M]étodo en "
-"<prgn>dselect</prgn>, y después seleccionar el método APT. Se le pedirá un "
-"conjunto de <em>fuentes</em>, ubicaciones de donde obtener los ficheros. "
-"Pueden ser sitios remotos de Internet, replicas locales de Debian o discos "
-"ópticos. Cada fuente puede proporcionar un fragmento del total del archivo "
-"Debian, los cuales APT combinará automáticamente para formar un conjunto "
-"completo de paquetes. Si tiene un disco óptico es una buena idea definirlo "
-"primero en el fichero de configuración y después especificar una replica "
-"para así tener acceso a los últimos arreglos de fallos. APT usará "
-"automáticamente los paquetes del disco óptico en lugar de descargarlos de "
-"Internet."
-
-#. type: <example></example>
-#: guide.sgml:198
+"<command>dselect</command>, y después seleccionar el método APT. Se le "
+"pedirá un conjunto de <emphasis>fuentes</emphasis>, ubicaciones de donde "
+"obtener los ficheros. Pueden ser sitios remotos de Internet, replicas "
+"locales de Debian o discos ópticos. Cada fuente puede proporcionar un "
+"fragmento del total del archivo Debian, los cuales APT combinará "
+"automáticamente para formar un conjunto completo de paquetes. Si tiene un "
+"disco óptico es una buena idea definirlo primero en el fichero de "
+"configuración y después especificar una replica para así tener acceso a los "
+"últimos arreglos de fallos. APT usará automáticamente los paquetes del disco "
+"óptico en lugar de descargarlos de Internet."
+
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:218
 #, no-wrap
 msgid ""
 "   Set up a list of distribution source locations\n"
-"\t \n"
+"\n"
 " Please give the base URL of the debian distribution.\n"
 " The access schemes I know about are: http file\n"
-"\t   \n"
+"\n"
 " For example:\n"
 "      file:/mnt/debian,\n"
 "      ftp://ftp.debian.org/debian,\n"
 "      http://ftp.de.debian.org/debian,\n"
-"      \n"
-"      \n"
-" URL [http://llug.sep.bnl.gov/debian]:"
+"\n"
+"\n"
+" URL [http://llug.sep.bnl.gov/debian]:\n"
 msgstr ""
 "   Set up a list of distribution source locations\n"
-"\t \n"
+"\n"
 " Please give the base URL of the debian distribution.\n"
 " The access schemes I know about are: http file\n"
-"\t   \n"
+"\n"
 " For example:\n"
 "      file:/mnt/debian,\n"
 "      ftp://ftp.debian.org/debian,\n"
 "      http://ftp.de.debian.org/debian,\n"
-"      \n"
-"      \n"
-" URL [http://llug.sep.bnl.gov/debian]:"
+"\n"
+"\n"
+" URL [http://llug.sep.bnl.gov/debian]:\n"
 
-#. type: <p></p>
-#: guide.sgml:205
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:232
 msgid ""
-"The <em>Sources</em> setup starts by asking for the base of the Debian "
-"archive, defaulting to a HTTP mirror. Next it asks for the distribution to "
-"get."
+"The <emphasis>Sources</emphasis> setup starts by asking for the base of the "
+"Debian archive, defaulting to a HTTP mirror. Next it asks for the "
+"distribution to get."
 msgstr ""
-"La configuración de las <em>fuentes</em> comienza preguntando la base del "
-"archivo de Debian, cuyo valor predeterminado es una réplica HTTP. A "
+"La configuración de las <emphasis>fuentes</emphasis> comienza preguntando la "
+"base del archivo de Debian, cuyo valor predeterminado es una réplica HTTP. A "
 "continuación, preguntará la distribución a obtener."
 
-#. type: <example></example>
-#: guide.sgml:212
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:237
 #, no-wrap
 msgid ""
 " Please give the distribution tag to get or a path to the\n"
 " package file ending in a /. The distribution\n"
 " tags are typically something like: stable unstable testing non-US\n"
-"   \n"
-" Distribution [stable]:"
+"\n"
+" Distribution [stable]:\n"
 msgstr ""
 " Please give the distribution tag to get or a path to the\n"
 " package file ending in a /. The distribution\n"
 " tags are typically something like: stable unstable testing non-US\n"
-"   \n"
-" Distribution [stable]:"
-
-#. type: <p></p>
-#: guide.sgml:222
-msgid ""
-"The distribution refers to the Debian version in the archive, <em>stable</"
-"em> refers to the latest released version and <em>unstable</em> refers to "
-"the developmental version. <em>non-US</em> is only available on some mirrors "
-"and refers to packages that contain encryption technology or other things "
-"that cannot be exported from the United States. Importing these packages "
-"into the US is legal however."
-msgstr ""
-"La distribución se refiere a la versión de Debian en el archivo, <em>stable</"
-"em> (estable) se refiere a la última versión publicada, y <em>unstable</em> "
-"(inestable) se refiere a la versión en desarrollo. <em>non-US</em> sólo está "
-"disponible en algunas réplicas, aquellos paquetes que contienen tecnología "
-"cifrada y otras cosas que no se pueden exportar desde los Estados Unidos. "
-"Aun así, importar estos paquetes a E.E.U.U es ilegal."
-
-#. type: <example></example>
-#: guide.sgml:228
+"\n"
+" Distribution [stable]:\n"
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:244
+msgid ""
+"The distribution refers to the Debian version in the archive, "
+"<emphasis>stable</emphasis> refers to the latest released version and "
+"<emphasis>unstable</emphasis> refers to the developmental version. "
+"<emphasis>non-US</emphasis> is only available on some mirrors and refers to "
+"packages that contain encryption technology or other things that cannot be "
+"exported from the United States. Importing these packages into the US is "
+"legal however."
+msgstr ""
+"La distribución se refiere a la versión de Debian en el archivo, "
+"<emphasis>stable</emphasis> (estable) se refiere a la última versión "
+"publicada, y <emphasis>unstable</emphasis> (inestable) se refiere a la "
+"versión en desarrollo. <emphasis>non-US</emphasis> sólo está disponible en "
+"algunas réplicas, aquellos paquetes que contienen tecnología cifrada y otras "
+"cosas que no se pueden exportar desde los Estados Unidos. Aun así, importar "
+"estos paquetes a E.E.U.U es ilegal."
+
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:253
 #, no-wrap
 msgid ""
 " Please give the components to get\n"
 " The components are typically something like: main contrib non-free\n"
-"  \n"
-" Components [main contrib non-free]:"
+"\n"
+" Components [main contrib non-free]:\n"
 msgstr ""
 " Please give the components to get\n"
 " The components are typically something like: main contrib non-free\n"
-"  \n"
-" Components [main contrib non-free]:"
+"\n"
+" Components [main contrib non-free]:\n"
 
-#. type: <p></p>
-#: guide.sgml:236
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:259
 msgid ""
 "The components list refers to the list of sub distributions to fetch. The "
 "distribution is split up based on software licenses, main being DFSG free "
@@ -9057,8 +9091,8 @@ msgstr ""
 "«non-free» contienen paquetes con restricciones en cuanto a su uso y "
 "distribución."
 
-#. type: <p></p>
-#: guide.sgml:240
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:265
 msgid ""
 "Any number of sources can be added, the setup script will continue to prompt "
 "until you have specified all that you want."
@@ -9066,23 +9100,24 @@ msgstr ""
 "Puede añadir cualquier número de fuentes, el script de configuración le "
 "preguntará por fuentes hasta que el usuario defina todo lo que quiera."
 
-#. type: <p></p>
-#: guide.sgml:247
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:269
 msgid ""
-"Before starting to use <prgn>dselect</prgn> it is necessary to update the "
-"available list by selecting [U]pdate from the menu. This is a superset of "
-"<tt>apt-get update</tt> that makes the fetched information available to "
-"<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get update</"
-"tt> has been run before."
+"Before starting to use <command>dselect</command> it is necessary to update "
+"the available list by selecting [U]pdate from the menu. This is a superset "
+"of <literal>apt-get update</literal> that makes the fetched information "
+"available to <command>dselect</command>. [U]pdate must be performed even if "
+"<literal>apt-get update</literal> has been run before."
 msgstr ""
 "Es necesario actualizar la lista disponible mediante el elemento de menú "
-"[A]ctualizar antes de iniciar <prgn>dselect</prgn>. Éste es un superconjunto "
-"de <tt>apt-get update</tt> que permite a <prgn>dselect</prgn> disponer de la "
-"información obtenida. Debe ejecutar [A]ctualizar aunque haya ejecutado "
-"<tt>apt-get update</tt> con anterioridad."
+"[A]ctualizar antes de iniciar <command>dselect</command>. Éste es un "
+"superconjunto de <literal>apt-get update</literal> que permite a "
+"<command>dselect</command> disponer de la información obtenida. Debe "
+"ejecutar [A]ctualizar aunque haya ejecutado <literal>apt-get update</"
+"literal> con anterioridad."
 
-#. type: <p></p>
-#: guide.sgml:253
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:276
 msgid ""
 "You can then go on and make your selections using [S]elect and then perform "
 "the installation using [I]nstall. When using the APT method the [C]onfig and "
@@ -9094,77 +9129,83 @@ msgstr ""
 "[C]onfig y [R]emove carecen de significado ya que la orden [I]nstall ejecuta "
 "ambos a la vez."
 
-#. type: <p></p>
-#: guide.sgml:258
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:282
 msgid ""
 "By default APT will automatically remove the package (.deb) files once they "
-"have been successfully installed. To change this behavior place <tt>Dselect::"
-"clean \"prompt\";</tt> in /etc/apt/apt.conf."
+"have been successfully installed. To change this behavior place "
+"<literal>Dselect::clean \"prompt\";</literal> in /etc/apt/apt.conf."
 msgstr ""
 "Por omisión, APT eliminará automáticamente los ficheros de paquete («.deb») "
 "una vez que se hayan instalado con éxito. Para modificar este "
-"comportamiento, inserte <tt>Dselect::clean \"prompt\";</tt> en «/etc/apt/apt."
-"conf»."
+"comportamiento, inserte <literal>Dselect::clean \"prompt\";</literal> en «/"
+"etc/apt/apt.conf»."
 
-#. type: <heading></heading>
-#: guide.sgml:264
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:288
 msgid "The Interface"
 msgstr "La interfaz"
 
-#. type: <p></p>
-#: guide.sgml:278
+#. type: Content of: <book><chapter><para><footnote><para>
+#: guide.dbk:292
+msgid ""
+"The <command>dselect</command> method actually is a set of wrapper scripts "
+"to <command>apt-get</command>. The method actually provides more "
+"functionality than is present in <command>apt-get</command> alone."
+msgstr ""
+"El método <command>dselect</command> es en realidad un conjunto de scripts "
+"en torno a <command>apt-get</command>. En realidad, el método ofrece más "
+"funcionalidad que la presente en <command>apt-get</command> por si mismo."
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:290
 msgid ""
-"Both that APT <prgn>dselect</prgn> method and <prgn>apt-get</prgn> share the "
-"same interface. It is a simple system that generally tells you what it will "
-"do and then goes and does it. <footnote><p>The <prgn>dselect</prgn> method "
-"actually is a set of wrapper scripts to <prgn>apt-get</prgn>. The method "
-"actually provides more functionality than is present in <prgn>apt-get</prgn> "
-"alone.</p></footnote> After printing out a summary of what will happen APT "
+"Both that APT <command>dselect</command> method and <command>apt-get</"
+"command> share the same interface. It is a simple system that generally "
+"tells you what it will do and then goes and does it. <placeholder type="
+"\"footnote\" id=\"0\"/> After printing out a summary of what will happen APT "
 "then will print out some informative status messages so that you can "
 "estimate how far along it is and how much is left to do."
 msgstr ""
-"El método <prgn>dselect</prgn> de APT y <prgn>apt-get</prgn> comparten la "
-"misma interfaz. Es un sencillo programa que le informa de lo que va a hacer, "
-"para después llevarlo a cabo. <footnote><p> El método <prgn>dselect</prgn> "
-"es en realidad un conjunto de scripts en torno a <prgn>apt-get</prgn>. En "
-"realidad, el método ofrece más funcionalidad que la presente en <prgn>apt-"
-"get</prgn> por si mismo. </p></footnote> Después de mostrar el resumen de lo "
-"que va a pasar APT mostrará mensajes de estado informativos para ofrecer una "
-"estimación de cuánto queda por hacer."
-
-#. type: <heading></heading>
-#: guide.sgml:280
+"El método <command>dselect</command> de APT y <command>apt-get</command> "
+"comparten la misma interfaz. Es un sencillo programa que le informa de lo "
+"que va a hacer, para después llevarlo a cabo. <placeholder type=\"footnote\" "
+"id=\"0\"/> Después de mostrar el resumen de lo que va a pasar APT mostrará "
+"mensajes de estado informativos para ofrecer una estimación de cuánto queda "
+"por hacer."
+
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:301
 msgid "Startup"
 msgstr "Arranque"
 
-#. type: <p></p>
-#: guide.sgml:284
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:303
 msgid ""
 "Before all operations except update, APT performs a number of actions to "
 "prepare its internal state. It also does some checks of the system's state. "
-"At any time these operations can be performed by running <tt>apt-get check</"
-"tt>."
+"At any time these operations can be performed by running <literal>apt-get "
+"check</literal>."
 msgstr ""
 "APT realiza un número de acciones para preparar su estado interno antes de "
 "cualquier operación, a excepción de «update». También realiza algunas "
 "revisiones del estado del sistema. Puede llevar a cabo estas acciones en "
-"cualquier momento ejecutando <tt>apt-get check</tt>."
+"cualquier momento ejecutando <literal>apt-get check</literal>."
 
-#. type: <example></example>
-#: guide.sgml:289
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:309
 #, no-wrap
 msgid ""
 "# apt-get check\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 msgstr ""
 "# apt-get check\n"
 "Leyendo lista de paquetes... Hecho\n"
-"Creando árbol de dependencias       \n"
-"Leyendo la información de estado... Hecho"
+"Creando árbol de dependencias... Hecho\n"
 
-#. type: <p></p>
-#: guide.sgml:297
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:314
 msgid ""
 "The first thing it does is read all the package files into memory. APT uses "
 "a caching scheme so this operation will be faster the second time it is run. "
@@ -9176,21 +9217,21 @@ msgstr ""
 "más rápida la segunda vez que la ejecute. De no encontrar algún fichero de "
 "paquete, éstos se ignorarán y verá una advertencia al finalizar apt-get."
 
-#. type: <p></p>
-#: guide.sgml:303
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:320
 msgid ""
 "The final operation performs a detailed analysis of the system's "
 "dependencies. It checks every dependency of every installed or unpacked "
 "package and considers if it is OK. Should this find a problem then a report "
-"will be printed out and <prgn>apt-get</prgn> will refuse to run."
+"will be printed out and <command>apt-get</command> will refuse to run."
 msgstr ""
 "La última acción realiza un detallado análisis de las dependencias del "
 "sistema. Revisa cada dependencia de cada paquete instalado o sin "
 "desempaquetar analiza su validación. En caso de error aparecerá un informe, "
-"y <prgn>apt-get</prgn> se negará a ejecutarse."
+"y <command>apt-get</command> se negará a ejecutarse."
 
-#. type: <example></example>
-#: guide.sgml:320
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:326
 #, no-wrap
 msgid ""
 "# apt-get check\n"
@@ -9200,34 +9241,33 @@ msgid ""
 "Sorry, but the following packages have unmet dependencies:\n"
 "  9fonts: Depends: xlib6g but it is not installed\n"
 "  uucp: Depends: mailx but it is not installed\n"
-"  blast: Depends: xlib6g (>= 3.3-5) but it is not installed\n"
+"  blast: Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
 "  adduser: Depends: perl-base but it is not installed\n"
 "  aumix: Depends: libgpmg1 but it is not installed\n"
 "  debiandoc-sgml: Depends: sgml-base but it is not installed\n"
-"  bash-builtins: Depends: bash (>= 2.01) but 2.0-3 is installed\n"
+"  bash-builtins: Depends: bash (&gt;= 2.01) but 2.0-3 is installed\n"
 "  cthugha: Depends: svgalibg1 but it is not installed\n"
-"           Depends: xlib6g (>= 3.3-5) but it is not installed\n"
-"  libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)"
+"           Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
+"  libreadlineg2: Conflicts:libreadline2 (&lt;&lt; 2.1-2.1)\n"
 msgstr ""
 "# apt-get check\n"
 "Leyendo lista de paquetes... Hecho\n"
-"Creando árbol de dependencias       \n"
-"Leyendo la información de estado... Hecho\n"
-"Tal vez quiera ejecutar `apt-get -f install' para corregirlo.\n"
+"Creando árbol de dependencias... Hecho\n"
+"Tal vez quiera ejecutar 'apt-get -f install' para corregirlo.\n"
 "Los siguientes paquetes tienen dependencias incumplidas:\n"
 "  9fonts: Depende: xlib6g pero no está instalado\n"
 "  uucp: Depende: mailx pero no está instalado\n"
-"  blast: Depende: xlib6g (>= 3.3-5) pero no está instalado\n"
+"  blast: Depende: xlib6g (&gt;= 3.3-5) pero no está instalado\n"
 "  adduser: Depende: perl-base pero no está instalado\n"
 "  aumix: Depende: libgpmg1 pero no está instalado\n"
 "  debiandoc-sgml: Depende: sgml-base pero no está instalado\n"
-"  bash-builtins: Depende: bash (>= 2.01) pero 2.0-3 está instalado\n"
+"  bash-builtins: Depende: bash (&gt;= 2.01) pero 2.0-3 está instalado\n"
 "  cthugha: Depende: svgalibg1 pero no está instalado\n"
-"           Depende: xlib6g (>= 3.3-5) pero no está instalado\n"
-"  libreadlineg2: Entra en conflicto:libreadline2 (<< 2.1-2.1)"
+"           Depende: xlib6g (&gt;= 3.3-5) pero no está instalado\n"
+"  libreadlineg2: Entra en conflicto:libreadline2 (&lt;&lt; 2.1-2.1)\n"
 
-#. type: <p></p>
-#: guide.sgml:329
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:343
 msgid ""
 "In this example the system has many problems, including a serious problem "
 "with libreadlineg2. For each package that has unmet dependencies a line is "
@@ -9241,86 +9281,95 @@ msgstr ""
 "dependencias no satisfechas. También incluye una explicación de porqué el "
 "paquete tiene un problema de dependencias."
 
-#. type: <p></p>
-#: guide.sgml:337
+#. type: Content of: <book><chapter><section><para><footnote><para>
+#: guide.dbk:352
+msgid ""
+"APT however considers all known dependencies and attempts to prevent broken "
+"packages"
+msgstr ""
+"APT, de todas formas, considera todas las dependencias conocidas e intenta "
+"prevenir paquetes rotos"
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:350
 msgid ""
 "There are two ways a system can get into a broken state like this. The first "
-"is caused by <prgn>dpkg</prgn> missing some subtle relationships between "
-"packages when performing upgrades. <footnote><p>APT however considers all "
-"known dependencies and attempts to prevent broken packages</p></footnote>. "
-"The second is if a package installation fails during an operation. In this "
-"situation a package may have been unpacked without its dependents being "
-"installed."
+"is caused by <command>dpkg</command> missing some subtle relationships "
+"between packages when performing upgrades. <placeholder type=\"footnote\" id="
+"\"0\"/>. The second is if a package installation fails during an operation. "
+"In this situation a package may have been unpacked without its dependents "
+"being installed."
 msgstr ""
 "Hay dos formas de que el sistema tenga un estado roto como éste. El primero "
-"es causado por la omisión de <prgn>dpkg</prgn> de ciertas relaciones "
-"delicadas entre paquetes al realizar una actualización. <footnote><p>APT, de "
-"todas formas, considera todas las dependencias conocidas e intenta prevenir "
-"paquetes rotos</p></footnote>. El segundo ocurre se la instalación de un "
-"paquete falla durante la operación. En esta situación puede que un paquete "
-"se haya desempaquetado sin que sus dependencias estuviesen instaladas "
-"previamente."
+"es causado por la omisión de <command>dpkg</command> de ciertas relaciones "
+"delicadas entre paquetes al realizar una actualización. <placeholder type="
+"\"footnote\" id=\"0\"/>. El segundo ocurre se la instalación de un paquete "
+"falla durante la operación. En esta situación puede que un paquete se haya "
+"desempaquetado sin que sus dependencias estuviesen instaladas previamente."
 
-#. type: <p></p>
-#: guide.sgml:345
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:359
 msgid ""
 "The second situation is much less serious than the first because APT places "
 "certain constraints on the order that packages are installed. In both cases "
-"supplying the <tt>-f</tt> option to <prgn>apt-get</prgn> will cause APT to "
-"deduce a possible solution to the problem and then continue on. The APT "
-"<prgn>dselect</prgn> method always supplies the <tt>-f</tt> option to allow "
-"for easy continuation of failed maintainer scripts."
+"supplying the <literal>-f</literal> option to <command>apt-get</command> "
+"will cause APT to deduce a possible solution to the problem and then "
+"continue on. The APT <command>dselect</command> method always supplies the "
+"<literal>-f</literal> option to allow for easy continuation of failed "
+"maintainer scripts."
 msgstr ""
 "La segunda situación es mucho menos grave que la primera ya que APT define "
 "ciertos límites en el orden de instalación de los paquetes. En ambos casos, "
-"introducir la opción <tt>-f</tt> a <prgn>apt-get</prgn> causará que APT "
-"deduzca una posible solución al problema para después continuar. El método "
-"<prgn>dselect</prgn> de APT siempre ofrece la opción <tt>-f</tt> para "
-"permitir una fácil continuación cuando existen scripts fallidos del "
-"mantenedor."
-
-#. type: <p></p>
-#: guide.sgml:351
-msgid ""
-"However, if the <tt>-f</tt> option is used to correct a seriously broken "
-"system caused by the first case then it is possible that it will either fail "
-"immediately or the installation sequence will fail. In either case it is "
-"necessary to manually use dpkg (possibly with forcing options) to correct "
-"the situation enough to allow APT to proceed."
-msgstr ""
-"Aún así, de usar la opción <tt>-f</tt> para corregir un sistema gravemente "
-"roto por el primer caso cabe que la acción falle inmediatamente o que la "
-"secuencia de instalación se interrumpa. En cualquier caso es necesario usar "
-"dpkg manualmente (puede que con opciones de forzado) para corregir la "
-"situación lo suficiente como para que APT pueda continuar."
-
-#. type: <heading></heading>
-#: guide.sgml:356
+"introducir la opción <literal>-f</literal> a <command>apt-get</command> "
+"causará que APT deduzca una posible solución al problema para después "
+"continuar. El método <command>dselect</command> de APT siempre ofrece la "
+"opción <literal>-f</literal> para permitir una fácil continuación cuando "
+"existen scripts fallidos del mantenedor."
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:368
+msgid ""
+"However, if the <literal>-f</literal> option is used to correct a seriously "
+"broken system caused by the first case then it is possible that it will "
+"either fail immediately or the installation sequence will fail. In either "
+"case it is necessary to manually use dpkg (possibly with forcing options) to "
+"correct the situation enough to allow APT to proceed."
+msgstr ""
+"Aún así, de usar la opción <literal>-f</literal> para corregir un sistema "
+"gravemente roto por el primer caso cabe que la acción falle inmediatamente o "
+"que la secuencia de instalación se interrumpa. En cualquier caso es "
+"necesario usar dpkg manualmente (puede que con opciones de forzado) para "
+"corregir la situación lo suficiente como para que APT pueda continuar."
+
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:376
 msgid "The Status Report"
 msgstr "El informe de estado"
 
-#. type: <p></p>
-#: guide.sgml:363
-msgid ""
-"Before proceeding <prgn>apt-get</prgn> will present a report on what will "
-"happen. Generally the report reflects the type of operation being performed "
-"but there are several common elements. In all cases the lists reflect the "
-"final state of things, taking into account the <tt>-f</tt> option and any "
-"other relevant activities to the command being executed."
-msgstr ""
-"Antes de proceder <prgn>apt-get</prgn> presentará un informe de lo que va a "
-"ocurrir. Generalmente el informe refleja el tipo de operación a realizar, "
-"pero hay ciertos elementos comunes. La lista refleja el estado final de las "
-"cosas en todos los casos, teniendo en cuenta la opción <tt>-f</tt> y "
-"cualquier otra actividad relevante a la orden ejecutada."
-
-#. type: <heading></heading>
-#: guide.sgml:364
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:378
+msgid ""
+"Before proceeding <command>apt-get</command> will present a report on what "
+"will happen. Generally the report reflects the type of operation being "
+"performed but there are several common elements. In all cases the lists "
+"reflect the final state of things, taking into account the <literal>-f</"
+"literal> option and any other relevant activities to the command being "
+"executed."
+msgstr ""
+"Antes de proceder <command>apt-get</command> presentará un informe de lo que "
+"va a ocurrir. Generalmente el informe refleja el tipo de operación a "
+"realizar, pero hay ciertos elementos comunes. La lista refleja el estado "
+"final de las cosas en todos los casos, teniendo en cuenta la opción "
+"<literal>-f</literal> y cualquier otra actividad relevante a la orden "
+"ejecutada."
+
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:385
 msgid "The Extra Package list"
 msgstr "La lista de paquetes extras"
 
-#. type: <example></example>
-#: guide.sgml:372
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:387
 #, no-wrap
 msgid ""
 "The following extra packages will be installed:\n"
@@ -9328,85 +9377,85 @@ msgid ""
 "  mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
 "  bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
 "  squake pgp-i python-base debmake ldso perl libreadlineg2\n"
-"  ssh"
+"  ssh\n"
 msgstr ""
 "Se instalarán los siguientes paquetes extras:\n"
 "  libdbd-mysql-perl xlib6 zlib1 xzx libreadline2 libdbd-msql-perl\n"
 "  mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
 "  bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
 "  squake pgp-i python-base debmake ldso perl libreadlineg2\n"
-"  ssh"
+"  ssh\n"
 
-#. type: <p></p>
-#: guide.sgml:379
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:395
 msgid ""
 "The Extra Package list shows all of the packages that will be installed or "
 "upgraded in excess of the ones mentioned on the command line. It is only "
-"generated for an <tt>install</tt> command. The listed packages are often the "
-"result of an Auto Install."
+"generated for an <literal>install</literal> command. The listed packages are "
+"often the result of an Auto Install."
 msgstr ""
 "La lista de paquetes extras muestra todos los paquetes que se van a instalar "
 "o actualizar en adición a aquellos mencionados en la línea de órdenes. Sólo "
-"se genera para la orden <tt>install</tt>. Generalmente, los paquetes "
-"listados son el resultado de una instalación automática."
+"se genera para la orden <literal>install</literal>. Generalmente, los "
+"paquetes listados son el resultado de una instalación automática."
 
-#. type: <heading></heading>
-#: guide.sgml:382
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:402
 msgid "The Packages to Remove"
 msgstr "Los paquetes a eliminar"
 
-#. type: <example></example>
-#: guide.sgml:389
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:404
 #, no-wrap
 msgid ""
 "The following packages will be REMOVED:\n"
 "  xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
 "  xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
 "  xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
-"  nas xpilot xfig"
+"  nas xpilot xfig\n"
 msgstr ""
 "Los siguientes paquetes se ELIMINARÁN:\n"
 "  xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
 "  xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
 "  xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
-"  nas xpilot xfig"
+"  nas xpilot xfig\n"
 
-#. type: <p></p>
-#: guide.sgml:399
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:411
 msgid ""
 "The Packages to Remove list shows all of the packages that will be removed "
 "from the system. It can be shown for any of the operations and should be "
 "given a careful inspection to ensure nothing important is to be taken off. "
-"The <tt>-f</tt> option is especially good at generating packages to remove "
-"so extreme care should be used in that case. The list may contain packages "
-"that are going to be removed because they are only partially installed, "
-"possibly due to an aborted installation."
+"The <literal>-f</literal> option is especially good at generating packages "
+"to remove so extreme care should be used in that case. The list may contain "
+"packages that are going to be removed because they are only partially "
+"installed, possibly due to an aborted installation."
 msgstr ""
 "La lista de paquetes a eliminar muestra todos los paquetes que se van a "
 "eliminar del sistema. Puede aparecer durante cualquier operación, y se "
 "debería revisar cuidadosamente para asegurar que no se va a eliminar nada "
-"importante. La opción <tt>-f</tt> puede generar varios paquetes a eliminar "
-"así que se debe utilizar con precaución. La lista puede contener paquetes a "
-"eliminar porque están parcialmente instalados, posiblemente debido a una "
-"instalación interrumpida."
+"importante. La opción <literal>-f</literal> puede generar varios paquetes a "
+"eliminar así que se debe utilizar con precaución. La lista puede contener "
+"paquetes a eliminar porque están parcialmente instalados, posiblemente "
+"debido a una instalación interrumpida."
 
-#. type: <heading></heading>
-#: guide.sgml:402
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:421
 msgid "The New Packages list"
 msgstr "La lista de paquetes nuevos"
 
-#. type: <example></example>
-#: guide.sgml:406
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:423
 #, no-wrap
 msgid ""
 "The following NEW packages will installed:\n"
-"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
+"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base\n"
 msgstr ""
 "Se instalarán los siguientes paquetes NUEVOS:\n"
-"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
+"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base\n"
 
-#. type: <p></p>
-#: guide.sgml:411
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:427
 msgid ""
 "The New Packages list is simply a reminder of what will happen. The packages "
 "listed are not presently installed in the system but will be when APT is "
@@ -9416,57 +9465,57 @@ msgstr ""
 "Los paquetes listados no se encuentran instalados en el sistema pero lo "
 "estarán cuando APT finalice."
 
-#. type: <heading></heading>
-#: guide.sgml:414
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:432
 msgid "The Kept Back list"
 msgstr "La lista de paquetes retenidos"
 
-#. type: <example></example>
-#: guide.sgml:419
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:434
 #, no-wrap
 msgid ""
 "The following packages have been kept back\n"
 "  compface man-db tetex-base msql libpaper svgalib1\n"
-"  gs snmp arena lynx xpat2 groff xscreensaver"
+"  gs snmp arena lynx xpat2 groff xscreensaver\n"
 msgstr ""
 "Los siguientes paquetes se han retenido:\n"
 "  compface man-db tetex-base msql libpaper svgalib1\n"
-"  gs snmp arena lynx xpat2 groff xscreensaver"
+"  gs snmp arena lynx xpat2 groff xscreensaver\n"
 
-#. type: <p></p>
-#: guide.sgml:428
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:439
 msgid ""
 "Whenever the whole system is being upgraded there is the possibility that "
 "new versions of packages cannot be installed because they require new things "
 "or conflict with already installed things. In this case the package will "
 "appear in the Kept Back list. The best way to convince packages listed there "
-"to install is with <tt>apt-get install</tt> or by using <prgn>dselect</prgn> "
-"to resolve their problems."
+"to install is with <literal>apt-get install</literal> or by using "
+"<command>dselect</command> to resolve their problems."
 msgstr ""
 "Puede que al actualizar el sistema por completo no se puedan instalar "
 "versiones nuevas de paquetes porque requieren nuevos elementos que entran en "
 "conflicto con paquetes ya instalados. En este caso, el paquete aparecerá en "
 "la lista de paquetes retenidos. La mejor manera de instalar paquetes "
-"listados aquí es mediante <tt>apt-get install</tt> o mediante <prgn>dselect</"
-"prgn> para así resolver esos problemas."
+"listados aquí es mediante <literal>apt-get install</literal> o mediante "
+"<command>dselect</command> para así resolver esos problemas."
 
-#. type: <heading></heading>
-#: guide.sgml:431
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:448
 msgid "Held Packages warning"
 msgstr "Advertencia de paquetes retenidos"
 
-#. type: <example></example>
-#: guide.sgml:435
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:450
 #, no-wrap
 msgid ""
 "The following held packages will be changed:\n"
-"  cvs"
+"  cvs\n"
 msgstr ""
 "Se cambiarán los siguientes paquetes retenidos:\n"
-"  cvs"
+"  cvs\n"
 
-#. type: <p></p>
-#: guide.sgml:441
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:454
 msgid ""
 "Sometimes you can ask APT to install a package that is on hold, in such a "
 "case it prints out a warning that the held package is going to be changed. "
@@ -9476,33 +9525,33 @@ msgstr ""
 "verá una advertencia de que el paquete retenido se va a modificar. Esto sólo "
 "debería ocurrir durante un «dist-upgrade» o un «install»."
 
-#. type: <heading></heading>
-#: guide.sgml:444
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:460
 msgid "Final summary"
 msgstr "Resumen final"
 
-#. type: <p></p>
-#: guide.sgml:447
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:462
 msgid ""
 "Finally, APT will print out a summary of all the changes that will occur."
 msgstr ""
 "Por último, APT mostrará un resumen de los cambios que se llevarán a cabo."
 
-#. type: <example></example>
-#: guide.sgml:452
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:465
 #, no-wrap
 msgid ""
 "206 packages upgraded, 8 newly installed, 23 to remove and 51 not upgraded.\n"
 "12 packages not fully installed or removed.\n"
-"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used."
+"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used.\n"
 msgstr ""
 "206 paquetes actualizados, 8 se instalarán, 23 para eliminar y 51 no\n"
 "actualizados.\n"
 "12 paquetes no instalados del todo o eliminados.\n"
-"Se necesita descargar 65.7M/66.7M de archivos. Se usarán 26.5M después de desempaquetar."
+"Se necesita descargar 65.7M/66.7M de archivos. Se usarán 26.5M después de desempaquetar.\n"
 
-#. type: <p></p>
-#: guide.sgml:470
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:470
 msgid ""
 "The first line of the summary simply is a reduced version of all of the "
 "lists and includes the number of upgrades - that is packages already "
@@ -9533,8 +9582,8 @@ msgstr ""
 "paquetes a eliminar el valor puede indicar la cantidad de espacio que se va "
 "a liberar."
 
-#. type: <p></p>
-#: guide.sgml:473
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:484
 msgid ""
 "Some other reports can be generated by using the -u option to show packages "
 "to upgrade, they are similar to the previous examples."
@@ -9542,13 +9591,13 @@ msgstr ""
 "Puede generar otros informes con la opción «-u» para mostrar los paquetes a "
 "actualizar, similar a los ejemplos anteriores."
 
-#. type: <heading></heading>
-#: guide.sgml:477
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:491
 msgid "The Status Display"
 msgstr "La pantalla de estado"
 
-#. type: <p></p>
-#: guide.sgml:481
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:493
 msgid ""
 "During the download of archives and package files APT prints out a series of "
 "status messages."
@@ -9556,8 +9605,8 @@ msgstr ""
 "APT muestra una serie de mensajes de estado en el transcurso de descargar "
 "ficheros de paquete y archivo."
 
-#. type: <example></example>
-#: guide.sgml:490
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:497
 #, no-wrap
 msgid ""
 "# apt-get update\n"
@@ -9566,7 +9615,7 @@ msgid ""
 "Hit http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
 "Get:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
 "Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
-"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s"
+"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s\n"
 msgstr ""
 "# apt-get update\n"
 "Des:1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages\n"
@@ -9574,70 +9623,73 @@ msgstr ""
 "Obj http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
 "Des:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
 "es:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
-"11% [5 testing/non-free Esperando las cabeceras 0/32.1k 0%] 2203b/s 1m52s"
+"11% [5 testing/non-free Esperando las cabeceras 0/32.1k 0%] 2203b/s 1m52s\n"
 
-#. type: <p></p>
-#: guide.sgml:500
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:506
 msgid ""
-"The lines starting with <em>Get</em> are printed out when APT begins to "
-"fetch a file while the last line indicates the progress of the download. The "
-"first percent value on the progress line indicates the total percent done of "
-"all files. Unfortunately since the size of the Package files is unknown "
-"<tt>apt-get update</tt> estimates the percent done which causes some "
-"inaccuracies."
+"The lines starting with <emphasis>Get</emphasis> are printed out when APT "
+"begins to fetch a file while the last line indicates the progress of the "
+"download. The first percent value on the progress line indicates the total "
+"percent done of all files. Unfortunately since the size of the Package files "
+"is unknown <literal>apt-get update</literal> estimates the percent done "
+"which causes some inaccuracies."
 msgstr ""
-"Las líneas comenzando con <em>Des</em> aparecen cuando APT inicia la "
-"obtención de un fichero, mientras que la última línea indica el progreso de "
-"la descarga. El primer valor porcentual en la barra de progreso indica el "
-"porcentaje total de los ficheros ya descargados. Desafortunadamente, <tt>apt-"
-"get update</tt> desconoce el tamaño de los ficheros de paquete y por ello "
-"genera una estimación que puede ser inexacta."
+"Las líneas comenzando con <emphasis>Des</emphasis> aparecen cuando APT "
+"inicia la obtención de un fichero, mientras que la última línea indica el "
+"progreso de la descarga. El primer valor porcentual en la barra de progreso "
+"indica el porcentaje total de los ficheros ya descargados. "
+"Desafortunadamente, <literal>apt-get update</literal> desconoce el tamaño de "
+"los ficheros de paquete y por ello genera una estimación que puede ser "
+"inexacta."
 
-#. type: <p></p>
-#: guide.sgml:509
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:514
 msgid ""
 "The next section of the status line is repeated once for each download "
 "thread and indicates the operation being performed and some useful "
 "information about what is happening. Sometimes this section will simply read "
-"<em>Forking</em> which means the OS is loading the download module. The "
-"first word after the [ is the fetch number as shown on the history lines. "
-"The next word is the short form name of the object being downloaded. For "
-"archives it will contain the name of the package that is being fetched."
+"<emphasis>Forking</emphasis> which means the OS is loading the download "
+"module. The first word after the [ is the fetch number as shown on the "
+"history lines. The next word is the short form name of the object being "
+"downloaded. For archives it will contain the name of the package that is "
+"being fetched."
 msgstr ""
 "La siguiente sección de la línea de estado se repite por cada instancia de "
 "descarga e indica la operación realizada, así como información útil relativa "
-"a lo que está pasando. Puede que esta sección sólo muestre <em>Forking</em>, "
-"lo cual significa que el sistema operativo está cargando el módulo de "
-"descargas. La primera palabra después de «[» es el número de obtención tal y "
-"como se muestra en la línea del histórico. La siguiente palabra es la forma "
-"corta del nombre del objeto en descarga. Al conectarse con los archivos, "
-"contendrá el nombre del paquete obtenido."
+"a lo que está pasando. Puede que esta sección sólo muestre "
+"<emphasis>Forking</emphasis>, lo cual significa que el sistema operativo "
+"está cargando el módulo de descargas. La primera palabra después de «[» es "
+"el número de obtención tal y como se muestra en la línea del histórico. La "
+"siguiente palabra es la forma corta del nombre del objeto en descarga. Al "
+"conectarse con los archivos, contendrá el nombre del paquete obtenido."
 
-#. type: <p></p>
-#: guide.sgml:524
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:524
 msgid ""
 "Inside of the single quote is an informative string indicating the progress "
 "of the negotiation phase of the download. Typically it progresses from "
-"<em>Connecting</em> to <em>Waiting for file</em> to <em>Downloading</em> or "
-"<em>Resuming</em>. The final value is the number of bytes downloaded from "
-"the remote site. Once the download begins this is represented as "
-"<tt>102/10.2k</tt> indicating that 102 bytes have been fetched and 10.2 "
-"kilobytes is expected. The total size is always shown in 4 figure notation "
-"to preserve space. After the size display is a percent meter for the file "
-"itself. The second last element is the instantaneous average speed. This "
-"values is updated every 5 seconds and reflects the rate of data transfer for "
-"that period. Finally is shown the estimated transfer time. This is updated "
-"regularly and reflects the time to complete everything at the shown transfer "
-"rate."
+"<emphasis>Connecting</emphasis> to <emphasis>Waiting for file</emphasis> to "
+"<emphasis>Downloading</emphasis> or <emphasis>Resuming</emphasis>. The final "
+"value is the number of bytes downloaded from the remote site. Once the "
+"download begins this is represented as <literal>102/10.2k</literal> "
+"indicating that 102 bytes have been fetched and 10.2 kilobytes is expected. "
+"The total size is always shown in 4 figure notation to preserve space. After "
+"the size display is a percent meter for the file itself. The second last "
+"element is the instantaneous average speed. This values is updated every 5 "
+"seconds and reflects the rate of data transfer for that period. Finally is "
+"shown the estimated transfer time. This is updated regularly and reflects "
+"the time to complete everything at the shown transfer rate."
 msgstr ""
 "Una cadena informativa aparecerá entre comillas simples indicando el "
 "progreso de la fase de negociación de la descarga. Generalmente progresa de "
-"<em>Conectando</em> a <em>Esperando fichero</em>, finalizando con "
-"<em>Descargando</em> o <em>Continuando</em>. El último valor es el número de "
-"bytes descargados desde el sitio remoto. Una vez que la descarga arranque se "
-"representará como <tt>102/10.2k</tt> indicando que ya se han obtenido 102 "
-"bytes y que se esperan 10.2 kilobytes. El tamaño total siempre aparece con "
-"la notación de la figura 4 para conservar espacio. A continuación aparece un "
+"<emphasis>Conectando</emphasis> a <emphasis>Esperando fichero</emphasis>, "
+"finalizando con <emphasis>Descargando</emphasis> o <emphasis>Continuando</"
+"emphasis>. El último valor es el número de bytes descargados desde el sitio "
+"remoto. Una vez que la descarga arranque se representará como "
+"<literal>102/10.2k</literal> indicando que ya se han obtenido 102 bytes y "
+"que se esperan 10.2 kilobytes. El tamaño total siempre aparece con la "
+"notación de la figura 4 para conservar espacio. A continuación aparece un "
 "medidor porcentual del fichero. El penúltimo elemento es la media "
 "instantánea de velocidad. Estos valores se actualizan cada 5 segundos y "
 "reflejan la tasa de descarga de datos de ese periodo. Por último puede ver "
@@ -9645,56 +9697,51 @@ msgstr ""
 "refleja el tiempo restante para completar todo tal y como se ve en la tasa "
 "de transferencia visible."
 
-#. type: <p></p>
-#: guide.sgml:530
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:539
 msgid ""
 "The status display updates every half second to provide a constant feedback "
 "on the download progress while the Get lines scroll back whenever a new file "
 "is started. Since the status display is constantly updated it is unsuitable "
-"for logging to a file, use the <tt>-q</tt> option to remove the status "
-"display."
+"for logging to a file, use the <literal>-q</literal> option to remove the "
+"status display."
 msgstr ""
 "La pantalla de estado se actualiza cada medio segundo para ofrecer una "
 "constante información del progreso de la descarga, mientras que las líneas "
 "«Des» se desplazan hacia atrás cuando se inicia la descarga de otro fichero. "
 "Ya que la pantalla de estado se actualiza constantemente carece de utilidad "
-"para su registro en un fichero. Puede usar la opción <tt>-q</tt> para omitir "
-"la pantalla de estado."
+"para su registro en un fichero. Puede usar la opción <literal>-q</literal> "
+"para omitir la pantalla de estado."
 
-#. type: <heading></heading>
-#: guide.sgml:535
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:547
 msgid "Dpkg"
 msgstr "Dpkg"
 
-#. type: <p></p>
-#: guide.sgml:542
-msgid ""
-"APT uses <prgn>dpkg</prgn> for installing the archives and will switch over "
-"to the <prgn>dpkg</prgn> interface once downloading is completed. "
-"<prgn>dpkg</prgn> will also ask a number of questions as it processes the "
-"packages and the packages themselves may also ask several questions. Before "
-"each question there is usually a description of what it is asking and the "
-"questions are too varied to discuss completely here."
-msgstr ""
-"APT usa <prgn>dpkg</prgn> para instalar ficheros, y pasará a interactuar con "
-"<prgn>dpkg</prgn> al finalizar la descarga. <prgn>dpkg</prgn> también "
-"planteará un número de preguntas a medida que procesa los paquetes, los "
-"cuales también pueden formular preguntas. A cada pregunta generalmente le "
-"precede una descripción de la pregunta en sí. Éstas son demasiado variadas "
-"como para poder tratarlas aquí en su totalidad."
-
-#. type: <title></title>
-#: offline.sgml:4
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:549
+msgid ""
+"APT uses <command>dpkg</command> for installing the archives and will switch "
+"over to the <command>dpkg</command> interface once downloading is completed. "
+"<command>dpkg</command> will also ask a number of questions as it processes "
+"the packages and the packages themselves may also ask several questions. "
+"Before each question there is usually a description of what it is asking and "
+"the questions are too varied to discuss completely here."
+msgstr ""
+"APT usa <command>dpkg</command> para instalar ficheros, y pasará a "
+"interactuar con <command>dpkg</command> al finalizar la descarga. "
+"<command>dpkg</command> también planteará un número de preguntas a medida "
+"que procesa los paquetes, los cuales también pueden formular preguntas. A "
+"cada pregunta generalmente le precede una descripción de la pregunta en sí. "
+"Éstas son demasiado variadas como para poder tratarlas aquí en su totalidad."
+
+#. type: Content of: <book><title>
+#: offline.dbk:10
 msgid "Using APT Offline"
 msgstr "Uso de APT Offline"
 
-#. type: <version></version>
-#: offline.sgml:7
-msgid "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
-msgstr "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
-
-#. type: <abstract></abstract>
-#: offline.sgml:12
+#. type: Content of: <book><bookinfo><abstract><para>
+#: offline.dbk:24
 msgid ""
 "This document describes how to use APT in a non-networked environment, "
 "specifically a 'sneaker-net' approach for performing upgrades."
@@ -9702,23 +9749,25 @@ msgstr ""
 "Este documento describe el uso de APT en un entorno sin conexión a red, "
 "específicamente una aproximación «sneaker-net» a la tarea de actualización."
 
-#. type: <copyrightsummary></copyrightsummary>
-#: offline.sgml:16
-msgid "Copyright &copy; Jason Gunthorpe, 1999."
-msgstr "Copyright &copy; Jason Gunthorpe, 1999."
+#. type: Content of: <book><bookinfo>
+#: offline.dbk:29
+msgid ""
+"<copyright><year>1999</year><holder>Jason Gunthorpe</holder></copyright>"
+msgstr ""
+"<copyright><year>1999</year><holder>Jason Gunthorpe</holder></copyright>"
 
-#. type: <heading></heading>
-#: offline.sgml:32
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:47
 msgid "Introduction"
 msgstr "Introducción"
 
-#. type: <heading></heading>
-#: offline.sgml:34 offline.sgml:65 offline.sgml:180
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:49 offline.dbk:79 offline.dbk:191
 msgid "Overview"
 msgstr "Resumen"
 
-#. type: <p></p>
-#: offline.sgml:40
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:51
 msgid ""
 "Normally APT requires direct access to a Debian archive, either from a local "
 "media or through a network. Another common complaint is that a Debian "
@@ -9731,8 +9780,8 @@ msgstr ""
 "de un módem, y otra máquina físicamente lejos dispone de una conexión muy "
 "rápida."
 
-#. type: <p></p>
-#: offline.sgml:51
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:57
 msgid ""
 "The solution to this is to use large removable media such as a Zip disc or a "
 "SuperDisk disc. These discs are not large enough to store the entire Debian "
@@ -9740,9 +9789,9 @@ msgid ""
 "to use APT to generate a list of packages that are required and then fetch "
 "them onto the disc using another machine with good connectivity. It is even "
 "possible to use another Debian machine with APT or to use a completely "
-"different OS and a download tool like wget. Let <em>remote host</em> mean "
-"the machine downloading the packages, and <em>target host</em> the one with "
-"bad or no connection."
+"different OS and a download tool like wget. Let <emphasis>remote host</"
+"emphasis> mean the machine downloading the packages, and <emphasis>target "
+"host</emphasis> the one with bad or no connection."
 msgstr ""
 "La solución a esto es usar dispositivos extraíbles de gran capacidad tales "
 "como un disco Zip o uno SuperDisk. Estos discos no tienen la suficiente "
@@ -9752,11 +9801,12 @@ msgstr ""
 "almacenarlos en un disco usando el sistema que tiene una conexión rápida. Es "
 "incluso posible usar otro sistema Debian con APT, o usar un sistema "
 "operativo totalmente distinto junto con una herramienta de descarga como "
-"wget. Digamos que el <em>sistema remoto</em> es aquél que descarga los "
-"paquetes, y <em>sistema destino</em> es aquél con poca o ninguna conexión."
+"wget. Digamos que el <emphasis>sistema remoto</emphasis> es aquél que "
+"descarga los paquetes, y <emphasis>sistema destino</emphasis> es aquél con "
+"poca o ninguna conexión."
 
-#. type: <p></p>
-#: offline.sgml:57
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:68
 msgid ""
 "This is achieved by creatively manipulating the APT configuration file. The "
 "essential premise to tell APT to look on a disc for it's archive files. Note "
@@ -9769,13 +9819,13 @@ msgstr ""
 "de un sistema de ficheros capaz de gestionar nombres largos de ficheros, "
 "tales como ext2, fat32 o vfat."
 
-#. type: <heading></heading>
-#: offline.sgml:63
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:77
 msgid "Using APT on both machines"
 msgstr "Uso de APT en ambas máquinas"
 
-#. type: <p><example>
-#: offline.sgml:71
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:81
 msgid ""
 "APT being available on both machines gives the simplest configuration. The "
 "basic idea is to place a copy of the status file on the disc and use the "
@@ -9788,8 +9838,8 @@ msgstr ""
 "paquete y decidir qué paquetes descargar. La estructura de directorios del "
 "disco debería tener este aspecto:"
 
-#. type: <example></example>
-#: offline.sgml:80
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:87
 #, no-wrap
 msgid ""
 "  /disc/\n"
@@ -9799,7 +9849,7 @@ msgid ""
 "       partial/\n"
 "    status\n"
 "    sources.list\n"
-"    apt.conf"
+"    apt.conf\n"
 msgstr ""
 "  /disc/\n"
 "    archives/\n"
@@ -9808,42 +9858,43 @@ msgstr ""
 "       partial/\n"
 "    status\n"
 "    sources.list\n"
-"    apt.conf"
+"    apt.conf\n"
 
-#. type: <heading></heading>
-#: offline.sgml:88
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:98
 msgid "The configuration file"
 msgstr "El fichero de configuración"
 
-#. type: <p></p>
-#: offline.sgml:96
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:100
 msgid ""
 "The configuration file should tell APT to store its files on the disc and to "
 "use the configuration files on the disc as well. The sources.list should "
 "contain the proper sites that you wish to use from the remote machine, and "
-"the status file should be a copy of <em>/var/lib/dpkg/status</em> from the "
-"<em>target host</em>. Please note, if you are using a local archive you must "
-"use copy URIs, the syntax is identical to file URIs."
+"the status file should be a copy of <emphasis>/var/lib/dpkg/status</"
+"emphasis> from the <emphasis>target host</emphasis>. Please note, if you are "
+"using a local archive you must use copy URIs, the syntax is identical to "
+"file URIs."
 msgstr ""
 "El fichero de configuración debería indicar a APT que guarde los ficheros en "
 "el disco, y también utilizar los ficheros de configuración en el disco. El "
 "fichero «sources.list» debería contener los sitios apropiados que desea "
 "utilizar desde el sistema remoto, y el fichero de estado debería ser una "
-"copia de <em>/var/lib/dpkg/status</em> del <em>sistema destino</em>. Tenga "
-"en cuenta que si usa un archivo local debe usar el URI «copy», de idéntica "
-"sintaxis al URI «file»."
+"copia de <emphasis>/var/lib/dpkg/status</emphasis> del <emphasis>sistema "
+"destino</emphasis>. Tenga en cuenta que si usa un archivo local debe usar el "
+"URI «copy», de idéntica sintaxis al URI «file»."
 
-#. type: <p><example>
-#: offline.sgml:100
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:108
 msgid ""
-"<em>apt.conf</em> must contain the necessary information to make APT use the "
-"disc:"
+"<emphasis>apt.conf</emphasis> must contain the necessary information to make "
+"APT use the disc:"
 msgstr ""
-"<em>apt-conf</em> debe contener toda la información necesaria para que APT "
-"use el disco:"
+"<emphasis>apt-conf</emphasis> debe contener toda la información necesaria "
+"para que APT use el disco:"
 
-#. type: <example></example>
-#: offline.sgml:124
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:112
 #, no-wrap
 msgid ""
 " APT\n"
@@ -9851,10 +9902,10 @@ msgid ""
 "   /* This is not necessary if the two machines are the same arch, it tells\n"
 "      the remote APT what architecture the target machine is */\n"
 "   Architecture \"i386\";\n"
-"   \n"
+"\n"
 "   Get::Download-Only \"true\";\n"
 " };\n"
-" \n"
+"\n"
 " Dir\n"
 " {\n"
 "   /* Use the disc for state information and redirect the status file from\n"
@@ -9865,20 +9916,20 @@ msgid ""
 "   // Binary caches will be stored locally\n"
 "   Cache::archives \"/disc/archives/\";\n"
 "   Cache \"/tmp/\";\n"
-"   \n"
+"\n"
 "   // Location of the source list.\n"
 "   Etc \"/disc/\";\n"
-" };"
+" };\n"
 msgstr ""
 " APT\n"
 " {\n"
 "   /* Esto no es necesario si ambos sistemas tienen la misma arquitectura,\n"
 "      informa al APT remoto la arquitectura del sistema destino */\n"
 "   Architecture \"i386\";\n"
-"   \n"
+"\n"
 "   Get::Download-Only \"true\";\n"
 " };\n"
-" \n"
+"\n"
 " Dir\n"
 " {\n"
 "   /* Use el disco para información de estado y redireccionar el fichero de\n"
@@ -9889,67 +9940,70 @@ msgstr ""
 "   // Los cachés binarios se guardan localmente\n"
 "   Cache::archives \"/disc/archives/\";\n"
 "   Cache \"/tmp/\";\n"
-"   \n"
+"\n"
 "   // Ubicación del fichero de fuentes.\n"
 "   Etc \"/disc/\";\n"
-" };"
+" };\n"
 
-#. type: </example></p>
-#: offline.sgml:129
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:137
 msgid ""
 "More details can be seen by examining the apt.conf man page and the sample "
-"configuration file in <em>/usr/share/doc/apt/examples/apt.conf</em>."
+"configuration file in <emphasis>/usr/share/doc/apt/examples/apt.conf</"
+"emphasis>."
 msgstr ""
 "Para más detalles consulte la página de manual y el fichero de configuración "
-"de ejemplo en <em>/usr/share/doc/apt/examples/apt.conf</em>."
+"de ejemplo en <emphasis>/usr/share/doc/apt/examples/apt.conf</emphasis>."
 
-#. type: <p><example>
-#: offline.sgml:136
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:142
 msgid ""
-"On the target machine the first thing to do is mount the disc and copy <em>/"
-"var/lib/dpkg/status</em> to it. You will also need to create the directories "
-"outlined in the Overview, <em>archives/partial/</em> and <em>lists/partial/</"
-"em>. Then take the disc to the remote machine and configure the sources."
-"list. On the remote machine execute the following:"
+"On the target machine the first thing to do is mount the disc and copy "
+"<emphasis>/var/lib/dpkg/status</emphasis> to it. You will also need to "
+"create the directories outlined in the Overview, <emphasis>archives/partial/"
+"</emphasis> and <emphasis>lists/partial/</emphasis>. Then take the disc to "
+"the remote machine and configure the sources.list. On the remote machine "
+"execute the following:"
 msgstr ""
 "Lo primero que debe hacer en el sistema destino es montar el disco y guardar "
-"en él una copia de <em>/var/lib/dpkg/status</em>. También debe crear los "
-"directorios definidos en el Resumen, <em>archives/partial/</em> y <em>lists/"
-"partial/</em>. Después, lleve el disco hasta el sistema remoto y configure "
-"«sources.list». Ejecute lo siguiente en el sistema remoto:"
-
-#. type: <example></example>
-#: offline.sgml:142
+"en él una copia de <emphasis>/var/lib/dpkg/status</emphasis>. También debe "
+"crear los directorios definidos en el Resumen, <emphasis>archives/partial/</"
+"emphasis> y <emphasis>lists/partial/</emphasis>. Después, lleve el disco "
+"hasta el sistema remoto y configure «sources.list». Ejecute lo siguiente en "
+"el sistema remoto:"
+
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:151
 #, no-wrap
 msgid ""
 " # export APT_CONFIG=\"/disc/apt.conf\"\n"
 " # apt-get update\n"
 " [ APT fetches the package files ]\n"
 " # apt-get dist-upgrade\n"
-" [ APT fetches all the packages needed to upgrade the target machine ]"
+" [ APT fetches all the packages needed to upgrade the target machine ]\n"
 msgstr ""
 " # export APT_CONFIG=\"/disc/apt.conf\"\n"
 " # apt-get update\n"
 " [ APT obtiene los ficheros de paquete ]\n"
 " # apt-get dist-upgrade\n"
 " [ APT obtiene todos los paquetes necesarios para actualizar el sistema\n"
-" destino ]"
+" destino ]\n"
 
-#. type: </example></p>
-#: offline.sgml:149
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:158
 msgid ""
 "The dist-upgrade command can be replaced with any other standard APT "
 "commands, particularly dselect-upgrade. You can even use an APT front end "
-"such as <em>dselect</em>. However this presents a problem in communicating "
-"your selections back to the local computer."
+"such as <emphasis>dselect</emphasis>. However this presents a problem in "
+"communicating your selections back to the local computer."
 msgstr ""
 "Puede reemplazar la orden «dist-upgrade» con cualquiera otra orden estándar "
 "de APT, en especial «dselect-upgrade». Incluso puede usar una interfaz de "
-"APT como <em>dselect</em>. Sin embargo, esto presenta un problema al "
-"informar después de sus selecciones al sistema remoto."
+"APT como <emphasis>dselect</emphasis>. Sin embargo, esto presenta un "
+"problema al informar después de sus selecciones al sistema remoto."
 
-#. type: <p><example>
-#: offline.sgml:153
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:164
 msgid ""
 "Now the disc contains all of the index files and archives needed to upgrade "
 "the target machine. Take the disc back and run:"
@@ -9957,24 +10011,24 @@ msgstr ""
 "Ahora el disco contiene todos los ficheros de índice y archivo necesarios "
 "para actualizar el sistema destino. Inserte el disco otra vez y ejecute:"
 
-#. type: <example></example>
-#: offline.sgml:159
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:168
 #, no-wrap
 msgid ""
 "  # export APT_CONFIG=\"/disc/apt.conf\"\n"
 "  # apt-get check\n"
 "  [ APT generates a local copy of the cache files ]\n"
 "  # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
-"  [ Or any other APT command ]"
+"  [ Or any other APT command ]\n"
 msgstr ""
 "  # export APT_CONFIG=\"/disc/apt.conf\"\n"
 "  # apt-get check\n"
 "  [ APT genera una copia local de los ficheros de caché ]\n"
 "  # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
-"  [ O cualquiera otra orden de APT ]"
+"  [ O cualquiera otra orden de APT ]\n"
 
-#. type: <p></p>
-#: offline.sgml:165
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:175
 msgid ""
 "It is necessary for proper function to re-specify the status file to be the "
 "local one. This is very important!"
@@ -9982,8 +10036,8 @@ msgstr ""
 "Para un correcto funcionamiento debe definir nuevamente el fichero de estado "
 "local. Tiene una importancia crucial."
 
-#. type: <p></p>
-#: offline.sgml:172
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:179
 msgid ""
 "If you are using dselect you can do the very risky operation of copying disc/"
 "status to /var/lib/dpkg/status so that any selections you made on the remote "
@@ -9997,24 +10051,25 @@ msgstr ""
 "en el sistema local, aunque puede que no sea posible. NO copie el fichero de "
 "estado si dpkg o APT se han ejecutado mientras tanto."
 
-#. type: <heading></heading>
-#: offline.sgml:178
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:189
 msgid "Using APT and wget"
 msgstr "Uso de APT y wget"
 
-#. type: <p></p>
-#: offline.sgml:185
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:193
 msgid ""
-"<em>wget</em> is a popular and portable download tool that can run on nearly "
-"any machine. Unlike the method above this requires that the Debian machine "
-"already has a list of available packages."
+"<emphasis>wget</emphasis> is a popular and portable download tool that can "
+"run on nearly any machine. Unlike the method above this requires that the "
+"Debian machine already has a list of available packages."
 msgstr ""
-"<em>wget</em> es una herramienta de descarga muy popular que funciona "
-"prácticamente en cualquier sistema. A diferencia del método anterior, "
-"requiere que el sistema Debian tenga una lista de paquetes disponibles."
+"<emphasis>wget</emphasis> es una herramienta de descarga muy popular que "
+"funciona prácticamente en cualquier sistema. A diferencia del método "
+"anterior, requiere que el sistema Debian tenga una lista de paquetes "
+"disponibles."
 
-#. type: <p></p>
-#: offline.sgml:190
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:198
 msgid ""
 "The basic idea is to create a disc that has only the archive files "
 "downloaded from the remote site. This is done by using the --print-uris "
@@ -10026,13 +10081,13 @@ msgstr ""
 "get «--print-uris», para después preparar un script de wget que finalmente "
 "obtendrá los paquetes."
 
-#. type: <heading></heading>
-#: offline.sgml:196
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:204
 msgid "Operation"
 msgstr "Operación"
 
-#. type: <p><example>
-#: offline.sgml:200
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:206
 msgid ""
 "Unlike the previous technique no special configuration files are required. "
 "We merely use the standard APT commands to generate the file list."
@@ -10041,23 +10096,23 @@ msgstr ""
 "configuración especial. Solo se utilizan órdenes estándar de APT para "
 "generar el fichero con la lista."
 
-#. type: <example></example>
-#: offline.sgml:205
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:210
 #, no-wrap
 msgid ""
-" # apt-get dist-upgrade \n"
+" # apt-get dist-upgrade\n"
 " [ Press no when prompted, make sure you are happy with the actions ]\n"
-" # apt-get -qq --print-uris dist-upgrade > uris\n"
-" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
+" # apt-get -qq --print-uris dist-upgrade &gt; uris\n"
+" # awk '{print \"wget -O \" $2 \" \" $1}' &lt; uris &gt; /disc/wget-script\n"
 msgstr ""
 " # apt-get dist-upgrade \n"
 " [ Pulse no cuando se le pregunte, asegúrese de estar conforme con las\n"
 " acciones ]\n"
-" # apt-get -qq --print-uris dist-upgrade > uris\n"
-" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
+" # apt-get -qq --print-uris dist-upgrade &gt; uris\n"
+" # awk '{print \"wget -O \" $2 \" \" $1}' &lt; uris &gt; /disc/wget-script\n"
 
-#. type: </example></p>
-#: offline.sgml:210
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:216
 msgid ""
 "Any command other than dist-upgrade could be used here, including dselect-"
 "upgrade."
@@ -10065,8 +10120,8 @@ msgstr ""
 "Se puede utilizar cualquier otra orden aparte de «dist-upgrade», incluyendo "
 "«dselect-upgrade»."
 
-#. type: <p></p>
-#: offline.sgml:216
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:220
 msgid ""
 "The /disc/wget-script file will now contain a list of wget commands to "
 "execute in order to fetch the necessary archives. This script should be run "
@@ -10078,25 +10133,25 @@ msgstr ""
 "ejecutar en el directorio del punto de montaje del disco para poder guardar "
 "la salida en el disco."
 
-#. type: <p><example>
-#: offline.sgml:219
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:226
 msgid "The remote machine would do something like"
 msgstr "El sistema remoto haría algo como"
 
-#. type: <example></example>
-#: offline.sgml:223
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:229
 #, no-wrap
 msgid ""
 "  # cd /disc\n"
 "  # sh -x ./wget-script\n"
-"  [ wait.. ]"
+"  [ wait.. ]\n"
 msgstr ""
 "  # cd /disc\n"
 "  # sh -x ./wget-script\n"
-"  [ wait.. ]"
+"  [ wait.. ]\n"
 
-#. type: </example><example>
-#: offline.sgml:228
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:234
 msgid ""
 "Once the archives are downloaded and the disc returned to the Debian machine "
 "installation can proceed using,"
@@ -10104,14 +10159,14 @@ msgstr ""
 "Una vez que los archivos se han descargado y el disco está finalmente "
 "conectado al sistema Debian, ejecute la instalación con lo siguiente."
 
-#. type: <example></example>
-#: offline.sgml:230
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:238
 #, no-wrap
-msgid "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
-msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
+msgid "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
+msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 
-#. type: </example></p>
-#: offline.sgml:234
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:241
 msgid "Which will use the already fetched archives on the disc."
 msgstr "Esto utiliza los archivos del disco previamente obtenidos."
 
diff --git a/doc/po/fr.po b/doc/po/fr.po
index 27990540..1fabc54d 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-04-01 14:24+0200\n"
-"PO-Revision-Date: 2014-04-01 14:00+0200\n"
+"POT-Creation-Date: 2014-07-10 10:52+0200\n"
+"PO-Revision-Date: 2014-07-04 01:28+0200\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "Language: fr\n"
@@ -785,7 +785,7 @@ msgstr ""
 #: apt.8.xml:145
 msgid ""
 "The <command>apt</command> command is meant to be pleasant for end users and "
-"does not need to be backward compatilbe like &apt-get;. Therefore some "
+"does not need to be backward compatible like &apt-get;. Therefore some "
 "options are different:"
 msgstr ""
 
@@ -793,7 +793,7 @@ msgstr ""
 #: apt.8.xml:151
 #, fuzzy
 #| msgid "the <literal>Package:</literal> line"
-msgid "The option <literal>DPkgPM::Progress-Fancy</literal> is enabled."
+msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
 msgstr "la ligne <literal>Package:</literal>"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
@@ -822,7 +822,7 @@ msgstr "La ligne <literal>Archive:</literal> ou <literal>Suite:</literal>"
 #. type: Content of: <refentry><refsect1><title>
 #: apt.8.xml:174 apt-get.8.xml:558 apt-cache.8.xml:352 apt-key.8.xml:197
 #: apt-mark.8.xml:133 apt-secure.8.xml:193 apt-cdrom.8.xml:154
-#: apt-config.8.xml:111 apt.conf.5.xml:1227 apt_preferences.5.xml:707
+#: apt-config.8.xml:111 apt.conf.5.xml:1228 apt_preferences.5.xml:707
 #: sources.list.5.xml:280 apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65
 #: apt-ftparchive.1.xml:609
 msgid "See Also"
@@ -1804,13 +1804,13 @@ msgid ""
 "Show user friendly progress information in the terminal window when packages "
 "are installed, upgraded or removed. For a machine parsable version of this "
 "data see README.progress-reporting in the apt doc directory.  Configuration "
-"Item: <literal>DpkgPM::Progress</literal> and <literal>Dpkg::Progress-Fancy</"
+"Item: <literal>Dpkg::Progress</literal> and <literal>Dpkg::Progress-Fancy</"
 "literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml:548 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127
-#: apt.conf.5.xml:1221 apt_preferences.5.xml:700
+#: apt.conf.5.xml:1222 apt_preferences.5.xml:700
 msgid "Files"
 msgstr "Fichiers"
 
@@ -3022,10 +3022,10 @@ msgstr ""
 #: apt-secure.8.xml:195
 msgid ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
 msgstr ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml:199
@@ -4598,15 +4598,27 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:607
+#, fuzzy
+#| msgid ""
+#| "<literal>Dir::Cache</literal> contains locations pertaining to local "
+#| "cache information, such as the two package caches <literal>srcpkgcache</"
+#| "literal> and <literal>pkgcache</literal> as well as the location to place "
+#| "downloaded archives, <literal>Dir::Cache::archives</literal>. Generation "
+#| "of caches can be turned off by setting their names to the empty string. "
+#| "This will slow down startup but save disk space. It is probably "
+#| "preferable to turn off the pkgcache rather than the srcpkgcache. Like "
+#| "<literal>Dir::State</literal> the default directory is contained in "
+#| "<literal>Dir::Cache</literal>"
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
 "and <literal>pkgcache</literal> as well as the location to place downloaded "
 "archives, <literal>Dir::Cache::archives</literal>. Generation of caches can "
-"be turned off by setting their names to the empty string. This will slow "
+"be turned off by setting <literal>pkgcache</literal> or "
+"<literal>srcpkgcache</literal> to <literal>\"\"</literal>.  This will slow "
 "down startup but save disk space. It is probably preferable to turn off the "
-"pkgcache rather than the srcpkgcache. Like <literal>Dir::State</literal> the "
-"default directory is contained in <literal>Dir::Cache</literal>"
+"pkgcache rather than the srcpkgcache.  Like <literal>Dir::State</literal> "
+"the default directory is contained in <literal>Dir::Cache</literal>"
 msgstr ""
 "<literal>Dir::Cache</literal> contient les emplacements qui renseignent sur "
 "le cache local : par exemple, les deux caches de paquets "
@@ -4620,7 +4632,7 @@ msgstr ""
 "Cache</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:616
+#: apt.conf.5.xml:617
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4635,7 +4647,7 @@ msgstr ""
 "fichier de configuration indiqué par la variable <envar>APT_CONFIG</envar>)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:622
+#: apt.conf.5.xml:623
 msgid ""
 "The <literal>Dir::Parts</literal> setting reads in all the config fragments "
 "in lexical order from the directory specified. After this is done then the "
@@ -4646,7 +4658,7 @@ msgstr ""
 "configuration est chargé."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:626
+#: apt.conf.5.xml:627
 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4664,7 +4676,7 @@ msgstr ""
 "programmes correspondants."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:634
+#: apt.conf.5.xml:635
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4686,7 +4698,7 @@ msgstr ""
 "staging/var/lib/dpkg/status</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:647
+#: apt.conf.5.xml:648
 msgid ""
 "The <literal>Ignore-Files-Silently</literal> list can be used to specify "
 "which files APT should silently ignore while parsing the files in the "
@@ -4704,12 +4716,12 @@ msgstr ""
 "est possible d'utiliser la syntaxe des expressions rationnelles."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:656
+#: apt.conf.5.xml:657
 msgid "APT in DSelect"
 msgstr "APT et DSelect"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:658
+#: apt.conf.5.xml:659
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behavior. These are in the <literal>DSelect</literal> "
@@ -4720,7 +4732,7 @@ msgstr ""
 "<literal>DSelect</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:663
+#: apt.conf.5.xml:664
 msgid ""
 "Cache Clean mode; this value may be one of <literal>always</literal>, "
 "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -4743,7 +4755,7 @@ msgstr ""
 "avant de récupérer de nouveaux paquets."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:677
+#: apt.conf.5.xml:678
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the install phase."
@@ -4752,7 +4764,7 @@ msgstr ""
 "&apt-get; lors de la phase d'installation."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:682
+#: apt.conf.5.xml:683
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the update phase."
@@ -4761,7 +4773,7 @@ msgstr ""
 "&apt-get; lors de la phase de mise à jour."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:687
+#: apt.conf.5.xml:688
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
@@ -4771,12 +4783,12 @@ msgstr ""
 "d'erreur que l'on propose à l'utilisateur d'intervenir."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:693
+#: apt.conf.5.xml:694
 msgid "How APT calls &dpkg;"
 msgstr "Méthode d'appel de &dpkg; par APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:694
+#: apt.conf.5.xml:695
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
@@ -4785,7 +4797,7 @@ msgstr ""
 "&dpkg; : elles figurent dans la section <literal>DPkg</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:699
+#: apt.conf.5.xml:700
 msgid ""
 "This is a list of options to pass to &dpkg;. The options must be specified "
 "using the list notation and each list item is passed as a single argument to "
@@ -4796,7 +4808,7 @@ msgstr ""
 "est passé comme un seul paramètre à &dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:705
+#: apt.conf.5.xml:706
 msgid ""
 "This is a list of shell commands to run before/after invoking &dpkg;.  Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -4809,7 +4821,7 @@ msgstr ""
 "<filename>/bin/sh</filename> : APT s'arrête dès que l'une d'elles échoue."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:712
+#: apt.conf.5.xml:713
 #, fuzzy
 #| msgid ""
 #| "This is a list of shell commands to run before invoking &dpkg;. Like "
@@ -4833,7 +4845,7 @@ msgstr ""
 "qu'il va installer, à raison d'un par ligne."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:719
+#: apt.conf.5.xml:720
 #, fuzzy
 #| msgid ""
 #| "Version 2 of this protocol dumps more information, including the protocol "
@@ -4855,7 +4867,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:724
+#: apt.conf.5.xml:725
 msgid ""
 "The version of the protocol to be used for the command "
 "<literal><replaceable>cmd</replaceable></literal> can be chosen by setting "
@@ -4866,7 +4878,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:731
+#: apt.conf.5.xml:732
 msgid ""
 "The file descriptor to be used to send the information can be requested with "
 "<literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::InfoFD</"
@@ -4877,7 +4889,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:741
+#: apt.conf.5.xml:742
 msgid ""
 "APT chdirs to this directory before invoking &dpkg;, the default is "
 "<filename>/</filename>."
@@ -4886,7 +4898,7 @@ msgstr ""
 "le répertoire <filename>/</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:746
+#: apt.conf.5.xml:747
 msgid ""
 "These options are passed to &dpkg-buildpackage; when compiling packages; the "
 "default is to disable signing and produce all binaries."
@@ -4896,14 +4908,14 @@ msgstr ""
 "créés."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:751
+#: apt.conf.5.xml:752
 msgid "dpkg trigger usage (and related options)"
 msgstr ""
 "utilisation des actions différées (« triggers ») de dpkg (et options "
 "associées)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:752
+#: apt.conf.5.xml:753
 msgid ""
 "APT can call &dpkg; in such a way as to let it make aggressive use of "
 "triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
@@ -4930,7 +4942,7 @@ msgstr ""
 "pendant la configuration des paquets."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:767
+#: apt.conf.5.xml:768
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -4944,7 +4956,7 @@ msgstr ""
 "DPkg::TriggersPending \"true\";"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:761
+#: apt.conf.5.xml:762
 msgid ""
 "Note that it is not guaranteed that APT will support these options or that "
 "these options will not cause (big) trouble in the future. If you have "
@@ -4968,7 +4980,7 @@ msgstr ""
 "<placeholder type=\"literallayout\" id=\"0\"/>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:774
+#: apt.conf.5.xml:775
 msgid ""
 "Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
 "call).  See &dpkg; if you are interested in what this actually means. In "
@@ -4991,7 +5003,7 @@ msgstr ""
 "options « unpack » et « remove »."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:782
+#: apt.conf.5.xml:783
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
@@ -5021,7 +5033,7 @@ msgstr ""
 "configuré et donc éventuellement non amorçable."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:797
+#: apt.conf.5.xml:798
 msgid ""
 "If this option is set APT will call <command>dpkg --configure --pending</"
 "command> to let &dpkg; handle all required configurations and triggers. This "
@@ -5040,7 +5052,7 @@ msgstr ""
 "peut conserver l'option active."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:804
+#: apt.conf.5.xml:805
 msgid ""
 "Useful for the <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal>, and "
@@ -5058,7 +5070,7 @@ msgstr ""
 "celles concernant le paquet en cours de traitement."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:817
+#: apt.conf.5.xml:818
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -5076,7 +5088,7 @@ msgstr ""
 "};"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:810
+#: apt.conf.5.xml:811
 msgid ""
 "Essential packages (and their dependencies) should be configured immediately "
 "after unpacking. It is a good idea to do this quite early in the upgrade "
@@ -5102,12 +5114,12 @@ msgstr ""
 "id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:830
+#: apt.conf.5.xml:831
 msgid "Periodic and Archives options"
 msgstr "Options « Periodic » et « Archive »"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:831
+#: apt.conf.5.xml:832
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by the "
@@ -5119,12 +5131,12 @@ msgstr ""
 "script <literal>/etc/cron.daily/apt</literal>, lancé quotidiennement."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:839
+#: apt.conf.5.xml:840
 msgid "Debug options"
 msgstr "Les options de débogage"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:841
+#: apt.conf.5.xml:842
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -5142,7 +5154,7 @@ msgstr ""
 "peuvent tout de même être utiles :"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:852
+#: apt.conf.5.xml:853
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -5153,7 +5165,7 @@ msgstr ""
 "upgrade, upgrade, install, remove et purge</literal>."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:860
+#: apt.conf.5.xml:861
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"
@@ -5165,7 +5177,7 @@ msgstr ""
 "superutilisateur."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:869
+#: apt.conf.5.xml:870
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -5177,7 +5189,7 @@ msgstr ""
 #. 	   motivating example, except I haven't a clue why you'd want
 #. 	   to do this. 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:877
+#: apt.conf.5.xml:878
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CD-ROM IDs."
@@ -5186,12 +5198,12 @@ msgstr ""
 "type statfs dans les identifiants de CD."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:887
+#: apt.conf.5.xml:888
 msgid "A full list of debugging options to apt follows."
 msgstr "Liste complète des options de débogage de APT :"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:896
+#: apt.conf.5.xml:897
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
@@ -5199,24 +5211,24 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:907
+#: apt.conf.5.xml:908
 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 "Affiche les informations concernant le téléchargement de paquets par FTP."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:918
+#: apt.conf.5.xml:919
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 "Affiche les informations concernant le téléchargement de paquets par HTTP."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:929
+#: apt.conf.5.xml:930
 msgid "Print information related to downloading packages using HTTPS."
 msgstr "Print information related to downloading packages using HTTPS."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:940
+#: apt.conf.5.xml:941
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
@@ -5225,7 +5237,7 @@ msgstr ""
 "cryptographiques avec <literal>gpg</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:951
+#: apt.conf.5.xml:952
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
@@ -5234,14 +5246,14 @@ msgstr ""
 "stockées sur CD."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:961
+#: apt.conf.5.xml:962
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 "Décrit le processus de résolution des dépendances pour la construction de "
 "paquets source ( « build-dependencies » ) par &apt-get;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:971
+#: apt.conf.5.xml:972
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
@@ -5250,7 +5262,7 @@ msgstr ""
 "librairies d'<literal>apt</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:981
+#: apt.conf.5.xml:982
 msgid ""
 "Do not include information from <literal>statfs</literal>, namely the number "
 "of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -5261,7 +5273,7 @@ msgstr ""
 "utilisés sur le système de fichier du CD."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:992
+#: apt.conf.5.xml:993
 msgid ""
 "Disable all file locking.  For instance, this will allow two instances of "
 "<quote><literal>apt-get update</literal></quote> to run at the same time."
@@ -5271,14 +5283,14 @@ msgstr ""
 "temps."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1004
+#: apt.conf.5.xml:1005
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 "Trace les ajouts et suppressions d'éléments de la queue globale de "
 "téléchargement."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1014
+#: apt.conf.5.xml:1015
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
@@ -5288,7 +5300,7 @@ msgstr ""
 "éventuelles."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1024
+#: apt.conf.5.xml:1025
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
@@ -5298,7 +5310,7 @@ msgstr ""
 "éventuelles."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1036
+#: apt.conf.5.xml:1037
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
@@ -5308,7 +5320,7 @@ msgstr ""
 "place des fichiers complets."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1047
+#: apt.conf.5.xml:1048
 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
@@ -5316,7 +5328,7 @@ msgstr ""
 "effectivement des téléchargements."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1058
+#: apt.conf.5.xml:1059
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
@@ -5325,7 +5337,7 @@ msgstr ""
 "automatiquement, et la suppression des paquets inutiles."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1068
+#: apt.conf.5.xml:1069
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
@@ -5340,7 +5352,7 @@ msgstr ""
 "de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1082
+#: apt.conf.5.xml:1083
 msgid ""
 "Generate debug messages describing which packages are marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
@@ -5376,7 +5388,7 @@ msgstr ""
 "de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1103
+#: apt.conf.5.xml:1104
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
@@ -5385,7 +5397,7 @@ msgstr ""
 "paramètres sont séparés par des espaces."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1114
+#: apt.conf.5.xml:1115
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
@@ -5395,7 +5407,7 @@ msgstr ""
 "fichier."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1125
+#: apt.conf.5.xml:1126
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
@@ -5404,18 +5416,18 @@ msgstr ""
 "<literal>apt</literal> passe les paquets à &dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1137
+#: apt.conf.5.xml:1138
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr "Affiche le détail des opérations liées à l'invocation de &dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1148
+#: apt.conf.5.xml:1149
 msgid "Output the priority of each package list on startup."
 msgstr "Affiche, au lancement, la priorité de chaque liste de paquets."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1158
+#: apt.conf.5.xml:1159
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
@@ -5424,7 +5436,7 @@ msgstr ""
 "concerne que les cas où un problème de dépendances complexe se présente)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1169
+#: apt.conf.5.xml:1170
 msgid ""
 "Display a list of all installed packages with their calculated score used by "
 "the pkgProblemResolver. The description of the package is the same as "
@@ -5435,7 +5447,7 @@ msgstr ""
 "est décrite dans <literal>Debug::pkgDepCache::Marker</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1181
+#: apt.conf.5.xml:1182
 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
@@ -5444,7 +5456,7 @@ msgstr ""
 "list</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1191
+#: apt.conf.5.xml:1192
 msgid ""
 "Display the external commands that are called by apt hooks.  This includes e."
 "g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or "
@@ -5452,13 +5464,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1215 apt_preferences.5.xml:547 sources.list.5.xml:239
+#: apt.conf.5.xml:1216 apt_preferences.5.xml:547 sources.list.5.xml:239
 #: apt-ftparchive.1.xml:598
 msgid "Examples"
 msgstr "Exemples"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1216
+#: apt.conf.5.xml:1217
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -5468,7 +5480,7 @@ msgstr ""
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1228
+#: apt.conf.5.xml:1229
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
 
@@ -8506,36 +8518,53 @@ msgstr ""
 "<command>apt-ftparchive</command> retourne zéro si tout se passe bien, le "
 "nombre 100 en cas d'erreur."
 
-#. type: <title></title>
-#: guide.sgml:4
+#. type: Attribute 'lang' of: <book>
+#: guide.dbk:8 offline.dbk:8
+msgid "en"
+msgstr "fr"
+
+#. type: Content of: <book><title>
+#: guide.dbk:10
 msgid "APT User's Guide"
 msgstr "Guide d'utilisation d'APT"
 
-#. type: <author></author>
-#: guide.sgml:6 offline.sgml:6
-msgid "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
-msgstr "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
+#. type: Content of: <book><bookinfo><authorgroup><author><personname>
+#: guide.dbk:16 offline.dbk:16
+msgid "Jason Gunthorpe"
+msgstr "Jason Gunthorpe"
+
+#. type: Content of: <book><bookinfo><authorgroup><author><email>
+#: guide.dbk:16 offline.dbk:16
+msgid "jgg@debian.org"
+msgstr "jgg@debian.org"
 
-#. type: <version></version>
-#: guide.sgml:7
-msgid "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
-msgstr "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
+#. type: Content of: <book><bookinfo><releaseinfo>
+#: guide.dbk:20 offline.dbk:20
+msgid "Version &apt-product-version;"
+msgstr ""
 
-#. type: <abstract></abstract>
-#: guide.sgml:11
+#. type: Content of: <book><bookinfo><abstract><para>
+#: guide.dbk:24
 msgid ""
 "This document provides an overview of how to use the the APT package manager."
 msgstr ""
 "Ce document fournit un aperçu des méthode d'utilisation du gestionnaire de "
 "paquets APT."
 
-#. type: <copyrightsummary></copyrightsummary>
-#: guide.sgml:15
-msgid "Copyright &copy; Jason Gunthorpe, 1998."
-msgstr "Copyright &copy; Jason Gunthorpe, 1998."
+#. type: Content of: <book><bookinfo>
+#: guide.dbk:28
+msgid ""
+"<copyright><year>1998</year><holder>Jason Gunthorpe</holder></copyright>"
+msgstr ""
+"<copyright><year>1998</year><holder>Jason Gunthorpe</holder></copyright>"
+
+#. type: Content of: <book><bookinfo><legalnotice><title>
+#: guide.dbk:31 offline.dbk:32
+msgid "License Notice"
+msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:21 offline.sgml:22
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: guide.dbk:33 offline.dbk:34
 msgid ""
 "\"APT\" and this document are free software; you can redistribute them and/"
 "or modify them under the terms of the GNU General Public License as "
@@ -8547,8 +8576,8 @@ msgstr ""
 "telle que publiée par la Free Software Foundation, en version 2 ou "
 "ultérieure."
 
-#. type: <p></p>
-#: guide.sgml:24 offline.sgml:25
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: guide.dbk:42 offline.dbk:40
 msgid ""
 "For more details, on Debian systems, see the file /usr/share/common-licenses/"
 "GPL for the full license."
@@ -8556,31 +8585,32 @@ msgstr ""
 "Les détails complets de cette licence sont, sur les systèmes Debian GNU/"
 "Linux, consultables dans le fichier usr/share/common-licenses/GPL."
 
-#. type: <heading></heading>
-#: guide.sgml:32
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:49
 msgid "General"
 msgstr "Généralités"
 
-#. type: <p></p>
-#: guide.sgml:38
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:51
 msgid ""
-"The APT package currently contains two sections, the APT <prgn>dselect</"
-"prgn> method and the <prgn>apt-get</prgn> command line user interface. Both "
-"provide a way to install and remove packages as well as download new "
-"packages from the Internet."
+"The APT package currently contains two sections, the APT <command>dselect</"
+"command> method and the <command>apt-get</command> command line user "
+"interface. Both provide a way to install and remove packages as well as "
+"download new packages from the Internet."
 msgstr ""
 "Le paquet APT comporte actuellement deux parties : la méthode APT pour "
-"<prgn>dselect</prgn> et l'interface en ligne de commande <prgn>apt-get</"
-"prgn>. Les deux fournissent des méthodes d'installation et de suppression de "
-"paquets ainsi que de téléchargement de nouveaux paquets par Internet."
+"<command>dselect</command> et l'interface en ligne de commande <command>apt-"
+"get</command>. Les deux fournissent des méthodes d'installation et de "
+"suppression de paquets ainsi que de téléchargement de nouveaux paquets par "
+"Internet."
 
-#. type: <heading></heading>
-#: guide.sgml:39
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:57
 msgid "Anatomy of the Package System"
 msgstr "Anatomie du système de gestion des paquets"
 
-#. type: <p></p>
-#: guide.sgml:44
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:59
 msgid ""
 "The Debian packaging system has a large amount of information associated "
 "with each package to help assure that it integrates cleanly and easily into "
@@ -8591,8 +8621,8 @@ msgstr ""
 "proprement et facilement sur le système. Une des fonctionnalités les plus "
 "immédiatement visibles est le système de gestion des dépendances."
 
-#. type: <p></p>
-#: guide.sgml:52
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:64
 msgid ""
 "The dependency system allows individual programs to make use of shared "
 "elements in the system such as libraries. It simplifies placing infrequently "
@@ -8608,8 +8638,8 @@ msgstr ""
 "d'effectuer des choix parmi les divers agents de transport de courrier "
 "électronique, les serveurs X et d'autres cxomposants du système."
 
-#. type: <p></p>
-#: guide.sgml:57
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:71
 msgid ""
 "The first step to understanding the dependency system is to grasp the "
 "concept of a simple dependency. The meaning of a simple dependency is that a "
@@ -8621,8 +8651,8 @@ msgstr ""
 "est le cas où un paquet donné a besoin qu'un autre paquet soit installé "
 "simultanément pour pouvoir fonctionner correctement."
 
-#. type: <p></p>
-#: guide.sgml:63
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:76
 msgid ""
 "For instance, mailcrypt is an emacs extension that aids in encrypting email "
 "with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a "
@@ -8635,8 +8665,8 @@ msgstr ""
 "plus, étant une extension à Emacs sans lequel il est totalement inutile, il "
 "a une dépendance simple sur emacs."
 
-#. type: <p></p>
-#: guide.sgml:73
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:82
 msgid ""
 "The other important dependency to understand is a conflicting dependency. It "
 "means that a package, when installed with another package, will not work and "
@@ -8659,8 +8689,8 @@ msgstr ""
 "courrier électronique soient établis comme étant en conflit les uns avec les "
 "autres."
 
-#. type: <p></p>
-#: guide.sgml:83
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:92
 msgid ""
 "As an added complication there is the possibility for a package to pretend "
 "to be another package. Consider that exim and sendmail for many intents are "
@@ -8682,8 +8712,8 @@ msgstr ""
 "paquet « mail-transprot-agent ». Cette fonctionnalité utile peut toutefois "
 "rendre la correction de certains défauts des paquets plus complexe."
 
-#. type: <p></p>
-#: guide.sgml:88
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:102
 msgid ""
 "At any given time a single dependency may be met by packages that are "
 "already installed or it may not be. APT attempts to help resolve dependency "
@@ -8695,81 +8725,87 @@ msgstr ""
 "problèmes de dépendances par l'intermédiaire d'un certain nombre "
 "d'algorithmes automatiques qui simplifient le choix des paquets à installer."
 
-#. type: <heading></heading>
-#: guide.sgml:96
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:111
 msgid "apt-get"
 msgstr "apt-get"
 
-#. type: <p></p>
-#: guide.sgml:102
-msgid ""
-"<prgn>apt-get</prgn> provides a simple way to install packages from the "
-"command line. Unlike <prgn>dpkg</prgn>, <prgn>apt-get</prgn> does not "
-"understand .deb files, it works with the package's proper name and can only "
-"install .deb archives from a <em>Source</em>."
-msgstr ""
-"Le programme <prgn>apt-get</prgn> offre une méthode simple pour installer "
-"des paquets à la ligne de commande. À la différence de <prgn>dpkg</prgn>, "
-"<prgn>apt-get</prgn> ne gère pas directement les fichiers .deb files. Il "
-"travaille avec le nom des paquets et ne peut installer les archives .deb que "
-"depuis une <em>Source</em>."
-
-#. type: <p></p>
-#: guide.sgml:109
-msgid ""
-"The first <footnote><p>If you are using an http proxy server you must set "
-"the http_proxy environment variable first, see sources.list(5)</p></"
-"footnote> thing that should be done before using <prgn>apt-get</prgn> is to "
-"fetch the package lists from the <em>Sources</em> so that it knows what "
-"packages are available. This is done with <tt>apt-get update</tt>. For "
-"instance,"
-msgstr ""
-"La première action <footnote><p>Si vous utilisez un serveur mandataire "
-"(« proxy ») HTTP, vous devez d'abord positionner la variable d'environnement "
-"http_proxy, voir sources.list(5)</p></footnote> à effectuer avant d'utiliser "
-"<prgn>apt-get</prgn> est de récupérer les listes de paquets depuis les "
-"<em>Sources</em> afin que le programme sache quels sont les paquets "
-"disponibles. Cela peut être effectué avec la commande <tt>apt-get update</"
-"tt>. Par exemple,"
-
-#. type: <example></example>
-#: guide.sgml:116
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:113
+msgid ""
+"<command>apt-get</command> provides a simple way to install packages from "
+"the command line. Unlike <command>dpkg</command>, <command>apt-get</command> "
+"does not understand .deb files, it works with the package's proper name and "
+"can only install .deb archives from a <emphasis>Source</emphasis>."
+msgstr ""
+"Le programme <command>apt-get</command> offre une méthode simple pour "
+"installer des paquets à la ligne de commande. À la différence de "
+"<command>dpkg</command>, <command>apt-get</command> ne gère pas directement "
+"les fichiers .deb files. Il travaille avec le nom des paquets et ne peut "
+"installer les archives .deb que depuis une <emphasis>Source</emphasis>."
+
+#. type: Content of: <book><chapter><para><footnote><para>
+#: guide.dbk:119
+msgid ""
+"If you are using an http proxy server you must set the http_proxy "
+"environment variable first, see sources.list(5)"
+msgstr ""
+"Si vous utilisez un serveur mandataire (« proxy ») HTTP, vous devez d'abord "
+"positionner la variable d'environnement http_proxy, voir sources.list(5)"
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:119
+msgid ""
+"The first <placeholder type=\"footnote\" id=\"0\"/> thing that should be "
+"done before using <command>apt-get</command> is to fetch the package lists "
+"from the <emphasis>Sources</emphasis> so that it knows what packages are "
+"available. This is done with <literal>apt-get update</literal>. For instance,"
+msgstr ""
+"La première action <placeholder type=\"footnote\" id=\"0\"/> à effectuer "
+"avant d'utiliser <command>apt-get</command> est de récupérer les listes de "
+"paquets depuis les <emphasis>Sources</emphasis> afin que le programme sache "
+"quels sont les paquets disponibles. Cela peut être effectué avec la commande "
+"<literal>apt-get update</literal>. Par exemple,"
+
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:127
 #, no-wrap
 msgid ""
 "# apt-get update\n"
 "Get http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
 "Get http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 msgstr ""
 "# apt-get update\n"
 "Réception de http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
 "Réception de http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
 "Lecture des listes de paquets... Fait\n"
-"Construction de l'arbre des dépendances... Fait"
+"Construction de l'arbre des dépendances... Fait\n"
 
-#. type: <p><taglist>
-#: guide.sgml:120
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:134
 msgid "Once updated there are several commands that can be used:"
 msgstr ""
 "Une fois cette mise à jour effectuée, plusieurs commandes peuvent être "
 "utilisées :"
 
-#. type: <tag></tag>
-#: guide.sgml:121
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:138
 msgid "upgrade"
 msgstr "upgrade"
 
-#. type: <p></p>
-#: guide.sgml:131
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:141
 msgid ""
 "Upgrade will attempt to gently upgrade the whole system. Upgrade will never "
 "install a new package or remove an existing package, nor will it ever "
 "upgrade a package that might cause some other package to break. This can be "
 "used daily to relatively safely upgrade the system. Upgrade will list all of "
 "the packages that it could not upgrade, this usually means that they depend "
-"on new packages or conflict with some other package. <prgn>dselect</prgn> or "
-"<tt>apt-get install</tt> can be used to force these packages to install."
+"on new packages or conflict with some other package. <command>dselect</"
+"command> or <literal>apt-get install</literal> can be used to force these "
+"packages to install."
 msgstr ""
 "La commande « upgrade » permet de mettre à jour le système de manière non "
 "invasive. Cette commande ne provoquera jamais l'installation de nouveaux "
@@ -8779,17 +8815,17 @@ msgstr ""
 "pour mettre à jour le système de manière relativement sûre. Lorsqu'elle est "
 "utilisée, la liste des paquets qui ne peuvent être mis à jour sera affichée. "
 "Cela est en général du au fait qu'ils dépendent de nouveaux paquets ou "
-"qu'ils entrent en conflit avec d'autres paquets. Le programme <prgn>dselect</"
-"prgn> ou la commande <tt>apt-get install</tt> peuvet être utilisés pour "
-"forcer l'installation de tels paquets."
+"qu'ils entrent en conflit avec d'autres paquets. Le programme "
+"<command>dselect</command> ou la commande <literal>apt-get install</literal> "
+"peuvet être utilisés pour forcer l'installation de tels paquets."
 
-#. type: <tag></tag>
-#: guide.sgml:131
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:153
 msgid "install"
 msgstr "install"
 
-#. type: <p></p>
-#: guide.sgml:140
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:156
 msgid ""
 "Install is used to install packages by name. The package is automatically "
 "fetched and installed. This can be useful if you already know the name of "
@@ -8809,21 +8845,22 @@ msgstr ""
 "demander une confirmation si des actions autres que ce qui est demandé à la "
 "ligne de commande sont nécessaires."
 
-#. type: <tag></tag>
-#: guide.sgml:140
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:167
 msgid "dist-upgrade"
 msgstr "dist-upgrade"
 
-#. type: <p></p>
-#: guide.sgml:149
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:170
 msgid ""
 "Dist-upgrade is a complete upgrader designed to simplify upgrading between "
 "releases of Debian. It uses a sophisticated algorithm to determine the best "
 "set of packages to install, upgrade and remove to get as much of the system "
 "to the newest release. In some situations it may be desired to use dist-"
 "upgrade rather than spend the time manually resolving dependencies in "
-"<prgn>dselect</prgn>. Once dist-upgrade has completed then <prgn>dselect</"
-"prgn> can be used to install any packages that may have been left out."
+"<command>dselect</command>. Once dist-upgrade has completed then "
+"<command>dselect</command> can be used to install any packages that may have "
+"been left out."
 msgstr ""
 "La commande « dist-upgrade » est une commande de mise à jour complète "
 "d'abord destinés à permettre les mises à jour entre deux versions "
@@ -8831,12 +8868,13 @@ msgstr ""
 "de paquets à installer, mettre à jour ou supprimer est déterminé dans le but "
 "d'amener une majorité du système vers la nouvelle version. Dans certains "
 "cas, il peut être judicieux d'utiliser « dist-upgrade » plutôt que de "
-"chercher à résoudre manuellement les dépendances avec <prgn>dselect</prgn>. "
-"Une fois que « dist-upgrade » a été utilisé, <prgn>dselect</prgn> peut "
-"servir à installer les paquets qui auraient pu être laissés de côté."
+"chercher à résoudre manuellement les dépendances avec <command>dselect</"
+"command>. Une fois que « dist-upgrade » a été utilisé, <command>dselect</"
+"command> peut servir à installer les paquets qui auraient pu être laissés de "
+"côté."
 
-#. type: <p></p>
-#: guide.sgml:152
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:180
 msgid ""
 "It is important to closely look at what dist-upgrade is going to do, its "
 "decisions may sometimes be quite surprising."
@@ -8844,174 +8882,179 @@ msgstr ""
 "Il est important de regarder de près ce que « dist-upgrade » car ses "
 "décisions peuvent parfois apparaître surprenantes."
 
-#. type: <p></p>
-#: guide.sgml:163
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:187
 #, fuzzy
 #| msgid ""
-#| "<prgn>apt-get</prgn> has several command line options that are detailed "
-#| "in its man page, <manref section=\"8\" name=\"apt-get\">. The most useful "
-#| "option is <tt>-d</tt> which does not install the fetched files. If the "
-#| "system has to download a large number of package it would be undesired to "
-#| "start installing them in case something goes wrong. When <tt>-d</tt> is "
-#| "used the downloaded archives can be installed by simply running the "
-#| "command that caused them to be downloaded again without <tt>-d</tt>."
-msgid ""
-"<prgn>apt-get</prgn> has several command line options that are detailed in "
-"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful "
-"option is <tt>-d</tt> which does not install the fetched files. If the "
-"system has to download a large number of package it would be undesired to "
-"start installing them in case something goes wrong. When <tt>-d</tt> is used "
-"the downloaded archives can be installed by simply running the command that "
-"caused them to be downloaded again without <tt>-d</tt>."
-msgstr ""
-"<prgn>apt-get</prgn> fournit de nombreuses options de ligne de commande qui "
-"sont expliquées en détail dans sa page de manuel, <manref section=\"8\" name="
-"\"apt-get\">. Une des plus utiles est l'option <tt>-d</tt> qui récupère sans "
-"les installer les fichiers nécessaires. Si le système a besoin de "
-"télécharger un grand nombre de paquets, il est par exemple souhaitable de "
-"pouvoir simplement les récupérer sans les installer immédiatement, au cas où "
-"quelque chose se passe mal. Une fois que <tt>-d</tt> a été utilisé, il est "
-"possible d'installer les archives téléchargées en exécutant simplement la "
-"commande qui a permis de les récupérer, sans l'option <tt>-d</tt>."
-
-#. type: <heading></heading>
-#: guide.sgml:168
+#| "<command>apt-get</command> has several command line options that are "
+#| "detailed in its man page, <manref section=\"8\" name=\"apt-get\">. The "
+#| "most useful option is <literal>-d</literal> which does not install the "
+#| "fetched files. If the system has to download a large number of package it "
+#| "would be undesired to start installing them in case something goes wrong. "
+#| "When <literal>-d</literal> is used the downloaded archives can be "
+#| "installed by simply running the command that caused them to be downloaded "
+#| "again without <literal>-d</literal>."
+msgid ""
+"<command>apt-get</command> has several command line options that are "
+"detailed in its man page, <citerefentry><refentrytitle>apt-get</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>. The most useful "
+"option is <literal>-d</literal> which does not install the fetched files. If "
+"the system has to download a large number of package it would be undesired "
+"to start installing them in case something goes wrong. When <literal>-d</"
+"literal> is used the downloaded archives can be installed by simply running "
+"the command that caused them to be downloaded again without <literal>-d</"
+"literal>."
+msgstr ""
+"<command>apt-get</command> fournit de nombreuses options de ligne de "
+"commande qui sont expliquées en détail dans sa page de manuel, <manref "
+"section=\"8\" name=\"apt-get\">. Une des plus utiles est l'option <literal>-"
+"d</literal> qui récupère sans les installer les fichiers nécessaires. Si le "
+"système a besoin de télécharger un grand nombre de paquets, il est par "
+"exemple souhaitable de pouvoir simplement les récupérer sans les installer "
+"immédiatement, au cas où quelque chose se passe mal. Une fois que <literal>-"
+"d</literal> a été utilisé, il est possible d'installer les archives "
+"téléchargées en exécutant simplement la commande qui a permis de les "
+"récupérer, sans l'option <literal>-d</literal>."
+
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:199
 msgid "DSelect"
 msgstr "DSelect"
 
-#. type: <p></p>
-#: guide.sgml:173
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:201
 msgid ""
-"The APT <prgn>dselect</prgn> method provides the complete APT system with "
-"the <prgn>dselect</prgn> package selection GUI. <prgn>dselect</prgn> is used "
-"to select the packages to be installed or removed and APT actually installs "
-"them."
+"The APT <command>dselect</command> method provides the complete APT system "
+"with the <command>dselect</command> package selection GUI. <command>dselect</"
+"command> is used to select the packages to be installed or removed and APT "
+"actually installs them."
 msgstr ""
-"La méthode APT de <prgn>dselect</prgn> permet d'utiliser le système APT dans "
-"son ensemble depuis l'interface graphique de gestion des paquets "
-"<prgn>dselect</prgn>. L'interface est alors utilisée pour choisir les "
+"La méthode APT de <command>dselect</command> permet d'utiliser le système "
+"APT dans son ensemble depuis l'interface graphique de gestion des paquets "
+"<command>dselect</command>. L'interface est alors utilisée pour choisir les "
 "paquets à installer ou supprimer et c'est APT qui effectue les opérations "
 "individuelles d'installation ou suppression."
 
-#. type: <p></p>
-#: guide.sgml:184
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:207
 msgid ""
-"To enable the APT method you need to select [A]ccess in <prgn>dselect</prgn> "
-"and then choose the APT method. You will be prompted for a set of "
-"<em>Sources</em> which are places to fetch archives from. These can be "
-"remote Internet sites, local Debian mirrors or CD-ROMs. Each source can "
-"provide a fragment of the total Debian archive, APT will automatically "
+"To enable the APT method you need to select [A]ccess in <command>dselect</"
+"command> and then choose the APT method. You will be prompted for a set of "
+"<emphasis>Sources</emphasis> which are places to fetch archives from. These "
+"can be remote Internet sites, local Debian mirrors or CD-ROMs. Each source "
+"can provide a fragment of the total Debian archive, APT will automatically "
 "combine them to form a complete set of packages. If you have a CD-ROM then "
 "it is a good idea to specify it first and then specify a mirror so that you "
 "have access to the latest bug fixes. APT will automatically use packages on "
 "your CD-ROM before downloading from the Internet."
 msgstr ""
 "Pour activer la méthode APT, il est nécessaire de choisir [A]ccéder dans "
-"<prgn>dselect</prgn> puis utiliser le choix permettant d'activer APT. Des "
-"<em>Sources</em> d'installation seront demandées, qui sont les emplacements "
-"d'où les paquets seront récupérés. Cela peut être des sites Internet "
-"distants, des miroirs locaux ou des CD. Chaque source peut fournir un sous-"
-"ensemble de l'archive complète Debian. APT les combinera automatiquement "
-"pour créer un jeu complet de paquets. Avec des supports de type CD, il est "
-"conseillé de les indiquer en premier puis de les compléter avec un miroir "
-"distant qui permettra d'obtenir les versions les plus à jour s'il y en a. "
-"APT utilisera alors les paquets disponibles sur les CD avant de les "
-"télécharger via l'Internet."
-
-#. type: <example></example>
-#: guide.sgml:198
+"<command>dselect</command> puis utiliser le choix permettant d'activer APT. "
+"Des <emphasis>Sources</emphasis> d'installation seront demandées, qui sont "
+"les emplacements d'où les paquets seront récupérés. Cela peut être des sites "
+"Internet distants, des miroirs locaux ou des CD. Chaque source peut fournir "
+"un sous-ensemble de l'archive complète Debian. APT les combinera "
+"automatiquement pour créer un jeu complet de paquets. Avec des supports de "
+"type CD, il est conseillé de les indiquer en premier puis de les compléter "
+"avec un miroir distant qui permettra d'obtenir les versions les plus à jour "
+"s'il y en a. APT utilisera alors les paquets disponibles sur les CD avant de "
+"les télécharger via l'Internet."
+
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:218
 #, no-wrap
 msgid ""
 "   Set up a list of distribution source locations\n"
-"\t \n"
+"\n"
 " Please give the base URL of the debian distribution.\n"
 " The access schemes I know about are: http file\n"
-"\t   \n"
+"\n"
 " For example:\n"
 "      file:/mnt/debian,\n"
 "      ftp://ftp.debian.org/debian,\n"
 "      http://ftp.de.debian.org/debian,\n"
-"      \n"
-"      \n"
-" URL [http://llug.sep.bnl.gov/debian]:"
+"\n"
+"\n"
+" URL [http://llug.sep.bnl.gov/debian]:\n"
 msgstr ""
 "  Réglage de a liste des emplacements sources de distribution\n"
-"\t \n"
+"\n"
 " Veuillez indiquer l'URL de base de la  distribution Debian.\n"
 " Les schémas d'accès connus sont : http file\n"
-"\t   \n"
+"\n"
 " Exemple:\n"
 "      file:/mnt/debian,\n"
 "      ftp://ftp.debian.org/debian,\n"
 "      http://ftp.de.debian.org/debian,\n"
-"      \n"
-"      \n"
-" URL [http://llug.sep.bnl.gov/debian]:"
+"\n"
+"\n"
+" URL [http://llug.sep.bnl.gov/debian]:\n"
 
-#. type: <p></p>
-#: guide.sgml:205
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:232
 msgid ""
-"The <em>Sources</em> setup starts by asking for the base of the Debian "
-"archive, defaulting to a HTTP mirror. Next it asks for the distribution to "
-"get."
+"The <emphasis>Sources</emphasis> setup starts by asking for the base of the "
+"Debian archive, defaulting to a HTTP mirror. Next it asks for the "
+"distribution to get."
 msgstr ""
-"La configuration des <em>Sources</em> débute par l'indication de la base de "
-"l'archive Debian, par défaut un miroir HTTP. Puis la distribution est "
-"demandée."
+"La configuration des <emphasis>Sources</emphasis> débute par l'indication de "
+"la base de l'archive Debian, par défaut un miroir HTTP. Puis la distribution "
+"est demandée."
 
-#. type: <example></example>
-#: guide.sgml:212
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:237
 #, no-wrap
 msgid ""
 " Please give the distribution tag to get or a path to the\n"
 " package file ending in a /. The distribution\n"
 " tags are typically something like: stable unstable testing non-US\n"
-"   \n"
-" Distribution [stable]:"
+"\n"
+" Distribution [stable]:\n"
 msgstr ""
 " Veuillez indiquer le nom de la distribution à utiliser ou\n"
 " le chemin d'accès au fichier des paquets, terminé par un /.\n"
 " Les noms de distribution sont en général de la forme suivante :\n"
 " stable unstable testing non-US\n"
-"   \n"
-" Distribution [stable] :"
+"\n"
+" Distribution [stable] :\n"
 
-#. type: <p></p>
-#: guide.sgml:222
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:244
 msgid ""
-"The distribution refers to the Debian version in the archive, <em>stable</"
-"em> refers to the latest released version and <em>unstable</em> refers to "
-"the developmental version. <em>non-US</em> is only available on some mirrors "
-"and refers to packages that contain encryption technology or other things "
-"that cannot be exported from the United States. Importing these packages "
-"into the US is legal however."
+"The distribution refers to the Debian version in the archive, "
+"<emphasis>stable</emphasis> refers to the latest released version and "
+"<emphasis>unstable</emphasis> refers to the developmental version. "
+"<emphasis>non-US</emphasis> is only available on some mirrors and refers to "
+"packages that contain encryption technology or other things that cannot be "
+"exported from the United States. Importing these packages into the US is "
+"legal however."
 msgstr ""
 "La distribution fait référence à la version de Debian dans l'archive. "
-"<em>stable</em> est la dernière version publiée et <em>unstable</em> la "
-"version en développement. <em>non-US</em> n'est disponible que sur certains "
-"miroirs et fait référence à des paquets contenant des technologies de "
-"chiffrement et d'autres élements dont l'exportation est interdite depuis les "
-"États-Unis d'Amérique. Il est toutefois autorisé de les y importer. [Note du "
-"traducteur : à la date de cette traduction, 2010, cette notion est "
-"totalement obsolète]."
-
-#. type: <example></example>
-#: guide.sgml:228
+"<emphasis>stable</emphasis> est la dernière version publiée et "
+"<emphasis>unstable</emphasis> la version en développement. <emphasis>non-US</"
+"emphasis> n'est disponible que sur certains miroirs et fait référence à des "
+"paquets contenant des technologies de chiffrement et d'autres élements dont "
+"l'exportation est interdite depuis les États-Unis d'Amérique. Il est "
+"toutefois autorisé de les y importer. [Note du traducteur : à la date de "
+"cette traduction, 2010, cette notion est totalement obsolète]."
+
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:253
 #, no-wrap
 msgid ""
 " Please give the components to get\n"
 " The components are typically something like: main contrib non-free\n"
-"  \n"
-" Components [main contrib non-free]:"
+"\n"
+" Components [main contrib non-free]:\n"
 msgstr ""
 " Veuillez indiquer les composants à utiliser\n"
 " Les composants sont en général de la forme suivante :\n"
 " main contrib non-free\n"
-"  \n"
-" Composants [main contrib non-free] :"
+"\n"
+" Composants [main contrib non-free] :\n"
 
-#. type: <p></p>
-#: guide.sgml:236
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:259
 msgid ""
 "The components list refers to the list of sub distributions to fetch. The "
 "distribution is split up based on software licenses, main being DFSG free "
@@ -9025,8 +9068,8 @@ msgstr ""
 "Debian (DFSG) alors que contrib et non-free correspondent à des éléments qui "
 "comprennent des restrictions de distribution ou d'utilisation."
 
-#. type: <p></p>
-#: guide.sgml:240
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:265
 msgid ""
 "Any number of sources can be added, the setup script will continue to prompt "
 "until you have specified all that you want."
@@ -9035,24 +9078,24 @@ msgstr ""
 "configuration continuera à les demander tant que vous n'indiquerez pas que "
 "le processus est terminé."
 
-#. type: <p></p>
-#: guide.sgml:247
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:269
 msgid ""
-"Before starting to use <prgn>dselect</prgn> it is necessary to update the "
-"available list by selecting [U]pdate from the menu. This is a superset of "
-"<tt>apt-get update</tt> that makes the fetched information available to "
-"<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get update</"
-"tt> has been run before."
+"Before starting to use <command>dselect</command> it is necessary to update "
+"the available list by selecting [U]pdate from the menu. This is a superset "
+"of <literal>apt-get update</literal> that makes the fetched information "
+"available to <command>dselect</command>. [U]pdate must be performed even if "
+"<literal>apt-get update</literal> has been run before."
 msgstr ""
-"Avant d'utiliser <prgn>dselect</prgn>, il est nécessaire de mettre à jour la "
-"liste de ce qui est disponible en choisissant « [M]ise à jour » depuis le "
-"menu. Cette action exécutera la commande « apt-get update », ce qui rendra "
-"les informations récupérées disponibles pour <prgn>dselect</prgn>. Elle doit "
-"être utilisée même si la commande « apt-get » a déjà été utilisée sur ce "
-"système."
+"Avant d'utiliser <command>dselect</command>, il est nécessaire de mettre à "
+"jour la liste de ce qui est disponible en choisissant « [M]ise à jour » "
+"depuis le menu. Cette action exécutera la commande « apt-get update », ce "
+"qui rendra les informations récupérées disponibles pour <command>dselect</"
+"command>. Elle doit être utilisée même si la commande « apt-get » a déjà été "
+"utilisée sur ce système."
 
-#. type: <p></p>
-#: guide.sgml:253
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:276
 msgid ""
 "You can then go on and make your selections using [S]elect and then perform "
 "the installation using [I]nstall. When using the APT method the [C]onfig and "
@@ -9065,77 +9108,84 @@ msgstr ""
 "« [C]onfigurer » et « [R]etirer » ne sont pas utilisées, car « [I]nstaller » "
 "fait l'ensemble des opérations."
 
-#. type: <p></p>
-#: guide.sgml:258
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:282
 msgid ""
 "By default APT will automatically remove the package (.deb) files once they "
-"have been successfully installed. To change this behavior place <tt>Dselect::"
-"clean \"prompt\";</tt> in /etc/apt/apt.conf."
+"have been successfully installed. To change this behavior place "
+"<literal>Dselect::clean \"prompt\";</literal> in /etc/apt/apt.conf."
 msgstr ""
 "Par défait, APT supprimera automatiquement les fichiers des paquets "
 "(fichiers .deb) une fois qu'ils ont été installés correctement. Pour "
-"modifier ce comportement, vous pouvez utiliser <tt>Dselect::clean \"prompt\";"
-"</tt> dans /etc/apt/apt.conf."
+"modifier ce comportement, vous pouvez utiliser <literal>Dselect::clean "
+"\"prompt\";</literal> dans /etc/apt/apt.conf."
 
-#. type: <heading></heading>
-#: guide.sgml:264
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:288
 msgid "The Interface"
 msgstr "L'interface"
 
-#. type: <p></p>
-#: guide.sgml:278
+#. type: Content of: <book><chapter><para><footnote><para>
+#: guide.dbk:292
+msgid ""
+"The <command>dselect</command> method actually is a set of wrapper scripts "
+"to <command>apt-get</command>. The method actually provides more "
+"functionality than is present in <command>apt-get</command> alone."
+msgstr ""
+"La méthode <command>dselect</command> consiste en fait en un jeu de scripts "
+"qui encapsulent <command>apt-get</command>. Cela approte des fonctionnalités "
+"supplémentaires à celles d'<command>apt-get</command> utilisé isolément."
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:290
 msgid ""
-"Both that APT <prgn>dselect</prgn> method and <prgn>apt-get</prgn> share the "
-"same interface. It is a simple system that generally tells you what it will "
-"do and then goes and does it. <footnote><p>The <prgn>dselect</prgn> method "
-"actually is a set of wrapper scripts to <prgn>apt-get</prgn>. The method "
-"actually provides more functionality than is present in <prgn>apt-get</prgn> "
-"alone.</p></footnote> After printing out a summary of what will happen APT "
+"Both that APT <command>dselect</command> method and <command>apt-get</"
+"command> share the same interface. It is a simple system that generally "
+"tells you what it will do and then goes and does it. <placeholder type="
+"\"footnote\" id=\"0\"/> After printing out a summary of what will happen APT "
 "then will print out some informative status messages so that you can "
 "estimate how far along it is and how much is left to do."
 msgstr ""
-"La méthode APT de <prgn>dselect</prgn> et le programme <prgn>apt-get</prgn> "
-"utilisent la même interface. Elle consiste en un système simple qui indique "
-"les opérations qui seront effectuées puis les réalise.<footnote><p>La "
-"méthode <prgn>dselect</prgn> consiste en fait en un jeu de scripts qui "
-"encapsulent <prgn>apt-get</prgn>. Cela approte des fonctionnalités "
-"supplémentaires à celles d'<prgn>apt-get</prgn> utilisé isolément.</p></"
-"footnote> Après avoir indiqué un résumé des opérations qui seront "
-"effectuées, APT donnera un certain nombre d'informations permettant "
-"d'estimer sa progression, tout au long des actions qu'il effectue. "
-
-#. type: <heading></heading>
-#: guide.sgml:280
+"La méthode APT de <command>dselect</command> et le programme <command>apt-"
+"get</command> utilisent la même interface. Elle consiste en un système "
+"simple qui indique les opérations qui seront effectuées puis les réalise."
+"<placeholder type=\"footnote\" id=\"0\"/> Après avoir indiqué un résumé des "
+"opérations qui seront effectuées, APT donnera un certain nombre "
+"d'informations permettant d'estimer sa progression, tout au long des actions "
+"qu'il effectue. "
+
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:301
 msgid "Startup"
 msgstr "Démarrage"
 
-#. type: <p></p>
-#: guide.sgml:284
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:303
 msgid ""
 "Before all operations except update, APT performs a number of actions to "
 "prepare its internal state. It also does some checks of the system's state. "
-"At any time these operations can be performed by running <tt>apt-get check</"
-"tt>."
+"At any time these operations can be performed by running <literal>apt-get "
+"check</literal>."
 msgstr ""
 "Avant toute opération autre qu'une mise à jour, APT effectue un certain "
 "nombre d'actions pour préparer ses mécaismes internes de fonctionnement. Il "
 "vérifie également l'état du système. Ces opérations peuvent être effectuées "
-"isolément avec la commande  <tt>apt-get check</tt>."
+"isolément avec la commande  <literal>apt-get check</literal>."
 
-#. type: <example></example>
-#: guide.sgml:289
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:309
 #, no-wrap
 msgid ""
 "# apt-get check\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 msgstr ""
 "# apt-get check\n"
 "Lecture de la liste des paquets... Fait\n"
-"Construction de l'arbre des dépendances... Fait"
+"Construction de l'arbre des dépendances... Fait\n"
 
-#. type: <p></p>
-#: guide.sgml:297
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:314
 msgid ""
 "The first thing it does is read all the package files into memory. APT uses "
 "a caching scheme so this operation will be faster the second time it is run. "
@@ -9148,21 +9198,21 @@ msgstr ""
 "pas trouvés, ils seront ignorés et une informatique sera affichée quand apt-"
 "get se terminera."
 
-#. type: <p></p>
-#: guide.sgml:303
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:320
 msgid ""
 "The final operation performs a detailed analysis of the system's "
 "dependencies. It checks every dependency of every installed or unpacked "
 "package and considers if it is OK. Should this find a problem then a report "
-"will be printed out and <prgn>apt-get</prgn> will refuse to run."
+"will be printed out and <command>apt-get</command> will refuse to run."
 msgstr ""
 "Ensuite, une analyse détaillée des dépendances du système est réalisée. Les "
 "dépendances de chaque paquet installé ou décompressé sont vérifiées. Si un "
-"problème est trouvé, il sera affiché et <prgn>apt-get</prgn> bloquera des "
-"opérations ultérieures."
+"problème est trouvé, il sera affiché et <command>apt-get</command> bloquera "
+"des opérations ultérieures."
 
-#. type: <example></example>
-#: guide.sgml:320
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:326
 #, no-wrap
 msgid ""
 "# apt-get check\n"
@@ -9172,33 +9222,33 @@ msgid ""
 "Sorry, but the following packages have unmet dependencies:\n"
 "  9fonts: Depends: xlib6g but it is not installed\n"
 "  uucp: Depends: mailx but it is not installed\n"
-"  blast: Depends: xlib6g (>= 3.3-5) but it is not installed\n"
+"  blast: Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
 "  adduser: Depends: perl-base but it is not installed\n"
 "  aumix: Depends: libgpmg1 but it is not installed\n"
 "  debiandoc-sgml: Depends: sgml-base but it is not installed\n"
-"  bash-builtins: Depends: bash (>= 2.01) but 2.0-3 is installed\n"
+"  bash-builtins: Depends: bash (&gt;= 2.01) but 2.0-3 is installed\n"
 "  cthugha: Depends: svgalibg1 but it is not installed\n"
-"           Depends: xlib6g (>= 3.3-5) but it is not installed\n"
-"  libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)"
+"           Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
+"  libreadlineg2: Conflicts:libreadline2 (&lt;&lt; 2.1-2.1)\n"
 msgstr ""
 "# apt-get check\n"
 "Lecture de la liste des paquets... Fait\n"
-"Construction de l'arbre des dépendances.. Fait\n"
+"Construction de l'arbre des dépendances... Fait\n"
 "Vous pouvez lancer « apt-get -f install » pour corriger ces problèmes.\n"
 "Les paquets suivants contiennent des dépendances non satisfaites :\n"
 "  9fonts: Depends: xlib6g mais il n'est pas installé\n"
 "  uucp: Depends: mailx mais il n'est pas installé\n"
-"  blast: Depends: xlib6g (>= 3.3-5) mais il n'est pas installé\n"
+"  blast: Depends: xlib6g (&gt;= 3.3-5) mais il n'est pas installé\n"
 "  adduser: Depends: perl-base mais il n'est pas installé\n"
 "  aumix: Depends: libgpmg1 mais il n'est pas installé\n"
 "  debiandoc-sgml: Depends: sgml-base mais il n'est pas installé\n"
-"  bash-builtins: Depends: bash (>= 2.01) but 2.0-3 is installed\n"
+"  bash-builtins: Depends: bash (&gt;= 2.01) but 2.0-3 is installed\n"
 "  cthugha: Depends: svgalibg1 mais il n'est pas installé\n"
-"           Depends: xlib6g (>= 3.3-5) mais il n'est pas installé\n"
-"  libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)"
+"           Depends: xlib6g (&gt;= 3.3-5) mais il n'est pas installé\n"
+"  libreadlineg2: Conflicts:libreadline2 (&lt;&lt; 2.1-2.1)\n"
 
-#. type: <p></p>
-#: guide.sgml:329
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:343
 msgid ""
 "In this example the system has many problems, including a serious problem "
 "with libreadlineg2. For each package that has unmet dependencies a line is "
@@ -9211,89 +9261,97 @@ msgstr ""
 "paquet dont les dépendances ne sont pas satisfaites, indiquant quel est le "
 "problème. Une explication simple du problème est donnée."
 
-#. type: <p></p>
-#: guide.sgml:337
+#. type: Content of: <book><chapter><section><para><footnote><para>
+#: guide.dbk:352
+msgid ""
+"APT however considers all known dependencies and attempts to prevent broken "
+"packages"
+msgstr ""
+"Cependant, APT prend en compte les dépendances connues et s'efforce d'éviter "
+"que cette situation ne se produise"
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:350
 msgid ""
 "There are two ways a system can get into a broken state like this. The first "
-"is caused by <prgn>dpkg</prgn> missing some subtle relationships between "
-"packages when performing upgrades. <footnote><p>APT however considers all "
-"known dependencies and attempts to prevent broken packages</p></footnote>. "
-"The second is if a package installation fails during an operation. In this "
-"situation a package may have been unpacked without its dependents being "
-"installed."
+"is caused by <command>dpkg</command> missing some subtle relationships "
+"between packages when performing upgrades. <placeholder type=\"footnote\" id="
+"\"0\"/>. The second is if a package installation fails during an operation. "
+"In this situation a package may have been unpacked without its dependents "
+"being installed."
 msgstr ""
 "Il existe deux façons pour le système d'aboutir à cet état. Cela peut "
 "d'abord être causé par des subtilités de relations entre les paquets que "
-"<prgn>dpkg</prgn> aurait manquées lors de mises à jour. "
-"<footnote><p>Cependant, APT prend en compte les dépendances connues et "
-"s'efforce d'éviter que cette situation ne se produise</p></footnote>. Cela "
-"peut également être dû à l'échec antérieur d'une installation de paquet. "
-"Dans le cas présent, un paquet a pu être décompressé sans que ses "
-"dépendances ne soient satisfaites."
+"<command>dpkg</command> aurait manquées lors de mises à jour. <placeholder "
+"type=\"footnote\" id=\"0\"/>. Cela peut également être dû à l'échec "
+"antérieur d'une installation de paquet. Dans le cas présent, un paquet a pu "
+"être décompressé sans que ses dépendances ne soient satisfaites."
 
-#. type: <p></p>
-#: guide.sgml:345
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:359
 msgid ""
 "The second situation is much less serious than the first because APT places "
 "certain constraints on the order that packages are installed. In both cases "
-"supplying the <tt>-f</tt> option to <prgn>apt-get</prgn> will cause APT to "
-"deduce a possible solution to the problem and then continue on. The APT "
-"<prgn>dselect</prgn> method always supplies the <tt>-f</tt> option to allow "
-"for easy continuation of failed maintainer scripts."
+"supplying the <literal>-f</literal> option to <command>apt-get</command> "
+"will cause APT to deduce a possible solution to the problem and then "
+"continue on. The APT <command>dselect</command> method always supplies the "
+"<literal>-f</literal> option to allow for easy continuation of failed "
+"maintainer scripts."
 msgstr ""
 "La seconde situation est moins grave que la première car APT met certaines "
 "contraintes sur l'ordre d'installation des paquets. Dans les deux cas, "
-"l'option  <tt>-f</tt> utilisée avec <prgn>apt-get</prgn> conduira APT à "
-"rechercher une solution possible puis à continuer. La méthode APT de "
-"<prgn>dselect</prgn> utilise toujours cette option <tt>-f</tt> afin de "
-"pouvoir poursuivre plus facilement ses opérations si un script de mainteneur "
-"échoue de manière inopinée."
-
-#. type: <p></p>
-#: guide.sgml:351
-msgid ""
-"However, if the <tt>-f</tt> option is used to correct a seriously broken "
-"system caused by the first case then it is possible that it will either fail "
-"immediately or the installation sequence will fail. In either case it is "
-"necessary to manually use dpkg (possibly with forcing options) to correct "
-"the situation enough to allow APT to proceed."
-msgstr ""
-"Cependant, si l'option <tt>-f</tt> est utilisée pour corriger un système "
-"fortement corrompu qui est dans le premier cas, il est possible que "
+"l'option  <literal>-f</literal> utilisée avec <command>apt-get</command> "
+"conduira APT à rechercher une solution possible puis à continuer. La méthode "
+"APT de <command>dselect</command> utilise toujours cette option <literal>-f</"
+"literal> afin de pouvoir poursuivre plus facilement ses opérations si un "
+"script de mainteneur échoue de manière inopinée."
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:368
+msgid ""
+"However, if the <literal>-f</literal> option is used to correct a seriously "
+"broken system caused by the first case then it is possible that it will "
+"either fail immediately or the installation sequence will fail. In either "
+"case it is necessary to manually use dpkg (possibly with forcing options) to "
+"correct the situation enough to allow APT to proceed."
+msgstr ""
+"Cependant, si l'option <literal>-f</literal> est utilisée pour corriger un "
+"système fortement corrompu qui est dans le premier cas, il est possible que "
 "l'opération échoue immédiatement ou au cours des diverses tentatives de "
 "réparation effectuées. Dans tous les cas, il peut être nécessaire de "
 "corriger la situation manuellement avec dpkg (éventuellement en utilisant "
 "des options pour forcer certains opérations) avant de pouvoir utiliser à "
 "nouveau APT."
 
-#. type: <heading></heading>
-#: guide.sgml:356
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:376
 msgid "The Status Report"
 msgstr "Le rapport d'état"
 
-#. type: <p></p>
-#: guide.sgml:363
-msgid ""
-"Before proceeding <prgn>apt-get</prgn> will present a report on what will "
-"happen. Generally the report reflects the type of operation being performed "
-"but there are several common elements. In all cases the lists reflect the "
-"final state of things, taking into account the <tt>-f</tt> option and any "
-"other relevant activities to the command being executed."
-msgstr ""
-"Avant de démarrer ses actions, <prgn>apt-get</prgn> en affiche un résumé. En "
-"général, ce rapport dépend du type d'opération qui est entreprise, mais de "
-"nombreux éléments sont communs aux différents types de rapports. Ainsi, dans "
-"tous les cas, les listes reflètent l'état final du système, en tenant compte "
-"de l'option <tt>-f</tt> et des autres opérations découlant du type de "
-"commande utilisée."
-
-#. type: <heading></heading>
-#: guide.sgml:364
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:378
+msgid ""
+"Before proceeding <command>apt-get</command> will present a report on what "
+"will happen. Generally the report reflects the type of operation being "
+"performed but there are several common elements. In all cases the lists "
+"reflect the final state of things, taking into account the <literal>-f</"
+"literal> option and any other relevant activities to the command being "
+"executed."
+msgstr ""
+"Avant de démarrer ses actions, <command>apt-get</command> en affiche un "
+"résumé. En général, ce rapport dépend du type d'opération qui est "
+"entreprise, mais de nombreux éléments sont communs aux différents types de "
+"rapports. Ainsi, dans tous les cas, les listes reflètent l'état final du "
+"système, en tenant compte de l'option <literal>-f</literal> et des autres "
+"opérations découlant du type de commande utilisée."
+
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:385
 msgid "The Extra Package list"
 msgstr "La liste des paquets supplémentaires"
 
-#. type: <example></example>
-#: guide.sgml:372
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:387
 #, no-wrap
 msgid ""
 "The following extra packages will be installed:\n"
@@ -9301,86 +9359,86 @@ msgid ""
 "  mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
 "  bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
 "  squake pgp-i python-base debmake ldso perl libreadlineg2\n"
-"  ssh"
+"  ssh\n"
 msgstr ""
 "Les paquets supplémentaires suivants seront installés :\n"
 "  libdbd-mysql-perl xlib6 zlib1 xzx libreadline2 libdbd-msql-perl\n"
 "  mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
 "  bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
 "  squake pgp-i python-base debmake ldso perl libreadlineg2\n"
-"  ssh"
+"  ssh\n"
 
-#. type: <p></p>
-#: guide.sgml:379
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:395
 msgid ""
 "The Extra Package list shows all of the packages that will be installed or "
 "upgraded in excess of the ones mentioned on the command line. It is only "
-"generated for an <tt>install</tt> command. The listed packages are often the "
-"result of an Auto Install."
+"generated for an <literal>install</literal> command. The listed packages are "
+"often the result of an Auto Install."
 msgstr ""
 "La liste des paquets supplémentaires montre tous les paquets installés ou "
 "mis à jour en plus de ceux indiqués à la ligne de commande. Elle n'apparaît "
-"qu'avec la commande <tt>install</tt>. Le plus souvent, les paquets concernés "
-"sont le résultat d'une installation automatique."
+"qu'avec la commande <literal>install</literal>. Le plus souvent, les paquets "
+"concernés sont le résultat d'une installation automatique."
 
-#. type: <heading></heading>
-#: guide.sgml:382
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:402
 msgid "The Packages to Remove"
 msgstr "Les paquets à supprimer"
 
-#. type: <example></example>
-#: guide.sgml:389
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:404
 #, no-wrap
 msgid ""
 "The following packages will be REMOVED:\n"
 "  xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
 "  xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
 "  xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
-"  nas xpilot xfig"
+"  nas xpilot xfig\n"
 msgstr ""
 "Les paquets suivants seront ENLEVÉS :\n"
 "  xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
 "  xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
 "  xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
-"  nas xpilot xfig"
+"  nas xpilot xfig\n"
 
-#. type: <p></p>
-#: guide.sgml:399
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:411
 msgid ""
 "The Packages to Remove list shows all of the packages that will be removed "
 "from the system. It can be shown for any of the operations and should be "
 "given a careful inspection to ensure nothing important is to be taken off. "
-"The <tt>-f</tt> option is especially good at generating packages to remove "
-"so extreme care should be used in that case. The list may contain packages "
-"that are going to be removed because they are only partially installed, "
-"possibly due to an aborted installation."
+"The <literal>-f</literal> option is especially good at generating packages "
+"to remove so extreme care should be used in that case. The list may contain "
+"packages that are going to be removed because they are only partially "
+"installed, possibly due to an aborted installation."
 msgstr ""
 "La liste des paquets à enlever montre tous les paquets qui seront supprimés "
 "du système. Elle peut apparaître pour tout type d'opération. Il est "
 "conseillé de l'inspecter en détail afin de vérifier qu'aucun paquet "
-"important ne va être supprimé. L'option  <tt>-f</tt> provoque notamment "
-"souvent des suppressions de paquets et il est déconseillé d'être "
+"important ne va être supprimé. L'option  <literal>-f</literal> provoque "
+"notamment souvent des suppressions de paquets et il est déconseillé d'être "
 "particulièrement attentif dans ce genre de cas. La liste peut comporter des "
 "paquets qui seront supprimés parce qu'ils sont seulement partiellement "
 "installés, par exemple après l'interruption d'une opération d'installation."
 
-#. type: <heading></heading>
-#: guide.sgml:402
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:421
 msgid "The New Packages list"
 msgstr "La liste des nouveaux paquets"
 
-#. type: <example></example>
-#: guide.sgml:406
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:423
 #, no-wrap
 msgid ""
 "The following NEW packages will installed:\n"
-"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
+"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base\n"
 msgstr ""
 "Les NOUVEAUX paquets suivants seront installés :\n"
-"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
+"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base\n"
 
-#. type: <p></p>
-#: guide.sgml:411
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:427
 msgid ""
 "The New Packages list is simply a reminder of what will happen. The packages "
 "listed are not presently installed in the system but will be when APT is "
@@ -9390,58 +9448,58 @@ msgstr ""
 "avoir lieu. Les paquets affichés ne sont pas encore présents sur le système "
 "mais le seront une fois qu'APT aura terminé."
 
-#. type: <heading></heading>
-#: guide.sgml:414
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:432
 msgid "The Kept Back list"
 msgstr "La liste des paquets conservés"
 
-#. type: <example></example>
-#: guide.sgml:419
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:434
 #, no-wrap
 msgid ""
 "The following packages have been kept back\n"
 "  compface man-db tetex-base msql libpaper svgalib1\n"
-"  gs snmp arena lynx xpat2 groff xscreensaver"
+"  gs snmp arena lynx xpat2 groff xscreensaver\n"
 msgstr ""
 "Les paquets suivants ont été conservés :\n"
 "  compface man-db tetex-base msql libpaper svgalib1\n"
-"  gs snmp arena lynx xpat2 groff xscreensaver"
+"  gs snmp arena lynx xpat2 groff xscreensaver\n"
 
-#. type: <p></p>
-#: guide.sgml:428
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:439
 msgid ""
 "Whenever the whole system is being upgraded there is the possibility that "
 "new versions of packages cannot be installed because they require new things "
 "or conflict with already installed things. In this case the package will "
 "appear in the Kept Back list. The best way to convince packages listed there "
-"to install is with <tt>apt-get install</tt> or by using <prgn>dselect</prgn> "
-"to resolve their problems."
+"to install is with <literal>apt-get install</literal> or by using "
+"<command>dselect</command> to resolve their problems."
 msgstr ""
 "À chaque fois que le système entier est mis à jour, il est possible que de "
 "nouvelles versions de paquets ne puissent pas être installées car elles ont "
 "besoins ne nouveaux paquets ou qu'elles entrent en conflit avec des paquets "
 "existants. Ces paquets apparaîtront alors dans la liste des paquets "
 "conservés. Le meilleure méthode pour effectivement installer ces paquets est "
-"souvent de le faire explicitement avec la commande <tt>apt-get install</tt> "
-"ou avec <prgn>dselect</prgn>."
+"souvent de le faire explicitement avec la commande <literal>apt-get install</"
+"literal> ou avec <command>dselect</command>."
 
-#. type: <heading></heading>
-#: guide.sgml:431
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:448
 msgid "Held Packages warning"
 msgstr "L'avertissement pour paquets retenus"
 
-#. type: <example></example>
-#: guide.sgml:435
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:450
 #, no-wrap
 msgid ""
 "The following held packages will be changed:\n"
-"  cvs"
+"  cvs\n"
 msgstr ""
 "Les paquets retenus suivants seront changés :\n"
-"  cvs"
+"  cvs\n"
 
-#. type: <p></p>
-#: guide.sgml:441
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:454
 msgid ""
 "Sometimes you can ask APT to install a package that is on hold, in such a "
 "case it prints out a warning that the held package is going to be changed. "
@@ -9452,32 +9510,32 @@ msgstr ""
 "que le paquet retenu va être modifié. Cela ne se produira que lors de "
 "l'utilisation des commandes dist-upgrade ou install."
 
-#. type: <heading></heading>
-#: guide.sgml:444
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:460
 msgid "Final summary"
 msgstr "Résumé final"
 
-#. type: <p></p>
-#: guide.sgml:447
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:462
 msgid ""
 "Finally, APT will print out a summary of all the changes that will occur."
 msgstr ""
 "Enfin, APT affichera un résumé de toutes les opérations qui prendront place."
 
-#. type: <example></example>
-#: guide.sgml:452
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:465
 #, no-wrap
 msgid ""
 "206 packages upgraded, 8 newly installed, 23 to remove and 51 not upgraded.\n"
 "12 packages not fully installed or removed.\n"
-"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used."
+"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used.\n"
 msgstr ""
 "206 paquets mis à jour, 8 nouvellement installés, 23 à enlever et 51 non mis à jour.\n"
 "12 paquets partiellement installés ou enlevés.\n"
-"Il est nécessaire de prendre 65,7Mo/66,7Mo dans les archives. Après cette opération, 26,5Mo d'espace disque supplémentaires seront utilisés."
+"Il est nécessaire de prendre 65,7Mo/66,7Mo dans les archives. Après cette opération, 26,5Mo d'espace disque supplémentaires seront utilisés.\n"
 
-#. type: <p></p>
-#: guide.sgml:470
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:470
 msgid ""
 "The first line of the summary simply is a reduced version of all of the "
 "lists and includes the number of upgrades - that is packages already "
@@ -9508,8 +9566,8 @@ msgstr ""
 "opérations. Si de nombreux paquets sont supprimés, cette valeur peut "
 "représenter l'espace qui est alors libéré."
 
-#. type: <p></p>
-#: guide.sgml:473
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:484
 msgid ""
 "Some other reports can be generated by using the -u option to show packages "
 "to upgrade, they are similar to the previous examples."
@@ -9517,13 +9575,13 @@ msgstr ""
 "D'autres rapports peuvent être créés avec l'option -u qui affiche les "
 "paquets à mettre à jour. Il sont analogues aux exemples précédents."
 
-#. type: <heading></heading>
-#: guide.sgml:477
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:491
 msgid "The Status Display"
 msgstr "L'affichage d'état"
 
-#. type: <p></p>
-#: guide.sgml:481
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:493
 msgid ""
 "During the download of archives and package files APT prints out a series of "
 "status messages."
@@ -9531,8 +9589,8 @@ msgstr ""
 "Pendant le téléchargement des fichiers des paquets, APT affiche un certain "
 "nombre de messages d'avancement."
 
-#. type: <example></example>
-#: guide.sgml:490
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:497
 #, no-wrap
 msgid ""
 "# apt-get update\n"
@@ -9541,7 +9599,7 @@ msgid ""
 "Hit http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
 "Get:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
 "Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
-"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s"
+"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s\n"
 msgstr ""
 "# apt-get update\n"
 "Réception de :1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages\n"
@@ -9549,71 +9607,73 @@ msgstr ""
 "Atteint http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
 "Réception de :4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
 "Réception de :5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
-"11% [5 testing/non-free `Attente du fichier' 0/32.1k 0%] 2203b/s 1m52s"
+"11% [5 testing/non-free `Attente du fichier' 0/32.1k 0%] 2203b/s 1m52s\n"
 
-#. type: <p></p>
-#: guide.sgml:500
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:506
 msgid ""
-"The lines starting with <em>Get</em> are printed out when APT begins to "
-"fetch a file while the last line indicates the progress of the download. The "
-"first percent value on the progress line indicates the total percent done of "
-"all files. Unfortunately since the size of the Package files is unknown "
-"<tt>apt-get update</tt> estimates the percent done which causes some "
-"inaccuracies."
+"The lines starting with <emphasis>Get</emphasis> are printed out when APT "
+"begins to fetch a file while the last line indicates the progress of the "
+"download. The first percent value on the progress line indicates the total "
+"percent done of all files. Unfortunately since the size of the Package files "
+"is unknown <literal>apt-get update</literal> estimates the percent done "
+"which causes some inaccuracies."
 msgstr ""
 "Les lignes qui débutent par « Réception de » sont affichées quand APT "
 "démarre la récupération d'un fichier alors que la dernière ligne indique la "
 "progression du téléchargement. La première valeur de pourcentage de la ligne "
 "est le pourcentage de téléchargement déjà effectué, pour l'ensemble des "
 "fichiers. Il faut noter que, comme la taille des fichiers de paquets n'est "
-"pas connue, <tt>apt-get update</tt> estime le pourcentage effectué ce qui "
-"peut conduire à des imprécisions."
+"pas connue, <literal>apt-get update</literal> estime le pourcentage effectué "
+"ce qui peut conduire à des imprécisions."
 
-#. type: <p></p>
-#: guide.sgml:509
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:514
 msgid ""
 "The next section of the status line is repeated once for each download "
 "thread and indicates the operation being performed and some useful "
 "information about what is happening. Sometimes this section will simply read "
-"<em>Forking</em> which means the OS is loading the download module. The "
-"first word after the [ is the fetch number as shown on the history lines. "
-"The next word is the short form name of the object being downloaded. For "
-"archives it will contain the name of the package that is being fetched."
+"<emphasis>Forking</emphasis> which means the OS is loading the download "
+"module. The first word after the [ is the fetch number as shown on the "
+"history lines. The next word is the short form name of the object being "
+"downloaded. For archives it will contain the name of the package that is "
+"being fetched."
 msgstr ""
 "La section suivante de la ligne d'état est répétée pour chaque sous-tâche de "
 "téléchargement. Elle indique l'opération effectuée et d'autres informations "
-"utiles sur ce qui est en cours. Cette section indiquera parfois <em>Forking</"
-"em> ce qui indique que le système charge le module de téléchargement. Le "
-"premier mot après le crochet ouvrant ([) est le numéro d'ordre de "
-"téléchargement comme indiqué dans les lignes d'historique. Le mot suivant "
-"est le nom court de l'objet téléchargé. Pour les archives, il s'agit du nom "
-"du paquet en cours de récupération."
+"utiles sur ce qui est en cours. Cette section indiquera parfois "
+"<emphasis>Forking</emphasis> ce qui indique que le système charge le module "
+"de téléchargement. Le premier mot après le crochet ouvrant ([) est le numéro "
+"d'ordre de téléchargement comme indiqué dans les lignes d'historique. Le mot "
+"suivant est le nom court de l'objet téléchargé. Pour les archives, il s'agit "
+"du nom du paquet en cours de récupération."
 
-#. type: <p></p>
-#: guide.sgml:524
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:524
 msgid ""
 "Inside of the single quote is an informative string indicating the progress "
 "of the negotiation phase of the download. Typically it progresses from "
-"<em>Connecting</em> to <em>Waiting for file</em> to <em>Downloading</em> or "
-"<em>Resuming</em>. The final value is the number of bytes downloaded from "
-"the remote site. Once the download begins this is represented as "
-"<tt>102/10.2k</tt> indicating that 102 bytes have been fetched and 10.2 "
-"kilobytes is expected. The total size is always shown in 4 figure notation "
-"to preserve space. After the size display is a percent meter for the file "
-"itself. The second last element is the instantaneous average speed. This "
-"values is updated every 5 seconds and reflects the rate of data transfer for "
-"that period. Finally is shown the estimated transfer time. This is updated "
-"regularly and reflects the time to complete everything at the shown transfer "
-"rate."
+"<emphasis>Connecting</emphasis> to <emphasis>Waiting for file</emphasis> to "
+"<emphasis>Downloading</emphasis> or <emphasis>Resuming</emphasis>. The final "
+"value is the number of bytes downloaded from the remote site. Once the "
+"download begins this is represented as <literal>102/10.2k</literal> "
+"indicating that 102 bytes have been fetched and 10.2 kilobytes is expected. "
+"The total size is always shown in 4 figure notation to preserve space. After "
+"the size display is a percent meter for the file itself. The second last "
+"element is the instantaneous average speed. This values is updated every 5 "
+"seconds and reflects the rate of data transfer for that period. Finally is "
+"shown the estimated transfer time. This is updated regularly and reflects "
+"the time to complete everything at the shown transfer rate."
 msgstr ""
 "À l'intérieur des guillemets, on trouve une information sur la progression "
 "de la phase de négociation du téléchargement. Usuellement, elle évolue de "
-"<em>Connexion</em> à <em>Attente du fichier</em>, puis <em>Téléchargement</"
-"em> ou <em>Reprise</em>. La valeur finale est le nombre d'octets téléchargés "
-"depuis le site distant. Une fois le téléchargement commencé, cette "
-"indication prend la forme <tt>102/10,2ko</tt>, ce qui indique que 102 octets "
-"ont été téléchargés et que 10,2 kilo-octets sont attendus. La taille totale "
-"est toujours représentées sur 4 digits pour des raisons de place disponible. "
+"<emphasis>Connexion</emphasis> à <emphasis>Attente du fichier</emphasis>, "
+"puis <emphasis>Téléchargement</emphasis> ou <emphasis>Reprise</emphasis>. La "
+"valeur finale est le nombre d'octets téléchargés depuis le site distant. Une "
+"fois le téléchargement commencé, cette indication prend la forme "
+"<literal>102/10,2ko</literal>, ce qui indique que 102 octets ont été "
+"téléchargés et que 10,2 kilo-octets sont attendus. La taille totale est "
+"toujours représentées sur 4 digits pour des raisons de place disponible. "
 "Après cet affichage de taille, se trouve une barre de progression pour le "
 "téléchargement du fichier lui-même. L'élément suivant est la vitesse "
 "instantanée de téléchargement. Elle est mise à jour toutes les 5 secondes et "
@@ -9622,57 +9682,52 @@ msgstr ""
 "régulièrement à jour et représete la durée estimée de téléchargement de "
 "toute ce qui est nécessaire, à la vitesse affichée."
 
-#. type: <p></p>
-#: guide.sgml:530
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:539
 msgid ""
 "The status display updates every half second to provide a constant feedback "
 "on the download progress while the Get lines scroll back whenever a new file "
 "is started. Since the status display is constantly updated it is unsuitable "
-"for logging to a file, use the <tt>-q</tt> option to remove the status "
-"display."
+"for logging to a file, use the <literal>-q</literal> option to remove the "
+"status display."
 msgstr ""
 "La ligne d'état est mise à jour chaque demi-seconde afin de fournir un "
 "retour régulier sur la progression du téléchargement alors que les lignes "
 "« Réception de » reculent d'une unité à chaque fois qu'un nouveau fichier "
 "est démarré. Comme l'état est mis à jour régulièrement, il ne peut pas "
 "servir pour la journalisation dans un fichier. Il est nécessaire d'utiliser "
-"l'option <tt>-q</tt> pour supprimer cet affichage."
+"l'option <literal>-q</literal> pour supprimer cet affichage."
 
-#. type: <heading></heading>
-#: guide.sgml:535
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:547
 msgid "Dpkg"
 msgstr "Dpkg"
 
-#. type: <p></p>
-#: guide.sgml:542
-msgid ""
-"APT uses <prgn>dpkg</prgn> for installing the archives and will switch over "
-"to the <prgn>dpkg</prgn> interface once downloading is completed. "
-"<prgn>dpkg</prgn> will also ask a number of questions as it processes the "
-"packages and the packages themselves may also ask several questions. Before "
-"each question there is usually a description of what it is asking and the "
-"questions are too varied to discuss completely here."
-msgstr ""
-"APT utilise <prgn>dpkg</prgn> pour installer les archives et bascule vers "
-"l'interface de ce programme une fois le téléchargement terminé. <prgn>dpkg</"
-"prgn> peut poser un certain nombre de questions pendant le traitement des "
-"paquets, qui peuvent eux-même être amener à poser des questions. Chacune de "
-"ces questions comporte un description de ce qui est attendu et elles sont "
-"trop variables d'un paquet à l'autre pour qu'une description détaillée soit "
-"donnée dans ce document."
-
-#. type: <title></title>
-#: offline.sgml:4
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:549
+msgid ""
+"APT uses <command>dpkg</command> for installing the archives and will switch "
+"over to the <command>dpkg</command> interface once downloading is completed. "
+"<command>dpkg</command> will also ask a number of questions as it processes "
+"the packages and the packages themselves may also ask several questions. "
+"Before each question there is usually a description of what it is asking and "
+"the questions are too varied to discuss completely here."
+msgstr ""
+"APT utilise <command>dpkg</command> pour installer les archives et bascule "
+"vers l'interface de ce programme une fois le téléchargement terminé. "
+"<command>dpkg</command> peut poser un certain nombre de questions pendant le "
+"traitement des paquets, qui peuvent eux-même être amener à poser des "
+"questions. Chacune de ces questions comporte un description de ce qui est "
+"attendu et elles sont trop variables d'un paquet à l'autre pour qu'une "
+"description détaillée soit donnée dans ce document."
+
+#. type: Content of: <book><title>
+#: offline.dbk:10
 msgid "Using APT Offline"
 msgstr "Utilisation d'APT hors ligne"
 
-#. type: <version></version>
-#: offline.sgml:7
-msgid "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
-msgstr "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
-
-#. type: <abstract></abstract>
-#: offline.sgml:12
+#. type: Content of: <book><bookinfo><abstract><para>
+#: offline.dbk:24
 msgid ""
 "This document describes how to use APT in a non-networked environment, "
 "specifically a 'sneaker-net' approach for performing upgrades."
@@ -9681,23 +9736,25 @@ msgstr ""
 "réseau, et plus particulièrement une approche « sneaker-net » pour les mises "
 "à jour."
 
-#. type: <copyrightsummary></copyrightsummary>
-#: offline.sgml:16
-msgid "Copyright &copy; Jason Gunthorpe, 1999."
-msgstr "Copyright &copy; Jason Gunthorpe, 1999."
+#. type: Content of: <book><bookinfo>
+#: offline.dbk:29
+msgid ""
+"<copyright><year>1999</year><holder>Jason Gunthorpe</holder></copyright>"
+msgstr ""
+"<copyright><year>1999</year><holder>Jason Gunthorpe</holder></copyright>"
 
-#. type: <heading></heading>
-#: offline.sgml:32
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:47
 msgid "Introduction"
 msgstr "Introduction"
 
-#. type: <heading></heading>
-#: offline.sgml:34 offline.sgml:65 offline.sgml:180
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:49 offline.dbk:79 offline.dbk:191
 msgid "Overview"
 msgstr "Aperçu"
 
-#. type: <p></p>
-#: offline.sgml:40
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:51
 msgid ""
 "Normally APT requires direct access to a Debian archive, either from a local "
 "media or through a network. Another common complaint is that a Debian "
@@ -9709,8 +9766,8 @@ msgstr ""
 "est celui d'une machine dotée d'une liaison peu rapide (comme un modem) avec "
 "une autre possédant une connexion à haut débit mais située à distance."
 
-#. type: <p></p>
-#: offline.sgml:51
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:57
 msgid ""
 "The solution to this is to use large removable media such as a Zip disc or a "
 "SuperDisk disc. These discs are not large enough to store the entire Debian "
@@ -9718,9 +9775,9 @@ msgid ""
 "to use APT to generate a list of packages that are required and then fetch "
 "them onto the disc using another machine with good connectivity. It is even "
 "possible to use another Debian machine with APT or to use a completely "
-"different OS and a download tool like wget. Let <em>remote host</em> mean "
-"the machine downloading the packages, and <em>target host</em> the one with "
-"bad or no connection."
+"different OS and a download tool like wget. Let <emphasis>remote host</"
+"emphasis> mean the machine downloading the packages, and <emphasis>target "
+"host</emphasis> the one with bad or no connection."
 msgstr ""
 "Une solution est d'utiliser un support amovible de grande taille tel qu'un "
 "disque Zip ou un disque Superdisk (NdT : ce document est daté..:-)). Bien "
@@ -9731,11 +9788,12 @@ msgstr ""
 "récupérer avec une machine disposant d'une bonne connectivité. Il est même "
 "possible d'utiliser soit une autre machine Debian avec APT soit un autre "
 "système d'exploitation et un outil de téléchargement tel que wget. Dans ce "
-"qui suit, <em>machine distante</em> désignera la machine qui télécharge les "
-"paquets et <em>machine cible</em>, celle qui a une connectivité limitée."
+"qui suit, <emphasis>machine distante</emphasis> désignera la machine qui "
+"télécharge les paquets et <emphasis>machine cible</emphasis>, celle qui a "
+"une connectivité limitée."
 
-#. type: <p></p>
-#: offline.sgml:57
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:68
 msgid ""
 "This is achieved by creatively manipulating the APT configuration file. The "
 "essential premise to tell APT to look on a disc for it's archive files. Note "
@@ -9748,13 +9806,13 @@ msgstr ""
 "système de fichier autorisant les noms longs, par exemple ext2, fat32 ou "
 "vfat."
 
-#. type: <heading></heading>
-#: offline.sgml:63
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:77
 msgid "Using APT on both machines"
 msgstr "Utilisation d'APT sur les deux machines"
 
-#. type: <p><example>
-#: offline.sgml:71
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:81
 msgid ""
 "APT being available on both machines gives the simplest configuration. The "
 "basic idea is to place a copy of the status file on the disc and use the "
@@ -9767,8 +9825,8 @@ msgstr ""
 "et choisir ceux à télécharger. La structure des répertoires du disque "
 "devraient ressembler à :"
 
-#. type: <example></example>
-#: offline.sgml:80
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:87
 #, no-wrap
 msgid ""
 "  /disc/\n"
@@ -9778,7 +9836,7 @@ msgid ""
 "       partial/\n"
 "    status\n"
 "    sources.list\n"
-"    apt.conf"
+"    apt.conf\n"
 msgstr ""
 "  /disc/\n"
 "    archives/\n"
@@ -9787,42 +9845,44 @@ msgstr ""
 "       partial/\n"
 "    status\n"
 "    sources.list\n"
-"    apt.conf"
+"    apt.conf\n"
 
-#. type: <heading></heading>
-#: offline.sgml:88
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:98
 msgid "The configuration file"
 msgstr "Le fichier de configuration"
 
-#. type: <p></p>
-#: offline.sgml:96
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:100
 msgid ""
 "The configuration file should tell APT to store its files on the disc and to "
 "use the configuration files on the disc as well. The sources.list should "
 "contain the proper sites that you wish to use from the remote machine, and "
-"the status file should be a copy of <em>/var/lib/dpkg/status</em> from the "
-"<em>target host</em>. Please note, if you are using a local archive you must "
-"use copy URIs, the syntax is identical to file URIs."
+"the status file should be a copy of <emphasis>/var/lib/dpkg/status</"
+"emphasis> from the <emphasis>target host</emphasis>. Please note, if you are "
+"using a local archive you must use copy URIs, the syntax is identical to "
+"file URIs."
 msgstr ""
 "Le fichier de configuration indique à APT où conserver ses fichiers sur le "
 "disque et d'utiliser également les fichiers de configuration du disque. Le "
 "fichier sources.list devrait référencer les sites que vous souhaitez "
 "utiliser depuis la machine distante et le fichier d'état doit être une copie "
-"de <em>/var/lib/dpkg/status</em> de l'<em>ordinateur cible</em>. Veuillez "
-"noter que si sous utilisez une archive locale, les URI doivent en être "
-"copiés. La syntaxe est la même que celle des URI fichiers."
+"de <emphasis>/var/lib/dpkg/status</emphasis> de l'<emphasis>ordinateur "
+"cible</emphasis>. Veuillez noter que si sous utilisez une archive locale, "
+"les URI doivent en être copiés. La syntaxe est la même que celle des URI "
+"fichiers."
 
-#. type: <p><example>
-#: offline.sgml:100
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:108
 msgid ""
-"<em>apt.conf</em> must contain the necessary information to make APT use the "
-"disc:"
+"<emphasis>apt.conf</emphasis> must contain the necessary information to make "
+"APT use the disc:"
 msgstr ""
-"<em>apt.conf</em> doit avoir les informations nécessaires pour qu'APT "
-"utilise le disque.disc:"
+"<emphasis>apt.conf</emphasis> doit avoir les informations nécessaires pour "
+"qu'APT utilise le disque.disc:"
 
-#. type: <example></example>
-#: offline.sgml:124
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:112
 #, no-wrap
 msgid ""
 " APT\n"
@@ -9830,10 +9890,10 @@ msgid ""
 "   /* This is not necessary if the two machines are the same arch, it tells\n"
 "      the remote APT what architecture the target machine is */\n"
 "   Architecture \"i386\";\n"
-"   \n"
+"\n"
 "   Get::Download-Only \"true\";\n"
 " };\n"
-" \n"
+"\n"
 " Dir\n"
 " {\n"
 "   /* Use the disc for state information and redirect the status file from\n"
@@ -9844,20 +9904,20 @@ msgid ""
 "   // Binary caches will be stored locally\n"
 "   Cache::archives \"/disc/archives/\";\n"
 "   Cache \"/tmp/\";\n"
-"   \n"
+"\n"
 "   // Location of the source list.\n"
 "   Etc \"/disc/\";\n"
-" };"
+" };\n"
 msgstr ""
 " APT\n"
 " {\n"
 "   /* This is not necessary if the two machines are the same arch, it tells\n"
 "      the remote APT what architecture the target machine is */\n"
 "   Architecture \"i386\";\n"
-"   \n"
+"\n"
 "   Get::Download-Only \"true\";\n"
 " };\n"
-" \n"
+"\n"
 " Dir\n"
 " {\n"
 "   /* Use the disc for state information and redirect the status file from\n"
@@ -9868,68 +9928,71 @@ msgstr ""
 "   // Binary caches will be stored locally\n"
 "   Cache::archives \"/disc/archives/\";\n"
 "   Cache \"/tmp/\";\n"
-"   \n"
+"\n"
 "   // Location of the source list.\n"
 "   Etc \"/disc/\";\n"
-" };"
+" };\n"
 
-#. type: </example></p>
-#: offline.sgml:129
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:137
 msgid ""
 "More details can be seen by examining the apt.conf man page and the sample "
-"configuration file in <em>/usr/share/doc/apt/examples/apt.conf</em>."
+"configuration file in <emphasis>/usr/share/doc/apt/examples/apt.conf</"
+"emphasis>."
 msgstr ""
 "Plus d'informations peuvent être trouvées dans la page de manuel du fichier "
 "apt.conf et dans l'exemple de fichier de configuration que l'on peut trouver "
-"dans <em>/usr/share/doc/apt/examples/apt.conf</em>."
+"dans <emphasis>/usr/share/doc/apt/examples/apt.conf</emphasis>."
 
-#. type: <p><example>
-#: offline.sgml:136
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:142
 msgid ""
-"On the target machine the first thing to do is mount the disc and copy <em>/"
-"var/lib/dpkg/status</em> to it. You will also need to create the directories "
-"outlined in the Overview, <em>archives/partial/</em> and <em>lists/partial/</"
-"em>. Then take the disc to the remote machine and configure the sources."
-"list. On the remote machine execute the following:"
+"On the target machine the first thing to do is mount the disc and copy "
+"<emphasis>/var/lib/dpkg/status</emphasis> to it. You will also need to "
+"create the directories outlined in the Overview, <emphasis>archives/partial/"
+"</emphasis> and <emphasis>lists/partial/</emphasis>. Then take the disc to "
+"the remote machine and configure the sources.list. On the remote machine "
+"execute the following:"
 msgstr ""
 "Sur la machine cible, il est d'abord nécessaire de monter le disque et y "
-"copier le fichier <em>/var/lib/dpkg/status</em>. Il sera aussi nécessaire de "
-"créer les répertoires dans l'aperçu (Overview), <em>archives/partial/</em> "
-"and <em>lists/partial/</em>. Connecter ensuite le disque à la machine "
-"distante et configurer le fichier sources.list. Sur la machine distante, "
-"exécuter la séquence de commandes suivante :"
-
-#. type: <example></example>
-#: offline.sgml:142
+"copier le fichier <emphasis>/var/lib/dpkg/status</emphasis>. Il sera aussi "
+"nécessaire de créer les répertoires dans l'aperçu (Overview), "
+"<emphasis>archives/partial/</emphasis> and <emphasis>lists/partial/</"
+"emphasis>. Connecter ensuite le disque à la machine distante et configurer "
+"le fichier sources.list. Sur la machine distante, exécuter la séquence de "
+"commandes suivante :"
+
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:151
 #, no-wrap
 msgid ""
 " # export APT_CONFIG=\"/disc/apt.conf\"\n"
 " # apt-get update\n"
 " [ APT fetches the package files ]\n"
 " # apt-get dist-upgrade\n"
-" [ APT fetches all the packages needed to upgrade the target machine ]"
+" [ APT fetches all the packages needed to upgrade the target machine ]\n"
 msgstr ""
 " # export APT_CONFIG=\"/disc/apt.conf\"\n"
 " # apt-get update\n"
 " [ APT récupère les fichiers des paquets ]\n"
 " # apt-get dist-upgrade\n"
-" [ APT récupère tous les fichiers nécessaires à la mise à jour de la machine distante ]"
+" [ APT récupère tous les fichiers nécessaires à la mise à jour de la machine distante ]\n"
 
-#. type: </example></p>
-#: offline.sgml:149
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:158
 msgid ""
 "The dist-upgrade command can be replaced with any other standard APT "
 "commands, particularly dselect-upgrade. You can even use an APT front end "
-"such as <em>dselect</em>. However this presents a problem in communicating "
-"your selections back to the local computer."
+"such as <emphasis>dselect</emphasis>. However this presents a problem in "
+"communicating your selections back to the local computer."
 msgstr ""
 "La commande dist-upgrade peut être remplacée par toute autres commande "
 "usuelle d'APT, notamment dselect-upgrade. Il est même possible d'utiliser "
-"une interface comme <em>dselect</em>. Cependant, cela complique la "
-"communication des choix vers l'ordinateur local."
+"une interface comme <emphasis>dselect</emphasis>. Cependant, cela complique "
+"la communication des choix vers l'ordinateur local."
 
-#. type: <p><example>
-#: offline.sgml:153
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:164
 msgid ""
 "Now the disc contains all of the index files and archives needed to upgrade "
 "the target machine. Take the disc back and run:"
@@ -9938,24 +10001,24 @@ msgstr ""
 "archives nécessaires pour mettr eà jour la machine cible. Il est alors "
 "possible d'y ramener le disque et exécuter :"
 
-#. type: <example></example>
-#: offline.sgml:159
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:168
 #, no-wrap
 msgid ""
 "  # export APT_CONFIG=\"/disc/apt.conf\"\n"
 "  # apt-get check\n"
 "  [ APT generates a local copy of the cache files ]\n"
 "  # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
-"  [ Or any other APT command ]"
+"  [ Or any other APT command ]\n"
 msgstr ""
 "  # export APT_CONFIG=\"/disc/apt.conf\"\n"
 "  # apt-get check\n"
 "  [ APT crée la copie locale des fichiers de cache ]\n"
 "  # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
-"  [ Ou toute autre commande APT ]"
+"  [ Ou toute autre commande APT ]\n"
 
-#. type: <p></p>
-#: offline.sgml:165
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:175
 msgid ""
 "It is necessary for proper function to re-specify the status file to be the "
 "local one. This is very important!"
@@ -9963,8 +10026,8 @@ msgstr ""
 "Pour un fonctionnement correct, il est indispensable de ré-indiquer que le "
 "fichier d'état est le fichier local. Cela est très important."
 
-#. type: <p></p>
-#: offline.sgml:172
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:179
 msgid ""
 "If you are using dselect you can do the very risky operation of copying disc/"
 "status to /var/lib/dpkg/status so that any selections you made on the remote "
@@ -9979,25 +10042,25 @@ msgstr ""
 "possible. NE COPIEZ PAS le fichier d'état si dpkg ou APT ont été exécutés "
 "dans l'intervalle."
 
-#. type: <heading></heading>
-#: offline.sgml:178
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:189
 msgid "Using APT and wget"
 msgstr "Utilisation d'APT et wget"
 
-#. type: <p></p>
-#: offline.sgml:185
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:193
 msgid ""
-"<em>wget</em> is a popular and portable download tool that can run on nearly "
-"any machine. Unlike the method above this requires that the Debian machine "
-"already has a list of available packages."
+"<emphasis>wget</emphasis> is a popular and portable download tool that can "
+"run on nearly any machine. Unlike the method above this requires that the "
+"Debian machine already has a list of available packages."
 msgstr ""
-"<em>wget</em> est un outil classique de téléchargement qui peut être exécuté "
-"sur à peu près tout type de machine. À la différence de la méthode "
-"précédente, cela impose que la machine Debian a déjà une liste des paquets "
-"disponibles."
+"<emphasis>wget</emphasis> est un outil classique de téléchargement qui peut "
+"être exécuté sur à peu près tout type de machine. À la différence de la "
+"méthode précédente, cela impose que la machine Debian a déjà une liste des "
+"paquets disponibles."
 
-#. type: <p></p>
-#: offline.sgml:190
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:198
 msgid ""
 "The basic idea is to create a disc that has only the archive files "
 "downloaded from the remote site. This is done by using the --print-uris "
@@ -10009,13 +10072,13 @@ msgstr ""
 "l'option --print-uris d'apt-get puis de la préparation d'un script wget "
 "permettant de récupérer les paquets/"
 
-#. type: <heading></heading>
-#: offline.sgml:196
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:204
 msgid "Operation"
 msgstr "Fonctionnement"
 
-#. type: <p><example>
-#: offline.sgml:200
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:206
 msgid ""
 "Unlike the previous technique no special configuration files are required. "
 "We merely use the standard APT commands to generate the file list."
@@ -10024,22 +10087,22 @@ msgstr ""
 "spécifique n'est nécessaire. Seules les commandes standard d'APT seront "
 "utilisées pour créer la liste de ficheirs."
 
-#. type: <example></example>
-#: offline.sgml:205
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:210
 #, no-wrap
 msgid ""
-" # apt-get dist-upgrade \n"
+" # apt-get dist-upgrade\n"
 " [ Press no when prompted, make sure you are happy with the actions ]\n"
-" # apt-get -qq --print-uris dist-upgrade > uris\n"
-" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
+" # apt-get -qq --print-uris dist-upgrade &gt; uris\n"
+" # awk '{print \"wget -O \" $2 \" \" $1}' &lt; uris &gt; /disc/wget-script\n"
 msgstr ""
 " # apt-get dist-upgrade \n"
 " [ Répondre négativement à la question, pour être sûr(e) que les actions vous conviennent ]\n"
-" # apt-get -qq --print-uris dist-upgrade > uris\n"
-" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
+" # apt-get -qq --print-uris dist-upgrade &gt; uris\n"
+" # awk '{print \"wget -O \" $2 \" \" $1}' &lt; uris &gt; /disc/wget-script\n"
 
-#. type: </example></p>
-#: offline.sgml:210
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:216
 msgid ""
 "Any command other than dist-upgrade could be used here, including dselect-"
 "upgrade."
@@ -10047,8 +10110,8 @@ msgstr ""
 "Toute autre commande que dist-upgrade peut être utilisée, y compris dselect-"
 "upgrade."
 
-#. type: <p></p>
-#: offline.sgml:216
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:220
 msgid ""
 "The /disc/wget-script file will now contain a list of wget commands to "
 "execute in order to fetch the necessary archives. This script should be run "
@@ -10060,25 +10123,25 @@ msgstr ""
 "exécuté depuis le point de montage du disque afin que les fichiers soient "
 "écrits sur le disque."
 
-#. type: <p><example>
-#: offline.sgml:219
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:226
 msgid "The remote machine would do something like"
 msgstr "Sur la machine distante, il faudra alors exécuter l'équivalent de :"
 
-#. type: <example></example>
-#: offline.sgml:223
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:229
 #, no-wrap
 msgid ""
 "  # cd /disc\n"
 "  # sh -x ./wget-script\n"
-"  [ wait.. ]"
+"  [ wait.. ]\n"
 msgstr ""
 "  # cd /disc\n"
 "  # sh -x ./wget-script\n"
-"  [ attendre.. ]"
+"  [ attendre.. ]\n"
 
-#. type: </example><example>
-#: offline.sgml:228
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:234
 msgid ""
 "Once the archives are downloaded and the disc returned to the Debian machine "
 "installation can proceed using,"
@@ -10086,14 +10149,14 @@ msgstr ""
 "Une fois les fichiers téléchargés et le disque reconnecté à la machine "
 "Debian, l'installation peut se poursuivre avec :"
 
-#. type: <example></example>
-#: offline.sgml:230
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:238
 #, no-wrap
-msgid "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
-msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
+msgid "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
+msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 
-#. type: </example></p>
-#: offline.sgml:234
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:241
 msgid "Which will use the already fetched archives on the disc."
 msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
 
diff --git a/doc/po/it.po b/doc/po/it.po
index cdb78fdb..e60dd79c 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-04-01 14:24+0200\n"
-"PO-Revision-Date: 2014-04-01 14:00+0200\n"
+"POT-Creation-Date: 2014-07-10 10:52+0200\n"
+"PO-Revision-Date: 2014-07-04 00:45+0200\n"
 "Last-Translator: Beatrice Torracca <beatricet@libero.it>\n"
 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
 "Language: it\n"
@@ -837,7 +837,7 @@ msgstr ""
 #: apt.8.xml:145
 msgid ""
 "The <command>apt</command> command is meant to be pleasant for end users and "
-"does not need to be backward compatilbe like &apt-get;. Therefore some "
+"does not need to be backward compatible like &apt-get;. Therefore some "
 "options are different:"
 msgstr ""
 
@@ -845,7 +845,7 @@ msgstr ""
 #: apt.8.xml:151
 #, fuzzy
 #| msgid "the <literal>Package:</literal> line"
-msgid "The option <literal>DPkgPM::Progress-Fancy</literal> is enabled."
+msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
 msgstr "la riga <literal>Package:</literal>"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
@@ -874,7 +874,7 @@ msgstr "la riga <literal>Archive:</literal> o <literal>Suite:</literal>"
 #. type: Content of: <refentry><refsect1><title>
 #: apt.8.xml:174 apt-get.8.xml:558 apt-cache.8.xml:352 apt-key.8.xml:197
 #: apt-mark.8.xml:133 apt-secure.8.xml:193 apt-cdrom.8.xml:154
-#: apt-config.8.xml:111 apt.conf.5.xml:1227 apt_preferences.5.xml:707
+#: apt-config.8.xml:111 apt.conf.5.xml:1228 apt_preferences.5.xml:707
 #: sources.list.5.xml:280 apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65
 #: apt-ftparchive.1.xml:609
 msgid "See Also"
@@ -1802,11 +1802,18 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:535
+#, fuzzy
+#| msgid ""
+#| "Show user friendly progress information in the terminal window when "
+#| "packages are installed, upgraded or removed. For a machine parsable "
+#| "version of this data see README.progress-reporting in the apt doc "
+#| "directory.  Configuration Item: <literal>DpkgPM::Progress</literal> and "
+#| "<literal>Dpkg::Progress-Fancy</literal>."
 msgid ""
 "Show user friendly progress information in the terminal window when packages "
 "are installed, upgraded or removed. For a machine parsable version of this "
 "data see README.progress-reporting in the apt doc directory.  Configuration "
-"Item: <literal>DpkgPM::Progress</literal> and <literal>Dpkg::Progress-Fancy</"
+"Item: <literal>Dpkg::Progress</literal> and <literal>Dpkg::Progress-Fancy</"
 "literal>."
 msgstr ""
 "Mostra informazioni sul progresso facili da leggere nella finestra del "
@@ -1818,7 +1825,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml:548 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127
-#: apt.conf.5.xml:1221 apt_preferences.5.xml:700
+#: apt.conf.5.xml:1222 apt_preferences.5.xml:700
 msgid "Files"
 msgstr "File"
 
@@ -3026,10 +3033,10 @@ msgstr ""
 #: apt-secure.8.xml:195
 msgid ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
 msgstr ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml:199
@@ -4586,15 +4593,27 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:607
+#, fuzzy
+#| msgid ""
+#| "<literal>Dir::Cache</literal> contains locations pertaining to local "
+#| "cache information, such as the two package caches <literal>srcpkgcache</"
+#| "literal> and <literal>pkgcache</literal> as well as the location to place "
+#| "downloaded archives, <literal>Dir::Cache::archives</literal>. Generation "
+#| "of caches can be turned off by setting their names to the empty string. "
+#| "This will slow down startup but save disk space. It is probably "
+#| "preferable to turn off the pkgcache rather than the srcpkgcache. Like "
+#| "<literal>Dir::State</literal> the default directory is contained in "
+#| "<literal>Dir::Cache</literal>"
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
 "and <literal>pkgcache</literal> as well as the location to place downloaded "
 "archives, <literal>Dir::Cache::archives</literal>. Generation of caches can "
-"be turned off by setting their names to the empty string. This will slow "
+"be turned off by setting <literal>pkgcache</literal> or "
+"<literal>srcpkgcache</literal> to <literal>\"\"</literal>.  This will slow "
 "down startup but save disk space. It is probably preferable to turn off the "
-"pkgcache rather than the srcpkgcache. Like <literal>Dir::State</literal> the "
-"default directory is contained in <literal>Dir::Cache</literal>"
+"pkgcache rather than the srcpkgcache.  Like <literal>Dir::State</literal> "
+"the default directory is contained in <literal>Dir::Cache</literal>"
 msgstr ""
 "<literal>Dir::Cache</literal> contiene le posizioni relative alle "
 "informazioni della cache locale, come le due cache dei pacchetti "
@@ -4607,7 +4626,7 @@ msgstr ""
 "la directory predefinita è contenuta in <literal>Dir::Cache</literal>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:616
+#: apt.conf.5.xml:617
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4622,7 +4641,7 @@ msgstr ""
 "configurazione specificato da <envar>APT_CONFIG</envar>)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:622
+#: apt.conf.5.xml:623
 msgid ""
 "The <literal>Dir::Parts</literal> setting reads in all the config fragments "
 "in lexical order from the directory specified. After this is done then the "
@@ -4633,7 +4652,7 @@ msgstr ""
 "termine viene caricato il file di configurazione principale."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:626
+#: apt.conf.5.xml:627
 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4650,7 +4669,7 @@ msgstr ""
 "specificano la posizione dei rispettivi programmi."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:634
+#: apt.conf.5.xml:635
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4671,7 +4690,7 @@ msgstr ""
 "staging/var/lib/dpkg/status</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:647
+#: apt.conf.5.xml:648
 msgid ""
 "The <literal>Ignore-Files-Silently</literal> list can be used to specify "
 "which files APT should silently ignore while parsing the files in the "
@@ -4689,12 +4708,12 @@ msgstr ""
 "questi modelli possono usare una sintassi con espressioni regolari."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:656
+#: apt.conf.5.xml:657
 msgid "APT in DSelect"
 msgstr "APT in DSelect"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:658
+#: apt.conf.5.xml:659
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behavior. These are in the <literal>DSelect</literal> "
@@ -4705,7 +4724,7 @@ msgstr ""
 "sezione <literal>DSelect</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:663
+#: apt.conf.5.xml:664
 msgid ""
 "Cache Clean mode; this value may be one of <literal>always</literal>, "
 "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -4727,7 +4746,7 @@ msgstr ""
 "scaricare i nuovi pacchetti."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:677
+#: apt.conf.5.xml:678
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the install phase."
@@ -4737,7 +4756,7 @@ msgstr ""
 "installazione."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:682
+#: apt.conf.5.xml:683
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the update phase."
@@ -4747,7 +4766,7 @@ msgstr ""
 "aggiornamento."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:687
+#: apt.conf.5.xml:688
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
@@ -4757,12 +4776,12 @@ msgstr ""
 "solo in caso di errore."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:693
+#: apt.conf.5.xml:694
 msgid "How APT calls &dpkg;"
 msgstr "Come APT invoca &dpkg;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:694
+#: apt.conf.5.xml:695
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
@@ -4771,7 +4790,7 @@ msgstr ""
 "&dpkg;; sono nella sezione <literal>DPkg</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:699
+#: apt.conf.5.xml:700
 msgid ""
 "This is a list of options to pass to &dpkg;. The options must be specified "
 "using the list notation and each list item is passed as a single argument to "
@@ -4782,7 +4801,7 @@ msgstr ""
 "passata a &dpkg; come un singolo argomento."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:705
+#: apt.conf.5.xml:706
 msgid ""
 "This is a list of shell commands to run before/after invoking &dpkg;.  Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -4795,7 +4814,7 @@ msgstr ""
 "bin/sh</filename>; se qualcuno dei comandi fallisce APT terminerà annullando."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:712
+#: apt.conf.5.xml:713
 msgid ""
 "This is a list of shell commands to run before invoking &dpkg;. Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -4813,7 +4832,7 @@ msgstr ""
 "lo standard input."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:719
+#: apt.conf.5.xml:720
 msgid ""
 "Version 2 of this protocol dumps more information, including the protocol "
 "version, the APT configuration space and the packages, files and versions "
@@ -4827,7 +4846,7 @@ msgstr ""
 "versione di cui viene fatto il dump."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:724
+#: apt.conf.5.xml:725
 msgid ""
 "The version of the protocol to be used for the command "
 "<literal><replaceable>cmd</replaceable></literal> can be chosen by setting "
@@ -4844,7 +4863,7 @@ msgstr ""
 "l'informazione nella versione più alta per cui ha il supporto."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:731
+#: apt.conf.5.xml:732
 msgid ""
 "The file descriptor to be used to send the information can be requested with "
 "<literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::InfoFD</"
@@ -4862,7 +4881,7 @@ msgstr ""
 "file usato per conferma."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:741
+#: apt.conf.5.xml:742
 msgid ""
 "APT chdirs to this directory before invoking &dpkg;, the default is "
 "<filename>/</filename>."
@@ -4871,7 +4890,7 @@ msgstr ""
 "valore predefinito è <filename>/</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:746
+#: apt.conf.5.xml:747
 msgid ""
 "These options are passed to &dpkg-buildpackage; when compiling packages; the "
 "default is to disable signing and produce all binaries."
@@ -4881,12 +4900,12 @@ msgstr ""
 "binari."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:751
+#: apt.conf.5.xml:752
 msgid "dpkg trigger usage (and related options)"
 msgstr "Uso dei trigger di dpkg (e relative opzioni)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:752
+#: apt.conf.5.xml:753
 msgid ""
 "APT can call &dpkg; in such a way as to let it make aggressive use of "
 "triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
@@ -4914,7 +4933,7 @@ msgstr ""
 "pacchetti."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:767
+#: apt.conf.5.xml:768
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -4928,7 +4947,7 @@ msgstr ""
 "DPkg::TriggersPending \"true\";"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:761
+#: apt.conf.5.xml:762
 msgid ""
 "Note that it is not guaranteed that APT will support these options or that "
 "these options will not cause (big) trouble in the future. If you have "
@@ -4952,7 +4971,7 @@ msgstr ""
 "\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:774
+#: apt.conf.5.xml:775
 msgid ""
 "Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
 "call).  See &dpkg; if you are interested in what this actually means. In "
@@ -4974,7 +4993,7 @@ msgstr ""
 "questa opzione anche alle chiamate per lo spacchettamento e la rimozione."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:782
+#: apt.conf.5.xml:783
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
@@ -5004,7 +5023,7 @@ msgstr ""
 "potrebbe finire in uno stato non configurato e potenzialmente non avviabile."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:797
+#: apt.conf.5.xml:798
 msgid ""
 "If this option is set APT will call <command>dpkg --configure --pending</"
 "command> to let &dpkg; handle all required configurations and triggers. This "
@@ -5022,7 +5041,7 @@ msgstr ""
 "si può disattivare questa opzione in tutte le esecuzioni tranne l'ultima."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:804
+#: apt.conf.5.xml:805
 msgid ""
 "Useful for the <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal>, and "
@@ -5038,7 +5057,7 @@ msgstr ""
 "necessari per configurare il pacchetto in questione."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:817
+#: apt.conf.5.xml:818
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -5056,7 +5075,7 @@ msgstr ""
 "};"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:810
+#: apt.conf.5.xml:811
 msgid ""
 "Essential packages (and their dependencies) should be configured immediately "
 "after unpacking. It is a good idea to do this quite early in the upgrade "
@@ -5081,12 +5100,12 @@ msgstr ""
 "con i loro valori predefiniti. <placeholder type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:830
+#: apt.conf.5.xml:831
 msgid "Periodic and Archives options"
 msgstr "Opzioni Periodic e Archives"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:831
+#: apt.conf.5.xml:832
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by the "
@@ -5100,12 +5119,12 @@ msgstr ""
 "all'inizio dello script."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:839
+#: apt.conf.5.xml:840
 msgid "Debug options"
 msgstr "Opzioni di debug"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:841
+#: apt.conf.5.xml:842
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -5123,7 +5142,7 @@ msgstr ""
 "esserlo:"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:852
+#: apt.conf.5.xml:853
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -5134,7 +5153,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:860
+#: apt.conf.5.xml:861
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"
@@ -5145,7 +5164,7 @@ msgstr ""
 "install</literal>) come utente non root."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:869
+#: apt.conf.5.xml:870
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -5157,7 +5176,7 @@ msgstr ""
 #. 	   motivating example, except I haven't a clue why you'd want
 #. 	   to do this. 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:877
+#: apt.conf.5.xml:878
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CD-ROM IDs."
@@ -5166,37 +5185,37 @@ msgstr ""
 "negli ID dei CD-ROM."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:887
+#: apt.conf.5.xml:888
 msgid "A full list of debugging options to apt follows."
 msgstr "Segue un elenco completo delle opzioni di debug per apt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:896
+#: apt.conf.5.xml:897
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
 "Stampa informazioni relative all'accesso a fonti <literal>cdrom://</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:907
+#: apt.conf.5.xml:908
 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 "Stampa informazioni relative allo scaricamento dei pacchetti usando FTP."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:918
+#: apt.conf.5.xml:919
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 "Stampa informazioni relative allo scaricamento dei pacchetti usando HTTP."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:929
+#: apt.conf.5.xml:930
 msgid "Print information related to downloading packages using HTTPS."
 msgstr ""
 "Stampa informazioni relative allo scaricamento dei pacchetti usando HTTPS."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:940
+#: apt.conf.5.xml:941
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
@@ -5205,7 +5224,7 @@ msgstr ""
 "usando <literal>gpg</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:951
+#: apt.conf.5.xml:952
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
@@ -5214,14 +5233,14 @@ msgstr ""
 "pacchetti memorizzati su CD-ROM."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:961
+#: apt.conf.5.xml:962
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 "Descrive il processo di risoluzione delle dipendenze di compilazione in &apt-"
 "get;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:971
+#: apt.conf.5.xml:972
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
@@ -5230,7 +5249,7 @@ msgstr ""
 "<literal>apt</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:981
+#: apt.conf.5.xml:982
 msgid ""
 "Do not include information from <literal>statfs</literal>, namely the number "
 "of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -5241,7 +5260,7 @@ msgstr ""
 "system del CD-ROM."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:992
+#: apt.conf.5.xml:993
 msgid ""
 "Disable all file locking.  For instance, this will allow two instances of "
 "<quote><literal>apt-get update</literal></quote> to run at the same time."
@@ -5251,14 +5270,14 @@ msgstr ""
 "contemporaneamente."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1004
+#: apt.conf.5.xml:1005
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 "Registra nel log quando vengono aggiunte o rimosse voci dalla coda globale "
 "degli scaricamenti."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1014
+#: apt.conf.5.xml:1015
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
@@ -5267,7 +5286,7 @@ msgstr ""
 "codici di controllo e delle firme di cifratura dei file scaricati."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1024
+#: apt.conf.5.xml:1025
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
@@ -5277,7 +5296,7 @@ msgstr ""
 "diff."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1036
+#: apt.conf.5.xml:1037
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
@@ -5287,7 +5306,7 @@ msgstr ""
 "invece degli indici completi."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1047
+#: apt.conf.5.xml:1048
 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
@@ -5295,7 +5314,7 @@ msgstr ""
 "realmente gli scaricamenti."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1058
+#: apt.conf.5.xml:1059
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
@@ -5304,7 +5323,7 @@ msgstr ""
 "installato dei pacchetti e alla rimozione dei pacchetti non utilizzati."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1068
+#: apt.conf.5.xml:1069
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
@@ -5320,7 +5339,7 @@ msgstr ""
 "pkgProblemResolver</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1082
+#: apt.conf.5.xml:1083
 msgid ""
 "Generate debug messages describing which packages are marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
@@ -5352,7 +5371,7 @@ msgstr ""
 "sezione in cui compare il pacchetto."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1103
+#: apt.conf.5.xml:1104
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
@@ -5361,7 +5380,7 @@ msgstr ""
 "gli argomenti separati da un singolo carattere di spazio."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1114
+#: apt.conf.5.xml:1115
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
@@ -5370,7 +5389,7 @@ msgstr ""
 "di stato ed ogni errore incontrato durante la sua analisi."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1125
+#: apt.conf.5.xml:1126
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
@@ -5379,7 +5398,7 @@ msgstr ""
 "literal> deve passare i pacchetti a &dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1137
+#: apt.conf.5.xml:1138
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""
@@ -5387,12 +5406,12 @@ msgstr ""
 "nell'invocazione di &dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1148
+#: apt.conf.5.xml:1149
 msgid "Output the priority of each package list on startup."
 msgstr "Produce in output la priorità di ogni elenco di pacchetti all'avvio."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1158
+#: apt.conf.5.xml:1159
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
@@ -5402,7 +5421,7 @@ msgstr ""
 "dipendenze)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1169
+#: apt.conf.5.xml:1170
 msgid ""
 "Display a list of all installed packages with their calculated score used by "
 "the pkgProblemResolver. The description of the package is the same as "
@@ -5413,7 +5432,7 @@ msgstr ""
 "la stessa descritta in <literal>Debug::pkgDepCache::Marker</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1181
+#: apt.conf.5.xml:1182
 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
@@ -5422,7 +5441,7 @@ msgstr ""
 "filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1191
+#: apt.conf.5.xml:1192
 msgid ""
 "Display the external commands that are called by apt hooks.  This includes e."
 "g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or "
@@ -5430,13 +5449,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1215 apt_preferences.5.xml:547 sources.list.5.xml:239
+#: apt.conf.5.xml:1216 apt_preferences.5.xml:547 sources.list.5.xml:239
 #: apt-ftparchive.1.xml:598
 msgid "Examples"
 msgstr "Esempi"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1216
+#: apt.conf.5.xml:1217
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -5446,7 +5465,7 @@ msgstr ""
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1228
+#: apt.conf.5.xml:1229
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
 
@@ -8472,36 +8491,53 @@ msgstr ""
 "<command>apt-ftparchive</command> restituisce zero in caso di funzionamento "
 "normale e il valore decimale 100 in caso di errore."
 
-#. type: <title></title>
-#: guide.sgml:4
+#. type: Attribute 'lang' of: <book>
+#: guide.dbk:8 offline.dbk:8
+msgid "en"
+msgstr "it"
+
+#. type: Content of: <book><title>
+#: guide.dbk:10
 msgid "APT User's Guide"
 msgstr "Guida dell'utente di APT"
 
-#. type: <author></author>
-#: guide.sgml:6 offline.sgml:6
-msgid "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
-msgstr "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
+#. type: Content of: <book><bookinfo><authorgroup><author><personname>
+#: guide.dbk:16 offline.dbk:16
+msgid "Jason Gunthorpe"
+msgstr "Jason Gunthorpe"
 
-#. type: <version></version>
-#: guide.sgml:7
-msgid "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
-msgstr "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
+#. type: Content of: <book><bookinfo><authorgroup><author><email>
+#: guide.dbk:16 offline.dbk:16
+msgid "jgg@debian.org"
+msgstr "jgg@debian.org"
 
-#. type: <abstract></abstract>
-#: guide.sgml:11
+#. type: Content of: <book><bookinfo><releaseinfo>
+#: guide.dbk:20 offline.dbk:20
+msgid "Version &apt-product-version;"
+msgstr ""
+
+#. type: Content of: <book><bookinfo><abstract><para>
+#: guide.dbk:24
 msgid ""
 "This document provides an overview of how to use the the APT package manager."
 msgstr ""
 "Questo documento fornisce una panoramica su come usare il gestore di "
 "pacchetti APT."
 
-#. type: <copyrightsummary></copyrightsummary>
-#: guide.sgml:15
-msgid "Copyright &copy; Jason Gunthorpe, 1998."
-msgstr "Copyright &copy; Jason Gunthorpe, 1998."
+#. type: Content of: <book><bookinfo>
+#: guide.dbk:28
+msgid ""
+"<copyright><year>1998</year><holder>Jason Gunthorpe</holder></copyright>"
+msgstr ""
+"<copyright><year>1998</year><holder>Jason Gunthorpe</holder></copyright>"
+
+#. type: Content of: <book><bookinfo><legalnotice><title>
+#: guide.dbk:31 offline.dbk:32
+msgid "License Notice"
+msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:21 offline.sgml:22
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: guide.dbk:33 offline.dbk:34
 msgid ""
 "\"APT\" and this document are free software; you can redistribute them and/"
 "or modify them under the terms of the GNU General Public License as "
@@ -8513,8 +8549,8 @@ msgstr ""
 "pubblicata dalla Free Software Foundation, nella versione 2 o (a propria "
 "scelta) qualsiasi versione successiva."
 
-#. type: <p></p>
-#: guide.sgml:24 offline.sgml:25
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: guide.dbk:42 offline.dbk:40
 msgid ""
 "For more details, on Debian systems, see the file /usr/share/common-licenses/"
 "GPL for the full license."
@@ -8522,31 +8558,31 @@ msgstr ""
 "Per ulteriori dettagli, sui sistemi Debian, si veda il testo completo della "
 "licenza nel file /usr/share/common-licenses/GPL."
 
-#. type: <heading></heading>
-#: guide.sgml:32
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:49
 msgid "General"
 msgstr "Descrizione generale"
 
-#. type: <p></p>
-#: guide.sgml:38
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:51
 msgid ""
-"The APT package currently contains two sections, the APT <prgn>dselect</"
-"prgn> method and the <prgn>apt-get</prgn> command line user interface. Both "
-"provide a way to install and remove packages as well as download new "
-"packages from the Internet."
+"The APT package currently contains two sections, the APT <command>dselect</"
+"command> method and the <command>apt-get</command> command line user "
+"interface. Both provide a way to install and remove packages as well as "
+"download new packages from the Internet."
 msgstr ""
 "Il pacchetto APT al momento contiene due sezioni, il metodo APT per "
-"<prgn>dselect</prgn> e l'interfaccia utente a riga di comando <prgn>apt-get</"
-"prgn>; entrambi forniscono un modo per installare e rimuovere pacchetti, "
-"così come per scaricarne di nuovi da Internet."
+"<command>dselect</command> e l'interfaccia utente a riga di comando "
+"<command>apt-get</command>; entrambi forniscono un modo per installare e "
+"rimuovere pacchetti, così come per scaricarne di nuovi da Internet."
 
-#. type: <heading></heading>
-#: guide.sgml:39
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:57
 msgid "Anatomy of the Package System"
 msgstr "Anatomia del sistema dei pacchetti"
 
-#. type: <p></p>
-#: guide.sgml:44
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:59
 msgid ""
 "The Debian packaging system has a large amount of information associated "
 "with each package to help assure that it integrates cleanly and easily into "
@@ -8557,8 +8593,8 @@ msgstr ""
 "maniera pulita nel sistema. La sua caratteristica più importante è il "
 "sistema di dipendenze."
 
-#. type: <p></p>
-#: guide.sgml:52
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:64
 msgid ""
 "The dependency system allows individual programs to make use of shared "
 "elements in the system such as libraries. It simplifies placing infrequently "
@@ -8573,8 +8609,8 @@ msgstr ""
 "possibile avere più di una scelta per cose quali i programmi di "
 "trasferimento della posta elettronica, i server X e così via."
 
-#. type: <p></p>
-#: guide.sgml:57
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:71
 msgid ""
 "The first step to understanding the dependency system is to grasp the "
 "concept of a simple dependency. The meaning of a simple dependency is that a "
@@ -8585,8 +8621,8 @@ msgstr ""
 "concetto di dipendenza semplice: un pacchetto richiede che un altro sia "
 "installato insieme ad esso per poter funzionare."
 
-#. type: <p></p>
-#: guide.sgml:63
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:76
 msgid ""
 "For instance, mailcrypt is an emacs extension that aids in encrypting email "
 "with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a "
@@ -8599,8 +8635,8 @@ msgstr ""
 "che si tratta di un'estensione di emacs, mailcrypt ha anche una dipendenza "
 "semplice da emacs, senza il quale è totalmente inutile."
 
-#. type: <p></p>
-#: guide.sgml:73
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:82
 msgid ""
 "The other important dependency to understand is a conflicting dependency. It "
 "means that a package, when installed with another package, will not work and "
@@ -8621,8 +8657,8 @@ msgstr ""
 "seriamente il sistema, quindi ciascun programma di trasporto della posta ha "
 "una dipendenza di conflitto verso tutti gli altri."
 
-#. type: <p></p>
-#: guide.sgml:83
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:92
 msgid ""
 "As an added complication there is the possibility for a package to pretend "
 "to be another package. Consider that exim and sendmail for many intents are "
@@ -8643,8 +8679,8 @@ msgstr ""
 "dipendere da mail-transport-agent. Quando si cerca di modificare a mano i "
 "pacchetti, questo può portare a moltissima confusione."
 
-#. type: <p></p>
-#: guide.sgml:88
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:102
 msgid ""
 "At any given time a single dependency may be met by packages that are "
 "already installed or it may not be. APT attempts to help resolve dependency "
@@ -8656,77 +8692,84 @@ msgstr ""
 "problemi di dipendenze fornendo svariati algoritmi automatici, che aiutano a "
 "selezionare i pacchetti da installare."
 
-#. type: <heading></heading>
-#: guide.sgml:96
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:111
 msgid "apt-get"
 msgstr "apt-get"
 
-#. type: <p></p>
-#: guide.sgml:102
-msgid ""
-"<prgn>apt-get</prgn> provides a simple way to install packages from the "
-"command line. Unlike <prgn>dpkg</prgn>, <prgn>apt-get</prgn> does not "
-"understand .deb files, it works with the package's proper name and can only "
-"install .deb archives from a <em>Source</em>."
-msgstr ""
-"<prgn>apt-get</prgn> fornisce un modo semplice di installare i pacchetti "
-"dalla riga di comando. Diversamente da <prgn>dpkg</prgn>, <prgn>apt-get</"
-"prgn> non tratta i file .deb, ma utilizza il vero nome dei pacchetti e può "
-"installare archivi .deb solo da una <em>fonte</em>."
-
-#. type: <p></p>
-#: guide.sgml:109
-msgid ""
-"The first <footnote><p>If you are using an http proxy server you must set "
-"the http_proxy environment variable first, see sources.list(5)</p></"
-"footnote> thing that should be done before using <prgn>apt-get</prgn> is to "
-"fetch the package lists from the <em>Sources</em> so that it knows what "
-"packages are available. This is done with <tt>apt-get update</tt>. For "
-"instance,"
-msgstr ""
-"La prima <footnote><p>Se si sta usando un server proxy http, si deve prima "
-"ancora impostare la variabile d'ambiente http_proxy; vedere sources.list(5)."
-"</p></footnote> cosa da fare prima di usare <prgn>apt-get</prgn> è scaricare "
-"gli elenchi dei pacchetti dalle <em>fonti</em> in modo che il programma "
-"sappia quali pacchetti sono disponibili. Lo si fa con <tt>apt-get update</"
-"tt>. Ad esempio,"
-
-#. type: <example></example>
-#: guide.sgml:116
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:113
+msgid ""
+"<command>apt-get</command> provides a simple way to install packages from "
+"the command line. Unlike <command>dpkg</command>, <command>apt-get</command> "
+"does not understand .deb files, it works with the package's proper name and "
+"can only install .deb archives from a <emphasis>Source</emphasis>."
+msgstr ""
+"<command>apt-get</command> fornisce un modo semplice di installare i "
+"pacchetti dalla riga di comando. Diversamente da <command>dpkg</command>, "
+"<command>apt-get</command> non tratta i file .deb, ma utilizza il vero nome "
+"dei pacchetti e può installare archivi .deb solo da una <emphasis>fonte</"
+"emphasis>."
+
+#. type: Content of: <book><chapter><para><footnote><para>
+#: guide.dbk:119
+msgid ""
+"If you are using an http proxy server you must set the http_proxy "
+"environment variable first, see sources.list(5)"
+msgstr ""
+"Se si sta usando un server proxy http, si deve prima ancora impostare la "
+"variabile d'ambiente http_proxy; vedere sources.list(5)."
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:119
+msgid ""
+"The first <placeholder type=\"footnote\" id=\"0\"/> thing that should be "
+"done before using <command>apt-get</command> is to fetch the package lists "
+"from the <emphasis>Sources</emphasis> so that it knows what packages are "
+"available. This is done with <literal>apt-get update</literal>. For instance,"
+msgstr ""
+"La prima <placeholder type=\"footnote\" id=\"0\"/> cosa da fare prima di "
+"usare <command>apt-get</command> è scaricare gli elenchi dei pacchetti dalle "
+"<emphasis>fonti</emphasis> in modo che il programma sappia quali pacchetti "
+"sono disponibili. Lo si fa con <literal>apt-get update</literal>. Ad esempio,"
+
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:127
 #, no-wrap
 msgid ""
 "# apt-get update\n"
 "Get http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
 "Get http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 msgstr ""
 "# apt-get update\n"
 "Scaricamento di: http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
 "Scaricamento di: http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
 "Lettura elenco dei pacchetti... Fatto\n"
-"Generazione albero delle dipendenze... Fatto"
+"Generazione albero delle dipendenze... Fatto\n"
 
-#. type: <p><taglist>
-#: guide.sgml:120
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:134
 msgid "Once updated there are several commands that can be used:"
 msgstr "Una volta aggiornato l'elenco, si possono usare svariati comandi:"
 
-#. type: <tag></tag>
-#: guide.sgml:121
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:138
 msgid "upgrade"
 msgstr "upgrade"
 
-#. type: <p></p>
-#: guide.sgml:131
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:141
 msgid ""
 "Upgrade will attempt to gently upgrade the whole system. Upgrade will never "
 "install a new package or remove an existing package, nor will it ever "
 "upgrade a package that might cause some other package to break. This can be "
 "used daily to relatively safely upgrade the system. Upgrade will list all of "
 "the packages that it could not upgrade, this usually means that they depend "
-"on new packages or conflict with some other package. <prgn>dselect</prgn> or "
-"<tt>apt-get install</tt> can be used to force these packages to install."
+"on new packages or conflict with some other package. <command>dselect</"
+"command> or <literal>apt-get install</literal> can be used to force these "
+"packages to install."
 msgstr ""
 "Upgrade tenterà di fare un aggiornamento indolore del sistema completo, "
 "senza installare mai nuovi pacchetti o rimuoverne di esistenti, e senza mai "
@@ -8735,15 +8778,15 @@ msgstr ""
 "Upgrade elencherà tutti i pacchetti che non avrà potuto aggiornare, cosa che "
 "in genere significa che questi dipendono da nuovi pacchetti o che vanno in "
 "conflitto con altri. Per forzare la loro installazione si può usare "
-"<prgn>dselect</prgn> o <tt>apt-get install</tt>."
+"<command>dselect</command> o <literal>apt-get install</literal>."
 
-#. type: <tag></tag>
-#: guide.sgml:131
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:153
 msgid "install"
 msgstr "install"
 
-#. type: <p></p>
-#: guide.sgml:140
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:156
 msgid ""
 "Install is used to install packages by name. The package is automatically "
 "fetched and installed. This can be useful if you already know the name of "
@@ -8762,21 +8805,22 @@ msgstr ""
 "devono essere modificati altri pacchetti che non siano quelli sulla riga di "
 "comando."
 
-#. type: <tag></tag>
-#: guide.sgml:140
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:167
 msgid "dist-upgrade"
 msgstr "dist-upgrade"
 
-#. type: <p></p>
-#: guide.sgml:149
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:170
 msgid ""
 "Dist-upgrade is a complete upgrader designed to simplify upgrading between "
 "releases of Debian. It uses a sophisticated algorithm to determine the best "
 "set of packages to install, upgrade and remove to get as much of the system "
 "to the newest release. In some situations it may be desired to use dist-"
 "upgrade rather than spend the time manually resolving dependencies in "
-"<prgn>dselect</prgn>. Once dist-upgrade has completed then <prgn>dselect</"
-"prgn> can be used to install any packages that may have been left out."
+"<command>dselect</command>. Once dist-upgrade has completed then "
+"<command>dselect</command> can be used to install any packages that may have "
+"been left out."
 msgstr ""
 "Dist-upgrade fa un aggiornamento completo ed è progettato in modo da rendere "
 "semplici gli aggiornamenti tra i rilasci di Debian. Usa un algoritmo "
@@ -8784,12 +8828,12 @@ msgstr ""
 "aggiornare e rimuovere per migrare alla versione più recente la maggior "
 "parte del sistema possibile. In alcune situazioni può essere vantaggioso "
 "usare dist-upgrade invece di dedicare tempo a risolvere manualmente le "
-"dipendenze con <prgn>dselect</prgn>. Una volta completato il lavoro di dist-"
-"upgrade, si può usare <prgn>dselect</prgn> per installare eventuali "
-"pacchetti che sono stati tralasciati."
+"dipendenze con <command>dselect</command>. Una volta completato il lavoro di "
+"dist-upgrade, si può usare <command>dselect</command> per installare "
+"eventuali pacchetti che sono stati tralasciati."
 
-#. type: <p></p>
-#: guide.sgml:152
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:180
 msgid ""
 "It is important to closely look at what dist-upgrade is going to do, its "
 "decisions may sometimes be quite surprising."
@@ -8797,167 +8841,172 @@ msgstr ""
 "È importante controllare attentamente cosa intende fare dist-upgrade, dato "
 "che le sue decisioni a volte possono essere abbastanza sorprendenti."
 
-#. type: <p></p>
-#: guide.sgml:163
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:187
 #, fuzzy
 #| msgid ""
-#| "<prgn>apt-get</prgn> has several command line options that are detailed "
-#| "in its man page, <manref section=\"8\" name=\"apt-get\">. The most useful "
-#| "option is <tt>-d</tt> which does not install the fetched files. If the "
-#| "system has to download a large number of package it would be undesired to "
-#| "start installing them in case something goes wrong. When <tt>-d</tt> is "
-#| "used the downloaded archives can be installed by simply running the "
-#| "command that caused them to be downloaded again without <tt>-d</tt>."
-msgid ""
-"<prgn>apt-get</prgn> has several command line options that are detailed in "
-"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful "
-"option is <tt>-d</tt> which does not install the fetched files. If the "
-"system has to download a large number of package it would be undesired to "
-"start installing them in case something goes wrong. When <tt>-d</tt> is used "
-"the downloaded archives can be installed by simply running the command that "
-"caused them to be downloaded again without <tt>-d</tt>."
-msgstr ""
-"<prgn>apt-get</prgn> ha diverse opzioni per la riga di comando, che sono "
-"documentate dettagliatamente nella sua pagina di manuale, <manref section="
-"\"8\" name=\"apt-get\">. L'opzione più utile è <tt>-d</tt>, che non installa "
-"i file scaricati; se il sistema deve scaricare un gran numero di pacchetti, "
-"non è bene iniziare ad installarli nel caso qualcosa dovesse andare storto. "
-"Quando si usa <tt>-d</tt>, gli archivi scaricati possono essere installati "
-"semplicemente eseguendo di nuovo lo stesso comando senza l'opzione <tt>-d</"
-"tt>."
-
-#. type: <heading></heading>
-#: guide.sgml:168
+#| "<command>apt-get</command> has several command line options that are "
+#| "detailed in its man page, <manref section=\"8\" name=\"apt-get\">. The "
+#| "most useful option is <literal>-d</literal> which does not install the "
+#| "fetched files. If the system has to download a large number of package it "
+#| "would be undesired to start installing them in case something goes wrong. "
+#| "When <literal>-d</literal> is used the downloaded archives can be "
+#| "installed by simply running the command that caused them to be downloaded "
+#| "again without <literal>-d</literal>."
+msgid ""
+"<command>apt-get</command> has several command line options that are "
+"detailed in its man page, <citerefentry><refentrytitle>apt-get</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>. The most useful "
+"option is <literal>-d</literal> which does not install the fetched files. If "
+"the system has to download a large number of package it would be undesired "
+"to start installing them in case something goes wrong. When <literal>-d</"
+"literal> is used the downloaded archives can be installed by simply running "
+"the command that caused them to be downloaded again without <literal>-d</"
+"literal>."
+msgstr ""
+"<command>apt-get</command> ha diverse opzioni per la riga di comando, che "
+"sono documentate dettagliatamente nella sua pagina di manuale, <manref "
+"section=\"8\" name=\"apt-get\">. L'opzione più utile è <literal>-d</"
+"literal>, che non installa i file scaricati; se il sistema deve scaricare un "
+"gran numero di pacchetti, non è bene iniziare ad installarli nel caso "
+"qualcosa dovesse andare storto. Quando si usa <literal>-d</literal>, gli "
+"archivi scaricati possono essere installati semplicemente eseguendo di nuovo "
+"lo stesso comando senza l'opzione <literal>-d</literal>."
+
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:199
 msgid "DSelect"
 msgstr "DSelect"
 
-#. type: <p></p>
-#: guide.sgml:173
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:201
 msgid ""
-"The APT <prgn>dselect</prgn> method provides the complete APT system with "
-"the <prgn>dselect</prgn> package selection GUI. <prgn>dselect</prgn> is used "
-"to select the packages to be installed or removed and APT actually installs "
-"them."
+"The APT <command>dselect</command> method provides the complete APT system "
+"with the <command>dselect</command> package selection GUI. <command>dselect</"
+"command> is used to select the packages to be installed or removed and APT "
+"actually installs them."
 msgstr ""
-"Il metodo APT di <prgn>dselect</prgn> fornisce tutte le funzionalità del "
-"sistema APT con l'interfaccia grafica di selezione dei pacchetti "
-"<prgn>dselect</prgn>. <prgn>dselect</prgn> viene usato per selezionare i "
-"pacchetti da installare o rimuovere, ed APT fa l'effettiva installazione."
+"Il metodo APT di <command>dselect</command> fornisce tutte le funzionalità "
+"del sistema APT con l'interfaccia grafica di selezione dei pacchetti "
+"<command>dselect</command>. <command>dselect</command> viene usato per "
+"selezionare i pacchetti da installare o rimuovere, ed APT fa l'effettiva "
+"installazione."
 
-#. type: <p></p>
-#: guide.sgml:184
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:207
 msgid ""
-"To enable the APT method you need to select [A]ccess in <prgn>dselect</prgn> "
-"and then choose the APT method. You will be prompted for a set of "
-"<em>Sources</em> which are places to fetch archives from. These can be "
-"remote Internet sites, local Debian mirrors or CD-ROMs. Each source can "
-"provide a fragment of the total Debian archive, APT will automatically "
+"To enable the APT method you need to select [A]ccess in <command>dselect</"
+"command> and then choose the APT method. You will be prompted for a set of "
+"<emphasis>Sources</emphasis> which are places to fetch archives from. These "
+"can be remote Internet sites, local Debian mirrors or CD-ROMs. Each source "
+"can provide a fragment of the total Debian archive, APT will automatically "
 "combine them to form a complete set of packages. If you have a CD-ROM then "
 "it is a good idea to specify it first and then specify a mirror so that you "
 "have access to the latest bug fixes. APT will automatically use packages on "
 "your CD-ROM before downloading from the Internet."
 msgstr ""
-"Per abilitare il metodo APT si deve selezionare [A]ccess in <prgn>dselect</"
-"prgn> e scegliere il metodo APT; verrà chiesto un insieme di fonti "
-"(<em>Sources</em>), cioè di posti da cui scaricare gli archivi. Possono "
-"essere siti Internet remoti, mirror locali di Debian o CD-ROM; ogni fonte "
-"può fornire una parte dell'intero archivio Debian, ed APT le combinerà "
-"automaticamente insieme per formare un insieme completo di pacchetti. Se si "
-"ha un CD-ROM allora è una buona idea indicarlo per primo e poi specificare "
-"un mirror, in modo da avere accesso alle ultime versioni con le soluzioni "
-"dei bug. APT in questo modo userà automaticamente i pacchetti sul CD-ROM "
-"prima di scaricarli da Internet."
-
-#. type: <example></example>
-#: guide.sgml:198
+"Per abilitare il metodo APT si deve selezionare [A]ccess in "
+"<command>dselect</command> e scegliere il metodo APT; verrà chiesto un "
+"insieme di fonti (<emphasis>Sources</emphasis>), cioè di posti da cui "
+"scaricare gli archivi. Possono essere siti Internet remoti, mirror locali di "
+"Debian o CD-ROM; ogni fonte può fornire una parte dell'intero archivio "
+"Debian, ed APT le combinerà automaticamente insieme per formare un insieme "
+"completo di pacchetti. Se si ha un CD-ROM allora è una buona idea indicarlo "
+"per primo e poi specificare un mirror, in modo da avere accesso alle ultime "
+"versioni con le soluzioni dei bug. APT in questo modo userà automaticamente "
+"i pacchetti sul CD-ROM prima di scaricarli da Internet."
+
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:218
 #, no-wrap
 msgid ""
 "   Set up a list of distribution source locations\n"
-"\t \n"
+"\n"
 " Please give the base URL of the debian distribution.\n"
 " The access schemes I know about are: http file\n"
-"\t   \n"
+"\n"
 " For example:\n"
 "      file:/mnt/debian,\n"
 "      ftp://ftp.debian.org/debian,\n"
 "      http://ftp.de.debian.org/debian,\n"
-"      \n"
-"      \n"
-" URL [http://llug.sep.bnl.gov/debian]:"
+"\n"
+"\n"
+" URL [http://llug.sep.bnl.gov/debian]:\n"
 msgstr ""
 "   Set up a list of distribution source locations\n"
-"\t \n"
+"\n"
 " Please give the base URL of the debian distribution.\n"
 " The access schemes I know about are: http file\n"
-"\t   \n"
+"\n"
 " For example:\n"
 "      file:/mnt/debian,\n"
 "      ftp://ftp.debian.org/debian,\n"
 "      http://ftp.de.debian.org/debian,\n"
-"      \n"
-"      \n"
-" URL [http://llug.sep.bnl.gov/debian]:"
+"\n"
+"\n"
+" URL [http://llug.sep.bnl.gov/debian]:\n"
 
-#. type: <p></p>
-#: guide.sgml:205
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:232
 msgid ""
-"The <em>Sources</em> setup starts by asking for the base of the Debian "
-"archive, defaulting to a HTTP mirror. Next it asks for the distribution to "
-"get."
+"The <emphasis>Sources</emphasis> setup starts by asking for the base of the "
+"Debian archive, defaulting to a HTTP mirror. Next it asks for the "
+"distribution to get."
 msgstr ""
-"La configurazione delle <em>fonti</em> inizia chiedendo la base "
+"La configurazione delle <emphasis>fonti</emphasis> inizia chiedendo la base "
 "dell'archivio Debian, proponendo in modo predefinito un mirror HTTP; "
 "successivamente viene chiesta la distribuzione da scaricare."
 
-#. type: <example></example>
-#: guide.sgml:212
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:237
 #, no-wrap
 msgid ""
 " Please give the distribution tag to get or a path to the\n"
 " package file ending in a /. The distribution\n"
 " tags are typically something like: stable unstable testing non-US\n"
-"   \n"
-" Distribution [stable]:"
+"\n"
+" Distribution [stable]:\n"
 msgstr ""
 " Please give the distribution tag to get or a path to the\n"
 " package file ending in a /. The distribution\n"
 " tags are typically something like: stable unstable testing non-US\n"
-"   \n"
-" Distribution [stable]:"
-
-#. type: <p></p>
-#: guide.sgml:222
-msgid ""
-"The distribution refers to the Debian version in the archive, <em>stable</"
-"em> refers to the latest released version and <em>unstable</em> refers to "
-"the developmental version. <em>non-US</em> is only available on some mirrors "
-"and refers to packages that contain encryption technology or other things "
-"that cannot be exported from the United States. Importing these packages "
-"into the US is legal however."
-msgstr ""
-"La distribuzione indica la versione Debian dell'archivio: <em>stable</em> è "
-"l'ultima versione rilasciata e <em>unstable</em> è quella di sviluppo. "
-"<em>non-US</em> è disponibile solo su alcuni mirror e contiene dei pacchetti "
-"in cui viene usata della tecnologia di cifratura o altre cose che non "
-"possono essere esportate dagli Stati Uniti; importare questi pacchetti negli "
-"USA è però legale."
-
-#. type: <example></example>
-#: guide.sgml:228
+"\n"
+" Distribution [stable]:\n"
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:244
+msgid ""
+"The distribution refers to the Debian version in the archive, "
+"<emphasis>stable</emphasis> refers to the latest released version and "
+"<emphasis>unstable</emphasis> refers to the developmental version. "
+"<emphasis>non-US</emphasis> is only available on some mirrors and refers to "
+"packages that contain encryption technology or other things that cannot be "
+"exported from the United States. Importing these packages into the US is "
+"legal however."
+msgstr ""
+"La distribuzione indica la versione Debian dell'archivio: <emphasis>stable</"
+"emphasis> è l'ultima versione rilasciata e <emphasis>unstable</emphasis> è "
+"quella di sviluppo. <emphasis>non-US</emphasis> è disponibile solo su alcuni "
+"mirror e contiene dei pacchetti in cui viene usata della tecnologia di "
+"cifratura o altre cose che non possono essere esportate dagli Stati Uniti; "
+"importare questi pacchetti negli USA è però legale."
+
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:253
 #, no-wrap
 msgid ""
 " Please give the components to get\n"
 " The components are typically something like: main contrib non-free\n"
-"  \n"
-" Components [main contrib non-free]:"
+"\n"
+" Components [main contrib non-free]:\n"
 msgstr ""
 " Please give the components to get\n"
 " The components are typically something like: main contrib non-free\n"
-"  \n"
-" Components [main contrib non-free]:"
+"\n"
+" Components [main contrib non-free]:\n"
 
-#. type: <p></p>
-#: guide.sgml:236
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:259
 msgid ""
 "The components list refers to the list of sub distributions to fetch. The "
 "distribution is split up based on software licenses, main being DFSG free "
@@ -8970,8 +9019,8 @@ msgstr ""
 "mentre contrib e non-free contengono software che ha diverse restrizioni "
 "sull'uso e sulla distribuzione."
 
-#. type: <p></p>
-#: guide.sgml:240
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:265
 msgid ""
 "Any number of sources can be added, the setup script will continue to prompt "
 "until you have specified all that you want."
@@ -8980,23 +9029,24 @@ msgstr ""
 "configurazione continuerà a chiedere fino a che non sono state specificate "
 "tutte quelle desiderate."
 
-#. type: <p></p>
-#: guide.sgml:247
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:269
 msgid ""
-"Before starting to use <prgn>dselect</prgn> it is necessary to update the "
-"available list by selecting [U]pdate from the menu. This is a superset of "
-"<tt>apt-get update</tt> that makes the fetched information available to "
-"<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get update</"
-"tt> has been run before."
+"Before starting to use <command>dselect</command> it is necessary to update "
+"the available list by selecting [U]pdate from the menu. This is a superset "
+"of <literal>apt-get update</literal> that makes the fetched information "
+"available to <command>dselect</command>. [U]pdate must be performed even if "
+"<literal>apt-get update</literal> has been run before."
 msgstr ""
-"Prima di cominciare a usare <prgn>dselect</prgn> è necessario aggiornare "
-"l'elenco dei pacchetti disponibili selezionando [U]pdate dal menù: si tratta "
-"di un sovrainsieme di ciò che fa <tt>apt-get update</tt>, che rende le "
-"informazioni scaricate disponibili a <prgn>dselect</prgn>. [U]pdate deve "
-"essere usato anche se prima è stato eseguito <tt>apt-get update</tt>."
+"Prima di cominciare a usare <command>dselect</command> è necessario "
+"aggiornare l'elenco dei pacchetti disponibili selezionando [U]pdate dal "
+"menù: si tratta di un sovrainsieme di ciò che fa <literal>apt-get update</"
+"literal>, che rende le informazioni scaricate disponibili a "
+"<command>dselect</command>. [U]pdate deve essere usato anche se prima è "
+"stato eseguito <literal>apt-get update</literal>."
 
-#. type: <p></p>
-#: guide.sgml:253
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:276
 msgid ""
 "You can then go on and make your selections using [S]elect and then perform "
 "the installation using [I]nstall. When using the APT method the [C]onfig and "
@@ -9008,77 +9058,94 @@ msgstr ""
 "[C]onfig e [R]emove non hanno significato, dato che entrambe le fasi sono "
 "contenute in [I]nstall."
 
-#. type: <p></p>
-#: guide.sgml:258
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:282
 msgid ""
 "By default APT will automatically remove the package (.deb) files once they "
-"have been successfully installed. To change this behavior place <tt>Dselect::"
-"clean \"prompt\";</tt> in /etc/apt/apt.conf."
+"have been successfully installed. To change this behavior place "
+"<literal>Dselect::clean \"prompt\";</literal> in /etc/apt/apt.conf."
 msgstr ""
 "In modo predefinito APT rimuoverà automaticamente i file (.deb) dei "
 "pacchetti che sono stati installati con successo. Per modificare questo "
-"comportamento, inserire <tt>Dselect::clean \"prompt\";</tt> in /etc/apt/apt."
-"conf."
+"comportamento, inserire <literal>Dselect::clean \"prompt\";</literal> in /"
+"etc/apt/apt.conf."
 
-#. type: <heading></heading>
-#: guide.sgml:264
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:288
 msgid "The Interface"
 msgstr "L'interfaccia"
 
-#. type: <p></p>
-#: guide.sgml:278
+#. type: Content of: <book><chapter><para><footnote><para>
+#: guide.dbk:292
 msgid ""
-"Both that APT <prgn>dselect</prgn> method and <prgn>apt-get</prgn> share the "
-"same interface. It is a simple system that generally tells you what it will "
-"do and then goes and does it. <footnote><p>The <prgn>dselect</prgn> method "
-"actually is a set of wrapper scripts to <prgn>apt-get</prgn>. The method "
-"actually provides more functionality than is present in <prgn>apt-get</prgn> "
-"alone.</p></footnote> After printing out a summary of what will happen APT "
+"The <command>dselect</command> method actually is a set of wrapper scripts "
+"to <command>apt-get</command>. The method actually provides more "
+"functionality than is present in <command>apt-get</command> alone."
+msgstr ""
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:290
+#, fuzzy
+#| msgid ""
+#| "Both that APT <command>dselect</command> method and <command>apt-get</"
+#| "command> share the same interface. It is a simple system that generally "
+#| "tells you what it will do and then goes and does it. <footnote><para>The "
+#| "<command>dselect</command> method actually is a set of wrapper scripts to "
+#| "<command>apt-get</command>. The method actually provides more "
+#| "functionality than is present in <command>apt-get</command> alone.</"
+#| "para></footnote> After printing out a summary of what will happen APT "
+#| "then will print out some informative status messages so that you can "
+#| "estimate how far along it is and how much is left to do."
+msgid ""
+"Both that APT <command>dselect</command> method and <command>apt-get</"
+"command> share the same interface. It is a simple system that generally "
+"tells you what it will do and then goes and does it. <placeholder type="
+"\"footnote\" id=\"0\"/> After printing out a summary of what will happen APT "
 "then will print out some informative status messages so that you can "
 "estimate how far along it is and how much is left to do."
 msgstr ""
-"Sia il metodo APT per <prgn>dselect</prgn> sia <prgn>apt-get</prgn> "
-"condividono la stessa interfaccia; si tratta di un sistema semplice che "
-"indica in genere cosa sta per fare, e poi lo fa. <footnote><p>Il metodo "
-"<prgn>dselect</prgn> è in realtà un insieme di script di wrapper per "
-"<prgn>apt-get</prgn>. Il metodo di fatto fornisce delle funzionalità "
-"maggiori del solo <prgn>apt-get</prgn>.</p></footnote> Dopo la stampa di un "
-"riassunto delle operazioni che saranno fatte, APT stampa dei messaggi "
-"informativi sullo stato, in modo da poter avere un'idea del punto a cui "
-"arrivato e di quanto ci sia ancora da fare."
-
-#. type: <heading></heading>
-#: guide.sgml:280
+"Sia il metodo APT per <command>dselect</command> sia <command>apt-get</"
+"command> condividono la stessa interfaccia; si tratta di un sistema semplice "
+"che indica in genere cosa sta per fare, e poi lo fa. <footnote><para>Il "
+"metodo <command>dselect</command> è in realtà un insieme di script di "
+"wrapper per <command>apt-get</command>. Il metodo di fatto fornisce delle "
+"funzionalità maggiori del solo <command>apt-get</command>.</para></footnote> "
+"Dopo la stampa di un riassunto delle operazioni che saranno fatte, APT "
+"stampa dei messaggi informativi sullo stato, in modo da poter avere un'idea "
+"del punto a cui arrivato e di quanto ci sia ancora da fare."
+
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:301
 msgid "Startup"
 msgstr "Avvio"
 
-#. type: <p></p>
-#: guide.sgml:284
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:303
 msgid ""
 "Before all operations except update, APT performs a number of actions to "
 "prepare its internal state. It also does some checks of the system's state. "
-"At any time these operations can be performed by running <tt>apt-get check</"
-"tt>."
+"At any time these operations can be performed by running <literal>apt-get "
+"check</literal>."
 msgstr ""
 "Prima di ogni operazione, eccetto update, APT compie alcune operazioni per "
 "preparare il suo stato interno; fa inoltre dei controlli sullo stato del "
 "sistema. In qualsiasi momento le stesse operazioni possono essere fatte con "
-"<tt>apt-get check</tt>."
+"<literal>apt-get check</literal>."
 
-#. type: <example></example>
-#: guide.sgml:289
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:309
 #, no-wrap
 msgid ""
 "# apt-get check\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 msgstr ""
 "# apt-get check\n"
 "Lettura elenco pacchetti... Fatto\n"
-"Generazione albero delle dipendenze... Fatto"
+"Generazione albero delle dipendenze... Fatto\n"
 
-#. type: <p></p>
-#: guide.sgml:297
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:314
 msgid ""
 "The first thing it does is read all the package files into memory. APT uses "
 "a caching scheme so this operation will be faster the second time it is run. "
@@ -9091,22 +9158,22 @@ msgstr ""
 "trovati, sono ignorati e viene stampato un avvertimento all'uscita di apt-"
 "get."
 
-#. type: <p></p>
-#: guide.sgml:303
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:320
 msgid ""
 "The final operation performs a detailed analysis of the system's "
 "dependencies. It checks every dependency of every installed or unpacked "
 "package and considers if it is OK. Should this find a problem then a report "
-"will be printed out and <prgn>apt-get</prgn> will refuse to run."
+"will be printed out and <command>apt-get</command> will refuse to run."
 msgstr ""
 "L'operazione finale consiste in un'analisi dettagliata delle dipendenze del "
 "sistema: viene controllato che tutte le dipendenze dei singoli pacchetti "
 "installati o non scompattati siano soddisfatte. Se vengono individuati dei "
-"problemi, viene stampato un resoconto, e <prgn>apt-get</prgn> esce senza "
-"eseguire alcuna operazione."
+"problemi, viene stampato un resoconto, e <command>apt-get</command> esce "
+"senza eseguire alcuna operazione."
 
-#. type: <example></example>
-#: guide.sgml:320
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:326
 #, no-wrap
 msgid ""
 "# apt-get check\n"
@@ -9116,14 +9183,14 @@ msgid ""
 "Sorry, but the following packages have unmet dependencies:\n"
 "  9fonts: Depends: xlib6g but it is not installed\n"
 "  uucp: Depends: mailx but it is not installed\n"
-"  blast: Depends: xlib6g (>= 3.3-5) but it is not installed\n"
+"  blast: Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
 "  adduser: Depends: perl-base but it is not installed\n"
 "  aumix: Depends: libgpmg1 but it is not installed\n"
 "  debiandoc-sgml: Depends: sgml-base but it is not installed\n"
-"  bash-builtins: Depends: bash (>= 2.01) but 2.0-3 is installed\n"
+"  bash-builtins: Depends: bash (&gt;= 2.01) but 2.0-3 is installed\n"
 "  cthugha: Depends: svgalibg1 but it is not installed\n"
-"           Depends: xlib6g (>= 3.3-5) but it is not installed\n"
-"  libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)"
+"           Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
+"  libreadlineg2: Conflicts:libreadline2 (&lt;&lt; 2.1-2.1)\n"
 msgstr ""
 "# apt-get check\n"
 "Lettura elenco pacchetti... Fatto\n"
@@ -9132,17 +9199,17 @@ msgstr ""
 "I seguenti pacchetti hanno dipendenze non soddisfatte:\n"
 "  9fonts: Dipende: xlib6g ma non è installato\n"
 "  uucp: Dipende: mailx ma non è installato\n"
-"  blast: Dipende: xlib6g (>= 3.3-5) ma non è installato\n"
+"  blast: Dipende: xlib6g (&gt;= 3.3-5) ma non è installato\n"
 "  adduser: Dipende: perl-base ma non è installato\n"
 "  aumix: Dipende: libgpmg1 ma non è installato\n"
 "  debiandoc-sgml: Dipende: sgml-base ma non è installato\n"
-"  bash-builtins: Dipende: bash (>= 2.01) ma la versione 2.0-3 è installata\n"
+"  bash-builtins: Dipende: bash (&gt;= 2.01) ma la versione 2.0-3 è installata\n"
 "  cthugha: Dipende: svgalibg1 ma non è installato\n"
-"           Dipende: xlib6g (>= 3.3-5) ma non è installato\n"
-"  libreadlineg2: Va in conflitto: libreadline2 (<< 2.1-2.1)"
+"           Dipende: xlib6g (&gt;= 3.3-5) ma non è installato\n"
+"  libreadlineg2: Va in conflitto: libreadline2 (&lt;&lt; 2.1-2.1)\n"
 
-#. type: <p></p>
-#: guide.sgml:329
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:343
 msgid ""
 "In this example the system has many problems, including a serious problem "
 "with libreadlineg2. For each package that has unmet dependencies a line is "
@@ -9156,86 +9223,105 @@ msgstr ""
 "dipendenze non sono soddisfatte. Viene inclusa inoltre una breve spiegazione "
 "del perché il pacchetto ha un problema di dipendenze."
 
-#. type: <p></p>
-#: guide.sgml:337
+#. type: Content of: <book><chapter><section><para><footnote><para>
+#: guide.dbk:352
+msgid ""
+"APT however considers all known dependencies and attempts to prevent broken "
+"packages"
+msgstr ""
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:350
+#, fuzzy
+#| msgid ""
+#| "There are two ways a system can get into a broken state like this. The "
+#| "first is caused by <command>dpkg</command> missing some subtle "
+#| "relationships between packages when performing upgrades. "
+#| "<footnote><para>APT however considers all known dependencies and attempts "
+#| "to prevent broken packages</para></footnote>. The second is if a package "
+#| "installation fails during an operation. In this situation a package may "
+#| "have been unpacked without its dependents being installed."
 msgid ""
 "There are two ways a system can get into a broken state like this. The first "
-"is caused by <prgn>dpkg</prgn> missing some subtle relationships between "
-"packages when performing upgrades. <footnote><p>APT however considers all "
-"known dependencies and attempts to prevent broken packages</p></footnote>. "
-"The second is if a package installation fails during an operation. In this "
-"situation a package may have been unpacked without its dependents being "
-"installed."
+"is caused by <command>dpkg</command> missing some subtle relationships "
+"between packages when performing upgrades. <placeholder type=\"footnote\" id="
+"\"0\"/>. The second is if a package installation fails during an operation. "
+"In this situation a package may have been unpacked without its dependents "
+"being installed."
 msgstr ""
 "Ci sono due modi in cui un sistema può arrivare in uno stato problematico di "
-"questo genere: il primo avviene se <prgn>dpkg</prgn> non ha ravvisato alcune "
-"relazioni delicate tra i pacchetti durante un aggiornamento. "
-"<footnote><p>APT invece considera tutte le dipendenze note e cerca di "
-"evitare la presenza di pacchetti difettosi.</p></footnote> Il secondo è "
+"questo genere: il primo avviene se <command>dpkg</command> non ha ravvisato "
+"alcune relazioni delicate tra i pacchetti durante un aggiornamento. "
+"<footnote><para>APT invece considera tutte le dipendenze note e cerca di "
+"evitare la presenza di pacchetti difettosi.</para></footnote> Il secondo è "
 "possibile se l'installazione di un pacchetto fallisce; in questo caso è "
 "possibile che un pacchetto venga scompattato senza che tutti quelli da cui "
 "dipende siano stati installati."
 
-#. type: <p></p>
-#: guide.sgml:345
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:359
 msgid ""
 "The second situation is much less serious than the first because APT places "
 "certain constraints on the order that packages are installed. In both cases "
-"supplying the <tt>-f</tt> option to <prgn>apt-get</prgn> will cause APT to "
-"deduce a possible solution to the problem and then continue on. The APT "
-"<prgn>dselect</prgn> method always supplies the <tt>-f</tt> option to allow "
-"for easy continuation of failed maintainer scripts."
+"supplying the <literal>-f</literal> option to <command>apt-get</command> "
+"will cause APT to deduce a possible solution to the problem and then "
+"continue on. The APT <command>dselect</command> method always supplies the "
+"<literal>-f</literal> option to allow for easy continuation of failed "
+"maintainer scripts."
 msgstr ""
 "La seconda situazione è molto meno seria della prima, dato che APT pone "
 "alcune restrizioni sull'ordine di installazione dei pacchetti. In entrambi i "
-"casi l'opzione <tt>-f</tt> di <prgn>apt-get</prgn> farà sì che APT trovi una "
-"soluzione possibile e possa continuare. Il metodo APT di <prgn>dselect</"
-"prgn> comprende sempre l'opzione <tt>-f</tt> per permettere di continuare "
-"facilmente anche in caso di script dei manutentori errati."
-
-#. type: <p></p>
-#: guide.sgml:351
-msgid ""
-"However, if the <tt>-f</tt> option is used to correct a seriously broken "
-"system caused by the first case then it is possible that it will either fail "
-"immediately or the installation sequence will fail. In either case it is "
-"necessary to manually use dpkg (possibly with forcing options) to correct "
-"the situation enough to allow APT to proceed."
-msgstr ""
-"Tuttavia, se l'opzione <tt>-f</tt> viene usata per correggere un sistema in "
-"uno stato molto problematico causato da una situazione del primo tipo, è "
-"possibile che l'operazione fallisca subito o che fallisca durante la "
+"casi l'opzione <literal>-f</literal> di <command>apt-get</command> farà sì "
+"che APT trovi una soluzione possibile e possa continuare. Il metodo APT di "
+"<command>dselect</command> comprende sempre l'opzione <literal>-f</literal> "
+"per permettere di continuare facilmente anche in caso di script dei "
+"manutentori errati."
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:368
+msgid ""
+"However, if the <literal>-f</literal> option is used to correct a seriously "
+"broken system caused by the first case then it is possible that it will "
+"either fail immediately or the installation sequence will fail. In either "
+"case it is necessary to manually use dpkg (possibly with forcing options) to "
+"correct the situation enough to allow APT to proceed."
+msgstr ""
+"Tuttavia, se l'opzione <literal>-f</literal> viene usata per correggere un "
+"sistema in uno stato molto problematico causato da una situazione del primo "
+"tipo, è possibile che l'operazione fallisca subito o che fallisca durante la "
 "sequenza di installazione. In entrambi i casi è necessario usare dpkg a mano "
 "(probabilmente usando delle opzioni di forzatura) per correggere quanto "
 "basta per poter fare continuare APT."
 
-#. type: <heading></heading>
-#: guide.sgml:356
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:376
 msgid "The Status Report"
 msgstr "Il resoconto sullo stato"
 
-#. type: <p></p>
-#: guide.sgml:363
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:378
 msgid ""
-"Before proceeding <prgn>apt-get</prgn> will present a report on what will "
-"happen. Generally the report reflects the type of operation being performed "
-"but there are several common elements. In all cases the lists reflect the "
-"final state of things, taking into account the <tt>-f</tt> option and any "
-"other relevant activities to the command being executed."
+"Before proceeding <command>apt-get</command> will present a report on what "
+"will happen. Generally the report reflects the type of operation being "
+"performed but there are several common elements. In all cases the lists "
+"reflect the final state of things, taking into account the <literal>-f</"
+"literal> option and any other relevant activities to the command being "
+"executed."
 msgstr ""
-"Prima di procedere, <prgn>apt-get</prgn> presenterà un resoconto delle "
+"Prima di procedere, <command>apt-get</command> presenterà un resoconto delle "
 "operazioni che sta per fare. In genere tale resoconto varierà con il tipo di "
 "operazione da fare, ma ci sono svariati elementi comuni: in tutti i casi gli "
 "elenchi riflettono lo stato finale delle cose, e tengono conto dell'opzione "
-"<tt>-f</tt> e di altre attività rilevanti per il comando da eseguire."
+"<literal>-f</literal> e di altre attività rilevanti per il comando da "
+"eseguire."
 
-#. type: <heading></heading>
-#: guide.sgml:364
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:385
 msgid "The Extra Package list"
 msgstr "L'elenco dei pacchetti extra"
 
-#. type: <example></example>
-#: guide.sgml:372
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:387
 #, no-wrap
 msgid ""
 "The following extra packages will be installed:\n"
@@ -9243,86 +9329,87 @@ msgid ""
 "  mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
 "  bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
 "  squake pgp-i python-base debmake ldso perl libreadlineg2\n"
-"  ssh"
+"  ssh\n"
 msgstr ""
 "I seguenti pacchetti saranno inoltre installati:\n"
 "  libdbd-mysql-perl xlib6 zlib1 xzx libreadline2 libdbd-msql-perl\n"
 "  mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
 "  bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
 "  squake pgp-i python-base debmake ldso perl libreadlineg2\n"
-"  ssh"
+"  ssh\n"
 
-#. type: <p></p>
-#: guide.sgml:379
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:395
 msgid ""
 "The Extra Package list shows all of the packages that will be installed or "
 "upgraded in excess of the ones mentioned on the command line. It is only "
-"generated for an <tt>install</tt> command. The listed packages are often the "
-"result of an Auto Install."
+"generated for an <literal>install</literal> command. The listed packages are "
+"often the result of an Auto Install."
 msgstr ""
 "L'elenco dei pacchetti extra mostra tutti i pacchetti che verranno "
 "installati o aggiornati oltre a quelli indicati sulla riga di comando. Viene "
-"generato solo per il comando <tt>install</tt>. I pacchetti elencati sono "
-"spesso il risultato di un'operazione di installazione automatica."
+"generato solo per il comando <literal>install</literal>. I pacchetti "
+"elencati sono spesso il risultato di un'operazione di installazione "
+"automatica."
 
-#. type: <heading></heading>
-#: guide.sgml:382
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:402
 msgid "The Packages to Remove"
 msgstr "I pacchetti da rimuovere"
 
-#. type: <example></example>
-#: guide.sgml:389
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:404
 #, no-wrap
 msgid ""
 "The following packages will be REMOVED:\n"
 "  xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
 "  xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
 "  xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
-"  nas xpilot xfig"
+"  nas xpilot xfig\n"
 msgstr ""
 "I seguenti pacchetti saranno RIMOSSI:\n"
 "  xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
 "  xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
 "  xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
-"  nas xpilot xfig"
+"  nas xpilot xfig\n"
 
-#. type: <p></p>
-#: guide.sgml:399
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:411
 msgid ""
 "The Packages to Remove list shows all of the packages that will be removed "
 "from the system. It can be shown for any of the operations and should be "
 "given a careful inspection to ensure nothing important is to be taken off. "
-"The <tt>-f</tt> option is especially good at generating packages to remove "
-"so extreme care should be used in that case. The list may contain packages "
-"that are going to be removed because they are only partially installed, "
-"possibly due to an aborted installation."
+"The <literal>-f</literal> option is especially good at generating packages "
+"to remove so extreme care should be used in that case. The list may contain "
+"packages that are going to be removed because they are only partially "
+"installed, possibly due to an aborted installation."
 msgstr ""
 "L'elenco dei pacchetti da rimuovere indica tutti i pacchetti che verranno "
 "rimossi dal sistema. Può essere mostrato per una qualsiasi delle operazioni, "
 "e deve sempre essere esaminato attentamente per assicurarsi che non venga "
-"eliminato qualcosa di importante. Con l'opzione <tt>-f</tt> è "
+"eliminato qualcosa di importante. Con l'opzione <literal>-f</literal> è "
 "particolarmente probabile che vengano eliminati dei pacchetti, perciò in "
 "questo caso va fatta particolare attenzione. L'elenco può contenere dei "
 "pacchetti che verranno rimossi perché sono solo parzialmente installati, "
 "forse a causa di un'installazione non terminata correttamente."
 
-#. type: <heading></heading>
-#: guide.sgml:402
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:421
 msgid "The New Packages list"
 msgstr "L'elenco dei nuovi pacchetti installati"
 
-#. type: <example></example>
-#: guide.sgml:406
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:423
 #, no-wrap
 msgid ""
 "The following NEW packages will installed:\n"
-"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
+"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base\n"
 msgstr ""
 "I seguenti pacchetti NUOVI saranno installati:\n"
-"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
+"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base\n"
 
-#. type: <p></p>
-#: guide.sgml:411
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:427
 msgid ""
 "The New Packages list is simply a reminder of what will happen. The packages "
 "listed are not presently installed in the system but will be when APT is "
@@ -9332,32 +9419,32 @@ msgstr ""
 "quello che accadrà. I pacchetti nell'elenco non sono al momento installati "
 "nel sistema, ma lo saranno alla fine delle operazioni di APT."
 
-#. type: <heading></heading>
-#: guide.sgml:414
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:432
 msgid "The Kept Back list"
 msgstr "L'elenco dei pacchetti bloccati"
 
-#. type: <example></example>
-#: guide.sgml:419
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:434
 #, no-wrap
 msgid ""
 "The following packages have been kept back\n"
 "  compface man-db tetex-base msql libpaper svgalib1\n"
-"  gs snmp arena lynx xpat2 groff xscreensaver"
+"  gs snmp arena lynx xpat2 groff xscreensaver\n"
 msgstr ""
 "I seguenti pacchetti sono stati mantenuti alla versione attuale:\n"
 "  compface man-db tetex-base msql libpaper svgalib1\n"
-"  gs snmp arena lynx xpat2 groff xscreensaver"
+"  gs snmp arena lynx xpat2 groff xscreensaver\n"
 
-#. type: <p></p>
-#: guide.sgml:428
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:439
 msgid ""
 "Whenever the whole system is being upgraded there is the possibility that "
 "new versions of packages cannot be installed because they require new things "
 "or conflict with already installed things. In this case the package will "
 "appear in the Kept Back list. The best way to convince packages listed there "
-"to install is with <tt>apt-get install</tt> or by using <prgn>dselect</prgn> "
-"to resolve their problems."
+"to install is with <literal>apt-get install</literal> or by using "
+"<command>dselect</command> to resolve their problems."
 msgstr ""
 "In ogni caso in cui il sistema viene aggiornato nel suo insieme, c'è la "
 "possibilità che non possano venire installate nuove versioni di alcuni "
@@ -9365,26 +9452,27 @@ msgstr ""
 "presenti nel sistema o entrare in conflitto con altri già presenti. In "
 "questo caso, il pacchetto viene elencato nella lista di quelli mantenuti "
 "alla versione attuale. Il miglior modo per forzare l'installazione dei "
-"pacchetti elencati in questa lista è installarli con <tt>apt-get install</"
-"tt> o usare <prgn>dselect</prgn> per risolvere i problemi."
+"pacchetti elencati in questa lista è installarli con <literal>apt-get "
+"install</literal> o usare <command>dselect</command> per risolvere i "
+"problemi."
 
-#. type: <heading></heading>
-#: guide.sgml:431
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:448
 msgid "Held Packages warning"
 msgstr "Messaggi di avvertimento sui pacchetti bloccati"
 
-#. type: <example></example>
-#: guide.sgml:435
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:450
 #, no-wrap
 msgid ""
 "The following held packages will be changed:\n"
-"  cvs"
+"  cvs\n"
 msgstr ""
 "I seguenti pacchetti bloccati saranno cambiati:\n"
-"  cvs"
+"  cvs\n"
 
-#. type: <p></p>
-#: guide.sgml:441
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:454
 msgid ""
 "Sometimes you can ask APT to install a package that is on hold, in such a "
 "case it prints out a warning that the held package is going to be changed. "
@@ -9395,32 +9483,32 @@ msgstr ""
 "pacchetto verrà modificato. Questo dovrebbe accadere solo durante operazioni "
 "di dist-upgrade o di install."
 
-#. type: <heading></heading>
-#: guide.sgml:444
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:460
 msgid "Final summary"
 msgstr "Resoconto finale"
 
-#. type: <p></p>
-#: guide.sgml:447
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:462
 msgid ""
 "Finally, APT will print out a summary of all the changes that will occur."
 msgstr ""
 "Infine, APT stamperà un riassunto di tutte le modifiche che accadranno."
 
-#. type: <example></example>
-#: guide.sgml:452
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:465
 #, no-wrap
 msgid ""
 "206 packages upgraded, 8 newly installed, 23 to remove and 51 not upgraded.\n"
 "12 packages not fully installed or removed.\n"
-"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used."
+"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used.\n"
 msgstr ""
 "206 aggiornati, 8 installati, 23 da rimuovere e 51 non aggiornati.\n"
 "12 non completamente installati o rimossi..\n"
-"È necessario scaricare 65.7M/66.7M di archivi. Dopo quest'operazione, verranno occupati 26.5M di spazio su disco."
+"È necessario scaricare 65.7M/66.7M di archivi. Dopo quest'operazione, verranno occupati 26.5M di spazio su disco.\n"
 
-#. type: <p></p>
-#: guide.sgml:470
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:470
 msgid ""
 "The first line of the summary simply is a reduced version of all of the "
 "lists and includes the number of upgrades - that is packages already "
@@ -9450,8 +9538,8 @@ msgstr ""
 "in /usr dopo l'installazione. Se si stanno rimuovendo molti pacchetti, "
 "allora il valore può indicare lo spazio che verrà liberato."
 
-#. type: <p></p>
-#: guide.sgml:473
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:484
 msgid ""
 "Some other reports can be generated by using the -u option to show packages "
 "to upgrade, they are similar to the previous examples."
@@ -9459,13 +9547,13 @@ msgstr ""
 "Si possono generare altri resoconti usando l'opzione -u per mostrare i "
 "pacchetti da aggiornare, ma sono simili all'esempio precedente."
 
-#. type: <heading></heading>
-#: guide.sgml:477
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:491
 msgid "The Status Display"
 msgstr "La visualizzazione dello stato"
 
-#. type: <p></p>
-#: guide.sgml:481
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:493
 msgid ""
 "During the download of archives and package files APT prints out a series of "
 "status messages."
@@ -9473,8 +9561,8 @@ msgstr ""
 "Durante lo scaricamento degli archivi e dei file dei pacchetti APT stampa "
 "una serie di messaggi di stato."
 
-#. type: <example></example>
-#: guide.sgml:490
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:497
 #, no-wrap
 msgid ""
 "# apt-get update\n"
@@ -9483,7 +9571,7 @@ msgid ""
 "Hit http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
 "Get:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
 "Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
-"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s"
+"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s\n"
 msgstr ""
 "# apt-get update\n"
 "Scaricamento di:1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages\n"
@@ -9491,129 +9579,127 @@ msgstr ""
 "Trovato http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
 "Scaricamento di:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
 "Scaricamento di:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
-"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s"
+"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s\n"
 
-#. type: <p></p>
-#: guide.sgml:500
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:506
 msgid ""
-"The lines starting with <em>Get</em> are printed out when APT begins to "
-"fetch a file while the last line indicates the progress of the download. The "
-"first percent value on the progress line indicates the total percent done of "
-"all files. Unfortunately since the size of the Package files is unknown "
-"<tt>apt-get update</tt> estimates the percent done which causes some "
-"inaccuracies."
+"The lines starting with <emphasis>Get</emphasis> are printed out when APT "
+"begins to fetch a file while the last line indicates the progress of the "
+"download. The first percent value on the progress line indicates the total "
+"percent done of all files. Unfortunately since the size of the Package files "
+"is unknown <literal>apt-get update</literal> estimates the percent done "
+"which causes some inaccuracies."
 msgstr ""
-"Le righe che cominciano con <em>Scaricamento di</em> vengono stampate quando "
-"APT inizia a scaricare un file, mentre l'ultima riga indica il progresso "
-"dell'operazione. Il primo valore in percentuale nella riga di progresso "
-"indica la percentuale totale scaricata di tutti i file; dato che la "
-"dimensione dei file Package non è nota, purtroppo a volte <tt>apt-get "
-"update</tt> fa una stima poco accurata."
+"Le righe che cominciano con <emphasis>Scaricamento di</emphasis> vengono "
+"stampate quando APT inizia a scaricare un file, mentre l'ultima riga indica "
+"il progresso dell'operazione. Il primo valore in percentuale nella riga di "
+"progresso indica la percentuale totale scaricata di tutti i file; dato che "
+"la dimensione dei file Package non è nota, purtroppo a volte <literal>apt-"
+"get update</literal> fa una stima poco accurata."
 
-#. type: <p></p>
-#: guide.sgml:509
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:514
 msgid ""
 "The next section of the status line is repeated once for each download "
 "thread and indicates the operation being performed and some useful "
 "information about what is happening. Sometimes this section will simply read "
-"<em>Forking</em> which means the OS is loading the download module. The "
-"first word after the [ is the fetch number as shown on the history lines. "
-"The next word is the short form name of the object being downloaded. For "
-"archives it will contain the name of the package that is being fetched."
+"<emphasis>Forking</emphasis> which means the OS is loading the download "
+"module. The first word after the [ is the fetch number as shown on the "
+"history lines. The next word is the short form name of the object being "
+"downloaded. For archives it will contain the name of the package that is "
+"being fetched."
 msgstr ""
 "La sezione successiva della riga di stato viene ripetuta una volta per "
 "ciascuna istanza di scaricamento, ed indica l'operazione in corso, insieme "
 "ad alcune informazioni utili su cosa stia accadendo. A volte questa sezione "
-"contiene solamente <em>Forking</em>, che significa che il sistema operativo "
-"sta caricando il modulo per lo scaricamento. La prima parola dopo la "
-"parentesi quadra aperta è il numero dello scaricamento come mostrato nelle "
-"righe della cronologia. La parola successiva è il nome breve dell'oggetto "
-"che si sta scaricando, che per gli archivi è il nome del pacchetto."
+"contiene solamente <emphasis>Forking</emphasis>, che significa che il "
+"sistema operativo sta caricando il modulo per lo scaricamento. La prima "
+"parola dopo la parentesi quadra aperta è il numero dello scaricamento come "
+"mostrato nelle righe della cronologia. La parola successiva è il nome breve "
+"dell'oggetto che si sta scaricando, che per gli archivi è il nome del "
+"pacchetto."
 
-#. type: <p></p>
-#: guide.sgml:524
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:524
 msgid ""
 "Inside of the single quote is an informative string indicating the progress "
 "of the negotiation phase of the download. Typically it progresses from "
-"<em>Connecting</em> to <em>Waiting for file</em> to <em>Downloading</em> or "
-"<em>Resuming</em>. The final value is the number of bytes downloaded from "
-"the remote site. Once the download begins this is represented as "
-"<tt>102/10.2k</tt> indicating that 102 bytes have been fetched and 10.2 "
-"kilobytes is expected. The total size is always shown in 4 figure notation "
-"to preserve space. After the size display is a percent meter for the file "
-"itself. The second last element is the instantaneous average speed. This "
-"values is updated every 5 seconds and reflects the rate of data transfer for "
-"that period. Finally is shown the estimated transfer time. This is updated "
-"regularly and reflects the time to complete everything at the shown transfer "
-"rate."
+"<emphasis>Connecting</emphasis> to <emphasis>Waiting for file</emphasis> to "
+"<emphasis>Downloading</emphasis> or <emphasis>Resuming</emphasis>. The final "
+"value is the number of bytes downloaded from the remote site. Once the "
+"download begins this is represented as <literal>102/10.2k</literal> "
+"indicating that 102 bytes have been fetched and 10.2 kilobytes is expected. "
+"The total size is always shown in 4 figure notation to preserve space. After "
+"the size display is a percent meter for the file itself. The second last "
+"element is the instantaneous average speed. This values is updated every 5 "
+"seconds and reflects the rate of data transfer for that period. Finally is "
+"shown the estimated transfer time. This is updated regularly and reflects "
+"the time to complete everything at the shown transfer rate."
 msgstr ""
 "All'interno delle virgolette singole c'è una stringa informativa, che indica "
 "il progresso della fase di negoziazione dello scaricamento. Tipicamente "
-"comincia con <em>Connecting</em>, procede con <em>Waiting for file</em> e "
-"poi con <em>Downloading</em> o <em>Resuming</em>; il valore finale è il "
-"numero di byte che sono stati scaricati dal sito remoto. Una volta "
-"cominciato lo scaricamento, viene rappresentato come <tt>102/10.2k</tt>, che "
-"indica che sono stati scaricati 102 byte su 10,2 kilobyte attesi. La "
-"dimensione totale viene sempre espressa in notazione a quattro cifre, per "
-"risparmiare spazio. Dopo la dimensione viene indicato un indicatore "
-"progressivo della percentuale del file. Il penultimo elemento è la velocità "
-"istantanea media, che viene aggiornata ogni 5 secondi e riflette la velocità "
-"di trasferimento dei dati in quel periodo. Infine, viene visualizzato il "
-"tempo stimato per il trasferimento, che viene aggiornato periodicamente e "
-"riflette il tempo necessario per completare tutte le operazioni alla "
-"velocità di trasferimento mostrata."
-
-#. type: <p></p>
-#: guide.sgml:530
+"comincia con <emphasis>Connecting</emphasis>, procede con <emphasis>Waiting "
+"for file</emphasis> e poi con <emphasis>Downloading</emphasis> o "
+"<emphasis>Resuming</emphasis>; il valore finale è il numero di byte che sono "
+"stati scaricati dal sito remoto. Una volta cominciato lo scaricamento, viene "
+"rappresentato come <literal>102/10.2k</literal>, che indica che sono stati "
+"scaricati 102 byte su 10,2 kilobyte attesi. La dimensione totale viene "
+"sempre espressa in notazione a quattro cifre, per risparmiare spazio. Dopo "
+"la dimensione viene indicato un indicatore progressivo della percentuale del "
+"file. Il penultimo elemento è la velocità istantanea media, che viene "
+"aggiornata ogni 5 secondi e riflette la velocità di trasferimento dei dati "
+"in quel periodo. Infine, viene visualizzato il tempo stimato per il "
+"trasferimento, che viene aggiornato periodicamente e riflette il tempo "
+"necessario per completare tutte le operazioni alla velocità di trasferimento "
+"mostrata."
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:539
 msgid ""
 "The status display updates every half second to provide a constant feedback "
 "on the download progress while the Get lines scroll back whenever a new file "
 "is started. Since the status display is constantly updated it is unsuitable "
-"for logging to a file, use the <tt>-q</tt> option to remove the status "
-"display."
+"for logging to a file, use the <literal>-q</literal> option to remove the "
+"status display."
 msgstr ""
 "La visualizzazione dello stato viene aggiornata ogni mezzo secondo per "
 "fornire un feedback costante sul processo di scaricamento, e le righe Get "
 "scorrono in alto quando viene avviato lo scaricamento di un nuovo file. Dato "
 "che la visualizzazione dello stato viene costantemente aggiornata, non è "
 "adatta per essere registrata in un file; per non visualizzarla si può usare "
-"l'opzione <tt>-q</tt>."
+"l'opzione <literal>-q</literal>."
 
-#. type: <heading></heading>
-#: guide.sgml:535
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:547
 msgid "Dpkg"
 msgstr "Dpkg"
 
-#. type: <p></p>
-#: guide.sgml:542
-msgid ""
-"APT uses <prgn>dpkg</prgn> for installing the archives and will switch over "
-"to the <prgn>dpkg</prgn> interface once downloading is completed. "
-"<prgn>dpkg</prgn> will also ask a number of questions as it processes the "
-"packages and the packages themselves may also ask several questions. Before "
-"each question there is usually a description of what it is asking and the "
-"questions are too varied to discuss completely here."
-msgstr ""
-"APT usa <prgn>dpkg</prgn> per installare gli archivi e passerà "
-"all'interfaccia di <prgn>dpkg</prgn> una volta completati gli scaricamenti. "
-"<prgn>dpkg</prgn> porrà anche alcune domande durante l'elaborazione dei "
-"pacchetti, ed i pacchetti stessi potranno farne altre. Prima di ciascuna "
-"domanda viene proposta di solito una descrizione di ciò che viene chiesto, e "
-"le domande sono troppo diverse per poter essere discusse in maniera completa "
-"in questa occasione."
-
-#. type: <title></title>
-#: offline.sgml:4
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:549
+msgid ""
+"APT uses <command>dpkg</command> for installing the archives and will switch "
+"over to the <command>dpkg</command> interface once downloading is completed. "
+"<command>dpkg</command> will also ask a number of questions as it processes "
+"the packages and the packages themselves may also ask several questions. "
+"Before each question there is usually a description of what it is asking and "
+"the questions are too varied to discuss completely here."
+msgstr ""
+"APT usa <command>dpkg</command> per installare gli archivi e passerà "
+"all'interfaccia di <command>dpkg</command> una volta completati gli "
+"scaricamenti. <command>dpkg</command> porrà anche alcune domande durante "
+"l'elaborazione dei pacchetti, ed i pacchetti stessi potranno farne altre. "
+"Prima di ciascuna domanda viene proposta di solito una descrizione di ciò "
+"che viene chiesto, e le domande sono troppo diverse per poter essere "
+"discusse in maniera completa in questa occasione."
+
+#. type: Content of: <book><title>
+#: offline.dbk:10
 msgid "Using APT Offline"
 msgstr "Usare APT offline"
 
-#. type: <version></version>
-#: offline.sgml:7
-msgid "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
-msgstr "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
-
-#. type: <abstract></abstract>
-#: offline.sgml:12
+#. type: Content of: <book><bookinfo><abstract><para>
+#: offline.dbk:24
 msgid ""
 "This document describes how to use APT in a non-networked environment, "
 "specifically a 'sneaker-net' approach for performing upgrades."
@@ -9622,23 +9708,24 @@ msgstr ""
 "rete, specificatamente un approccio «sfrutta-altra-rete» per fare gli "
 "aggiornamenti."
 
-#. type: <copyrightsummary></copyrightsummary>
-#: offline.sgml:16
-msgid "Copyright &copy; Jason Gunthorpe, 1999."
-msgstr "Copyright &copy; Jason Gunthorpe, 1999."
+#. type: Content of: <book><bookinfo>
+#: offline.dbk:29
+msgid ""
+"<copyright><year>1999</year><holder>Jason Gunthorpe</holder></copyright>"
+msgstr ""
 
-#. type: <heading></heading>
-#: offline.sgml:32
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:47
 msgid "Introduction"
 msgstr "Introduzione"
 
-#. type: <heading></heading>
-#: offline.sgml:34 offline.sgml:65 offline.sgml:180
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:49 offline.dbk:79 offline.dbk:191
 msgid "Overview"
 msgstr "Panoramica"
 
-#. type: <p></p>
-#: offline.sgml:40
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:51
 msgid ""
 "Normally APT requires direct access to a Debian archive, either from a local "
 "media or through a network. Another common complaint is that a Debian "
@@ -9650,8 +9737,8 @@ msgstr ""
 "ha un collegamento lento, come un modem, e un'altra macchina ha una "
 "connessione veloce, ma le due sono fisicamente distanti."
 
-#. type: <p></p>
-#: offline.sgml:51
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:57
 msgid ""
 "The solution to this is to use large removable media such as a Zip disc or a "
 "SuperDisk disc. These discs are not large enough to store the entire Debian "
@@ -9659,9 +9746,9 @@ msgid ""
 "to use APT to generate a list of packages that are required and then fetch "
 "them onto the disc using another machine with good connectivity. It is even "
 "possible to use another Debian machine with APT or to use a completely "
-"different OS and a download tool like wget. Let <em>remote host</em> mean "
-"the machine downloading the packages, and <em>target host</em> the one with "
-"bad or no connection."
+"different OS and a download tool like wget. Let <emphasis>remote host</"
+"emphasis> mean the machine downloading the packages, and <emphasis>target "
+"host</emphasis> the one with bad or no connection."
 msgstr ""
 "La soluzione è usare supporti rimovibili grandi come un disco Zip o uno "
 "SuperDisk. Questi dischi non sono grandi abbastanza per memorizzare l'intero "
@@ -9671,12 +9758,12 @@ msgstr ""
 "nel disco usando un'altra macchina con una buona connettività. È possibile "
 "anche usare un'altra macchina Debian con APT o usare un sistema operativo "
 "completamente diverso e uno strumento per scaricare file come wget. In "
-"questo documento con <em>host remoto</em> viene indicata la macchina che "
-"scarica i pacchetti, e <em>host di destinazione</em> è quella senza "
-"connessione o con una connessione non buona."
+"questo documento con <emphasis>host remoto</emphasis> viene indicata la "
+"macchina che scarica i pacchetti, e <emphasis>host di destinazione</"
+"emphasis> è quella senza connessione o con una connessione non buona."
 
-#. type: <p></p>
-#: offline.sgml:57
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:68
 msgid ""
 "This is achieved by creatively manipulating the APT configuration file. The "
 "essential premise to tell APT to look on a disc for it's archive files. Note "
@@ -9689,13 +9776,13 @@ msgstr ""
 "essere formattato con un file system che può gestire i nomi di file lunghi, "
 "come ext2, fat32 o vfat."
 
-#. type: <heading></heading>
-#: offline.sgml:63
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:77
 msgid "Using APT on both machines"
 msgstr "Usare APT su entrambe le macchine"
 
-#. type: <p><example>
-#: offline.sgml:71
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:81
 msgid ""
 "APT being available on both machines gives the simplest configuration. The "
 "basic idea is to place a copy of the status file on the disc and use the "
@@ -9708,8 +9795,8 @@ msgstr ""
 "per decidere quali pacchetti scaricare. La struttura delle directory sul "
 "disco deve essere simile a:"
 
-#. type: <example></example>
-#: offline.sgml:80
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:87
 #, no-wrap
 msgid ""
 "  /disc/\n"
@@ -9719,7 +9806,7 @@ msgid ""
 "       partial/\n"
 "    status\n"
 "    sources.list\n"
-"    apt.conf"
+"    apt.conf\n"
 msgstr ""
 "  /disc/\n"
 "    archives/\n"
@@ -9728,42 +9815,43 @@ msgstr ""
 "       partial/\n"
 "    status\n"
 "    sources.list\n"
-"    apt.conf"
+"    apt.conf\n"
 
-#. type: <heading></heading>
-#: offline.sgml:88
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:98
 msgid "The configuration file"
 msgstr "Il file di configurazione"
 
-#. type: <p></p>
-#: offline.sgml:96
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:100
 msgid ""
 "The configuration file should tell APT to store its files on the disc and to "
 "use the configuration files on the disc as well. The sources.list should "
 "contain the proper sites that you wish to use from the remote machine, and "
-"the status file should be a copy of <em>/var/lib/dpkg/status</em> from the "
-"<em>target host</em>. Please note, if you are using a local archive you must "
-"use copy URIs, the syntax is identical to file URIs."
+"the status file should be a copy of <emphasis>/var/lib/dpkg/status</"
+"emphasis> from the <emphasis>target host</emphasis>. Please note, if you are "
+"using a local archive you must use copy URIs, the syntax is identical to "
+"file URIs."
 msgstr ""
 "Il file di configurazione deve indicare ad APT di memorizzare i suoi file "
 "sul disco e di usare i file di configurazione anch'essi sul disco. Il file "
 "sources.list deve contenere i siti appropriati che si desiderano usare dalla "
-"macchina remota e il file di stato dovrebbe essere una copia di <em>/var/lib/"
-"dpkg/status</em> della <em>macchina di destinazione</em>. Notare che, se si "
-"sta usando un archivio locale, si devono usare URI «copy» la cui sintassi è "
-"identica a quella degli URI «file»."
+"macchina remota e il file di stato dovrebbe essere una copia di <emphasis>/"
+"var/lib/dpkg/status</emphasis> della <emphasis>macchina di destinazione</"
+"emphasis>. Notare che, se si sta usando un archivio locale, si devono usare "
+"URI «copy» la cui sintassi è identica a quella degli URI «file»."
 
-#. type: <p><example>
-#: offline.sgml:100
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:108
 msgid ""
-"<em>apt.conf</em> must contain the necessary information to make APT use the "
-"disc:"
+"<emphasis>apt.conf</emphasis> must contain the necessary information to make "
+"APT use the disc:"
 msgstr ""
-"<em>apt.conf</em> deve contenere le informazioni necessarie per far sì che "
-"APT usi il disco:"
+"<emphasis>apt.conf</emphasis> deve contenere le informazioni necessarie per "
+"far sì che APT usi il disco:"
 
-#. type: <example></example>
-#: offline.sgml:124
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:112
 #, no-wrap
 msgid ""
 " APT\n"
@@ -9771,10 +9859,10 @@ msgid ""
 "   /* This is not necessary if the two machines are the same arch, it tells\n"
 "      the remote APT what architecture the target machine is */\n"
 "   Architecture \"i386\";\n"
-"   \n"
+"\n"
 "   Get::Download-Only \"true\";\n"
 " };\n"
-" \n"
+"\n"
 " Dir\n"
 " {\n"
 "   /* Use the disc for state information and redirect the status file from\n"
@@ -9785,20 +9873,20 @@ msgid ""
 "   // Binary caches will be stored locally\n"
 "   Cache::archives \"/disc/archives/\";\n"
 "   Cache \"/tmp/\";\n"
-"   \n"
+"\n"
 "   // Location of the source list.\n"
 "   Etc \"/disc/\";\n"
-" };"
+" };\n"
 msgstr ""
 " APT\n"
 " {\n"
 "   /* Questo non è necessario se le due macchine hanno la stessa architettura,\n"
 "      dice ad APT remoto qual è l'architettura della macchina di destinazione */\n"
 "   Architecture \"i386\";\n"
-"   \n"
+"\n"
 "   Get::Download-Only \"true\";\n"
 " };\n"
-" \n"
+"\n"
 " Dir\n"
 " {\n"
 "   /* Usa il disco per le informazioni sullo stato e ridirige il file di stato\n"
@@ -9809,67 +9897,70 @@ msgstr ""
 "   // Le cache binarie saranno memorizzate in locale\n"
 "   Cache::archives \"/disc/archives/\";\n"
 "   Cache \"/tmp/\";\n"
-"   \n"
+"\n"
 "   // Posizione dell'elenco di fonti.\n"
 "   Etc \"/disc/\";\n"
-" };"
+" };\n"
 
-#. type: </example></p>
-#: offline.sgml:129
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:137
 msgid ""
 "More details can be seen by examining the apt.conf man page and the sample "
-"configuration file in <em>/usr/share/doc/apt/examples/apt.conf</em>."
+"configuration file in <emphasis>/usr/share/doc/apt/examples/apt.conf</"
+"emphasis>."
 msgstr ""
 "Si possono vedere informazioni più dettagliate nella pagina di manuale di "
-"apt.conf e nel file di configurazione d'esempio in <em>/usr/share/doc/apt/"
-"examples/apt.conf</em>."
+"apt.conf e nel file di configurazione d'esempio in <emphasis>/usr/share/doc/"
+"apt/examples/apt.conf</emphasis>."
 
-#. type: <p><example>
-#: offline.sgml:136
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:142
 msgid ""
-"On the target machine the first thing to do is mount the disc and copy <em>/"
-"var/lib/dpkg/status</em> to it. You will also need to create the directories "
-"outlined in the Overview, <em>archives/partial/</em> and <em>lists/partial/</"
-"em>. Then take the disc to the remote machine and configure the sources."
-"list. On the remote machine execute the following:"
+"On the target machine the first thing to do is mount the disc and copy "
+"<emphasis>/var/lib/dpkg/status</emphasis> to it. You will also need to "
+"create the directories outlined in the Overview, <emphasis>archives/partial/"
+"</emphasis> and <emphasis>lists/partial/</emphasis>. Then take the disc to "
+"the remote machine and configure the sources.list. On the remote machine "
+"execute the following:"
 msgstr ""
 "Nella macchina di destinazione, la prima cosa da fare è montare il disco e "
-"copiarvi <em>/var/lib/dpkg/status</em>. Sarà anche necessario creare le "
-"directory elencate nella panoramica: <em>archives/partial/</em> e <em>lists/"
-"partial/</em>. Poi portare il disco nella macchina remota e configurare il "
-"file sources.list; in tale macchina eseguire:"
+"copiarvi <emphasis>/var/lib/dpkg/status</emphasis>. Sarà anche necessario "
+"creare le directory elencate nella panoramica: <emphasis>archives/partial/</"
+"emphasis> e <emphasis>lists/partial/</emphasis>. Poi portare il disco nella "
+"macchina remota e configurare il file sources.list; in tale macchina "
+"eseguire:"
 
-#. type: <example></example>
-#: offline.sgml:142
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:151
 #, no-wrap
 msgid ""
 " # export APT_CONFIG=\"/disc/apt.conf\"\n"
 " # apt-get update\n"
 " [ APT fetches the package files ]\n"
 " # apt-get dist-upgrade\n"
-" [ APT fetches all the packages needed to upgrade the target machine ]"
+" [ APT fetches all the packages needed to upgrade the target machine ]\n"
 msgstr ""
 " # export APT_CONFIG=\"/disc/apt.conf\"\n"
 " # apt-get update\n"
 " [ APT scarica i file degli elenchi dei pacchetti ]\n"
 " # apt-get dist-upgrade\n"
-" [ APT scarica tutti i pacchetti necessari per aggiornare la macchina di destinazione ]"
+" [ APT scarica tutti i pacchetti necessari per aggiornare la macchina di destinazione ]\n"
 
-#. type: </example></p>
-#: offline.sgml:149
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:158
 msgid ""
 "The dist-upgrade command can be replaced with any other standard APT "
 "commands, particularly dselect-upgrade. You can even use an APT front end "
-"such as <em>dselect</em>. However this presents a problem in communicating "
-"your selections back to the local computer."
+"such as <emphasis>dselect</emphasis>. However this presents a problem in "
+"communicating your selections back to the local computer."
 msgstr ""
 "Il comando dist-upgrade può essere sostituito con qualsiasi altro comando "
 "APT standard, in particolare dselect-upgrade. Si può persino usare un "
-"frontend per APT come <em>dselect</em>; questo tuttavia pone alcuni problemi "
-"nel comunicare le selezioni fatte al computer locale."
+"frontend per APT come <emphasis>dselect</emphasis>; questo tuttavia pone "
+"alcuni problemi nel comunicare le selezioni fatte al computer locale."
 
-#. type: <p><example>
-#: offline.sgml:153
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:164
 msgid ""
 "Now the disc contains all of the index files and archives needed to upgrade "
 "the target machine. Take the disc back and run:"
@@ -9878,24 +9969,24 @@ msgstr ""
 "la macchina di destinazione. Riportare il disco alla macchina locale ed "
 "eseguire:"
 
-#. type: <example></example>
-#: offline.sgml:159
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:168
 #, no-wrap
 msgid ""
 "  # export APT_CONFIG=\"/disc/apt.conf\"\n"
 "  # apt-get check\n"
 "  [ APT generates a local copy of the cache files ]\n"
 "  # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
-"  [ Or any other APT command ]"
+"  [ Or any other APT command ]\n"
 msgstr ""
 "  # export APT_CONFIG=\"/disc/apt.conf\"\n"
 "  # apt-get check\n"
 "  [ APT genera una copia locale dei file di cache ]\n"
 "  # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
-"  [ O qualsiasi altro comando APT ]"
+"  [ O qualsiasi altro comando APT ]\n"
 
-#. type: <p></p>
-#: offline.sgml:165
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:175
 msgid ""
 "It is necessary for proper function to re-specify the status file to be the "
 "local one. This is very important!"
@@ -9903,8 +9994,8 @@ msgstr ""
 "Per il corretto funzionamento è necessario rispecificare il fatto che il "
 "file di stato è quello locale. Questo è molto importante!"
 
-#. type: <p></p>
-#: offline.sgml:172
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:179
 msgid ""
 "If you are using dselect you can do the very risky operation of copying disc/"
 "status to /var/lib/dpkg/status so that any selections you made on the remote "
@@ -9918,25 +10009,25 @@ msgstr ""
 "solamente nella macchina locale, ma ciò non è sempre possibile. NON copiare "
 "il file di stato se nel frattempo sono stati eseguiti dpkg o APT!"
 
-#. type: <heading></heading>
-#: offline.sgml:178
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:189
 msgid "Using APT and wget"
 msgstr "Usare APT e wget"
 
-#. type: <p></p>
-#: offline.sgml:185
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:193
 msgid ""
-"<em>wget</em> is a popular and portable download tool that can run on nearly "
-"any machine. Unlike the method above this requires that the Debian machine "
-"already has a list of available packages."
+"<emphasis>wget</emphasis> is a popular and portable download tool that can "
+"run on nearly any machine. Unlike the method above this requires that the "
+"Debian machine already has a list of available packages."
 msgstr ""
-"<em>wget</em> è uno strumento popolare e portabile per scaricare file che "
-"può essere eseguito quasi su qualsiasi macchina. A differenza del metodo "
-"descritto sopra, questo richiede che la macchina Debian abbia già un elenco "
-"dei pacchetti disponibili."
+"<emphasis>wget</emphasis> è uno strumento popolare e portabile per scaricare "
+"file che può essere eseguito quasi su qualsiasi macchina. A differenza del "
+"metodo descritto sopra, questo richiede che la macchina Debian abbia già un "
+"elenco dei pacchetti disponibili."
 
-#. type: <p></p>
-#: offline.sgml:190
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:198
 msgid ""
 "The basic idea is to create a disc that has only the archive files "
 "downloaded from the remote site. This is done by using the --print-uris "
@@ -9948,13 +10039,13 @@ msgstr ""
 "print-uris di apt-get e poi preparando uno script che usa wget per scaricare "
 "effettivamente i pacchetti."
 
-#. type: <heading></heading>
-#: offline.sgml:196
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:204
 msgid "Operation"
 msgstr "Funzionamento"
 
-#. type: <p><example>
-#: offline.sgml:200
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:206
 msgid ""
 "Unlike the previous technique no special configuration files are required. "
 "We merely use the standard APT commands to generate the file list."
@@ -9963,22 +10054,22 @@ msgstr ""
 "configurazione speciali; vengono semplicemente usati i comandi APT standard "
 "per generare l'elenco dei file."
 
-#. type: <example></example>
-#: offline.sgml:205
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:210
 #, no-wrap
 msgid ""
-" # apt-get dist-upgrade \n"
+" # apt-get dist-upgrade\n"
 " [ Press no when prompted, make sure you are happy with the actions ]\n"
-" # apt-get -qq --print-uris dist-upgrade > uris\n"
-" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
+" # apt-get -qq --print-uris dist-upgrade &gt; uris\n"
+" # awk '{print \"wget -O \" $2 \" \" $1}' &lt; uris &gt; /disc/wget-script\n"
 msgstr ""
 " # apt-get dist-upgrade \n"
 " [ Inserire no alla domanda, assicurarsi di approvare le azioni proposte ]\n"
-" # apt-get -qq --print-uris dist-upgrade > uris\n"
-" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
+" # apt-get -qq --print-uris dist-upgrade &gt; uris\n"
+" # awk '{print \"wget -O \" $2 \" \" $1}' &lt; uris &gt; /disc/wget-script\n"
 
-#. type: </example></p>
-#: offline.sgml:210
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:216
 msgid ""
 "Any command other than dist-upgrade could be used here, including dselect-"
 "upgrade."
@@ -9986,8 +10077,8 @@ msgstr ""
 "Si può usare qualsiasi comando che non sia dist-upgrade, incluso dselect-"
 "upgrade."
 
-#. type: <p></p>
-#: offline.sgml:216
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:220
 msgid ""
 "The /disc/wget-script file will now contain a list of wget commands to "
 "execute in order to fetch the necessary archives. This script should be run "
@@ -9999,25 +10090,25 @@ msgstr ""
 "essere eseguito con il punto di mount del disco come directory attuale di "
 "lavoro, in modo che l'output venga salvato sul disco."
 
-#. type: <p><example>
-#: offline.sgml:219
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:226
 msgid "The remote machine would do something like"
 msgstr "Nella macchina remota fare qualcosa come:"
 
-#. type: <example></example>
-#: offline.sgml:223
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:229
 #, no-wrap
 msgid ""
 "  # cd /disc\n"
 "  # sh -x ./wget-script\n"
-"  [ wait.. ]"
+"  [ wait.. ]\n"
 msgstr ""
 "  # cd /disc\n"
 "  # sh -x ./wget-script\n"
-"  [ attendere... ]"
+"  [ attendere... ]\n"
 
-#. type: </example><example>
-#: offline.sgml:228
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:234
 msgid ""
 "Once the archives are downloaded and the disc returned to the Debian machine "
 "installation can proceed using,"
@@ -10025,14 +10116,14 @@ msgstr ""
 "Una volta che gli archivi sono stati scaricati e il disco è stato riportato "
 "alla macchina Debian, si può procedere con l'installazione usando"
 
-#. type: <example></example>
-#: offline.sgml:230
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:238
 #, no-wrap
-msgid "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
-msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
+msgid "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
+msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 
-#. type: </example></p>
-#: offline.sgml:234
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:241
 msgid "Which will use the already fetched archives on the disc."
 msgstr "che userà gli archivi già scaricati e presenti sul disco."
 
@@ -10133,9 +10224,6 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
 #~ msgid "FILES"
 #~ msgstr "FILE"
 
-#~ msgid "<!-- -*- mode: sgml; mode: fold -*- -->"
-#~ msgstr "<!-- -*- mode: sgml; mode: fold -*- -->"
-
 #~ msgid ""
 #~ "<!-- Some common paths.. --> <!ENTITY docdir \"/usr/share/doc/apt/\"> <!"
 #~ "ENTITY guidesdir \"/usr/share/doc/apt-doc/\"> <!ENTITY configureindex "
@@ -11565,22 +11653,24 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
 
 #, fuzzy
 #~ msgid ""
-#~ "To enable the APT method you need to select [A]ccess in <prgn>dselect</"
-#~ "prgn> and then choose the APT method. You will be prompted for a set of "
-#~ "<em>Sources</em> which are places to fetch archives from. These can be "
-#~ "remote Internet sites, local Debian mirrors or CDROMs. Each source can "
-#~ "provide a fragment of the total Debian archive, APT will automatically "
-#~ "combine them to form a complete set of packages. If you have a CDROM then "
-#~ "it is a good idea to specify it first and then specify a mirror so that "
-#~ "you have access to the latest bug fixes. APT will automatically use "
-#~ "packages on your CDROM before downloading from the Internet."
+#~ "To enable the APT method you need to select [A]ccess in <command>dselect</"
+#~ "command> and then choose the APT method. You will be prompted for a set "
+#~ "of <emphasis>Sources</emphasis> which are places to fetch archives from. "
+#~ "These can be remote Internet sites, local Debian mirrors or CDROMs. Each "
+#~ "source can provide a fragment of the total Debian archive, APT will "
+#~ "automatically combine them to form a complete set of packages. If you "
+#~ "have a CDROM then it is a good idea to specify it first and then specify "
+#~ "a mirror so that you have access to the latest bug fixes. APT will "
+#~ "automatically use packages on your CDROM before downloading from the "
+#~ "Internet."
 #~ msgstr ""
-#~ "Per abilitare il metodo APT dovete selezionare [A]ccess in <prgn>dselect</"
-#~ "prgn> e scegliere il metodo APT; vi verrà chiesto un insieme di fonti "
-#~ "(<em>Sources</em>), cioè di posti da cui scaricare gli archivi. Tali "
-#~ "fonti possono essere siti Internet remoti, mirror locali di Debian o "
-#~ "CDROM; ciascuna di esse può fornire una parte dell'archivio Debian, ed "
-#~ "APT le combinerà insieme in un set completo di pacchetti. Se avete un "
-#~ "CDROM è una buona idea indicare quello per primo, e poi i mirror, in modo "
-#~ "da avere accesso alle ultime versioni; APT userà in questo modo "
-#~ "automaticamente i pacchetti sul CDROM prima di scaricarli da Internet."
+#~ "Per abilitare il metodo APT dovete selezionare [A]ccess in "
+#~ "<command>dselect</command> e scegliere il metodo APT; vi verrà chiesto un "
+#~ "insieme di fonti (<emphasis>Sources</emphasis>), cioè di posti da cui "
+#~ "scaricare gli archivi. Tali fonti possono essere siti Internet remoti, "
+#~ "mirror locali di Debian o CDROM; ciascuna di esse può fornire una parte "
+#~ "dell'archivio Debian, ed APT le combinerà insieme in un set completo di "
+#~ "pacchetti. Se avete un CDROM è una buona idea indicare quello per primo, "
+#~ "e poi i mirror, in modo da avere accesso alle ultime versioni; APT userà "
+#~ "in questo modo automaticamente i pacchetti sul CDROM prima di scaricarli "
+#~ "da Internet."
diff --git a/doc/po/ja.po b/doc/po/ja.po
index 9c7aa3de..582ff037 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -6,13 +6,13 @@
 # KURASAWA Nozomu, 2003-2006, 2009-2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 0.7.25.3\n"
+"Project-Id-Version: apt 1.0.6\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-04-01 14:24+0200\n"
-"PO-Revision-Date: 2014-04-01 14:00+0200\n"
+"POT-Creation-Date: 2014-07-10 10:52+0200\n"
+"PO-Revision-Date: 2014-07-10 19:52+0900\n"
 "Last-Translator: KURASAWA Nozomu <nabetaro@debian.or.jp>\n"
 "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
-"Language: \n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -675,7 +675,7 @@ msgstr "APT"
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt.8.xml:32
 msgid "command-line interface"
-msgstr ""
+msgstr "コマンドラインインターフェイス"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.8.xml:37 apt-get.8.xml:40 apt-cache.8.xml:40 apt-key.8.xml:39
@@ -694,6 +694,10 @@ msgid ""
 "management of the system.  See also &apt-get; and &apt-cache; for more low-"
 "level command options."
 msgstr ""
+"<command>apt</command> (Advanced Package Tool、高度パッケージツール) はパッ"
+"ケージ処理用のコマンドラインツールです。システムのパッケージ管理用コマンドラ"
+"インインターフェイスを提供します。さらなる低レベルコマンドオプションについて"
+"は &apt-get; 及び &apt-cache; も参照してください。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml:47
@@ -703,6 +707,10 @@ msgid ""
 "<option>--installed</option>, <option>--upgradable</option>, <option>--all-"
 "versions</option> are supported."
 msgstr ""
+"パッケージ一覧を表示するには <literal>list</literal> を使います。パッケージ名"
+"のマッチングにシェルパターン、そしてオプション <option>--installed</"
+"option>、 <option>--upgradable</option>、 <option>--all-versions</option> を"
+"サポートしています。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml:58
@@ -710,18 +718,17 @@ msgid ""
 "<literal>search</literal> searches for the given term(s) and display "
 "matching packages."
 msgstr ""
+"<literal>search</literal> では指定した語を検索して該当するパッケージを表示し"
+"ます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml:64
-#, fuzzy
-#| msgid ""
-#| "<literal>rdepends</literal> shows a listing of each reverse dependency a "
-#| "package has."
 msgid ""
 "<literal>show</literal> shows the package information for the given "
 "package(s)."
 msgstr ""
-"<literal>rdepends</literal> は、パッケージが持つ被依存関係を一覧表示します。"
+"<literal>show</literal> では指定したパッケージについてのパッケージ情報を表示"
+"します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml:71
@@ -729,6 +736,8 @@ msgid ""
 "<literal>install</literal> is followed by one or more package names desired "
 "for installation or upgrading."
 msgstr ""
+"<literal>install</literal> に続けてインストールやアップグレードしたいパッケー"
+"ジの名前を指定します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml:75 apt-get.8.xml:118
@@ -768,19 +777,17 @@ msgid ""
 "<literal>edit-sources</literal> lets you edit your sources.list file and "
 "provides basic sanity checks."
 msgstr ""
+"<literal>edit-sources</literal> では sources.list ファイルを編集させ、基礎的"
+"な健全性確認を行います。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml:99
-#, fuzzy
-#| msgid ""
-#| "<literal>showhold</literal> is used to print a list of packages on hold "
-#| "in the same way as for the other show commands."
 msgid ""
 "<literal>update</literal> is used to resynchronize the package index files "
 "from their sources."
 msgstr ""
-"<literal>showhold</literal> は、他の show コマンドと同様に、保留されている"
-"パッケージを出力します。"
+"<literal>update</literal> を使うとパッケージ索引ファイルをそれぞれのソースと"
+"再同期します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml:105
@@ -790,6 +797,10 @@ msgid ""
 "<filename>/etc/apt/sources.list</filename>. New package will be installed, "
 "but existing package will never removed."
 msgstr ""
+"<literal>upgrade</literal> を使うとシステムに現在インストールされている全パッ"
+"ケージの最新版を <filename>/etc/apt/sources.list</filename> に記載されている"
+"ソースからインストールします。新しいパッケージはインストールされますが既存の"
+"パッケージが削除されることはありません。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml:114
@@ -798,6 +809,9 @@ msgid ""
 "also remove installed packages if that is required in order to resolve a "
 "package conflict."
 msgstr ""
+"<literal>full-upgrade</literal> はアップグレードの機能を実行しますが、パッ"
+"ケージの衝突を解決するために必要であればインストールされているパッケージの削"
+"除も行います。"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.8.xml:124 apt-get.8.xml:257 apt-cache.8.xml:250 apt-mark.8.xml:110
@@ -809,7 +823,7 @@ msgstr "オプション"
 #. type: Content of: <refentry><refsect1><title>
 #: apt.8.xml:134
 msgid "Script usage"
-msgstr ""
+msgstr "スクリプトでの利用"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml:136
@@ -820,33 +834,38 @@ msgid ""
 "&apt-cache; and &apt-get; via APT options. Please prefer using these "
 "commands in your scripts."
 msgstr ""
+"&apt; コマンドラインはエンドユーザ向けツールとして設計されており、出力はバー"
+"ジョン間で変更される可能性があります。後方互換性を損なうことのないようには努"
+"めますが、その保証はありません。&apt; の機能は全てAPTオプションを経由して "
+"&apt-cache; や &apt-get; で利用可能です。スクリプトでは各コマンドの利用を選択"
+"するようにしてください。"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.8.xml:144
 msgid "Differences to &apt-get;"
-msgstr ""
+msgstr "&apt-get; との違い"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml:145
 msgid ""
 "The <command>apt</command> command is meant to be pleasant for end users and "
-"does not need to be backward compatilbe like &apt-get;. Therefore some "
+"does not need to be backward compatible like &apt-get;. Therefore some "
 "options are different:"
 msgstr ""
+"<command>apt</command> コマンドはエンドユーザにとって使いやすいように意図して"
+"作られているため &apt-get; のように後方互換性が必ずしもあるとは限りません。し"
+"たがって、一部のオプションに異なる点があります:"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: apt.8.xml:151
-#, fuzzy
-#| msgid "the <literal>Package:</literal> line"
-msgid "The option <literal>DPkgPM::Progress-Fancy</literal> is enabled."
-msgstr "<literal>Package:</literal> 行"
+msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
+msgstr ""
+"オプション <literal>DPkg::Progress-Fancy</literal> が有効になっています。"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: apt.8.xml:155
-#, fuzzy
-#| msgid "the <literal>Component:</literal> line"
 msgid "The option <literal>APT::Color</literal> is enabled."
-msgstr "<literal>Component:</literal> 行"
+msgstr "オプション <literal>APT::Color</literal> が有効になっています。"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: apt.8.xml:159
@@ -854,20 +873,22 @@ msgid ""
 "A new <literal>list</literal> command is available similar to <literal>dpkg "
 "--list</literal>."
 msgstr ""
+"新しい <literal>list</literal> コマンドは <literal>dpkg --list</literal> と同"
+"じように利用できます。"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: apt.8.xml:164
-#, fuzzy
-#| msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
 msgid ""
 "The option <literal>upgrade</literal> has <literal>--with-new-pkgs</literal> "
 "enabled by default."
-msgstr "<literal>Archive:</literal> 行や <literal>Suite:</literal> 行"
+msgstr ""
+"オプション <literal>upgrade</literal> では <literal>--with-new-pkgs</"
+"literal> がデフォルトで有効になっています。"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.8.xml:174 apt-get.8.xml:558 apt-cache.8.xml:352 apt-key.8.xml:197
 #: apt-mark.8.xml:133 apt-secure.8.xml:193 apt-cdrom.8.xml:154
-#: apt-config.8.xml:111 apt.conf.5.xml:1227 apt_preferences.5.xml:707
+#: apt-config.8.xml:111 apt.conf.5.xml:1228 apt_preferences.5.xml:707
 #: sources.list.5.xml:280 apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65
 #: apt-ftparchive.1.xml:609
 msgid "See Also"
@@ -875,18 +896,12 @@ msgstr "関連項目"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml:175
-#, fuzzy
-#| msgid ""
-#| "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
-#| "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
-#| "preferences;, the APT Howto."
 msgid ""
 "&apt-get;, &apt-cache;, &sources-list;, &apt-conf;, &apt-config;, The APT "
 "User's guide in &guidesdir;, &apt-preferences;, the APT Howto."
 msgstr ""
-"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
-"&apt-config;, &apt-secure;, &guidesdir; にある APT ユーザガイド, &apt-"
-"preferences;, APT Howto"
+"&apt-get;、 &apt-cache;、 &sources-list;、 &apt-conf;、 &apt-config;、 "
+"&guidesdir; にあるAPTユーザガイド、 &apt-preferences;、 APT Howto."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.8.xml:180 apt-get.8.xml:564 apt-cache.8.xml:357 apt-mark.8.xml:137
@@ -897,16 +912,12 @@ msgstr "診断メッセージ"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml:181
-#, fuzzy
-#| msgid ""
-#| "<command>apt-get</command> returns zero on normal operation, decimal 100 "
-#| "on error."
 msgid ""
 "<command>apt</command> returns zero on normal operation, decimal 100 on "
 "error."
 msgstr ""
-"<command>apt-get</command> は正常終了時に 0 を返します。エラー時には十進の "
-"100 を返します。"
+"<command>apt</command> は正常終了時に 0 を返します。エラー時には十進の 100 を"
+"返します。"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-get.8.xml:35
@@ -915,12 +926,6 @@ msgstr "APT パッケージ操作ユーティリティ -- コマンドライン�
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-get.8.xml:41
-#, fuzzy
-#| msgid ""
-#| "<command>apt-get</command> is the command-line tool for handling "
-#| "packages, and may be considered the user's \"back-end\" to other tools "
-#| "using the APT library.  Several \"front-end\" interfaces exist, such as "
-#| "&dselect;, &aptitude;, &synaptic; and &wajig;."
 msgid ""
 "<command>apt-get</command> is the command-line tool for handling packages, "
 "and may be considered the user's \"back-end\" to other tools using the APT "
@@ -929,8 +934,8 @@ msgid ""
 msgstr ""
 "<command>apt-get</command> は、パッケージを操作するコマンドラインツールで、"
 "APT ライブラリを用いる他のツールのユーザ側「バックエンド」といえるものです。"
-"「フロントエンド」インターフェースには、&dselect;, &aptitude;, &synaptic;, "
-"&wajig; などがあります。"
+"「フロントエンド」インターフェースには、&aptitude;, &synaptic;, &wajig; など"
+"があります。"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-get.8.xml:46 apt-cache.8.xml:46 apt-cdrom.8.xml:53 apt-config.8.xml:46
@@ -1229,15 +1234,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:217
-#, fuzzy
-#| msgid ""
-#| "<literal>clean</literal> clears out the local repository of retrieved "
-#| "package files. It removes everything but the lock file from "
-#| "<filename>&cachedir;/archives/</filename> and <filename>&cachedir;/"
-#| "archives/partial/</filename>. When APT is used as a &dselect; method, "
-#| "<literal>clean</literal> is run automatically.  Those who do not use "
-#| "dselect will likely want to run <literal>apt-get clean</literal> from "
-#| "time to time to free up disk space."
 msgid ""
 "<literal>clean</literal> clears out the local repository of retrieved "
 "package files. It removes everything but the lock file from "
@@ -1246,10 +1242,7 @@ msgid ""
 msgstr ""
 "<literal>clean</literal> は、取得したパッケージのローカルリポジトリを掃除しま"
 "す。<filename>&cachedir;/archives/</filename> と <filename>&cachedir;/"
-"archives/partial/</filename> からロックファイル以外すべて削除します。APT が "
-"&dselect; から呼ばれるときには、自動的に <literal>clean</literal> が実行され"
-"ます。dselectを使用しない場合は、ディスクスペースを解放するため、時々 "
-"<literal>apt-get clean</literal> を実行したくなるでしょう。"
+"archives/partial/</filename> からロックファイル以外すべて削除します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:224
@@ -1331,19 +1324,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:277
-#, fuzzy
-#| msgid ""
-#| "Fix; attempt to correct a system with broken dependencies in place. This "
-#| "option, when used with install/remove, can omit any packages to permit "
-#| "APT to deduce a likely solution. If packages are specified, these have to "
-#| "completely correct the problem. The option is sometimes necessary when "
-#| "running APT for the first time; APT itself does not allow broken package "
-#| "dependencies to exist on a system. It is possible that a system's "
-#| "dependency structure can be so corrupt as to require manual intervention "
-#| "(which usually means using &dselect; or <command>dpkg --remove</command> "
-#| "to eliminate some of the offending packages). Use of this option together "
-#| "with <option>-m</option> may produce an error in some situations.  "
-#| "Configuration Item: <literal>APT::Get::Fix-Broken</literal>."
 msgid ""
 "Fix; attempt to correct a system with broken dependencies in place. This "
 "option, when used with install/remove, can omit any packages to permit APT "
@@ -1363,10 +1343,10 @@ msgstr ""
 "体は、システムに存在する破損したパッケージ依存関係を許すことができないので、"
 "初めて APT を実行する場合、このオプションが必要になることがあります。システム"
 "の依存関係構造にかなり問題がある場合は、手動で修正するよう要求することもあり"
-"ます。(通常は、問題のあるパッケージを取り除くのに &dselect; や <command>dpkg "
-"--remove</command> を使用します) このオプションを <option>-m</option> オプ"
-"ションと同時に使用すると、エラーになる状況があるかもしれません。設定項目: "
-"<literal>APT::Get::Fix-Broken</literal>"
+"ます。(通常は、問題のあるパッケージを取り除くのに <command>dpkg --remove</"
+"command> を使用します) このオプションを <option>-m</option> オプションと同時"
+"に使用すると、エラーになる状況があるかもしれません。設定項目: <literal>APT::"
+"Get::Fix-Broken</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:292
@@ -1502,14 +1482,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:370
-#, fuzzy
-#| msgid ""
-#| "This option controls the architecture packages are built for by "
-#| "<command>apt-get source --compile</command> and how cross-"
-#| "builddependencies are satisfied. By default is it not set which means "
-#| "that the host architecture is the same as the build architecture (which "
-#| "is defined by <literal>APT::Architecture</literal>).  Configuration Item: "
-#| "<literal>APT::Get::Host-Architecture</literal>"
 msgid ""
 "This option controls the architecture packages are built for by <command>apt-"
 "get source --compile</command> and how cross-builddependencies are "
@@ -1522,18 +1494,10 @@ msgstr ""
 "ケージのアーキテクチャや、どのようにクロス依存関係を解決するかを制御します。"
 "デフォルトでは未定義で、これはホストアーキテクチャは、(<literal>APT::"
 "Architecture</literal> で定義した) ビルドアーキテクチャと同じという意味になり"
-"ます。設定項目: <literal>APT::Get::Host-Architecture</literal>"
+"ます。設定項目: <literal>APT::Get::Host-Architecture</literal>。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:380
-#, fuzzy
-#| msgid ""
-#| "This option controls the architecture packages are built for by "
-#| "<command>apt-get source --compile</command> and how cross-"
-#| "builddependencies are satisfied. By default is it not set which means "
-#| "that the host architecture is the same as the build architecture (which "
-#| "is defined by <literal>APT::Architecture</literal>).  Configuration Item: "
-#| "<literal>APT::Get::Host-Architecture</literal>"
 msgid ""
 "This option controls the activated build profiles for which a source package "
 "is built by <command>apt-get source --compile</command> and how build "
@@ -1541,11 +1505,11 @@ msgid ""
 "than one build profile can be activated at a time by concatenating them with "
 "a comma.  Configuration Item: <literal>APT::Build-Profiles</literal>."
 msgstr ""
-"このオプションは、<command>apt-get source --compile</command> で構築するパッ"
-"ケージのアーキテクチャや、どのようにクロス依存関係を解決するかを制御します。"
-"デフォルトでは未定義で、これはホストアーキテクチャは、(<literal>APT::"
-"Architecture</literal> で定義した) ビルドアーキテクチャと同じという意味になり"
-"ます。設定項目: <literal>APT::Get::Host-Architecture</literal>"
+"このオプションは、<command>apt-get source --compile</command> でパッケージを"
+"ビルドする際に有効化するビルドプロファイルや、どのようにクロス依存関係を解決"
+"するかを制御します。デフォルトでは有効化するビルドプロファイルはありません。"
+"コンマで連結することで複数のビルドプロファイルを有効化できます。設定項目: "
+"<literal>APT::Get::Host-Architecture</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:391
@@ -1580,6 +1544,13 @@ msgid ""
 "will never remove packages, only allow adding new ones.  Configuration Item: "
 "<literal>APT::Get::Upgrade-Allow-New</literal>."
 msgstr ""
+"<literal>upgrade</literal> と併せて使った場合に新しいパッケージのインストール"
+"を許可します。これは新しい依存をインストールするために既にインストールされて"
+"いるパッケージを更新する必要がある場合に有用です。パッケージを保留する代わり"
+"に <literal>upgrade</literal> がパッケージをアップグレードして新しい依存をイ"
+"ンストールします。このオプションと併せて使った場合、<literal>upgrade</"
+"literal> がパッケージを削除することはなく、新規追加を許可するだけであることに"
+"注意してください。設定項目: <literal>APT::Get::Upgrade-Allow-New</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:415
@@ -1793,31 +1764,31 @@ msgid ""
 "Show user friendly progress information in the terminal window when packages "
 "are installed, upgraded or removed. For a machine parsable version of this "
 "data see README.progress-reporting in the apt doc directory.  Configuration "
-"Item: <literal>DpkgPM::Progress</literal> and <literal>Dpkg::Progress-Fancy</"
+"Item: <literal>Dpkg::Progress</literal> and <literal>Dpkg::Progress-Fancy</"
 "literal>."
 msgstr ""
+"パッケージのインストール、アップグレード、削除時にユーザにとってわかりやすい"
+"形で進捗情報をターミナルウィンドウ内に表示します。このデータの機械的に解析で"
+"きるバージョンについては apt の doc ディレクトリにある README.progress-"
+"reporting を見てください。設定項目: <literal>Dpkg::Progress</literal>、 "
+"<literal>Dpkg::Progress-Fancy</literal>"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml:548 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127
-#: apt.conf.5.xml:1221 apt_preferences.5.xml:700
+#: apt.conf.5.xml:1222 apt_preferences.5.xml:700
 msgid "Files"
 msgstr "ファイル"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-get.8.xml:559
-#, fuzzy
-#| msgid ""
-#| "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
-#| "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
-#| "preferences;, the APT Howto."
 msgid ""
 "&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-config;, "
 "&apt-secure;, The APT User's guide in &guidesdir;, &apt-preferences;, the "
 "APT Howto."
 msgstr ""
-"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
-"&apt-config;, &apt-secure;, &guidesdir; にある APT ユーザガイド, &apt-"
-"preferences;, APT Howto"
+"&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-config;, "
+"&apt-secure;, &guidesdir; にある APT ユーザガイド, &apt-preferences;, APT "
+"Howto"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-get.8.xml:565
@@ -2482,7 +2453,8 @@ msgstr ""
 "ローカルキーリングをアーカイブキーリングで更新し、もう有効でなくなったアーカ"
 "イブキーをローカルキーリングから削除します。アーカイブキーリングは、使用中の"
 "ディストリビューションにある <literal>archive-keyring</literal> パッケージ "
-"(例: &keyring-distro; では &keyring-package; パッケージ) で提供されています。"
+"(例えば &keyring-distro; では &keyring-package; パッケージ) で提供されていま"
+"す。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:146
@@ -2802,11 +2774,12 @@ msgid ""
 msgstr ""
 "アップロードされたパッケージが検証されてアーカイブに格納されると、メンテナの"
 "署名を取り外し、パッケージのチェックサムを計算して、Packages ファイルに格納し"
-"ます。その後、全パッケージファイルのチェックサムを計算して、Release ファイル"
+"ます。その後、全 Packages ファイルのチェックサムを計算して、Release ファイル"
 "に格納します。Release ファイルは、その &keyring-distro; リリースのアーカイブ"
 "キーで署名され、&keyring-distro; ミラーサイトでパッケージや Packages ファイル"
-"とともに配布されます。このキーは、&keyring-package; パッケージに収録されてい"
-"る、&keyring-distro; アーカイブキーリングに含まれます。"
+"とともに配布されます。このキーは、<package>debian-archive-keyring</package> "
+"パッケージに収録されている、&keyring-distro; アーカイブキーリングに含まれま"
+"す。"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml:115
@@ -2963,10 +2936,10 @@ msgstr ""
 #: apt-secure.8.xml:195
 msgid ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
 msgstr ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml:199
@@ -3064,19 +3037,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:87
-#, fuzzy
-#| msgid ""
-#| "Mount point; specify the location to mount the CD-ROM. This mount point "
-#| "must be listed in <filename>/etc/fstab</filename> and properly "
-#| "configured.  Configuration Item: <literal>Acquire::cdrom::mount</literal>."
 msgid ""
 "Do not try to auto-detect the CD-ROM path. Usually combined with the "
 "<option>--cdrom</option> option.  Configuration Item: <literal>Acquire::"
 "cdrom::AutoDetect</literal>."
 msgstr ""
-"マウントポイント - CD-ROM をマウントする場所を指定します。このマウントポイン"
-"トは、<filename>/etc/fstab</filename> に正しく設定されている必要があります。"
-"設定項目: <literal>Acquire::cdrom::mount</literal>"
+"CD-ROM パスの自動検出を試行しません。通常、<option>--cdrom</option> オプショ"
+"ンと組み合わせて使います。設定項目: <literal>Acquire::cdrom::AutoDetect</"
+"literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:95
@@ -3600,6 +3568,10 @@ msgid ""
 "is empty. The <envar>DEB_BUILD_PROFILES</envar> as used by &dpkg-"
 "buildpackage; overrides the list notation."
 msgstr ""
+"構築依存の解決にあたって有効になっているビルドプロファイルを名前空間の"
+"「<literal>profile.</literal>」接頭辞を取り除いたもの全ての一覧です。デフォル"
+"トではこの一覧は空です。&dpkg-buildpackage; で利用される "
+"<envar>DEB_BUILD_PROFILES</envar> はこの一覧よりも優先されます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:190
@@ -3997,13 +3969,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:400
-#, fuzzy
-#| msgid ""
-#| "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
-#| "literal> which accepts integer values in kilobytes. The default value is "
-#| "0 which deactivates the limit and tries to use all available bandwidth "
-#| "(note that this option implicitly disables downloading from multiple "
-#| "servers at the same time.)"
 msgid ""
 "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
 "literal> which accepts integer values in kilobytes per second. The default "
@@ -4011,10 +3976,10 @@ msgid ""
 "bandwidth.  Note that this option implicitly disables downloading from "
 "multiple servers at the same time."
 msgstr ""
-"使用する帯域を制限するには、<literal>Acquire::http::Dl-Limit</literal> にキロ"
-"バイトで整数値を与えます。デフォルト値は 0 で、制限を解除し、使用できる帯域を"
-"すべて使おうとします (このオプションは暗黙的に、同時に複数のサーバからダウン"
-"ロードしなくなることに注意してください)。"
+"使用する帯域を制限するには、<literal>Acquire::http::Dl-Limit</literal> に秒あ"
+"たりのキロバイトで整数値を与えます。デフォルト値は 0 で、制限を解除し、使用で"
+"きる帯域をすべて使おうとします。このオプションは暗黙的に、同時に複数のサーバ"
+"からダウンロードしなくなることに注意してください。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:407
@@ -4040,6 +4005,14 @@ msgid ""
 "takes precedence over the legacy option name <literal>ProxyAutoDetect</"
 "literal>."
 msgstr ""
+"<literal>Acquire::http::Proxy-Auto-Detect</literal> を使って利用する http プ"
+"ロキシを検出するための外部コマンドを指定できます。APT はコマンドが標準出力に "
+"<literal>http://proxy:port/</literal> 形式でプロキシを出力することを期待して"
+"います。これは全体を指定する <literal>Acquire::http::Proxy</literal> よりも優"
+"先されますが <literal>Acquire::http::Proxy::$HOST</literal> 経由でセットした"
+"特定のホストのプロキシ設定はこれよりも優先されます。avahi を利用する実装例に"
+"ついては &squid-deb-proxy-client; パッケージを見てください。このオプションは"
+"古い <literal>ProxyAutoDetect</literal> よりも優先されます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:429
@@ -4404,12 +4377,12 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:585
 msgid "When downloading, force to use only the IPv4 protocol."
-msgstr ""
+msgstr "ダウンロード時に IPv4 プロトコルだけを使うように強制します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:591
 msgid "When downloading, force to use only the IPv6 protocol."
-msgstr ""
+msgstr "ダウンロード時に IPv6 プロトコルだけを使うように強制します。"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml:598
@@ -4442,22 +4415,24 @@ msgid ""
 "information, such as the two package caches <literal>srcpkgcache</literal> "
 "and <literal>pkgcache</literal> as well as the location to place downloaded "
 "archives, <literal>Dir::Cache::archives</literal>. Generation of caches can "
-"be turned off by setting their names to the empty string. This will slow "
+"be turned off by setting <literal>pkgcache</literal> or "
+"<literal>srcpkgcache</literal> to <literal>\"\"</literal>.  This will slow "
 "down startup but save disk space. It is probably preferable to turn off the "
-"pkgcache rather than the srcpkgcache. Like <literal>Dir::State</literal> the "
-"default directory is contained in <literal>Dir::Cache</literal>"
+"pkgcache rather than the srcpkgcache.  Like <literal>Dir::State</literal> "
+"the default directory is contained in <literal>Dir::Cache</literal>"
 msgstr ""
 "<literal>Dir::Cache</literal> は、ローカルキャッシュ情報に関する場所を格納し"
 "ています。これは、ダウンロード済アーカイブの場所を示す <literal>Dir::Cache::"
-"archives</literal> と同様に、<literal>srcpkgcache</literal> と "
-"<literal>pkgcache</literal> のパッケージキャッシュの場所になります。それぞれ"
-"に空文字をセットすることで、キャッシュの生成を無効にできます。これにより起動"
-"時に遅くなりますが、ディスク容量を節約できます。おそらく、srcpkgcache よりも "
-"pkgcache を無効にすることが多いと思います。<literal>Dir::State</literal> と同"
-"様、<literal>Dir::Cache</literal> はデフォルトディレクトリを含んでいます。"
+"archives</literal> と同様に、<literal>srcpkgcache</literal> と <literal>"
+"pkgcache</literal> のパッケージキャッシュの場所になります。<literal>pkgcache"
+"</literal> や <literal>srcpkgcache</literal> に <literal>\"\"</literal> を"
+"セットすることで、キャッシュの生成を無効にできます。これにより起動時に遅くな"
+"りますが、ディスク容量を節約できます。おそらく、srcpkgcache よりも pkgcache "
+"を無効にすることが多いと思います。<literal>Dir::State</literal> と同様、"
+"<literal>Dir::Cache</literal> はデフォルトディレクトリを含んでいます。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:616
+#: apt.conf.5.xml:617
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4471,7 +4446,7 @@ msgstr ""
 "ファイルを指定された場合のみ、この設定の効果があります)"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:622
+#: apt.conf.5.xml:623
 msgid ""
 "The <literal>Dir::Parts</literal> setting reads in all the config fragments "
 "in lexical order from the directory specified. After this is done then the "
@@ -4482,7 +4457,7 @@ msgstr ""
 "します。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:626
+#: apt.conf.5.xml:627
 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4499,7 +4474,7 @@ msgstr ""
 "プログラムの場所を指定します。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:634
+#: apt.conf.5.xml:635
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4519,7 +4494,7 @@ msgstr ""
 "<filename>/tmp/staging/var/lib/dpkg/status</filename> から探します。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:647
+#: apt.conf.5.xml:648
 msgid ""
 "The <literal>Ignore-Files-Silently</literal> list can be used to specify "
 "which files APT should silently ignore while parsing the files in the "
@@ -4535,12 +4510,12 @@ msgstr ""
 "フォルト値を見ればわかる通り、このパターンには正規表現を使用できます。"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:656
+#: apt.conf.5.xml:657
 msgid "APT in DSelect"
 msgstr "DSelect での APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:658
+#: apt.conf.5.xml:659
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behavior. These are in the <literal>DSelect</literal> "
@@ -4551,7 +4526,7 @@ msgstr ""
 "ます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:663
+#: apt.conf.5.xml:664
 msgid ""
 "Cache Clean mode; this value may be one of <literal>always</literal>, "
 "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -4572,7 +4547,7 @@ msgstr ""
 "パッケージをダウンロードする直前に行います。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:677
+#: apt.conf.5.xml:678
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the install phase."
@@ -4581,7 +4556,7 @@ msgstr ""
 "されます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:682
+#: apt.conf.5.xml:683
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the update phase."
@@ -4590,7 +4565,7 @@ msgstr ""
 "されます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:687
+#: apt.conf.5.xml:688
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
@@ -4599,12 +4574,12 @@ msgstr ""
 "します。デフォルトはエラーが発生した場合のみです。"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:693
+#: apt.conf.5.xml:694
 msgid "How APT calls &dpkg;"
 msgstr "APT が &dpkg; を呼ぶ方法"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:694
+#: apt.conf.5.xml:695
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
@@ -4613,7 +4588,7 @@ msgstr ""
 "<literal>DPkg</literal> セクションにあります。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:699
+#: apt.conf.5.xml:700
 msgid ""
 "This is a list of options to pass to &dpkg;. The options must be specified "
 "using the list notation and each list item is passed as a single argument to "
@@ -4623,7 +4598,7 @@ msgstr ""
 "なければなりません。また、各リストは単一の引数として &dpkg; に渡されます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:705
+#: apt.conf.5.xml:706
 msgid ""
 "This is a list of shell commands to run before/after invoking &dpkg;.  Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -4635,14 +4610,7 @@ msgstr ""
 "bin/sh</filename> を通して呼び出され、何か問題があれば APT が異常終了します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:712
-#, fuzzy
-#| msgid ""
-#| "This is a list of shell commands to run before invoking &dpkg;. Like "
-#| "<literal>options</literal> this must be specified in list notation. The "
-#| "commands are invoked in order using <filename>/bin/sh</filename>; should "
-#| "any fail APT will abort. APT will pass the filenames of all .deb files it "
-#| "is going to install to the commands, one per line on standard input."
+#: apt.conf.5.xml:713
 msgid ""
 "This is a list of shell commands to run before invoking &dpkg;. Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -4654,18 +4622,12 @@ msgstr ""
 "&dpkg; を呼び出す前に実行するシェルコマンドのリストです。<literal>options</"
 "literal> のようにリスト記法で指定しなければなりません。コマンドは <filename>/"
 "bin/sh</filename> を通して呼び出され、何か問題があれば、APT は異常終了しま"
-"す。APT はインストールしようとする全 .deb ファイルのファイル名を、1 行ずつコ"
-"マンドの標準入力に送ります。"
+"す。APT はインストールしようとする全 .deb ファイルのファイル名を、要求した"
+"ファイルディスクリプタについて1 行ずつ、デフォルトではコマンドの標準入力に送"
+"ります。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:719
-#, fuzzy
-#| msgid ""
-#| "Version 2 of this protocol dumps more information, including the protocol "
-#| "version, the APT configuration space and the packages, files and versions "
-#| "being changed. Version 2 is enabled by setting <literal>DPkg::Tools::"
-#| "options::cmd::Version</literal> to 2. <literal>cmd</literal> is a command "
-#| "given to <literal>Pre-Install-Pkgs</literal>."
+#: apt.conf.5.xml:720
 msgid ""
 "Version 2 of this protocol dumps more information, including the protocol "
 "version, the APT configuration space and the packages, files and versions "
@@ -4674,12 +4636,11 @@ msgid ""
 msgstr ""
 "このプロトコルのバージョン 2 では、(プロトコルのバージョンや APT 設定スペー"
 "ス、パッケージを含む) 詳細情報やファイル、変更されているバージョンを出力しま"
-"す。<literal>DPkg::Tools::options::cmd::Version</literal> に 2 を設定すると、"
-"バージョン 2 を有効にできます。<literal>cmd</literal> は <literal>Pre-"
-"Install-Pkgs</literal> で与えられるコマンドです。"
+"す。バージョン 3 では出力の各バージョンにアーキテクチャと "
+"<literal>MultiArch</literal> フラグが追加されています。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:724
+#: apt.conf.5.xml:725
 msgid ""
 "The version of the protocol to be used for the command "
 "<literal><replaceable>cmd</replaceable></literal> can be chosen by setting "
@@ -4688,9 +4649,14 @@ msgid ""
 "the requested version it will send the information in the highest version it "
 "has support for instead."
 msgstr ""
+"コマンド <literal><replaceable>cmd</replaceable></literal> で利用するプロトコ"
+"ルのバージョンは <literal>DPkg::Tools::options::<replaceable>cmd</"
+"replaceable>::Version</literal> の設定により選択でき、デフォルトはバージョン "
+"1 となっています。リクエストしたバージョンを APT がサポートしていない場合はサ"
+"ポートしている最大のバージョンの情報を代わりに送ります。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:731
+#: apt.conf.5.xml:732
 msgid ""
 "The file descriptor to be used to send the information can be requested with "
 "<literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::InfoFD</"
@@ -4699,9 +4665,15 @@ msgid ""
 "looking for the environment variable <envar>APT_HOOK_INFO_FD</envar> which "
 "contains the number of the used file descriptor as a confirmation."
 msgstr ""
+"情報の送信に利用するファイルディスクリプタは <literal>DPkg::Tools::options::"
+"<replaceable>cmd</replaceable>::InfoFD</literal> によりリクエストでき、デフォ"
+"ルトは <literal>0</literal> で標準入力を指定します。バージョン 0.9.11 から利"
+"用可能となりました。環境変数 <envar>APT_HOOK_INFO_FD</envar> を見ることでこの"
+"オプションに対応していることを検出でき、それには確認として利用しているファイ"
+"ルディスクリプタの番号が収録されています。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:741
+#: apt.conf.5.xml:742
 msgid ""
 "APT chdirs to this directory before invoking &dpkg;, the default is "
 "<filename>/</filename>."
@@ -4710,7 +4682,7 @@ msgstr ""
 "<filename>/</filename> です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:746
+#: apt.conf.5.xml:747
 msgid ""
 "These options are passed to &dpkg-buildpackage; when compiling packages; the "
 "default is to disable signing and produce all binaries."
@@ -4719,12 +4691,12 @@ msgstr ""
 "ます。デフォルトでは署名を無効にし、全バイナリを生成します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:751
+#: apt.conf.5.xml:752
 msgid "dpkg trigger usage (and related options)"
 msgstr "dpkg トリガの使い方 (および関連オプション)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:752
+#: apt.conf.5.xml:753
 msgid ""
 "APT can call &dpkg; in such a way as to let it make aggressive use of "
 "triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
@@ -4748,7 +4720,7 @@ msgstr ""
 "(もしくはそれ以上) の時間 100% のままとなり、進捗レポートを壊してしまいます。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:767
+#: apt.conf.5.xml:768
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -4762,7 +4734,7 @@ msgstr ""
 "DPkg::TriggersPending \"true\";"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:761
+#: apt.conf.5.xml:762
 msgid ""
 "Note that it is not guaranteed that APT will support these options or that "
 "these options will not cause (big) trouble in the future. If you have "
@@ -4785,7 +4757,7 @@ msgstr ""
 "\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:774
+#: apt.conf.5.xml:775
 msgid ""
 "Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
 "call).  See &dpkg; if you are interested in what this actually means. In "
@@ -4805,7 +4777,7 @@ msgstr ""
 "在 APT は、このフラグを、展開呼び出しや削除呼び出しにも追加します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:782
+#: apt.conf.5.xml:783
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
@@ -4832,7 +4804,7 @@ msgstr ""
 "能性があるからです。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:797
+#: apt.conf.5.xml:798
 msgid ""
 "If this option is set APT will call <command>dpkg --configure --pending</"
 "command> to let &dpkg; handle all required configurations and triggers. This "
@@ -4849,7 +4821,7 @@ msgstr ""
 "では、最後以外のすべての実行で、無効にできます。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:804
+#: apt.conf.5.xml:805
 msgid ""
 "Useful for the <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal>, and "
@@ -4864,7 +4836,7 @@ msgstr ""
 "ことに注意してください。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:817
+#: apt.conf.5.xml:818
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -4882,7 +4854,7 @@ msgstr ""
 "};"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:810
+#: apt.conf.5.xml:811
 msgid ""
 "Essential packages (and their dependencies) should be configured immediately "
 "after unpacking. It is a good idea to do this quite early in the upgrade "
@@ -4905,12 +4877,12 @@ msgstr ""
 "\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:830
+#: apt.conf.5.xml:831
 msgid "Periodic and Archives options"
 msgstr "Periodic オプションと Archives オプション"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:831
+#: apt.conf.5.xml:832
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by the "
@@ -4923,12 +4895,12 @@ msgstr ""
 "トは、このスクリプトの先頭を参照してください。"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:839
+#: apt.conf.5.xml:840
 msgid "Debug options"
 msgstr "デバッグオプション"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:841
+#: apt.conf.5.xml:842
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -4944,7 +4916,7 @@ msgstr ""
 "のオプションは興味がないでしょうが、以下のものは興味を引くかもしれません。"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:852
+#: apt.conf.5.xml:853
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -4955,7 +4927,7 @@ msgstr ""
 "にします。"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:860
+#: apt.conf.5.xml:861
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"
@@ -4966,7 +4938,7 @@ msgstr ""
 "literal>) を行う場合に使用します。"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:869
+#: apt.conf.5.xml:870
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -4978,7 +4950,7 @@ msgstr ""
 #. 	   motivating example, except I haven't a clue why you'd want
 #. 	   to do this. 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:877
+#: apt.conf.5.xml:878
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CD-ROM IDs."
@@ -4987,34 +4959,34 @@ msgstr ""
 "ないようにします。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:887
+#: apt.conf.5.xml:888
 msgid "A full list of debugging options to apt follows."
 msgstr "以下は apt に対するデバッグオプションのすべてです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:896
+#: apt.conf.5.xml:897
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
 "<literal>cdrom://</literal> ソースへのアクセスに関する情報を出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:907
+#: apt.conf.5.xml:908
 msgid "Print information related to downloading packages using FTP."
 msgstr "FTP を用いたパッケージのダウンロードに関する情報を出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:918
+#: apt.conf.5.xml:919
 msgid "Print information related to downloading packages using HTTP."
 msgstr "HTTP を用いたパッケージのダウンロードに関する情報を出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:929
+#: apt.conf.5.xml:930
 msgid "Print information related to downloading packages using HTTPS."
 msgstr "HTTPS を用いたパッケージのダウンロードに関する情報を出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:940
+#: apt.conf.5.xml:941
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
@@ -5022,7 +4994,7 @@ msgstr ""
 "<literal>gpg</literal> を用いた暗号署名の検証に関する情報を出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:951
+#: apt.conf.5.xml:952
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
@@ -5031,12 +5003,12 @@ msgstr ""
 "します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:961
+#: apt.conf.5.xml:962
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr "&apt-get; での構築依存関係解決のプロセスを説明します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:971
+#: apt.conf.5.xml:972
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
@@ -5044,7 +5016,7 @@ msgstr ""
 "<literal>apt</literal> ライブラリが生成した、暗号化ハッシュを出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:981
+#: apt.conf.5.xml:982
 msgid ""
 "Do not include information from <literal>statfs</literal>, namely the number "
 "of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -5054,7 +5026,7 @@ msgstr ""
 "システムにある使用済・未使用ブロックの数からの情報を含めないようにします。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:992
+#: apt.conf.5.xml:993
 msgid ""
 "Disable all file locking.  For instance, this will allow two instances of "
 "<quote><literal>apt-get update</literal></quote> to run at the same time."
@@ -5063,13 +5035,13 @@ msgstr ""
 "<quote><literal>apt-get update</literal></quote> を実行できるようになります。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1004
+#: apt.conf.5.xml:1005
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 "グローバルダウンロードキューに対する項目の追加・削除の際にログを出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1014
+#: apt.conf.5.xml:1015
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
@@ -5078,7 +5050,7 @@ msgstr ""
 "ジやエラーを出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1024
+#: apt.conf.5.xml:1025
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
@@ -5087,7 +5059,7 @@ msgstr ""
 "します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1036
+#: apt.conf.5.xml:1037
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
@@ -5096,14 +5068,14 @@ msgstr ""
 "リストへのパッチ適用に関する情報を出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1047
+#: apt.conf.5.xml:1048
 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
 "実際のダウンロードを行う際の、サブプロセスとのやりとりをログに出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1058
+#: apt.conf.5.xml:1059
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
@@ -5112,7 +5084,7 @@ msgstr ""
 "に出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1068
+#: apt.conf.5.xml:1069
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
@@ -5127,7 +5099,7 @@ msgstr ""
 "路に対応しています。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1082
+#: apt.conf.5.xml:1083
 msgid ""
 "Generate debug messages describing which packages are marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
@@ -5156,7 +5128,7 @@ msgstr ""
 "ます。<literal>section</literal> はパッケージが現れるセクション名です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1103
+#: apt.conf.5.xml:1104
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
@@ -5165,7 +5137,7 @@ msgstr ""
 "切られます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1114
+#: apt.conf.5.xml:1115
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
@@ -5174,7 +5146,7 @@ msgstr ""
 "を解析中に発生したエラーを出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1125
+#: apt.conf.5.xml:1126
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
@@ -5183,18 +5155,18 @@ msgstr ""
 "のトレースを生成します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1137
+#: apt.conf.5.xml:1138
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr "&dpkg; を呼び出す際に、実行手順を追跡した状態メッセージを出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1148
+#: apt.conf.5.xml:1149
 msgid "Output the priority of each package list on startup."
 msgstr "起動時の各パッケージの優先度を表示します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1158
+#: apt.conf.5.xml:1159
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
@@ -5203,7 +5175,7 @@ msgstr ""
 "した場合にのみ、適用されます)。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1169
+#: apt.conf.5.xml:1170
 msgid ""
 "Display a list of all installed packages with their calculated score used by "
 "the pkgProblemResolver. The description of the package is the same as "
@@ -5214,7 +5186,7 @@ msgstr ""
 "説明したものと同じです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1181
+#: apt.conf.5.xml:1182
 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
@@ -5223,21 +5195,24 @@ msgstr ""
 "します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1191
+#: apt.conf.5.xml:1192
 msgid ""
 "Display the external commands that are called by apt hooks.  This includes e."
 "g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or "
 "<literal>APT::Update::{Pre,Post}-Invoke</literal>."
 msgstr ""
+"aptのフックにより呼び出される外部コマンドを表示します。これには例えば、設定オ"
+"プション <literal>DPkg::{Pre,Post}-Invoke</literal> や <literal>APT::Update::"
+"{Pre,Post}-Invoke</literal> があります。"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1215 apt_preferences.5.xml:547 sources.list.5.xml:239
+#: apt.conf.5.xml:1216 apt_preferences.5.xml:547 sources.list.5.xml:239
 #: apt-ftparchive.1.xml:598
 msgid "Examples"
 msgstr "サンプル"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1216
+#: apt.conf.5.xml:1217
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -5247,7 +5222,7 @@ msgstr ""
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1228
+#: apt.conf.5.xml:1229
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
 
@@ -6676,10 +6651,9 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml:82
-#, fuzzy, no-wrap
-#| msgid "deb [ options ] uri distribution [component1] [component2] [...]"
+#, no-wrap
 msgid "deb [ options ] uri suite [component1] [component2] [...]"
-msgstr "deb [ オプション ] uri distribution [コンポーネント1] [コンポーネント2] [...]"
+msgstr "deb [ オプション ] uri スイート [コンポーネント1] [コンポーネント2] [...]"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
 #: sources.list.5.xml:86
@@ -6703,6 +6677,23 @@ msgid ""
 "     [option1]: [option1-value]\n"
 "   "
 msgstr ""
+"     Types: deb deb-src\n"
+"     URIs: http://example.com\n"
+"     Suites: stable testing\n"
+"     Sections: component1 component2\n"
+"     Description: short\n"
+"      long long long\n"
+"     [option1]: [option1-value]\n"
+"\n"
+"     Types: deb\n"
+"     URIs: http://another.example.com\n"
+"     Suites: experimental\n"
+"     Sections: component1 component2\n"
+"     Enabled: no\n"
+"     Description: short\n"
+"      long long long\n"
+"     [option1]: [option1-value]\n"
+"   "
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:84
@@ -6710,19 +6701,11 @@ msgid ""
 "Alternatively a rfc822 style format is also supported: <placeholder type="
 "\"literallayout\" id=\"0\"/>"
 msgstr ""
+"他に rfc822 形式の表記もサポートしています: <placeholder type=\"literallayout"
+"\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:105
-#, fuzzy
-#| msgid ""
-#| "The URI for the <literal>deb</literal> type must specify the base of the "
-#| "Debian distribution, from which APT will find the information it needs.  "
-#| "<literal>distribution</literal> can specify an exact path, in which case "
-#| "the components must be omitted and <literal>distribution</literal> must "
-#| "end with a slash (<literal>/</literal>). This is useful for the case when "
-#| "only a particular sub-section of the archive denoted by the URI is of "
-#| "interest.  If <literal>distribution</literal> does not specify an exact "
-#| "path, at least one <literal>component</literal> must be present."
 msgid ""
 "The URI for the <literal>deb</literal> type must specify the base of the "
 "Debian distribution, from which APT will find the information it needs.  "
@@ -6734,25 +6717,16 @@ msgid ""
 "<literal>component</literal> must be present."
 msgstr ""
 "<literal>deb</literal> タイプの URI は、APT が必要な情報を見つけられるよう"
-"に、Debian ディストリビューションの基底を指定しなければなりません。"
-"<literal>distribution</literal> には正確なパスを指定できます。その場合 "
-"component を省略し、<literal>distribution</literal> はスラッシュ (<literal>/"
-"</literal>) で終わらなくてはなりません。これは URL で指定されたアーカイブの、"
-"特定のサブセクションのみに関心があるときに役に立ちます。"
-"<literal>distribution</literal> に正確なパスを指定しないのなら、少なくともひ"
-"とつは <literal>component</literal> を指定しなければなりません。"
+"に、Debian ディストリビューションの基底を指定しなければなりません。<literal>"
+"スイート</literal>には正確なパスを指定できます。その場合コンポーネントを省略"
+"し、<literal>スイート</literal>はスラッシュ (<literal>/</literal>) で終わらな"
+"くてはなりません。これは URL で指定されたアーカイブの、特定のサブセクションの"
+"みに関心があるときに役に立ちます。<literal>スイート</literal>に正確なパスを指"
+"定しないのなら、少なくともひとつは <literal>コンポーネント</literal> を指定し"
+"なければなりません。"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:114
-#, fuzzy
-#| msgid ""
-#| "<literal>distribution</literal> may also contain a variable, <literal>"
-#| "$(ARCH)</literal> which expands to the Debian architecture (such as "
-#| "<literal>amd64</literal> or <literal>armel</literal>) used on the system. "
-#| "This permits architecture-independent <filename>sources.list</filename> "
-#| "files to be used. In general this is only of interest when specifying an "
-#| "exact path, <literal>APT</literal> will automatically generate a URI with "
-#| "the current architecture otherwise."
 msgid ""
 "<literal>suite</literal> may also contain a variable, <literal>$(ARCH)</"
 "literal> which expands to the Debian architecture (such as <literal>amd64</"
@@ -6762,29 +6736,16 @@ msgid ""
 "<literal>APT</literal> will automatically generate a URI with the current "
 "architecture otherwise."
 msgstr ""
-"<literal>distribution</literal> は、<literal>$(ARCH)</literal> 変数を含む場合"
-"があります。<literal>$(ARCH)</literal> 変数は、システムで使用している Debian "
-"アーキテクチャ (<literal>amd64</literal> や <literal>armel</literal> など) に"
-"展開されます。これにより、アーキテクチャに依存しない <filename>sources.list</"
+"<literal>スイート</literal> は、<literal>$(ARCH)</literal> 変数を含む場合があ"
+"ります。<literal>$(ARCH)</literal> 変数は、システムで使用している Debian アー"
+"キテクチャ (<literal>amd64</literal> や <literal>armel</literal> など) に展開"
+"されます。これにより、アーキテクチャに依存しない <filename>sources.list</"
 "filename> ファイルを使用できます。一般的に、これは正しいパスを指定するときに"
 "気にするだけです。そうでない場合は、<literal>APT</literal> は現在のアーキテク"
 "チャで URI を自動的に生成します。"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:122
-#, fuzzy
-#| msgid ""
-#| "Since only one distribution can be specified per line it may be necessary "
-#| "to have multiple lines for the same URI, if a subset of all available "
-#| "distributions or components at that location is desired.  APT will sort "
-#| "the URI list after it has generated a complete set internally, and will "
-#| "collapse multiple references to the same Internet host, for instance, "
-#| "into a single connection, so that it does not inefficiently establish an "
-#| "FTP connection, close it, do something else, and then re-establish a "
-#| "connection to that same host. This feature is useful for accessing busy "
-#| "FTP sites with limits on the number of simultaneous anonymous users. APT "
-#| "also parallelizes connections to different hosts to more effectively deal "
-#| "with sites with low bandwidth."
 msgid ""
 "In the traditional style sources.list format since only one distribution can "
 "be specified per line it may be necessary to have multiple lines for the "
@@ -6798,14 +6759,15 @@ msgid ""
 "users. APT also parallelizes connections to different hosts to more "
 "effectively deal with sites with low bandwidth."
 msgstr ""
-"有効な全 distribution, component の場所から、一部が必要な場合、1 行につき 1 "
-"distribution しか指定できないため、同じ URI の行を複数記述することになるで"
-"しょう。APT は内部で URI リストを生成してから、並べ替えます。そして、同じイン"
-"ターネットホストに対しては複数の参照をまとめます。例えば FTP 接続後、切断して"
-"からまた同じホストに再接続するといった、効率の悪いことをせずに、1 接続にまと"
-"めます。この機能は、同時接続匿名ユーザ数を制限している、混んでいる FTP サイト"
-"にアクセスするのに便利です。APT は、帯域の狭いサイトを効率よく扱うのに、異な"
-"るホストへは、接続を並行して行うようにもしています。"
+"古い形式の sources.list の記法では有効なディストリビューションやコンポーネン"
+"トの場所全てから、一部が必要な場合、1 行につき 1 つのディストリビューションし"
+"か指定できないため、同じ URI の行を複数記述することになるでしょう。APT は内部"
+"で URI リストを生成してから、並べ替えます。そして、同じインターネットホストに"
+"対しては複数の参照をまとめます。例えば FTP 接続後、切断してからまた同じホスト"
+"に再接続するといった、効率の悪いことをせずに、1 接続にまとめます。この機能"
+"は、同時接続匿名ユーザ数を制限している、混んでいる FTP サイトにアクセスするの"
+"に便利です。APT は、帯域の狭いサイトを効率よく扱うのに、異なるホストへは、接"
+"続を並行して行うようにもしています。"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:136
@@ -6839,23 +6801,16 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: sources.list.5.xml:146
-#, fuzzy
-#| msgid ""
-#| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
-#| "replaceable>,…</literal> can be used to specify for which architectures "
-#| "information should be downloaded. If this option is not set all "
-#| "architectures defined by the <literal>APT::Architectures</literal> option "
-#| "will be downloaded."
 msgid ""
 "<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</"
 "replaceable>,…</literal> and <literal>arch-=<replaceable>arch1</replaceable>,"
 "<replaceable>arch2</replaceable>,…</literal> which can be used to add/remove "
 "architectures from the set which will be downloaded."
 msgstr ""
-"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
-"replaceable>,…</literal> により、どのアーキテクチャ情報をダウンロードするか指"
-"定します。このオプションを指定していないと、<literal>APT::Architectures</"
-"literal> オプションに定義してある、全アーキテクチャをダウンロードします。"
+"<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</"
+"replaceable>,…</literal> あるいは <literal>arch-=<replaceable>arch1</"
+"replaceable>,<replaceable>arch2</replaceable>,…</literal> を使って、ダウン"
+"ロードするアーキテクチャを追加、削除できます。"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: sources.list.5.xml:149
@@ -8194,34 +8149,51 @@ msgstr ""
 "<command>apt-ftparchive</command> は正常終了時に 0 を返します。エラー時には十"
 "進の 100 を返します。"
 
-#. type: <title></title>
-#: guide.sgml:4
+#. type: Attribute 'lang' of: <book>
+#: guide.dbk:8 offline.dbk:8
+msgid "en"
+msgstr "ja"
+
+#. type: Content of: <book><title>
+#: guide.dbk:10
 msgid "APT User's Guide"
 msgstr "APT ユーザガイド"
 
-#. type: <author></author>
-#: guide.sgml:6 offline.sgml:6
-msgid "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
-msgstr "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
+#. type: Content of: <book><bookinfo><authorgroup><author><personname>
+#: guide.dbk:16 offline.dbk:16
+msgid "Jason Gunthorpe"
+msgstr "Jason Gunthorpe"
 
-#. type: <version></version>
-#: guide.sgml:7
-msgid "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
-msgstr "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
+#. type: Content of: <book><bookinfo><authorgroup><author><email>
+#: guide.dbk:16 offline.dbk:16
+msgid "jgg@debian.org"
+msgstr "jgg@debian.org"
 
-#. type: <abstract></abstract>
-#: guide.sgml:11
+#. type: Content of: <book><bookinfo><releaseinfo>
+#: guide.dbk:20 offline.dbk:20
+msgid "Version &apt-product-version;"
+msgstr "バージョン &apt-product-version;"
+
+#. type: Content of: <book><bookinfo><abstract><para>
+#: guide.dbk:24
 msgid ""
 "This document provides an overview of how to use the the APT package manager."
 msgstr "本文書は APT パッケージマネージャの使い方の概要を提供します。"
 
-#. type: <copyrightsummary></copyrightsummary>
-#: guide.sgml:15
-msgid "Copyright &copy; Jason Gunthorpe, 1998."
-msgstr "Copyright &copy; Jason Gunthorpe, 1998."
+#. type: Content of: <book><bookinfo>
+#: guide.dbk:28
+msgid ""
+"<copyright><year>1998</year><holder>Jason Gunthorpe</holder></copyright>"
+msgstr ""
+"<copyright><year>1998</year><holder>Jason Gunthorpe</holder></copyright>"
+
+#. type: Content of: <book><bookinfo><legalnotice><title>
+#: guide.dbk:31 offline.dbk:32
+msgid "License Notice"
+msgstr "ライセンスについて"
 
-#. type: <p></p>
-#: guide.sgml:21 offline.sgml:22
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: guide.dbk:33 offline.dbk:34
 msgid ""
 "\"APT\" and this document are free software; you can redistribute them and/"
 "or modify them under the terms of the GNU General Public License as "
@@ -8233,8 +8205,8 @@ msgstr ""
 "published by the Free Software Foundation; either version 2 of the License, "
 "or (at your option) any later version."
 
-#. type: <p></p>
-#: guide.sgml:24 offline.sgml:25
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: guide.dbk:42 offline.dbk:40
 msgid ""
 "For more details, on Debian systems, see the file /usr/share/common-licenses/"
 "GPL for the full license."
@@ -8242,35 +8214,42 @@ msgstr ""
 "For more details, on Debian systems, see the file /usr/share/common-licenses/"
 "GPL for the full license."
 
-#. type: <heading></heading>
-#: guide.sgml:32
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:49
 msgid "General"
 msgstr "全般"
 
-#. type: <p></p>
-#: guide.sgml:38
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:51
 msgid ""
-"The APT package currently contains two sections, the APT <prgn>dselect</"
-"prgn> method and the <prgn>apt-get</prgn> command line user interface. Both "
-"provide a way to install and remove packages as well as download new "
-"packages from the Internet."
+"The APT package currently contains two sections, the APT <command>dselect</"
+"command> method and the <command>apt-get</command> command line user "
+"interface. Both provide a way to install and remove packages as well as "
+"download new packages from the Internet."
 msgstr ""
+"APT パッケージは現在、APT <command>dselect</command> メソッドと <command>apt-"
+"get</command> コマンドラインユーザインターフェイスの2つを収録しています。両方"
+"ともインターネットから新しいパッケージをダウンロードするのと同様、パッケージ"
+"をインストール、削除する方法を提供しています。"
 
-#. type: <heading></heading>
-#: guide.sgml:39
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:57
 msgid "Anatomy of the Package System"
 msgstr "パッケージシステムの構造"
 
-#. type: <p></p>
-#: guide.sgml:44
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:59
 msgid ""
 "The Debian packaging system has a large amount of information associated "
 "with each package to help assure that it integrates cleanly and easily into "
 "the system. The most prominent of its features is the dependency system."
 msgstr ""
+"Debian パッケージシステムには各パッケージに関連する膨大な情報があり、システム"
+"に手際良く簡単に統合することを支援します。その最も重要な機能は依存システムで"
+"す。"
 
-#. type: <p></p>
-#: guide.sgml:52
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:64
 msgid ""
 "The dependency system allows individual programs to make use of shared "
 "elements in the system such as libraries. It simplifies placing infrequently "
@@ -8278,27 +8257,40 @@ msgid ""
 "things the average user is required to install. Also, it allows for choices "
 "in mail transport agents, X servers and so on."
 msgstr ""
+"依存システムにより、システムにあるライブラリ等の共有要素を個々のプログラムを"
+"使えるようになります。簡単に言うと、プログラムのうちまれに利用される部分を別"
+"個のパッケージに配置して、平均的ユーザがインストールを必要とするものの数を減"
+"らします。また、メール転送エージェントや X サーバ等の選択ができるようにもなり"
+"ます。"
 
-#. type: <p></p>
-#: guide.sgml:57
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:71
 msgid ""
 "The first step to understanding the dependency system is to grasp the "
 "concept of a simple dependency. The meaning of a simple dependency is that a "
 "package requires another package to be installed at the same time to work "
 "properly."
 msgstr ""
+"依存システムの理解はまず単純な依存の概念を把握することから始まります。単純な"
+"依存というのは、あるパッケージが適切に機能するためには別のパッケージが同時に"
+"インストールされている必要があるということです。"
 
-#. type: <p></p>
-#: guide.sgml:63
+# Translator's NOTE: maybe s/GPGP/GPG/?
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:76
 msgid ""
 "For instance, mailcrypt is an emacs extension that aids in encrypting email "
 "with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a "
 "simple dependency on GPG. Also, because it is an emacs extension it has a "
 "simple dependency on emacs, without emacs it is completely useless."
 msgstr ""
+"例えば mailcrypt は emacs を拡張するプログラムで、GPG によるメールの暗号化を"
+"支援します。GPGP がインストールされていなければ mailcrypt は役に立たないので "
+"mailcrypt には GPG に単純に依存しています。また、これは emacs の拡張なので "
+"emacs に単純に依存し、emacs がないと何の役にも立ちません。"
 
-#. type: <p></p>
-#: guide.sgml:73
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:82
 msgid ""
 "The other important dependency to understand is a conflicting dependency. It "
 "means that a package, when installed with another package, will not work and "
@@ -8309,9 +8301,17 @@ msgid ""
 "system so all mail transport agents have a conflicting dependency with all "
 "other mail transport agents."
 msgstr ""
+"理解しておかないといけないもう一つの重要な依存に競合する依存があります。これ"
+"はあるパッケージが別のパッケージと同時にインストールされていると機能せず、シ"
+"ステムにとってひどく有害なこともあります。例として sendmail や exim、qmail 等"
+"のメール転送エージェントで考えてみましょう。メール転送エージェントはどれも"
+"メールを受け取るのにネットワークを待ち受ける必要があるため、2つインストールす"
+"ることは不可能です。複数インストールするとシステムに重大な被害を与える可能性"
+"があるため、メール転送エージェントはどれも他のあらゆるメール転送エージェント"
+"と競合依存となっています。"
 
-#. type: <p></p>
-#: guide.sgml:83
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:92
 msgid ""
 "As an added complication there is the possibility for a package to pretend "
 "to be another package. Consider that exim and sendmail for many intents are "
@@ -8322,86 +8322,121 @@ msgid ""
 "depend on mail-transport-agent. This can add a great deal of confusion when "
 "trying to manually fix packages."
 msgstr ""
+"複雑な例としては、別のパッケージのように装うパッケージがあります。exim と "
+"sendmail について見てみると、その多くの目的は同一で、両方ともメールを配送し、"
+"一般的インターフェイスを解釈します。そこで、パッケージシステムにはどちらも "
+"mail-transport-agents だと宣言する方法があります。そうして exim と sendmail "
+"は両方とも mail-transport-agent を提供すると宣言し、他のメール転送エージェン"
+"トを必要とするパッケージは mail-transport-agent に依存します。手作業により"
+"パッケージを修正しようとしたときに多大な混乱が生まれる可能性があります。"
 
-#. type: <p></p>
-#: guide.sgml:88
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:102
 msgid ""
 "At any given time a single dependency may be met by packages that are "
 "already installed or it may not be. APT attempts to help resolve dependency "
 "issues by providing a number of automatic algorithms that help in selecting "
 "packages for installation."
 msgstr ""
+"既にインストールされている、あるいはされていないパッケージについて、1つの依存"
+"が生まれる可能性は常にあります。APT はインストールするパッケージの選択を支援"
+"する自動化でのアルゴリズムをいくつか提供することで依存問題の解決支援に努めま"
+"す。"
 
-#. type: <heading></heading>
-#: guide.sgml:96
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:111
 msgid "apt-get"
 msgstr "apt-get"
 
-#. type: <p></p>
-#: guide.sgml:102
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:113
 msgid ""
-"<prgn>apt-get</prgn> provides a simple way to install packages from the "
-"command line. Unlike <prgn>dpkg</prgn>, <prgn>apt-get</prgn> does not "
-"understand .deb files, it works with the package's proper name and can only "
-"install .deb archives from a <em>Source</em>."
+"<command>apt-get</command> provides a simple way to install packages from "
+"the command line. Unlike <command>dpkg</command>, <command>apt-get</command> "
+"does not understand .deb files, it works with the package's proper name and "
+"can only install .deb archives from a <emphasis>Source</emphasis>."
 msgstr ""
+"<command>apt-get</command> はコマンドラインからパッケージをインストールする簡"
+"単な方法を提供します。<command>dpkg</command> とは異なり、<command>apt-get</"
+"command> は .deb ファイルを解釈せず、連携するのはパッケージ特有の名前で、イン"
+"ストールできるのは<emphasis>ソース</emphasis>にある .deb アーカイブだけです。"
 
-#. type: <p></p>
-#: guide.sgml:109
+#. type: Content of: <book><chapter><para><footnote><para>
+#: guide.dbk:119
 msgid ""
-"The first <footnote><p>If you are using an http proxy server you must set "
-"the http_proxy environment variable first, see sources.list(5)</p></"
-"footnote> thing that should be done before using <prgn>apt-get</prgn> is to "
-"fetch the package lists from the <em>Sources</em> so that it knows what "
-"packages are available. This is done with <tt>apt-get update</tt>. For "
-"instance,"
+"If you are using an http proxy server you must set the http_proxy "
+"environment variable first, see sources.list(5)"
 msgstr ""
+"http プロキシサーバを使っている場合はまず http_proxy 環境変数をセットする必"
+"要があります。sources.list(5) を見てください"
 
-#. type: <example></example>
-#: guide.sgml:116
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:119
+msgid ""
+"The first <placeholder type=\"footnote\" id=\"0\"/> thing that should be "
+"done before using <command>apt-get</command> is to fetch the package lists "
+"from the <emphasis>Sources</emphasis> so that it knows what packages are "
+"available. This is done with <literal>apt-get update</literal>. For instance,"
+msgstr ""
+"<command>apt-get</command> を使う前にまずやるべきことは<placeholder type=\""
+"footnote\" id=\"0\"/>パッケージ一覧を<emphasis>ソース</emphasis>から取得する"
+"ことで、それにより利用できるパッケージがわかるようになります。これには "
+"<literal>apt-get update</literal> を実行します。例えば"
+
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:127
 #, no-wrap
 msgid ""
 "# apt-get update\n"
 "Get http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
 "Get http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 msgstr ""
 "# apt-get update\n"
 "Get http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
 "Get http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 
-#. type: <p><taglist>
-#: guide.sgml:120
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:134
 msgid "Once updated there are several commands that can be used:"
-msgstr ""
+msgstr "更新後は複数のコマンドを使えます:"
 
-#. type: <tag></tag>
-#: guide.sgml:121
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:138
 msgid "upgrade"
 msgstr "upgrade"
 
-#. type: <p></p>
-#: guide.sgml:131
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:141
 msgid ""
 "Upgrade will attempt to gently upgrade the whole system. Upgrade will never "
 "install a new package or remove an existing package, nor will it ever "
 "upgrade a package that might cause some other package to break. This can be "
 "used daily to relatively safely upgrade the system. Upgrade will list all of "
 "the packages that it could not upgrade, this usually means that they depend "
-"on new packages or conflict with some other package. <prgn>dselect</prgn> or "
-"<tt>apt-get install</tt> can be used to force these packages to install."
-msgstr ""
-
-#. type: <tag></tag>
-#: guide.sgml:131
+"on new packages or conflict with some other package. <command>dselect</"
+"command> or <literal>apt-get install</literal> can be used to force these "
+"packages to install."
+msgstr ""
+"upgrade を行うとシステム全体を穏やかにアップグレードします。アップグレードで"
+"は新しいパッケージのインストールや既存のパッケージの削除、アップグレードする"
+"と他のパッケージを破壊する可能性のある場合のそのパッケージのアップグレードは"
+"行いません。これは毎日実行してシステムを比較的安全にアップグレードできます。"
+"upgrade を行うとアップグレードできないパッケージがある場合にその一覧を表示し"
+"ます。これは通常新しいパッケージに依存しているか他のパッケージと競合している"
+"ということになります。<command>dselect</command> や <literal>apt-get install"
+"</literal> を使うとそういったパッケージを強制的にインストールできます。"
+
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:153
 msgid "install"
 msgstr "install"
 
-#. type: <p></p>
-#: guide.sgml:140
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:156
 msgid ""
 "Install is used to install packages by name. The package is automatically "
 "fetched and installed. This can be useful if you already know the name of "
@@ -8411,236 +8446,347 @@ msgid ""
 "listed packages and will print a summary and ask for confirmation if "
 "anything other than its arguments are changed."
 msgstr ""
+"install を使ってパッケージを名前によりインストールします。パッケージは自動的"
+"に取得、インストールされます。これはインストールするパッケージの名前が既にわ"
+"かっていて GUI を使って選択したくない場合に有用です。インストールするパッケー"
+"ジはいくらでも指定でき、全て取得されます。install では対象パッケージ一覧から"
+"自動的に依存問題の解決に努めてまとめを提示し、指示以外の変更がある場合は確認"
+"を促します。"
 
-#. type: <tag></tag>
-#: guide.sgml:140
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:167
 msgid "dist-upgrade"
 msgstr "dist-upgrade"
 
-#. type: <p></p>
-#: guide.sgml:149
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:170
 msgid ""
 "Dist-upgrade is a complete upgrader designed to simplify upgrading between "
 "releases of Debian. It uses a sophisticated algorithm to determine the best "
 "set of packages to install, upgrade and remove to get as much of the system "
 "to the newest release. In some situations it may be desired to use dist-"
 "upgrade rather than spend the time manually resolving dependencies in "
-"<prgn>dselect</prgn>. Once dist-upgrade has completed then <prgn>dselect</"
-"prgn> can be used to install any packages that may have been left out."
+"<command>dselect</command>. Once dist-upgrade has completed then "
+"<command>dselect</command> can be used to install any packages that may have "
+"been left out."
 msgstr ""
+"dist-upgrade は完全なアップグレードを行うように設計されていて、Debian のリ"
+"リース間のアップグレードを単純化します。洗練されたアルゴリズムを使って、シス"
+"テムをできるだけ最新のリリースにするためにインストール、アップグレード、削除"
+"する最善のパッケージ群を決定します。状況によっては <command>dselect</command> で手"
+"作業により時間を掛けて依存を解決するよりも dist-upgrade を使う方が希望には合"
+"うかもしれません。dist-upgrade 完了後は <command>dselect</command> を使って、残って"
+"いるパッケージがあればインストールできます。"
 
-#. type: <p></p>
-#: guide.sgml:152
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:180
 msgid ""
 "It is important to closely look at what dist-upgrade is going to do, its "
 "decisions may sometimes be quite surprising."
 msgstr ""
+"dist-upgrade が実行する内容をよく観察するのは重要です。かなり驚くような判断が"
+"なされることもあります。"
 
-#. type: <p></p>
-#: guide.sgml:163
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:187
 msgid ""
-"<prgn>apt-get</prgn> has several command line options that are detailed in "
-"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful "
-"option is <tt>-d</tt> which does not install the fetched files. If the "
-"system has to download a large number of package it would be undesired to "
-"start installing them in case something goes wrong. When <tt>-d</tt> is used "
-"the downloaded archives can be installed by simply running the command that "
-"caused them to be downloaded again without <tt>-d</tt>."
+"<command>apt-get</command> has several command line options that are "
+"detailed in its man page, <citerefentry><refentrytitle>apt-get</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>. The most useful "
+"option is <literal>-d</literal> which does not install the fetched files. If "
+"the system has to download a large number of package it would be undesired "
+"to start installing them in case something goes wrong. When <literal>-d</"
+"literal> is used the downloaded archives can be installed by simply running "
+"the command that caused them to be downloaded again without <literal>-d</"
+"literal>."
 msgstr ""
-
-#. type: <heading></heading>
-#: guide.sgml:168
+"<command>apt-get</command> にはコマンドラインオプションが複数あり、man ページ"
+"の <citerefentry><refentrytitle>apt-get</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry> で詳細に説明されています。最も有用なオプションは取"
+"得したファイルをインストールしない <literal>-d</literal> です。システムが大量"
+"のパッケージをダウンロードする必要がある場合、何かうまくいかなかったときに"
+"インストールを開始するのは望ましくはないでしょう。<literal>-d</literal> を指"
+"定すると、ダウンロードしたときのコマンドを単純に再び、<literal>-d</literal> "
+"を付けずに実行することでダウンロードしたアーカイブをインストールできます。"
+
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:199
 msgid "DSelect"
 msgstr "DSelect"
 
-#. type: <p></p>
-#: guide.sgml:173
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:201
 msgid ""
-"The APT <prgn>dselect</prgn> method provides the complete APT system with "
-"the <prgn>dselect</prgn> package selection GUI. <prgn>dselect</prgn> is used "
-"to select the packages to be installed or removed and APT actually installs "
-"them."
+"The APT <command>dselect</command> method provides the complete APT system "
+"with the <command>dselect</command> package selection GUI. <command>dselect</"
+"command> is used to select the packages to be installed or removed and APT "
+"actually installs them."
 msgstr ""
+"APT の <command>dselect</command> メソッドは <command>dselect</command> パッ"
+"ケージ選択 GUI を使った完全な APT システムを提供します。インストールや削除す"
+"るパッケージの選択には <command>dselect</command> を使い、実際のインストール"
+"は APT が行います。"
 
-#. type: <p></p>
-#: guide.sgml:184
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:207
 msgid ""
-"To enable the APT method you need to select [A]ccess in <prgn>dselect</prgn> "
-"and then choose the APT method. You will be prompted for a set of "
-"<em>Sources</em> which are places to fetch archives from. These can be "
-"remote Internet sites, local Debian mirrors or CD-ROMs. Each source can "
-"provide a fragment of the total Debian archive, APT will automatically "
+"To enable the APT method you need to select [A]ccess in <command>dselect</"
+"command> and then choose the APT method. You will be prompted for a set of "
+"<emphasis>Sources</emphasis> which are places to fetch archives from. These "
+"can be remote Internet sites, local Debian mirrors or CD-ROMs. Each source "
+"can provide a fragment of the total Debian archive, APT will automatically "
 "combine them to form a complete set of packages. If you have a CD-ROM then "
 "it is a good idea to specify it first and then specify a mirror so that you "
 "have access to the latest bug fixes. APT will automatically use packages on "
 "your CD-ROM before downloading from the Internet."
 msgstr ""
-
-#. type: <example></example>
-#: guide.sgml:198
+"APT メソッドを有効にするには、<command>dselect</command> でアクセス(a) を選択"
+"し、それから APT メソッドを選択する必要があります。そうするとアーカイブの取得"
+"先の場所となる<emphasis>ソース</emphasis>群を聞かれます。これにはリモートの"
+"インターネットサイトやローカルの Debian ミラー、CD-ROM を指定できます。各ソー"
+"スで Debian アーカイブ全体のうちの一部を提供でき、APT は自動的に組み合わせて"
+"パッケージ群一式を構成します。CD-ROM がある場合はまずそれを指定し、それからミ"
+"ラーを指定するのが良い方法で、そうすることで最新のバグ修正にアクセスできるよ"
+"うになります。APT はインターネットからダウンロードする前に CD-ROM にあるパッ"
+"ケージを自動的に利用します。"
+
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:218
 #, no-wrap
 msgid ""
 "   Set up a list of distribution source locations\n"
-"\t \n"
+"\n"
 " Please give the base URL of the debian distribution.\n"
 " The access schemes I know about are: http file\n"
-"\t   \n"
+"\n"
 " For example:\n"
 "      file:/mnt/debian,\n"
 "      ftp://ftp.debian.org/debian,\n"
 "      http://ftp.de.debian.org/debian,\n"
-"      \n"
-"      \n"
-" URL [http://llug.sep.bnl.gov/debian]:"
-msgstr "   "
+"\n"
+"\n"
+" URL [http://llug.sep.bnl.gov/debian]:\n"
+msgstr ""
+"   ディストリビューションソース位置一覧の準備\n"
+"\n"
+" Debian ディストリビューションの基底 URL を指定してください。\n"
+" 認識できるアクセス方法: http file\n"
+"\n"
+" 例:\n"
+"      file:/mnt/debian,\n"
+"      ftp://ftp.debian.org/debian,\n"
+"      http://ftp.de.debian.org/debian,\n"
+"\n"
+"\n"
+" URL [http://llug.sep.bnl.gov/debian]:\n"
 
-#. type: <p></p>
-#: guide.sgml:205
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:232
 msgid ""
-"The <em>Sources</em> setup starts by asking for the base of the Debian "
-"archive, defaulting to a HTTP mirror. Next it asks for the distribution to "
-"get."
+"The <emphasis>Sources</emphasis> setup starts by asking for the base of the "
+"Debian archive, defaulting to a HTTP mirror. Next it asks for the "
+"distribution to get."
 msgstr ""
+"<emphasis>ソース</emphasis>の準備は基礎となる Debian アーカイブの質問から始まり、デフォル"
+"トは HTTP ミラーとなっています。その次は取得するディストリビューションを質問"
+"します。"
 
-#. type: <example></example>
-#: guide.sgml:212
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:237
 #, no-wrap
 msgid ""
 " Please give the distribution tag to get or a path to the\n"
 " package file ending in a /. The distribution\n"
 " tags are typically something like: stable unstable testing non-US\n"
-"   \n"
-" Distribution [stable]:"
-msgstr " "
-
-#. type: <p></p>
-#: guide.sgml:222
-msgid ""
-"The distribution refers to the Debian version in the archive, <em>stable</"
-"em> refers to the latest released version and <em>unstable</em> refers to "
-"the developmental version. <em>non-US</em> is only available on some mirrors "
-"and refers to packages that contain encryption technology or other things "
-"that cannot be exported from the United States. Importing these packages "
-"into the US is legal however."
+"\n"
+" Distribution [stable]:\n"
 msgstr ""
-
-#. type: <example></example>
-#: guide.sgml:228
+" 取得するディストリビューションのタグやパッケージファイルへのパスを\n"
+" / で終える形式で指定してください。ディストリビューションのタグには\n"
+" 以下のようなものがあります: stable unstable testing non-US\n"
+"\n"
+" ディストリビューション [stable]:\n"
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:244
+msgid ""
+"The distribution refers to the Debian version in the archive, "
+"<emphasis>stable</emphasis> refers to the latest released version and "
+"<emphasis>unstable</emphasis> refers to the developmental version. "
+"<emphasis>non-US</emphasis> is only available on some mirrors and refers to "
+"packages that contain encryption technology or other things that cannot be "
+"exported from the United States. Importing these packages into the US is "
+"legal however."
+msgstr ""
+"ディストリビューションはアーカイブ中の Debian バージョンを参照し、<emphasis>"
+"stable</emphasis> は最新のリリース版を、<emphasis>unstable</emphasis> は開発"
+"版を参照します。<emphasis>non-US</emphasis> は一部のミラーでのみ利用可能で、"
+"合衆国からの輸出ができない暗号化技術その他のものを収録するパッケージを参照し"
+"ます。ただしこういったパッケージの合衆国への輸入は合法です。"
+
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:253
 #, no-wrap
 msgid ""
 " Please give the components to get\n"
 " The components are typically something like: main contrib non-free\n"
-"  \n"
-" Components [main contrib non-free]:"
-msgstr " "
+"\n"
+" Components [main contrib non-free]:\n"
+msgstr ""
+" 取得するコンポーネントを指定してください\n"
+" コンポーネントには以下のようなものがあります: main contrib non-free\n"
+"\n"
+" コンポーネント [main contrib non-free]:\n"
 
-#. type: <p></p>
-#: guide.sgml:236
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:259
 msgid ""
 "The components list refers to the list of sub distributions to fetch. The "
 "distribution is split up based on software licenses, main being DFSG free "
 "packages while contrib and non-free contain things that have various "
 "restrictions placed on their use and distribution."
 msgstr ""
+"コンポーネント一覧は取得するサブディストリビューションの一覧を参照します。こ"
+"のディストリビューションはソフトウェアのライセンスを基にして分けられていま"
+"す。main にあるのは DFSG フリーのパッケージですが contrib や non-free には利"
+"用目的や配布形態に様々な制限を課せられているものが収録されています。"
 
-#. type: <p></p>
-#: guide.sgml:240
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:265
 msgid ""
 "Any number of sources can be added, the setup script will continue to prompt "
 "until you have specified all that you want."
 msgstr ""
+"ソースはいくらでも追加できます。準備スクリプトは必要なソースを全て指定するま"
+"で聞き続けます。"
 
-#. type: <p></p>
-#: guide.sgml:247
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:269
 msgid ""
-"Before starting to use <prgn>dselect</prgn> it is necessary to update the "
-"available list by selecting [U]pdate from the menu. This is a superset of "
-"<tt>apt-get update</tt> that makes the fetched information available to "
-"<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get update</"
-"tt> has been run before."
+"Before starting to use <command>dselect</command> it is necessary to update "
+"the available list by selecting [U]pdate from the menu. This is a superset "
+"of <literal>apt-get update</literal> that makes the fetched information "
+"available to <command>dselect</command>. [U]pdate must be performed even if "
+"<literal>apt-get update</literal> has been run before."
 msgstr ""
+"<command>dselect</command> を使う前にメニューから更新(u)を選択して利用可能な"
+"パッケージ一覧を更新する必要があります。これは <literal>apt-get update</"
+"literal> の上位集合で、取得した情報を <command>dselect</command> から利用でき"
+"るようにします。以前に <literal>apt-get update</literal> を実行していても更新"
+"(u)を実行する必要があります。"
 
-#. type: <p></p>
-#: guide.sgml:253
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:276
 msgid ""
 "You can then go on and make your selections using [S]elect and then perform "
 "the installation using [I]nstall. When using the APT method the [C]onfig and "
 "[R]emove commands have no meaning, the [I]nstall command performs both of "
 "them together."
 msgstr ""
+"その後は選択(s)を使って選択し、導入(i)を使ってインストールします。APT メソッ"
+"ドを使っている場合は設定(c)や削除(r)コマンドに意味はなく、導入(i)コマンドがそ"
+"の両方を実行します。"
 
-#. type: <p></p>
-#: guide.sgml:258
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:282
 msgid ""
 "By default APT will automatically remove the package (.deb) files once they "
-"have been successfully installed. To change this behavior place <tt>Dselect::"
-"clean \"prompt\";</tt> in /etc/apt/apt.conf."
+"have been successfully installed. To change this behavior place "
+"<literal>Dselect::clean \"prompt\";</literal> in /etc/apt/apt.conf."
 msgstr ""
+"デフォルトで APT はインストールに成功したパッケージ (.deb) ファイルを自動的に"
+"削除します。この挙動を変更するには /etc/apt/apt.conf 中に <literal>Dselect::"
+"clean \"prompt\";</literal> と記述します。"
 
-#. type: <heading></heading>
-#: guide.sgml:264
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:288
 msgid "The Interface"
 msgstr "インターフェース"
 
-#. type: <p></p>
-#: guide.sgml:278
+#. type: Content of: <book><chapter><para><footnote><para>
+#: guide.dbk:292
+msgid ""
+"The <command>dselect</command> method actually is a set of wrapper scripts "
+"to <command>apt-get</command>. The method actually provides more "
+"functionality than is present in <command>apt-get</command> alone."
+msgstr ""
+"<command>dselect</command> メソッドは実際に <command>apt-get</command> に対"
+"するラッパースクリプト群です。このメソッドでは <command>apt-get</command> 単"
+"体に存在している以上の機能を実際に提供しています。"
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:290
 msgid ""
-"Both that APT <prgn>dselect</prgn> method and <prgn>apt-get</prgn> share the "
-"same interface. It is a simple system that generally tells you what it will "
-"do and then goes and does it. <footnote><p>The <prgn>dselect</prgn> method "
-"actually is a set of wrapper scripts to <prgn>apt-get</prgn>. The method "
-"actually provides more functionality than is present in <prgn>apt-get</prgn> "
-"alone.</p></footnote> After printing out a summary of what will happen APT "
+"Both that APT <command>dselect</command> method and <command>apt-get</"
+"command> share the same interface. It is a simple system that generally "
+"tells you what it will do and then goes and does it. <placeholder type="
+"\"footnote\" id=\"0\"/> After printing out a summary of what will happen APT "
 "then will print out some informative status messages so that you can "
 "estimate how far along it is and how much is left to do."
 msgstr ""
+"APT の <command>dselect</command> メソッドと <command>apt-get</command> は共"
+"に同一のインターフェイスを共有しています。通常は行う内容を告知して実行する簡"
+"単なシステムです。<placeholder type=\"footnote\" id=\"0\"/> 実行内容のまとめ"
+"を告知した後 APT が参考になる状態メッセージをいくらか表示するため、どれくら"
+"い進んでいるのか、あるいは残り作業がどれくらいあるのか見積もることができるよ"
+"うになっています。"
 
-#. type: <heading></heading>
-#: guide.sgml:280
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:301
 msgid "Startup"
 msgstr "スタートアップ"
 
-#. type: <p></p>
-#: guide.sgml:284
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:303
 msgid ""
 "Before all operations except update, APT performs a number of actions to "
 "prepare its internal state. It also does some checks of the system's state. "
-"At any time these operations can be performed by running <tt>apt-get check</"
-"tt>."
+"At any time these operations can be performed by running <literal>apt-get "
+"check</literal>."
 msgstr ""
+"update 以外のあらゆる操作で、APT はいくつか処理を行い内部状態を準備します。ま"
+"た、システムの状態についてもいくらか確認します。この処理は <literal>apt-get "
+"check</literal> によりいつでも実行できます。"
 
-#. type: <example></example>
-#: guide.sgml:289
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:309
 #, no-wrap
 msgid ""
 "# apt-get check\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 msgstr ""
 "# apt-get check\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 
-#. type: <p></p>
-#: guide.sgml:297
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:314
 msgid ""
 "The first thing it does is read all the package files into memory. APT uses "
 "a caching scheme so this operation will be faster the second time it is run. "
 "If some of the package files are not found then they will be ignored and a "
 "warning will be printed when apt-get exits."
 msgstr ""
+"これが最初に行うのはパッケージファイルを全てメモリに読み込むことです。APT は"
+"キャッシュを使うようになっているので、この処理は次に実行するときには早く終わ"
+"ります。見つけられないパッケージファイルがある場合は無視され、apt-get 終了時"
+"に注意を表示します。"
 
-#. type: <p></p>
-#: guide.sgml:303
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:320
 msgid ""
 "The final operation performs a detailed analysis of the system's "
 "dependencies. It checks every dependency of every installed or unpacked "
 "package and considers if it is OK. Should this find a problem then a report "
-"will be printed out and <prgn>apt-get</prgn> will refuse to run."
+"will be printed out and <command>apt-get</command> will refuse to run."
 msgstr ""
+"最後の処理はシステムの依存関係の詳細な分析です。インストール、あるいは展開さ"
+"れたパッケージの依存関係を全て確認し、問題ないか判断します。問題が見つかった"
+"場合は報告し、<command>apt-get</command> の実行を拒否します。"
 
-#. type: <example></example>
-#: guide.sgml:320
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:326
 #, no-wrap
 msgid ""
 "# apt-get check\n"
@@ -8650,14 +8796,14 @@ msgid ""
 "Sorry, but the following packages have unmet dependencies:\n"
 "  9fonts: Depends: xlib6g but it is not installed\n"
 "  uucp: Depends: mailx but it is not installed\n"
-"  blast: Depends: xlib6g (>= 3.3-5) but it is not installed\n"
+"  blast: Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
 "  adduser: Depends: perl-base but it is not installed\n"
 "  aumix: Depends: libgpmg1 but it is not installed\n"
 "  debiandoc-sgml: Depends: sgml-base but it is not installed\n"
-"  bash-builtins: Depends: bash (>= 2.01) but 2.0-3 is installed\n"
+"  bash-builtins: Depends: bash (&gt;= 2.01) but 2.0-3 is installed\n"
 "  cthugha: Depends: svgalibg1 but it is not installed\n"
-"           Depends: xlib6g (>= 3.3-5) but it is not installed\n"
-"  libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)"
+"           Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
+"  libreadlineg2: Conflicts:libreadline2 (&lt;&lt; 2.1-2.1)\n"
 msgstr ""
 "# apt-get check\n"
 "Reading Package Lists... Done\n"
@@ -8666,17 +8812,17 @@ msgstr ""
 "Sorry, but the following packages have unmet dependencies:\n"
 "  9fonts: Depends: xlib6g but it is not installed\n"
 "  uucp: Depends: mailx but it is not installed\n"
-"  blast: Depends: xlib6g (>= 3.3-5) but it is not installed\n"
+"  blast: Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
 "  adduser: Depends: perl-base but it is not installed\n"
 "  aumix: Depends: libgpmg1 but it is not installed\n"
 "  debiandoc-sgml: Depends: sgml-base but it is not installed\n"
-"  bash-builtins: Depends: bash (>= 2.01) but 2.0-3 is installed\n"
+"  bash-builtins: Depends: bash (&gt;= 2.01) but 2.0-3 is installed\n"
 "  cthugha: Depends: svgalibg1 but it is not installed\n"
-"           Depends: xlib6g (>= 3.3-5) but it is not installed\n"
-"  libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)"
+"           Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
+"  libreadlineg2: Conflicts:libreadline2 (&lt;&lt; 2.1-2.1)\n"
 
-#. type: <p></p>
-#: guide.sgml:329
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:343
 msgid ""
 "In this example the system has many problems, including a serious problem "
 "with libreadlineg2. For each package that has unmet dependencies a line is "
@@ -8684,62 +8830,97 @@ msgid ""
 "that are unmet. A short explanation of why the package has a dependency "
 "problem is also included."
 msgstr ""
+"この例ではシステムに libreadlineg2 に関する重大な問題を含めて多数の問題があり"
+"ます。未解決の依存関係があれば各パッケージごとにそのパッケージに問題があるこ"
+"とを示し、併せて未解決の依存関係を1行で出力します。そのパッケージの依存問題の"
+"理由について簡潔な説明も添えられます。"
 
-#. type: <p></p>
-#: guide.sgml:337
+#. type: Content of: <book><chapter><section><para><footnote><para>
+#: guide.dbk:352
 msgid ""
-"There are two ways a system can get into a broken state like this. The first "
-"is caused by <prgn>dpkg</prgn> missing some subtle relationships between "
-"packages when performing upgrades. <footnote><p>APT however considers all "
-"known dependencies and attempts to prevent broken packages</p></footnote>. "
-"The second is if a package installation fails during an operation. In this "
-"situation a package may have been unpacked without its dependents being "
-"installed."
+"APT however considers all known dependencies and attempts to prevent broken "
+"packages"
 msgstr ""
+"APT はそれでも既知の依存関係を全て検討し、パッケージが壊れた状態となることを"
+"回避しようとします。"
 
-#. type: <p></p>
-#: guide.sgml:345
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:350
 msgid ""
-"The second situation is much less serious than the first because APT places "
-"certain constraints on the order that packages are installed. In both cases "
-"supplying the <tt>-f</tt> option to <prgn>apt-get</prgn> will cause APT to "
-"deduce a possible solution to the problem and then continue on. The APT "
-"<prgn>dselect</prgn> method always supplies the <tt>-f</tt> option to allow "
-"for easy continuation of failed maintainer scripts."
+"There are two ways a system can get into a broken state like this. The first "
+"is caused by <command>dpkg</command> missing some subtle relationships "
+"between packages when performing upgrades. <placeholder type=\"footnote\" id="
+"\"0\"/>. The second is if a package installation fails during an operation. "
+"In this situation a package may have been unpacked without its dependents "
+"being installed."
 msgstr ""
+"システムがこのように壊れた状態となる原因は2つあります。1つ目はアップグレード"
+"実行時にパッケージ間の難解な依存関係を <command>dpkg</command> がいくらか欠"
+"いていることによります。<placeholder type=\"footnote\" id=\"0\"/>2つ目はパッ"
+"ケージのインストール処理中に何か失敗した場合です。この状況では依存するパッ"
+"ケージがインストールされないままパッケージが展開されている可能性があります。"
 
-#. type: <p></p>
-#: guide.sgml:351
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:359
 msgid ""
-"However, if the <tt>-f</tt> option is used to correct a seriously broken "
-"system caused by the first case then it is possible that it will either fail "
-"immediately or the installation sequence will fail. In either case it is "
-"necessary to manually use dpkg (possibly with forcing options) to correct "
-"the situation enough to allow APT to proceed."
-msgstr ""
-
-#. type: <heading></heading>
-#: guide.sgml:356
+"The second situation is much less serious than the first because APT places "
+"certain constraints on the order that packages are installed. In both cases "
+"supplying the <literal>-f</literal> option to <command>apt-get</command> "
+"will cause APT to deduce a possible solution to the problem and then "
+"continue on. The APT <command>dselect</command> method always supplies the "
+"<literal>-f</literal> option to allow for easy continuation of failed "
+"maintainer scripts."
+msgstr ""
+"APT がパッケージのインストール順序に特定の制約を設けていることにより2つ目の状"
+"況は1つ目の状況と比べて重大ですらなくなります。どちらの場合でも <command>apt-"
+"get</command> に <literal>-f</literal> オプションを指定することで APT は解決"
+"方法を推測し、処理を続けます。APT <command>dselect</command> メソッドでは常"
+"に <literal>-f</literal> オプションを有効にして、メンテナスクリプトでの問題が"
+"起きた場合でも簡単に処理を継続できるようにしています。"
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:368
+msgid ""
+"However, if the <literal>-f</literal> option is used to correct a seriously "
+"broken system caused by the first case then it is possible that it will "
+"either fail immediately or the installation sequence will fail. In either "
+"case it is necessary to manually use dpkg (possibly with forcing options) to "
+"correct the situation enough to allow APT to proceed."
+msgstr ""
+"しかし、1つ目の状況により重大な壊れ方になっているシステムの修正に <literal>-"
+"f</literal> オプションを使った場合はインストールにすぐに失敗、あるいはインス"
+"トール順序がおかしくなる可能性があります。どちらの場合も、APT が処理を十分に"
+"進められるところまで手作業により dpkg を使って (恐らく強制するオプションを指"
+"定して) 状況を修正する必要があります。"
+
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:376
 msgid "The Status Report"
 msgstr "状態レポート"
 
-#. type: <p></p>
-#: guide.sgml:363
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:378
 msgid ""
-"Before proceeding <prgn>apt-get</prgn> will present a report on what will "
-"happen. Generally the report reflects the type of operation being performed "
-"but there are several common elements. In all cases the lists reflect the "
-"final state of things, taking into account the <tt>-f</tt> option and any "
-"other relevant activities to the command being executed."
+"Before proceeding <command>apt-get</command> will present a report on what "
+"will happen. Generally the report reflects the type of operation being "
+"performed but there are several common elements. In all cases the lists "
+"reflect the final state of things, taking into account the <literal>-f</"
+"literal> option and any other relevant activities to the command being "
+"executed."
 msgstr ""
+"処理を続ける前に <command>apt-get</command> は実行しようとする処理について報"
+"告します。通常この報告は実行される操作の種類を反映したものになりますが、一般"
+"的要素がいくつかあります。どの場合でもこの処理一覧は最終的な状態を示し、"
+"<literal>-f</literal> オプションその他の実行されるコマンドに関連する動作を考"
+"慮したものとなります。"
 
-#. type: <heading></heading>
-#: guide.sgml:364
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:385
 msgid "The Extra Package list"
 msgstr "追加パッケージリスト"
 
-#. type: <example></example>
-#: guide.sgml:372
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:387
 #, no-wrap
 msgid ""
 "The following extra packages will be installed:\n"
@@ -8747,156 +8928,178 @@ msgid ""
 "  mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
 "  bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
 "  squake pgp-i python-base debmake ldso perl libreadlineg2\n"
-"  ssh"
+"  ssh\n"
 msgstr ""
 "The following extra packages will be installed:\n"
 "  libdbd-mysql-perl xlib6 zlib1 xzx libreadline2 libdbd-msql-perl\n"
 "  mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
 "  bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
 "  squake pgp-i python-base debmake ldso perl libreadlineg2\n"
-"  ssh"
+"  ssh\n"
 
-#. type: <p></p>
-#: guide.sgml:379
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:395
 msgid ""
 "The Extra Package list shows all of the packages that will be installed or "
 "upgraded in excess of the ones mentioned on the command line. It is only "
-"generated for an <tt>install</tt> command. The listed packages are often the "
-"result of an Auto Install."
+"generated for an <literal>install</literal> command. The listed packages are "
+"often the result of an Auto Install."
 msgstr ""
+"追加パッケージリストはコマンドラインで指示した以外にインストールやアップグ"
+"レードされるパッケージを全て表示します。これは <literal>install</literal> コ"
+"マンドの場合にのみ生成されます。一覧に挙げられるパッケージは自動インストール"
+"の結果による場合が多くなります。"
 
-#. type: <heading></heading>
-#: guide.sgml:382
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:402
 msgid "The Packages to Remove"
 msgstr "削除するパッケージ"
 
-#. type: <example></example>
-#: guide.sgml:389
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:404
 #, no-wrap
 msgid ""
 "The following packages will be REMOVED:\n"
 "  xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
 "  xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
 "  xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
-"  nas xpilot xfig"
+"  nas xpilot xfig\n"
 msgstr ""
 "The following packages will be REMOVED:\n"
 "  xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
 "  xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
 "  xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
-"  nas xpilot xfig"
+"  nas xpilot xfig\n"
 
-#. type: <p></p>
-#: guide.sgml:399
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:411
 msgid ""
 "The Packages to Remove list shows all of the packages that will be removed "
 "from the system. It can be shown for any of the operations and should be "
 "given a careful inspection to ensure nothing important is to be taken off. "
-"The <tt>-f</tt> option is especially good at generating packages to remove "
-"so extreme care should be used in that case. The list may contain packages "
-"that are going to be removed because they are only partially installed, "
-"possibly due to an aborted installation."
-msgstr ""
-
-#. type: <heading></heading>
-#: guide.sgml:402
+"The <literal>-f</literal> option is especially good at generating packages "
+"to remove so extreme care should be used in that case. The list may contain "
+"packages that are going to be removed because they are only partially "
+"installed, possibly due to an aborted installation."
+msgstr ""
+"削除するパッケージリストはシステムから削除されるパッケージを全て表示します。"
+"これはどの操作でも起きるもので、重要なものが失われることのないように注意深く"
+"確認すべきです。<literal>-f</literal> オプションを使った場合はパッケージの削"
+"除を伴うことが特に多く、そのためこのオプションを指定した場合は特に注意を払う"
+"ようにしてください。この一覧にはインストールの中止等により一部だけがインス"
+"トールされているために削除されるパッケージが含まれることがあります。"
+
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:421
 msgid "The New Packages list"
 msgstr "新規パッケージリスト"
 
-#. type: <example></example>
-#: guide.sgml:406
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:423
 #, no-wrap
 msgid ""
 "The following NEW packages will installed:\n"
-"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
+"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base\n"
 msgstr ""
 "The following NEW packages will installed:\n"
-"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
+"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base\n"
 
-#. type: <p></p>
-#: guide.sgml:411
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:427
 msgid ""
 "The New Packages list is simply a reminder of what will happen. The packages "
 "listed are not presently installed in the system but will be when APT is "
 "done."
 msgstr ""
+"新規パッケージリストでは単純にこれから起きることを再通知します。このパッケー"
+"ジ一覧は現在システムにインストールされておらず、APT 処理後には存在することに"
+"なります。"
 
-#. type: <heading></heading>
-#: guide.sgml:414
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:432
 msgid "The Kept Back list"
 msgstr "一時固定リスト"
 
-#. type: <example></example>
-#: guide.sgml:419
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:434
 #, no-wrap
 msgid ""
 "The following packages have been kept back\n"
 "  compface man-db tetex-base msql libpaper svgalib1\n"
-"  gs snmp arena lynx xpat2 groff xscreensaver"
+"  gs snmp arena lynx xpat2 groff xscreensaver\n"
 msgstr ""
 "The following packages have been kept back\n"
 "  compface man-db tetex-base msql libpaper svgalib1\n"
-"  gs snmp arena lynx xpat2 groff xscreensaver"
+"  gs snmp arena lynx xpat2 groff xscreensaver\n"
 
-#. type: <p></p>
-#: guide.sgml:428
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:439
 msgid ""
 "Whenever the whole system is being upgraded there is the possibility that "
 "new versions of packages cannot be installed because they require new things "
 "or conflict with already installed things. In this case the package will "
 "appear in the Kept Back list. The best way to convince packages listed there "
-"to install is with <tt>apt-get install</tt> or by using <prgn>dselect</prgn> "
-"to resolve their problems."
-msgstr ""
-
-#. type: <heading></heading>
-#: guide.sgml:431
+"to install is with <literal>apt-get install</literal> or by using "
+"<command>dselect</command> to resolve their problems."
+msgstr ""
+"システム全体をアップグレードする場合、新しいパッケージが必要であったり既にイ"
+"ンストールされているパッケージと競合するためにパッケージの新しいバージョンが"
+"インストールできないということがあります。この場合、そのパッケージは一時固定"
+"リストに表示されます。この一覧に挙げられたパッケージをインストールする最善の"
+"方法は <literal>apt-get install</literal> または <command>dselect</command> "
+"を使ってその問題を解決することです。"
+
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:448
 msgid "Held Packages warning"
 msgstr "保留パッケージの警告"
 
-#. type: <example></example>
-#: guide.sgml:435
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:450
 #, no-wrap
 msgid ""
 "The following held packages will be changed:\n"
-"  cvs"
+"  cvs\n"
 msgstr ""
 "The following held packages will be changed:\n"
-"  cvs"
+"  cvs\n"
 
-#. type: <p></p>
-#: guide.sgml:441
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:454
 msgid ""
 "Sometimes you can ask APT to install a package that is on hold, in such a "
 "case it prints out a warning that the held package is going to be changed. "
 "This should only happen during dist-upgrade or install."
 msgstr ""
+"保留となっているパッケージをインストールするように APT に指示することもできま"
+"す。その際、保留となっているパッケージを変更することを警告します。これは "
+"dist-upgrade または install を指示したときにしか起きないはずです。"
 
-#. type: <heading></heading>
-#: guide.sgml:444
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:460
 msgid "Final summary"
 msgstr "最後のまとめ"
 
-#. type: <p></p>
-#: guide.sgml:447
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:462
 msgid ""
 "Finally, APT will print out a summary of all the changes that will occur."
-msgstr ""
+msgstr "最後に、APT は発生する全変更のまとめを表示します。"
 
-#. type: <example></example>
-#: guide.sgml:452
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:465
 #, no-wrap
 msgid ""
 "206 packages upgraded, 8 newly installed, 23 to remove and 51 not upgraded.\n"
 "12 packages not fully installed or removed.\n"
-"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used."
+"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used.\n"
 msgstr ""
 "206 packages upgraded, 8 newly installed, 23 to remove and 51 not upgraded.\n"
 "12 packages not fully installed or removed.\n"
-"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used."
+"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used.\n"
 
-#. type: <p></p>
-#: guide.sgml:470
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:470
 msgid ""
 "The first line of the summary simply is a reduced version of all of the "
 "lists and includes the number of upgrades - that is packages already "
@@ -8912,28 +9115,42 @@ msgid ""
 "If a large number of packages are being removed then the value may indicate "
 "the amount of space that will be freed."
 msgstr ""
+"まとめの1行目は単純に一覧を全て短くまとめたもので、アップグレードされる (既に"
+"インストールされていて新しいバージョンが利用可能な) パッケージの数についても"
+"示します。2行目は設定が完了していないパッケージの数を示し、インストールを中止"
+"した場合にこれに集計されることがあります。最終行はそのインストールで必要とな"
+"る容量の要件を示します。最初の数値の組はアーカイブファイルのサイズを示しま"
+"す。この1つ目の数値はリモートから取得してくる必要のあるバイト数、2つ目は必要"
+"となる全アーカイブの合計サイズを示します。次の数値は現在インストールされてい"
+"るパッケージと新しくインストールしたパッケージのサイズの違いを示します。これ"
+"は処理が全て終わった後に /usr で消費される容量にほぼ相当します。パッケージを"
+"大量に削除する場合は解放される容量を示すこともあります。"
 
-#. type: <p></p>
-#: guide.sgml:473
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:484
 msgid ""
 "Some other reports can be generated by using the -u option to show packages "
 "to upgrade, they are similar to the previous examples."
 msgstr ""
+"他の報告として、-u オプションを使うとアップグレードされるパッケージを表示しま"
+"す。これは前に示した例と似たものです。"
 
-#. type: <heading></heading>
-#: guide.sgml:477
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:491
 msgid "The Status Display"
 msgstr "状態表示"
 
-#. type: <p></p>
-#: guide.sgml:481
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:493
 msgid ""
 "During the download of archives and package files APT prints out a series of "
 "status messages."
 msgstr ""
+"アーカイブやパッケージファイルのダウンロード中、APT は状態を示す一連のメッ"
+"セージを表示します。"
 
-#. type: <example></example>
-#: guide.sgml:490
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:497
 #, no-wrap
 msgid ""
 "# apt-get update\n"
@@ -8942,7 +9159,7 @@ msgid ""
 "Hit http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
 "Get:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
 "Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
-"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s"
+"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s\n"
 msgstr ""
 "# apt-get update\n"
 "Get:1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages\n"
@@ -8950,87 +9167,115 @@ msgstr ""
 "Hit http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
 "Get:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
 "Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
-"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s"
+"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s\n"
 
-#. type: <p></p>
-#: guide.sgml:500
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:506
 msgid ""
-"The lines starting with <em>Get</em> are printed out when APT begins to "
-"fetch a file while the last line indicates the progress of the download. The "
-"first percent value on the progress line indicates the total percent done of "
-"all files. Unfortunately since the size of the Package files is unknown "
-"<tt>apt-get update</tt> estimates the percent done which causes some "
-"inaccuracies."
+"The lines starting with <emphasis>Get</emphasis> are printed out when APT "
+"begins to fetch a file while the last line indicates the progress of the "
+"download. The first percent value on the progress line indicates the total "
+"percent done of all files. Unfortunately since the size of the Package files "
+"is unknown <literal>apt-get update</literal> estimates the percent done "
+"which causes some inaccuracies."
 msgstr ""
+"APT がファイルの取得を開始すると、最終行でダウンロードの進捗状況を示しつつ"
+"<emphasis>取得</emphasis>で始まる行が表示されます。進捗の最初のパーセント値は"
+"全ファイルに対する取得済みの全体での割合を示します。残念ながらパッケージファ"
+"イルのサイズは不明なので <literal>apt-get update</literal> は不正確な予測を行"
+"う可能性があります。"
 
-#. type: <p></p>
-#: guide.sgml:509
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:514
 msgid ""
 "The next section of the status line is repeated once for each download "
 "thread and indicates the operation being performed and some useful "
 "information about what is happening. Sometimes this section will simply read "
-"<em>Forking</em> which means the OS is loading the download module. The "
-"first word after the [ is the fetch number as shown on the history lines. "
-"The next word is the short form name of the object being downloaded. For "
-"archives it will contain the name of the package that is being fetched."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:524
+"<emphasis>Forking</emphasis> which means the OS is loading the download "
+"module. The first word after the [ is the fetch number as shown on the "
+"history lines. The next word is the short form name of the object being "
+"downloaded. For archives it will contain the name of the package that is "
+"being fetched."
+msgstr ""
+"状態を示す行の次の節は各ダウンロードスレッドごとに1度ずつ繰り返され、進行中の"
+"操作や処理についての有用な情報をいくらか示します。この節は単純に <emphasis>"
+"Forking</emphasis> となっていることもあり、その場合は OS がダウンロード用のモ"
+"ジュールを読み込んでいることを示します。[ の後の最初の語は履歴に表示されてい"
+"る取得番号です。その次の語はダウンロード対象の名前の短縮形です。アーカイブの"
+"場合は取得中のパッケージの名前が入ります。"
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:524
 msgid ""
 "Inside of the single quote is an informative string indicating the progress "
 "of the negotiation phase of the download. Typically it progresses from "
-"<em>Connecting</em> to <em>Waiting for file</em> to <em>Downloading</em> or "
-"<em>Resuming</em>. The final value is the number of bytes downloaded from "
-"the remote site. Once the download begins this is represented as "
-"<tt>102/10.2k</tt> indicating that 102 bytes have been fetched and 10.2 "
-"kilobytes is expected. The total size is always shown in 4 figure notation "
-"to preserve space. After the size display is a percent meter for the file "
-"itself. The second last element is the instantaneous average speed. This "
-"values is updated every 5 seconds and reflects the rate of data transfer for "
-"that period. Finally is shown the estimated transfer time. This is updated "
-"regularly and reflects the time to complete everything at the shown transfer "
-"rate."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:530
+"<emphasis>Connecting</emphasis> to <emphasis>Waiting for file</emphasis> to "
+"<emphasis>Downloading</emphasis> or <emphasis>Resuming</emphasis>. The final "
+"value is the number of bytes downloaded from the remote site. Once the "
+"download begins this is represented as <literal>102/10.2k</literal> "
+"indicating that 102 bytes have been fetched and 10.2 kilobytes is expected. "
+"The total size is always shown in 4 figure notation to preserve space. After "
+"the size display is a percent meter for the file itself. The second last "
+"element is the instantaneous average speed. This values is updated every 5 "
+"seconds and reflects the rate of data transfer for that period. Finally is "
+"shown the estimated transfer time. This is updated regularly and reflects "
+"the time to complete everything at the shown transfer rate."
+msgstr ""
+"単一引用符内はダウンロードのやりとりの進捗を示す有益な文字列です。標準的には"
+"<emphasis>...へ接続しています</emphasis>から<emphasis>ファイルを待っています"
+"</emphasis>へ、それから<emphasis>...をダウンロードしています</emphasis>または"
+"<emphasis>...を再開しています</emphasis>へと進みます。最後の値はリモートサイ"
+"トからダウンロードしたバイト数です。ダウンロードが始まるとこれは <literal>"
+"102/10.2k</literal> のように表示され、この場合10.2キロバイトのうち102バイトが"
+"取得済みであることを示します。合計サイズは常に4ケタで表示され、表示空間を保つ"
+"ようになっています。サイズ表示の後はそのファイル自体の進捗状況を百分率で示し"
+"たものです。その2つ後は瞬間的な平均速度です。この値は5秒ごとに更新され、その"
+"間のデータ転送速度を反映します。最後は推定転送時間を表示しています。これは定"
+"期的に更新され、表示している転送速度で全て完了する時間を表示します。"
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:539
 msgid ""
 "The status display updates every half second to provide a constant feedback "
 "on the download progress while the Get lines scroll back whenever a new file "
 "is started. Since the status display is constantly updated it is unsuitable "
-"for logging to a file, use the <tt>-q</tt> option to remove the status "
-"display."
+"for logging to a file, use the <literal>-q</literal> option to remove the "
+"status display."
 msgstr ""
+"状態表示は0.5秒ごとに更新してダウンロードの進捗状況を絶えず通知し、取得行は新"
+"しいファイルの処理が始まるたびに流れていきます。状態表示は絶えず更新されるた"
+"めファイルへの記録には適しません。<literal>-q</literal> オプションを使うと状"
+"態を表示しないようにできます。"
 
-#. type: <heading></heading>
-#: guide.sgml:535
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:547
 msgid "Dpkg"
 msgstr "Dpkg"
 
-#. type: <p></p>
-#: guide.sgml:542
-msgid ""
-"APT uses <prgn>dpkg</prgn> for installing the archives and will switch over "
-"to the <prgn>dpkg</prgn> interface once downloading is completed. "
-"<prgn>dpkg</prgn> will also ask a number of questions as it processes the "
-"packages and the packages themselves may also ask several questions. Before "
-"each question there is usually a description of what it is asking and the "
-"questions are too varied to discuss completely here."
-msgstr ""
-
-#. type: <title></title>
-#: offline.sgml:4
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:549
+msgid ""
+"APT uses <command>dpkg</command> for installing the archives and will switch "
+"over to the <command>dpkg</command> interface once downloading is completed. "
+"<command>dpkg</command> will also ask a number of questions as it processes "
+"the packages and the packages themselves may also ask several questions. "
+"Before each question there is usually a description of what it is asking and "
+"the questions are too varied to discuss completely here."
+msgstr ""
+"APT はアーカイブのインストールに <command>dpkg</command> を使い、ダウンロード"
+"の完了後は <command>dpkg</command> インターフェイスに切り替わります。"
+"<command>dpkg</command> もパッケージの処理中にいくつか質問し、パッケージ自体"
+"も複数質問するかもしれません。通常それぞれの質問の前にそれが何を聞いているの"
+"か説明します。その質問の内容は多岐にわたるものであり、ここで説明できるもので"
+"は全くありません。"
+
+#. type: Content of: <book><title>
+#: offline.dbk:10
 msgid "Using APT Offline"
 msgstr "オフラインでの APT の使用法"
 
-#. type: <version></version>
-#: offline.sgml:7
-msgid "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
-msgstr "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
-
-#. type: <abstract></abstract>
-#: offline.sgml:12
+#. type: Content of: <book><bookinfo><abstract><para>
+#: offline.dbk:24
 msgid ""
 "This document describes how to use APT in a non-networked environment, "
 "specifically a 'sneaker-net' approach for performing upgrades."
@@ -9038,32 +9283,38 @@ msgstr ""
 "このドキュメントはネットワークがない環境での APT の使用方法を説明しています。"
 "具体的には、アップグレード時の「スニーカーネット」アプローチです。"
 
-#. type: <copyrightsummary></copyrightsummary>
-#: offline.sgml:16
-msgid "Copyright &copy; Jason Gunthorpe, 1999."
-msgstr "Copyright &copy; Jason Gunthorpe, 1999."
+#. type: Content of: <book><bookinfo>
+#: offline.dbk:29
+msgid ""
+"<copyright><year>1999</year><holder>Jason Gunthorpe</holder></copyright>"
+msgstr ""
+"<copyright><year>1999</year><holder>Jason Gunthorpe</holder></copyright>"
 
-#. type: <heading></heading>
-#: offline.sgml:32
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:47
 msgid "Introduction"
 msgstr "はじめに"
 
-#. type: <heading></heading>
-#: offline.sgml:34 offline.sgml:65 offline.sgml:180
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:49 offline.dbk:79 offline.dbk:191
 msgid "Overview"
 msgstr "概要"
 
-#. type: <p></p>
-#: offline.sgml:40
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:51
 msgid ""
 "Normally APT requires direct access to a Debian archive, either from a local "
 "media or through a network. Another common complaint is that a Debian "
 "machine is on a slow link, such as a modem and another machine has a very "
 "fast connection but they are physically distant."
 msgstr ""
+"通常 APT は Debian アーカイブに、ローカルメディアから、あるいはネットワーク経"
+"由で直接アクセスできる必要があります。他によくある苦情としてはある Debian マ"
+"シンの接続がモデム等のために低速で、別のマシンには非常に高速な接続があるけれ"
+"ども物理的に遠い、といったことがあります。"
 
-#. type: <p></p>
-#: offline.sgml:51
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:57
 msgid ""
 "The solution to this is to use large removable media such as a Zip disc or a "
 "SuperDisk disc. These discs are not large enough to store the entire Debian "
@@ -9071,36 +9322,53 @@ msgid ""
 "to use APT to generate a list of packages that are required and then fetch "
 "them onto the disc using another machine with good connectivity. It is even "
 "possible to use another Debian machine with APT or to use a completely "
-"different OS and a download tool like wget. Let <em>remote host</em> mean "
-"the machine downloading the packages, and <em>target host</em> the one with "
-"bad or no connection."
-msgstr ""
-
-#. type: <p></p>
-#: offline.sgml:57
+"different OS and a download tool like wget. Let <emphasis>remote host</"
+"emphasis> mean the machine downloading the packages, and <emphasis>target "
+"host</emphasis> the one with bad or no connection."
+msgstr ""
+"これに対する解法としては Zip や SuperDisk ディスクといった大容量脱着可能メ"
+"ディアを使います。こういったディスクは Debian アーカイブ全体を格納するには十"
+"分とは言えない容量ですがほとんどのユーザにとって必要なその一部を収めるには十"
+"分余裕があります。その考え方は APT を使って必要なパッケージの一覧を生成し、接"
+"続状態の良好な別のマシンを使ってそのディスク上に取得します。APT を使える別の "
+"Debian マシンや、完全に異なる OS で wget のようなダウンロードツールを使うこと"
+"も可能です。<emphasis>リモートホスト</emphasis>はパッケージをダウンロードする"
+"マシン、<emphasis>対象ホスト</emphasis>は接続がないあるいは良くないマシンだと"
+"考えてください。"
+
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:68
 msgid ""
 "This is achieved by creatively manipulating the APT configuration file. The "
 "essential premise to tell APT to look on a disc for it's archive files. Note "
 "that the disc should be formated with a filesystem that can handle long file "
 "names such as ext2, fat32 or vfat."
 msgstr ""
+"これは APT 設定ファイルを独創的に操作することで実現できます。あるディスクを "
+"APT が検索するようにするために必須となる前提条件はアーカイブファイルです。そ"
+"のディスクは長いファイル名を扱えるファイルシステム、例えば ext2 や fat32、"
+"vfat でフォーマットする必要があることに注意してください。"
 
-#. type: <heading></heading>
-#: offline.sgml:63
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:77
 msgid "Using APT on both machines"
 msgstr "両方のマシンでの APT の使用法"
 
-#. type: <p><example>
-#: offline.sgml:71
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:81
 msgid ""
 "APT being available on both machines gives the simplest configuration. The "
 "basic idea is to place a copy of the status file on the disc and use the "
 "remote machine to fetch the latest package files and decide which packages "
 "to download. The disk directory structure should look like:"
 msgstr ""
+"APT を両方のマシンで利用できるようにする最も単純な設定を考えます。基本的な考"
+"え方は status ファイルのコピーをそのディスクに置いて最新のパッケージファイル"
+"の取得やダウンロードするパッケージの決定にはリモートマシンを使います。その"
+"ディスクのディレクトリ構造は次のようになります:"
 
-#. type: <example></example>
-#: offline.sgml:80
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:87
 #, no-wrap
 msgid ""
 "  /disc/\n"
@@ -9110,7 +9378,7 @@ msgid ""
 "       partial/\n"
 "    status\n"
 "    sources.list\n"
-"    apt.conf"
+"    apt.conf\n"
 msgstr ""
 "  /disc/\n"
 "    archives/\n"
@@ -9119,33 +9387,42 @@ msgstr ""
 "       partial/\n"
 "    status\n"
 "    sources.list\n"
-"    apt.conf"
+"    apt.conf\n"
 
-#. type: <heading></heading>
-#: offline.sgml:88
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:98
 msgid "The configuration file"
 msgstr "設定ファイル"
 
-#. type: <p></p>
-#: offline.sgml:96
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:100
 msgid ""
 "The configuration file should tell APT to store its files on the disc and to "
 "use the configuration files on the disc as well. The sources.list should "
 "contain the proper sites that you wish to use from the remote machine, and "
-"the status file should be a copy of <em>/var/lib/dpkg/status</em> from the "
-"<em>target host</em>. Please note, if you are using a local archive you must "
-"use copy URIs, the syntax is identical to file URIs."
+"the status file should be a copy of <emphasis>/var/lib/dpkg/status</"
+"emphasis> from the <emphasis>target host</emphasis>. Please note, if you are "
+"using a local archive you must use copy URIs, the syntax is identical to "
+"file URIs."
 msgstr ""
+"設定ファイルでは APT が管理ファイルをそのディスクに保存し、そのディスク上の設"
+"定ファイルを同様に利用するように指示する必要があります。sources.list ではリ"
+"モートマシンから利用する適切なサイトを指定し、status ファイルは<emphasis>対象"
+"ホスト</emphasis>の <emphasis>/var/lib/dpkg/status</emphasis> をコピーしたも"
+"のを利用します。ローカルアーカイブを使っている場合はその URI を利用しないとい"
+"けないことに注意してください。書式はファイルの URI と同一です。"
 
-#. type: <p><example>
-#: offline.sgml:100
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:108
 msgid ""
-"<em>apt.conf</em> must contain the necessary information to make APT use the "
-"disc:"
+"<emphasis>apt.conf</emphasis> must contain the necessary information to make "
+"APT use the disc:"
 msgstr ""
+"<emphasis>apt.conf</emphasis> には APT がそのディスクを使うようにするのに必要"
+"な情報を記述しないといけません:"
 
-#. type: <example></example>
-#: offline.sgml:124
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:112
 #, no-wrap
 msgid ""
 " APT\n"
@@ -9153,10 +9430,10 @@ msgid ""
 "   /* This is not necessary if the two machines are the same arch, it tells\n"
 "      the remote APT what architecture the target machine is */\n"
 "   Architecture \"i386\";\n"
-"   \n"
+"\n"
 "   Get::Download-Only \"true\";\n"
 " };\n"
-" \n"
+"\n"
 " Dir\n"
 " {\n"
 "   /* Use the disc for state information and redirect the status file from\n"
@@ -9167,20 +9444,20 @@ msgid ""
 "   // Binary caches will be stored locally\n"
 "   Cache::archives \"/disc/archives/\";\n"
 "   Cache \"/tmp/\";\n"
-"   \n"
+"\n"
 "   // Location of the source list.\n"
 "   Etc \"/disc/\";\n"
-" };"
+" };\n"
 msgstr ""
 " APT\n"
 " {\n"
 "   /* This is not necessary if the two machines are the same arch, it tells\n"
 "      the remote APT what architecture the target machine is */\n"
 "   Architecture \"i386\";\n"
-"   \n"
+"\n"
 "   Get::Download-Only \"true\";\n"
 " };\n"
-" \n"
+"\n"
 " Dir\n"
 " {\n"
 "   /* Use the disc for state information and redirect the status file from\n"
@@ -9191,85 +9468,103 @@ msgstr ""
 "   // Binary caches will be stored locally\n"
 "   Cache::archives \"/disc/archives/\";\n"
 "   Cache \"/tmp/\";\n"
-"   \n"
+"\n"
 "   // Location of the source list.\n"
 "   Etc \"/disc/\";\n"
-" };"
+" };\n"
 
-#. type: </example></p>
-#: offline.sgml:129
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:137
 msgid ""
 "More details can be seen by examining the apt.conf man page and the sample "
-"configuration file in <em>/usr/share/doc/apt/examples/apt.conf</em>."
-msgstr ""
-
-#. type: <p><example>
-#: offline.sgml:136
-msgid ""
-"On the target machine the first thing to do is mount the disc and copy <em>/"
-"var/lib/dpkg/status</em> to it. You will also need to create the directories "
-"outlined in the Overview, <em>archives/partial/</em> and <em>lists/partial/</"
-"em>. Then take the disc to the remote machine and configure the sources."
-"list. On the remote machine execute the following:"
-msgstr ""
-
-#. type: <example></example>
-#: offline.sgml:142
+"configuration file in <emphasis>/usr/share/doc/apt/examples/apt.conf</"
+"emphasis>."
+msgstr ""
+"apt.conf の man ページや <emphasis>/usr/share/doc/apt/examples/apt.conf</"
+"emphasis> にある見本の設定ファイルを調べるとさらなる詳細があります。"
+
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:142
+msgid ""
+"On the target machine the first thing to do is mount the disc and copy "
+"<emphasis>/var/lib/dpkg/status</emphasis> to it. You will also need to "
+"create the directories outlined in the Overview, <emphasis>archives/partial/"
+"</emphasis> and <emphasis>lists/partial/</emphasis>. Then take the disc to "
+"the remote machine and configure the sources.list. On the remote machine "
+"execute the following:"
+msgstr ""
+"対象のマシンでまず行うことはディスクをマウントしてそのディスクに <emphasis>/"
+"var/lib/dpkg/status</emphasis> をコピーすることです。概要にまとめられているよ"
+"うに、ディレクトリ <emphasis>archives/partial/</emphasis> 及び <emphasis>"
+"lists/partial/</emphasis> を作成する必要もあるでしょう。それからディスクをリ"
+"モートマシンに移動して sources.list を設定します。リモートマシンでは以下の手"
+"順を実行します:"
+
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:151
 #, no-wrap
 msgid ""
 " # export APT_CONFIG=\"/disc/apt.conf\"\n"
 " # apt-get update\n"
 " [ APT fetches the package files ]\n"
 " # apt-get dist-upgrade\n"
-" [ APT fetches all the packages needed to upgrade the target machine ]"
+" [ APT fetches all the packages needed to upgrade the target machine ]\n"
 msgstr ""
 " # export APT_CONFIG=\"/disc/apt.conf\"\n"
 " # apt-get update\n"
 " [ package ファイルを APT が取得します ]\n"
 " # apt-get dist-upgrade\n"
-" [ 対象マシンをアップグレードするのに必要なパッケージを、APT が取得します ]"
+" [ 対象マシンをアップグレードするのに必要なパッケージを、APT が取得します ]\n"
 
-#. type: </example></p>
-#: offline.sgml:149
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:158
 msgid ""
 "The dist-upgrade command can be replaced with any other standard APT "
 "commands, particularly dselect-upgrade. You can even use an APT front end "
-"such as <em>dselect</em>. However this presents a problem in communicating "
-"your selections back to the local computer."
+"such as <emphasis>dselect</emphasis>. However this presents a problem in "
+"communicating your selections back to the local computer."
 msgstr ""
+"dist-upgrade コマンドは他の任意の標準的な APT コマンド、特に dselect-upgrade "
+"に置き換えることができます。<emphasis>dselect</emphasis> 等の APT フロント"
+"エンドを使うこともできます。しかし、それには選択したときにローカルコンピュー"
+"タとやりとりしてしまうという問題があります。"
 
-#. type: <p><example>
-#: offline.sgml:153
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:164
 msgid ""
 "Now the disc contains all of the index files and archives needed to upgrade "
 "the target machine. Take the disc back and run:"
 msgstr ""
+"これで、対象のマシンをアップグレードするのに必要な索引ファイルとアーカイブが"
+"全てこのディスクに収録されたということになります。ディスクを戻して実行します:"
 
-#. type: <example></example>
-#: offline.sgml:159
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:168
 #, no-wrap
 msgid ""
 "  # export APT_CONFIG=\"/disc/apt.conf\"\n"
 "  # apt-get check\n"
 "  [ APT generates a local copy of the cache files ]\n"
 "  # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
-"  [ Or any other APT command ]"
+"  [ Or any other APT command ]\n"
 msgstr ""
 "  # export APT_CONFIG=\"/disc/apt.conf\"\n"
 "  # apt-get check\n"
-" [ キャッシュファイルのローカルコピーを生成します ]\n"
-" # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
-" [ もしくはその他の APT コマンド ]"
+"  [ キャッシュファイルのローカルコピーを生成します ]\n"
+"  # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
+"  [ もしくはその他の APT コマンド ]\n"
 
-#. type: <p></p>
-#: offline.sgml:165
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:175
 msgid ""
 "It is necessary for proper function to re-specify the status file to be the "
 "local one. This is very important!"
 msgstr ""
+"適切に機能するためにはローカルのファイルを status ファイルに再指定する必要が"
+"あります。これは非常に重要です!"
 
-#. type: <p></p>
-#: offline.sgml:172
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:179
 msgid ""
 "If you are using dselect you can do the very risky operation of copying disc/"
 "status to /var/lib/dpkg/status so that any selections you made on the remote "
@@ -9277,233 +9572,123 @@ msgid ""
 "the local machine - but this may not always be possible. DO NOT copy the "
 "status file if dpkg or APT have been run in the mean time!!"
 msgstr ""
+"dselect を使っている場合、disc/status はリモートマシンで何か選択すると更新さ"
+"れるため /var/lib/dpkg/status にコピーするのは非常に危険です。選択はローカル"
+"マシンでのみ行うことを強く勧めます - しかしこれは常に可能だとは限りません。"
+"dpkg や APT を実行している間は status ファイルをコピー *しないでください* !!"
 
-#. type: <heading></heading>
-#: offline.sgml:178
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:189
 msgid "Using APT and wget"
-msgstr "APT と wget の使用法"
+msgstr "APT と wget の使用"
 
-#. type: <p></p>
-#: offline.sgml:185
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:193
 msgid ""
-"<em>wget</em> is a popular and portable download tool that can run on nearly "
-"any machine. Unlike the method above this requires that the Debian machine "
-"already has a list of available packages."
+"<emphasis>wget</emphasis> is a popular and portable download tool that can "
+"run on nearly any machine. Unlike the method above this requires that the "
+"Debian machine already has a list of available packages."
 msgstr ""
+"<emphasis>wget</emphasis> は人気のある移植性の高いダウンロードツールで、ほぼ"
+"あらゆるマシンで実行できます。上記の方法とは異なり、これには利用可能なパッ"
+"ケージの一覧を Debian マシンで用意しておく必要があります。"
 
-#. type: <p></p>
-#: offline.sgml:190
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:198
 msgid ""
 "The basic idea is to create a disc that has only the archive files "
 "downloaded from the remote site. This is done by using the --print-uris "
 "option to apt-get and then preparing a wget script to actually fetch the "
 "packages."
 msgstr ""
+"基本的な考え方は、リモートサイトからダウンロードしたアーカイブファイルだけを"
+"収録したディスクを作成するということです。これは apt-get に --print-uris オプ"
+"ションを使って行い、それから wget スクリプトを準備して実際にパッケージを取得"
+"します。"
 
-#. type: <heading></heading>
-#: offline.sgml:196
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:204
 msgid "Operation"
 msgstr "操作"
 
-#. type: <p><example>
-#: offline.sgml:200
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:206
 msgid ""
 "Unlike the previous technique no special configuration files are required. "
 "We merely use the standard APT commands to generate the file list."
 msgstr ""
+"前の技とは異なり、特別な設定ファイルを必要としません。標準的な APT コマンドを"
+"単純に使ってファイル一覧を生成します。"
 
-#. type: <example></example>
-#: offline.sgml:205
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:210
 #, no-wrap
 msgid ""
-" # apt-get dist-upgrade \n"
+" # apt-get dist-upgrade\n"
 " [ Press no when prompted, make sure you are happy with the actions ]\n"
-" # apt-get -qq --print-uris dist-upgrade > uris\n"
-" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
+" # apt-get -qq --print-uris dist-upgrade &gt; uris\n"
+" # awk '{print \"wget -O \" $2 \" \" $1}' &lt; uris &gt; /disc/wget-script\n"
 msgstr ""
-" # apt-get dist-upgrade \n"
+" # apt-get dist-upgrade\n"
 " [ Press no when prompted, make sure you are happy with the actions ]\n"
-" # apt-get -qq --print-uris dist-upgrade > uris\n"
-" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
+" # apt-get -qq --print-uris dist-upgrade &gt; uris\n"
+" # awk '{print \"wget -O \" $2 \" \" $1}' &lt; uris &gt; /disc/wget-script\n"
 
-#. type: </example></p>
-#: offline.sgml:210
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:216
 msgid ""
 "Any command other than dist-upgrade could be used here, including dselect-"
 "upgrade."
 msgstr ""
+"dselect-upgrade を含め、ここでは dist-upgrade 以外の任意のコマンドを使えま"
+"す。"
 
-#. type: <p></p>
-#: offline.sgml:216
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:220
 msgid ""
 "The /disc/wget-script file will now contain a list of wget commands to "
 "execute in order to fetch the necessary archives. This script should be run "
 "with the current directory as the disc's mount point so as to save the "
 "output on the disc."
 msgstr ""
+"/disc/wget-script ファイルには、必要なアーカイブを取得するために実行する "
+"wget コマンドの一覧を収録するようになっています。ディスク上の出力を減らすた"
+"め、このスクリプトは現在のディレクトリをそのディスクのマウントポイントとして"
+"実行するようにしてください。"
 
-#. type: <p><example>
-#: offline.sgml:219
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:226
 msgid "The remote machine would do something like"
 msgstr "リモートマシンでは以下のようにします。"
 
-#. type: <example></example>
-#: offline.sgml:223
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:229
 #, no-wrap
 msgid ""
 "  # cd /disc\n"
 "  # sh -x ./wget-script\n"
-"  [ wait.. ]"
+"  [ wait.. ]\n"
 msgstr ""
 "  # cd /disc\n"
 "  # sh -x ./wget-script\n"
-"  [ お待ちください... ]"
+"  [ お待ちください... ]\n"
 
-#. type: </example><example>
-#: offline.sgml:228
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:234
 msgid ""
 "Once the archives are downloaded and the disc returned to the Debian machine "
 "installation can proceed using,"
 msgstr ""
+"アーカイブのダウンロードが終わってディスクが Debian マシンに返ってくるとイン"
+"ストールを続けられるようになります。"
 
-#. type: <example></example>
-#: offline.sgml:230
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:238
 #, no-wrap
-msgid "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
-msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
+msgid "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
+msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 
-#. type: </example></p>
-#: offline.sgml:234
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:241
 msgid "Which will use the already fetched archives on the disc."
-msgstr "これで、disc にある取得済みのアーカイブを使用するようになります。"
-
-#~ msgid "apt"
-#~ msgstr "apt"
-
-#~ msgid "16 June 1998"
-#~ msgstr "16 June 1998"
-
-#~ msgid "Debian"
-#~ msgstr "Debian"
-
-#~ msgid "NAME"
-#~ msgstr "名前"
-
-#~ msgid "apt - Advanced Package Tool"
-#~ msgstr "apt - 高度パッケージツール"
-
-#~ msgid "SYNOPSIS"
-#~ msgstr "書式"
-
-#~ msgid "B<apt>"
-#~ msgstr "B<apt>"
-
-#~ msgid "DESCRIPTION"
-#~ msgstr "説明"
-
-#, fuzzy
-#~| msgid ""
-#~| "APT is a management system for software packages. For normal day to day "
-#~| "package management there are several frontends available, such as "
-#~| "B<aptitude>(8)  for the command line or B<synaptic>(8)  for the X Window "
-#~| "System. Some options are only implemented in B<apt-get>(8)  though."
-#~ msgid ""
-#~ "For normal day to day package management there are several frontends "
-#~ "available, such as B<aptitude>(8)  for the command line or "
-#~ "B<synaptic>(8)  for the X Window System. Some options are only "
-#~ "implemented in B<apt-get>(8)  though."
-#~ msgstr ""
-#~ "APT はソフトウェアパッケージの管理システムです。日々のパッケージ管理のため"
-#~ "に、コマンドライン用の B<aptitude>(8) や、X Window System 用の "
-#~ "B<synaptic>(8) といった、いくつかのフロントエンドが用意されています。いく"
-#~ "つかのオプションは B<apt-get>(8) にしか実装されていません。"
-
-#~ msgid "SEE ALSO"
-#~ msgstr "関連項目"
-
-#, fuzzy
-#~| msgid ""
-#~| "B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), "
-#~| "B<apt_preferences>(5), B<apt-secure>(8)"
-#~ msgid ""
-#~ "B<apt>(8), B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources."
-#~ "list>(5), B<apt_preferences>(5), B<apt-secure>(8)"
-#~ msgstr ""
-#~ "B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), "
-#~ "B<apt_preferences>(5), B<apt-secure>(8)"
-
-#~ msgid "DIAGNOSTICS"
-#~ msgstr "診断メッセージ"
-
-#~ msgid "apt returns zero on normal operation, decimal 100 on error."
-#~ msgstr ""
-#~ "apt は正常終了時に 0 を返します。エラー時には十進の 100 を返します。"
-
-#~ msgid "BUGS"
-#~ msgstr "バグ"
-
-#~ msgid "This manpage isn't even started."
-#~ msgstr "このマニュアルページは、始まってさえいません。"
-
-#~ msgid ""
-#~ "See E<lt>http://bugs.debian.org/aptE<gt>.  If you wish to report a bug in "
-#~ "B<apt>, please see I</usr/share/doc/debian/bug-reporting.txt> or the "
-#~ "B<reportbug>(1)  command."
-#~ msgstr ""
-#~ "E<lt>http://bugs.debian.org/aptE<gt> をご覧ください。B<apt> のバグを報告す"
-#~ "る場合は、I</usr/share/doc/debian/bug-reporting.txt> や B<reportbug>(1) コ"
-#~ "マンドをご覧ください。"
-
-#~ msgid "AUTHOR"
-#~ msgstr "著者"
-
-#~ msgid "apt was written by the APT team E<lt>apt@packages.debian.orgE<gt>."
-#~ msgstr ""
-#~ "apt は APT チーム E<lt>apt@packages.debian.orgE<gt> によって書かれました。"
-
-#~ msgid "Debian GNU/Linux"
-#~ msgstr "Debian GNU/Linux"
-
-#~ msgid "&apt-commonoptions;"
-#~ msgstr "&apt-commonoptions;"
-
-#~ msgid "&file-sourceslist; &file-statelists;"
-#~ msgstr "&file-sourceslist; &file-statelists;"
-
-#~ msgid ""
-#~ "Unless the <option>-h</option>, or <option>--help</option> option is "
-#~ "given one of the commands below must be present.  <placeholder type="
-#~ "\"variablelist\" id=\"0\"/>"
-#~ msgstr ""
-#~ "<option>-h</option> オプションや <option>--help</option> オプションを除"
-#~ "き、以下に挙げるコマンドが必要です。<placeholder type=\"variablelist\" id="
-#~ "\"0\"/>"
-
-#~ msgid ""
-#~ "Unless the <option>-h</option>, or <option>--help</option> option is "
-#~ "given one of the commands below must be present."
-#~ msgstr ""
-#~ "<option>-h</option> オプションや <option>--help</option> オプションを除"
-#~ "き、以下に挙げるコマンドが必要です。"
-
-#~ msgid "Dir Section"
-#~ msgstr "Dir セクション"
-
-#~ msgid "Default Section"
-#~ msgstr "Default セクション"
-
-#~ msgid "TreeDefault Section"
-#~ msgstr "TreeDefault セクション"
-
-#~ msgid "Tree Section"
-#~ msgstr "Tree セクション"
-
-#~ msgid ""
-#~ "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
-#~ "&file-statelists;"
-#~ msgstr ""
-#~ "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
-#~ "&file-statelists;"
-
-#~ msgid "&file-trustedgpg;"
-#~ msgstr "&file-trustedgpg;"
+msgstr "これで、ディスクにある取得済みのアーカイブを使用するようになります。"
diff --git a/doc/po/pl.po b/doc/po/pl.po
index 22cd47ba..0eb144f5 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.9.7.3\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-04-01 14:24+0200\n"
-"PO-Revision-Date: 2014-04-01 13:59+0200\n"
+"POT-Creation-Date: 2014-07-10 10:52+0200\n"
+"PO-Revision-Date: 2014-07-04 02:13+0200\n"
 "Last-Translator: Robert Luberda <robert@debian.org>\n"
 "Language-Team: Polish <manpages-pl-list@lists.sourceforge.net>\n"
 "Language: pl\n"
@@ -833,7 +833,7 @@ msgstr ""
 #: apt.8.xml:145
 msgid ""
 "The <command>apt</command> command is meant to be pleasant for end users and "
-"does not need to be backward compatilbe like &apt-get;. Therefore some "
+"does not need to be backward compatible like &apt-get;. Therefore some "
 "options are different:"
 msgstr ""
 
@@ -841,7 +841,7 @@ msgstr ""
 #: apt.8.xml:151
 #, fuzzy
 #| msgid "the <literal>Package:</literal> line"
-msgid "The option <literal>DPkgPM::Progress-Fancy</literal> is enabled."
+msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
 msgstr "linia <literal>Package:</literal>"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
@@ -870,7 +870,7 @@ msgstr "linia <literal>Archive:</literal> lub <literal>Suite:</literal>"
 #. type: Content of: <refentry><refsect1><title>
 #: apt.8.xml:174 apt-get.8.xml:558 apt-cache.8.xml:352 apt-key.8.xml:197
 #: apt-mark.8.xml:133 apt-secure.8.xml:193 apt-cdrom.8.xml:154
-#: apt-config.8.xml:111 apt.conf.5.xml:1227 apt_preferences.5.xml:707
+#: apt-config.8.xml:111 apt.conf.5.xml:1228 apt_preferences.5.xml:707
 #: sources.list.5.xml:280 apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65
 #: apt-ftparchive.1.xml:609
 msgid "See Also"
@@ -1882,13 +1882,13 @@ msgid ""
 "Show user friendly progress information in the terminal window when packages "
 "are installed, upgraded or removed. For a machine parsable version of this "
 "data see README.progress-reporting in the apt doc directory.  Configuration "
-"Item: <literal>DpkgPM::Progress</literal> and <literal>Dpkg::Progress-Fancy</"
+"Item: <literal>Dpkg::Progress</literal> and <literal>Dpkg::Progress-Fancy</"
 "literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml:548 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127
-#: apt.conf.5.xml:1221 apt_preferences.5.xml:700
+#: apt.conf.5.xml:1222 apt_preferences.5.xml:700
 msgid "Files"
 msgstr "Pliki"
 
@@ -3131,10 +3131,10 @@ msgstr ""
 #: apt-secure.8.xml:195
 msgid ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
 msgstr ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml:199
@@ -4317,14 +4317,15 @@ msgid ""
 "information, such as the two package caches <literal>srcpkgcache</literal> "
 "and <literal>pkgcache</literal> as well as the location to place downloaded "
 "archives, <literal>Dir::Cache::archives</literal>. Generation of caches can "
-"be turned off by setting their names to the empty string. This will slow "
+"be turned off by setting <literal>pkgcache</literal> or "
+"<literal>srcpkgcache</literal> to <literal>\"\"</literal>.  This will slow "
 "down startup but save disk space. It is probably preferable to turn off the "
-"pkgcache rather than the srcpkgcache. Like <literal>Dir::State</literal> the "
-"default directory is contained in <literal>Dir::Cache</literal>"
+"pkgcache rather than the srcpkgcache.  Like <literal>Dir::State</literal> "
+"the default directory is contained in <literal>Dir::Cache</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:616
+#: apt.conf.5.xml:617
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4334,7 +4335,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:622
+#: apt.conf.5.xml:623
 msgid ""
 "The <literal>Dir::Parts</literal> setting reads in all the config fragments "
 "in lexical order from the directory specified. After this is done then the "
@@ -4342,7 +4343,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:626
+#: apt.conf.5.xml:627
 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4353,7 +4354,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:634
+#: apt.conf.5.xml:635
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4366,7 +4367,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:647
+#: apt.conf.5.xml:648
 msgid ""
 "The <literal>Ignore-Files-Silently</literal> list can be used to specify "
 "which files APT should silently ignore while parsing the files in the "
@@ -4377,12 +4378,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:656
+#: apt.conf.5.xml:657
 msgid "APT in DSelect"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:658
+#: apt.conf.5.xml:659
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behavior. These are in the <literal>DSelect</literal> "
@@ -4390,7 +4391,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:663
+#: apt.conf.5.xml:664
 msgid ""
 "Cache Clean mode; this value may be one of <literal>always</literal>, "
 "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -4403,40 +4404,40 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:677
+#: apt.conf.5.xml:678
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the install phase."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:682
+#: apt.conf.5.xml:683
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the update phase."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:687
+#: apt.conf.5.xml:688
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:693
+#: apt.conf.5.xml:694
 msgid "How APT calls &dpkg;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:694
+#: apt.conf.5.xml:695
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:699
+#: apt.conf.5.xml:700
 msgid ""
 "This is a list of options to pass to &dpkg;. The options must be specified "
 "using the list notation and each list item is passed as a single argument to "
@@ -4444,7 +4445,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:705
+#: apt.conf.5.xml:706
 msgid ""
 "This is a list of shell commands to run before/after invoking &dpkg;.  Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -4453,7 +4454,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:712
+#: apt.conf.5.xml:713
 msgid ""
 "This is a list of shell commands to run before invoking &dpkg;. Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -4464,7 +4465,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:719
+#: apt.conf.5.xml:720
 msgid ""
 "Version 2 of this protocol dumps more information, including the protocol "
 "version, the APT configuration space and the packages, files and versions "
@@ -4473,7 +4474,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:724
+#: apt.conf.5.xml:725
 msgid ""
 "The version of the protocol to be used for the command "
 "<literal><replaceable>cmd</replaceable></literal> can be chosen by setting "
@@ -4484,7 +4485,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:731
+#: apt.conf.5.xml:732
 msgid ""
 "The file descriptor to be used to send the information can be requested with "
 "<literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::InfoFD</"
@@ -4495,26 +4496,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:741
+#: apt.conf.5.xml:742
 msgid ""
 "APT chdirs to this directory before invoking &dpkg;, the default is "
 "<filename>/</filename>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:746
+#: apt.conf.5.xml:747
 msgid ""
 "These options are passed to &dpkg-buildpackage; when compiling packages; the "
 "default is to disable signing and produce all binaries."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:751
+#: apt.conf.5.xml:752
 msgid "dpkg trigger usage (and related options)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:752
+#: apt.conf.5.xml:753
 msgid ""
 "APT can call &dpkg; in such a way as to let it make aggressive use of "
 "triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
@@ -4529,7 +4530,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:767
+#: apt.conf.5.xml:768
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -4543,7 +4544,7 @@ msgstr ""
 "DPkg::TriggersPending \"true\";"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:761
+#: apt.conf.5.xml:762
 msgid ""
 "Note that it is not guaranteed that APT will support these options or that "
 "these options will not cause (big) trouble in the future. If you have "
@@ -4557,7 +4558,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:774
+#: apt.conf.5.xml:775
 msgid ""
 "Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
 "call).  See &dpkg; if you are interested in what this actually means. In "
@@ -4570,7 +4571,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:782
+#: apt.conf.5.xml:783
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
@@ -4587,7 +4588,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:797
+#: apt.conf.5.xml:798
 msgid ""
 "If this option is set APT will call <command>dpkg --configure --pending</"
 "command> to let &dpkg; handle all required configurations and triggers. This "
@@ -4598,7 +4599,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:804
+#: apt.conf.5.xml:805
 msgid ""
 "Useful for the <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal>, and "
@@ -4608,7 +4609,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:817
+#: apt.conf.5.xml:818
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -4626,7 +4627,7 @@ msgstr ""
 "};"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:810
+#: apt.conf.5.xml:811
 msgid ""
 "Essential packages (and their dependencies) should be configured immediately "
 "after unpacking. It is a good idea to do this quite early in the upgrade "
@@ -4640,12 +4641,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:830
+#: apt.conf.5.xml:831
 msgid "Periodic and Archives options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:831
+#: apt.conf.5.xml:832
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by the "
@@ -4654,13 +4655,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:839
+#: apt.conf.5.xml:840
 #, fuzzy
 msgid "Debug options"
 msgstr "opcje"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:841
+#: apt.conf.5.xml:842
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -4671,7 +4672,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:852
+#: apt.conf.5.xml:853
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -4679,7 +4680,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:860
+#: apt.conf.5.xml:861
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"
@@ -4687,7 +4688,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:869
+#: apt.conf.5.xml:870
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -4697,7 +4698,7 @@ msgstr ""
 #. 	   motivating example, except I haven't a clue why you'd want
 #. 	   to do this. 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:877
+#: apt.conf.5.xml:878
 #, fuzzy
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
@@ -4707,59 +4708,59 @@ msgstr ""
 "in CDROM IDs."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:887
+#: apt.conf.5.xml:888
 msgid "A full list of debugging options to apt follows."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:896
+#: apt.conf.5.xml:897
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:907
+#: apt.conf.5.xml:908
 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:918
+#: apt.conf.5.xml:919
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:929
+#: apt.conf.5.xml:930
 msgid "Print information related to downloading packages using HTTPS."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:940
+#: apt.conf.5.xml:941
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:951
+#: apt.conf.5.xml:952
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:961
+#: apt.conf.5.xml:962
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:971
+#: apt.conf.5.xml:972
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:981
+#: apt.conf.5.xml:982
 msgid ""
 "Do not include information from <literal>statfs</literal>, namely the number "
 "of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -4767,53 +4768,53 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:992
+#: apt.conf.5.xml:993
 msgid ""
 "Disable all file locking.  For instance, this will allow two instances of "
 "<quote><literal>apt-get update</literal></quote> to run at the same time."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1004
+#: apt.conf.5.xml:1005
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1014
+#: apt.conf.5.xml:1015
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1024
+#: apt.conf.5.xml:1025
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1036
+#: apt.conf.5.xml:1037
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1047
+#: apt.conf.5.xml:1048
 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1058
+#: apt.conf.5.xml:1059
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1068
+#: apt.conf.5.xml:1069
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
@@ -4823,7 +4824,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1082
+#: apt.conf.5.xml:1083
 msgid ""
 "Generate debug messages describing which packages are marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
@@ -4841,46 +4842,46 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1103
+#: apt.conf.5.xml:1104
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1114
+#: apt.conf.5.xml:1115
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1125
+#: apt.conf.5.xml:1126
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1137
+#: apt.conf.5.xml:1138
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1148
+#: apt.conf.5.xml:1149
 msgid "Output the priority of each package list on startup."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1158
+#: apt.conf.5.xml:1159
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1169
+#: apt.conf.5.xml:1170
 msgid ""
 "Display a list of all installed packages with their calculated score used by "
 "the pkgProblemResolver. The description of the package is the same as "
@@ -4888,14 +4889,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1181
+#: apt.conf.5.xml:1182
 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1191
+#: apt.conf.5.xml:1192
 msgid ""
 "Display the external commands that are called by apt hooks.  This includes e."
 "g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or "
@@ -4903,13 +4904,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1215 apt_preferences.5.xml:547 sources.list.5.xml:239
+#: apt.conf.5.xml:1216 apt_preferences.5.xml:547 sources.list.5.xml:239
 #: apt-ftparchive.1.xml:598
 msgid "Examples"
 msgstr "Przykłady"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1216
+#: apt.conf.5.xml:1217
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -4917,7 +4918,7 @@ msgstr ""
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1228
+#: apt.conf.5.xml:1229
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
 
@@ -7763,34 +7764,51 @@ msgstr ""
 "<command>apt-ftparchive</command> zwraca zero, gdy zakończyło się pomyślnie, "
 "100 - w przypadku błędu."
 
-#. type: <title></title>
-#: guide.sgml:4
+#. type: Attribute 'lang' of: <book>
+#: guide.dbk:8 offline.dbk:8
+msgid "en"
+msgstr "pl"
+
+#. type: Content of: <book><title>
+#: guide.dbk:10
 msgid "APT User's Guide"
 msgstr "Podręcznik użytkownika APT"
 
-#. type: <author></author>
-#: guide.sgml:6 offline.sgml:6
-msgid "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
-msgstr "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
+#. type: Content of: <book><bookinfo><authorgroup><author><personname>
+#: guide.dbk:16 offline.dbk:16
+msgid "Jason Gunthorpe"
+msgstr "Jason Gunthorpe"
 
-#. type: <version></version>
-#: guide.sgml:7
-msgid "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
-msgstr "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
+#. type: Content of: <book><bookinfo><authorgroup><author><email>
+#: guide.dbk:16 offline.dbk:16
+msgid "jgg@debian.org"
+msgstr "jgg@debian.org"
 
-#. type: <abstract></abstract>
-#: guide.sgml:11
+#. type: Content of: <book><bookinfo><releaseinfo>
+#: guide.dbk:20 offline.dbk:20
+msgid "Version &apt-product-version;"
+msgstr ""
+
+#. type: Content of: <book><bookinfo><abstract><para>
+#: guide.dbk:24
 msgid ""
 "This document provides an overview of how to use the the APT package manager."
 msgstr "Dokument zawiera opis używania menadżera pakietów APT."
 
-#. type: <copyrightsummary></copyrightsummary>
-#: guide.sgml:15
-msgid "Copyright &copy; Jason Gunthorpe, 1998."
-msgstr "Copyright &copy; Jason Gunthorpe, 1998."
+#. type: Content of: <book><bookinfo>
+#: guide.dbk:28
+msgid ""
+"<copyright><year>1998</year><holder>Jason Gunthorpe</holder></copyright>"
+msgstr ""
+"<copyright><year>1998</year><holder>Jason Gunthorpe</holder></copyright>"
+
+#. type: Content of: <book><bookinfo><legalnotice><title>
+#: guide.dbk:31 offline.dbk:32
+msgid "License Notice"
+msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:21 offline.sgml:22
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: guide.dbk:33 offline.dbk:34
 msgid ""
 "\"APT\" and this document are free software; you can redistribute them and/"
 "or modify them under the terms of the GNU General Public License as "
@@ -7803,8 +7821,8 @@ msgstr ""
 "\" (GNU General Public License) publikowanej przez \"Fundację Wolnego "
 "Oprogramowania (Free Software Foundation)."
 
-#. type: <p></p>
-#: guide.sgml:24 offline.sgml:25
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: guide.dbk:42 offline.dbk:40
 msgid ""
 "For more details, on Debian systems, see the file /usr/share/common-licenses/"
 "GPL for the full license."
@@ -7812,31 +7830,31 @@ msgstr ""
 "Więcej szczegółów można uzyskać, przeglądając plik zawierający pełen tekst "
 "licencji (w systemach Debian jest to plik /usr/share/common-licenses/GPL)."
 
-#. type: <heading></heading>
-#: guide.sgml:32
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:49
 msgid "General"
 msgstr "Ogólne"
 
-#. type: <p></p>
-#: guide.sgml:38
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:51
 msgid ""
-"The APT package currently contains two sections, the APT <prgn>dselect</"
-"prgn> method and the <prgn>apt-get</prgn> command line user interface. Both "
-"provide a way to install and remove packages as well as download new "
-"packages from the Internet."
+"The APT package currently contains two sections, the APT <command>dselect</"
+"command> method and the <command>apt-get</command> command line user "
+"interface. Both provide a way to install and remove packages as well as "
+"download new packages from the Internet."
 msgstr ""
-"Pakiet APT składa się z dwóch części: z metody APT programu <prgn>dselect</"
-"prgn> oraz z programu <prgn>apt-get</prgn> będącego interfejsem linii "
-"poleceń. Obie części pozwalają na instalowanie i usuwanie pakietów oraz na "
-"pobieranie nowych pakietów z Internetu."
+"Pakiet APT składa się z dwóch części: z metody APT programu "
+"<command>dselect</command> oraz z programu <command>apt-get</command> "
+"będącego interfejsem linii poleceń. Obie części pozwalają na instalowanie i "
+"usuwanie pakietów oraz na pobieranie nowych pakietów z Internetu."
 
-#. type: <heading></heading>
-#: guide.sgml:39
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:57
 msgid "Anatomy of the Package System"
 msgstr "Budowa systemu pakietów"
 
-#. type: <p></p>
-#: guide.sgml:44
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:59
 msgid ""
 "The Debian packaging system has a large amount of information associated "
 "with each package to help assure that it integrates cleanly and easily into "
@@ -7846,8 +7864,8 @@ msgstr ""
 "pakietem, zapewniających integralność pakietów w systemie. Najbardziej "
 "widoczną cechą systemu pakietów jest system zależności."
 
-#. type: <p></p>
-#: guide.sgml:52
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:64
 msgid ""
 "The dependency system allows individual programs to make use of shared "
 "elements in the system such as libraries. It simplifies placing infrequently "
@@ -7861,8 +7879,8 @@ msgstr ""
 "liczbę pakietów instalowanych przez przeciętnego użytkownika. Pozwala także "
 "wybierać programy odpowiedzialne za dostarczanie poczty, serwery X-ów itp."
 
-#. type: <p></p>
-#: guide.sgml:57
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:71
 msgid ""
 "The first step to understanding the dependency system is to grasp the "
 "concept of a simple dependency. The meaning of a simple dependency is that a "
@@ -7873,8 +7891,8 @@ msgstr ""
 "zrozumienie koncepcji prostej zależności. Prosta zależność oznacza, że dany "
 "pakiet do poprawnego działania wymaga zainstalowania innego pakietu."
 
-#. type: <p></p>
-#: guide.sgml:63
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:76
 msgid ""
 "For instance, mailcrypt is an emacs extension that aids in encrypting email "
 "with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a "
@@ -7887,8 +7905,8 @@ msgstr ""
 "GPG. Ma także prostą zależność od pakietu emacs, ponieważ jest rozszerzeniem "
 "emacsa, więc i bez emacsa jest równie bezużyteczny."
 
-#. type: <p></p>
-#: guide.sgml:73
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:82
 msgid ""
 "The other important dependency to understand is a conflicting dependency. It "
 "means that a package, when installed with another package, will not work and "
@@ -7910,8 +7928,8 @@ msgstr ""
 "są w konflikcie ze wszystkimi innymi programami obsługującymi dostarczanie "
 "poczty."
 
-#. type: <p></p>
-#: guide.sgml:83
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:92
 msgid ""
 "As an added complication there is the possibility for a package to pretend "
 "to be another package. Consider that exim and sendmail for many intents are "
@@ -7932,8 +7950,8 @@ msgstr ""
 "obsługi poczty. Może to być bardzo mylące podczas próby ręcznego naprawiania "
 "zależności pakietów."
 
-#. type: <p></p>
-#: guide.sgml:88
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:102
 msgid ""
 "At any given time a single dependency may be met by packages that are "
 "already installed or it may not be. APT attempts to help resolve dependency "
@@ -7944,77 +7962,85 @@ msgstr ""
 "obecnie zainstalowane pakiety. ATP próbuje rozwiązać zależności używając "
 "pewnej liczby algorytmów pomagających w wyborze pakietów do zainstalowania."
 
-#. type: <heading></heading>
-#: guide.sgml:96
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:111
 msgid "apt-get"
 msgstr "apt-get"
 
-#. type: <p></p>
-#: guide.sgml:102
-msgid ""
-"<prgn>apt-get</prgn> provides a simple way to install packages from the "
-"command line. Unlike <prgn>dpkg</prgn>, <prgn>apt-get</prgn> does not "
-"understand .deb files, it works with the package's proper name and can only "
-"install .deb archives from a <em>Source</em>."
-msgstr ""
-"<prgn>apt-get</prgn> dostarcza prostego sposobu na zainstalowanie pakietów z "
-"linii poleceń. W przeciwieństwie do <prgn>dpkg</prgn>, <prgn>apt-get</prgn> "
-"nie posługuje się nazwami plików \".deb\", lecz używa nazw pakietów i może "
-"zainstalować tylko archiwa \".deb\" ze skonfigurowanych <em>źródeł</em>."
-
-#. type: <p></p>
-#: guide.sgml:109
-msgid ""
-"The first <footnote><p>If you are using an http proxy server you must set "
-"the http_proxy environment variable first, see sources.list(5)</p></"
-"footnote> thing that should be done before using <prgn>apt-get</prgn> is to "
-"fetch the package lists from the <em>Sources</em> so that it knows what "
-"packages are available. This is done with <tt>apt-get update</tt>. For "
-"instance,"
-msgstr ""
-"Pierwszą rzeczą <footnote><p> Aby używać serwera proxy, należy najpierw "
-"ustawić zmienną środowiskową http_proxy, proszę przeczytać sources.list(5)</"
-"p></footnote>, którą należy zrobić przed użyciem <prgn>apt-get</prgn> jest "
-"pobranie listy pakietów (ze <em>źródeł</em> wymienionych w pliku sources."
-"list(5)), tak żeby APT wiedział, jakie pakiety są dostępne. Robi się to za "
-"pomocą polecenia <tt>apt-get update</tt>. Na przykład:"
-
-#. type: <example></example>
-#: guide.sgml:116
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:113
+msgid ""
+"<command>apt-get</command> provides a simple way to install packages from "
+"the command line. Unlike <command>dpkg</command>, <command>apt-get</command> "
+"does not understand .deb files, it works with the package's proper name and "
+"can only install .deb archives from a <emphasis>Source</emphasis>."
+msgstr ""
+"<command>apt-get</command> dostarcza prostego sposobu na zainstalowanie "
+"pakietów z linii poleceń. W przeciwieństwie do <command>dpkg</command>, "
+"<command>apt-get</command> nie posługuje się nazwami plików \".deb\", lecz "
+"używa nazw pakietów i może zainstalować tylko archiwa \".deb\" ze "
+"skonfigurowanych <emphasis>źródeł</emphasis>."
+
+#. type: Content of: <book><chapter><para><footnote><para>
+#: guide.dbk:119
+msgid ""
+"If you are using an http proxy server you must set the http_proxy "
+"environment variable first, see sources.list(5)"
+msgstr ""
+"Aby używać serwera proxy, należy najpierw ustawić zmienną środowiskową "
+"http_proxy, proszę przeczytać sources.list(5)"
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:119
+msgid ""
+"The first <placeholder type=\"footnote\" id=\"0\"/> thing that should be "
+"done before using <command>apt-get</command> is to fetch the package lists "
+"from the <emphasis>Sources</emphasis> so that it knows what packages are "
+"available. This is done with <literal>apt-get update</literal>. For instance,"
+msgstr ""
+"Pierwszą rzeczą <placeholder type=\"footnote\" id=\"0\"/>, którą należy "
+"zrobić przed użyciem <command>apt-get</command> jest pobranie listy pakietów "
+"(ze <emphasis>źródeł</emphasis> wymienionych w pliku sources.list(5)), tak "
+"żeby APT wiedział, jakie pakiety są dostępne. Robi się to za pomocą "
+"polecenia <literal>apt-get update</literal>. Na przykład:"
+
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:127
 #, no-wrap
 msgid ""
 "# apt-get update\n"
 "Get http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
 "Get http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 msgstr ""
 "# apt-get update\n"
 "Pob: http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
 "Pob: http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
 "Czytanie list pakietów... Gotowe\n"
-"Budowanie drzewa zależności.. Gotowe"
+"Budowanie drzewa zależności... Gotowe\n"
 
-#. type: <p><taglist>
-#: guide.sgml:120
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:134
 msgid "Once updated there are several commands that can be used:"
 msgstr "Po zaktualizowaniu można użyć następnych poleceń:"
 
-#. type: <tag></tag>
-#: guide.sgml:121
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:138
 msgid "upgrade"
 msgstr "upgrade"
 
-#. type: <p></p>
-#: guide.sgml:131
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:141
 msgid ""
 "Upgrade will attempt to gently upgrade the whole system. Upgrade will never "
 "install a new package or remove an existing package, nor will it ever "
 "upgrade a package that might cause some other package to break. This can be "
 "used daily to relatively safely upgrade the system. Upgrade will list all of "
 "the packages that it could not upgrade, this usually means that they depend "
-"on new packages or conflict with some other package. <prgn>dselect</prgn> or "
-"<tt>apt-get install</tt> can be used to force these packages to install."
+"on new packages or conflict with some other package. <command>dselect</"
+"command> or <literal>apt-get install</literal> can be used to force these "
+"packages to install."
 msgstr ""
 "Upgrade spróbuje delikatnie zaktualizować cały system. Upgrade nigdy nie "
 "zainstaluje nowego pakietu ani nie usunie istniejącego pakiety, ani też nie "
@@ -8023,15 +8049,16 @@ msgstr ""
 "aktualizacji systemu. Upgrade wypisze listę pakietów, których nie potrafił "
 "zaktualizować, co zazwyczaj oznacza, że zależą one od nowych pakietów lub są "
 "w konflikcie z innymi pakietami. Można wymusić instalację takich pakietów, "
-"używając do tego <prgn>dselect</prgn> lub <tt>apt-get install</tt>."
+"używając do tego <command>dselect</command> lub <literal>apt-get install</"
+"literal>."
 
-#. type: <tag></tag>
-#: guide.sgml:131
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:153
 msgid "install"
 msgstr "install"
 
-#. type: <p></p>
-#: guide.sgml:140
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:156
 msgid ""
 "Install is used to install packages by name. The package is automatically "
 "fetched and installed. This can be useful if you already know the name of "
@@ -8050,21 +8077,22 @@ msgstr ""
 "wypisze podsumowanie i poprosi o potwierdzenie, jeśli zamierza zmienić "
 "cokolwiek innego niż pakiety podane jako jego argumenty."
 
-#. type: <tag></tag>
-#: guide.sgml:140
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:167
 msgid "dist-upgrade"
 msgstr "dist-upgrade"
 
-#. type: <p></p>
-#: guide.sgml:149
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:170
 msgid ""
 "Dist-upgrade is a complete upgrader designed to simplify upgrading between "
 "releases of Debian. It uses a sophisticated algorithm to determine the best "
 "set of packages to install, upgrade and remove to get as much of the system "
 "to the newest release. In some situations it may be desired to use dist-"
 "upgrade rather than spend the time manually resolving dependencies in "
-"<prgn>dselect</prgn>. Once dist-upgrade has completed then <prgn>dselect</"
-"prgn> can be used to install any packages that may have been left out."
+"<command>dselect</command>. Once dist-upgrade has completed then "
+"<command>dselect</command> can be used to install any packages that may have "
+"been left out."
 msgstr ""
 "Dist-upgrade powoduje całkowitą aktualizację systemu i jest zaprojektowany "
 "do uproszczenia aktualizacji z jednego wydania Debiana do kolejnego. Używa "
@@ -8072,11 +8100,12 @@ msgstr ""
 "zainstalowania, aktualizacji lub usunięcia, tak aby zaktualizować jak "
 "najwięcej pakietów w systemie do nowszego wydania. W niektórych sytuacjach, "
 "może być prościej użyć dist-upgrade niż ręcznie rozwiązywać zależności w "
-"programie <prgn>dselect</prgn>. Kiedy dist-upgrade zakończy działanie, można "
-"użyć programu <prgn>dselect</prgn> do zainstalowania pominiętych pakietów."
+"programie <command>dselect</command>. Kiedy dist-upgrade zakończy działanie, "
+"można użyć programu <command>dselect</command> do zainstalowania pominiętych "
+"pakietów."
 
-#. type: <p></p>
-#: guide.sgml:152
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:180
 msgid ""
 "It is important to closely look at what dist-upgrade is going to do, its "
 "decisions may sometimes be quite surprising."
@@ -8084,168 +8113,165 @@ msgstr ""
 "Jest ważne, aby dokładnie przyjrzeć się temu, co dist-upgrade zamierza "
 "zrobić, gdyż jego decyzje mogą czasami zdumiewać."
 
-#. type: <p></p>
-#: guide.sgml:163
-#, fuzzy
-#| msgid ""
-#| "<prgn>apt-get</prgn> has several command line options that are detailed "
-#| "in its man page, <manref section=\"8\" name=\"apt-get\">. The most useful "
-#| "option is <tt>-d</tt> which does not install the fetched files. If the "
-#| "system has to download a large number of package it would be undesired to "
-#| "start installing them in case something goes wrong. When <tt>-d</tt> is "
-#| "used the downloaded archives can be installed by simply running the "
-#| "command that caused them to be downloaded again without <tt>-d</tt>."
-msgid ""
-"<prgn>apt-get</prgn> has several command line options that are detailed in "
-"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful "
-"option is <tt>-d</tt> which does not install the fetched files. If the "
-"system has to download a large number of package it would be undesired to "
-"start installing them in case something goes wrong. When <tt>-d</tt> is used "
-"the downloaded archives can be installed by simply running the command that "
-"caused them to be downloaded again without <tt>-d</tt>."
-msgstr ""
-"Zachowanie programu <prgn>apt-get</prgn> można kontrolować za pomocą opcji "
-"linii poleceń szczegółowo opisanych w stronie podręcznika ekranowego <manref "
-"section=\"8\" name=\"apt-get\">. Najbardziej użyteczną z nich jest <tt>-d</"
-"tt>, która nie instaluje pobranych plików. Jeśli system musi pobrać dużą "
-"liczbę pakietów, instalowanie ich może być niepożądane, jeśli coś pójdzie "
-"nie tak. Jeśli użyto <tt>-d</tt>, to pobrane archiwa można zainstalować, "
-"ponownie uruchamiając polecenie, które spowodowało ich pobranie, tym razem "
-"bez opcji <tt>-d</tt>."
-
-#. type: <heading></heading>
-#: guide.sgml:168
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:187
+msgid ""
+"<command>apt-get</command> has several command line options that are "
+"detailed in its man page, <citerefentry><refentrytitle>apt-get</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>. The most useful "
+"option is <literal>-d</literal> which does not install the fetched files. If "
+"the system has to download a large number of package it would be undesired "
+"to start installing them in case something goes wrong. When <literal>-d</"
+"literal> is used the downloaded archives can be installed by simply running "
+"the command that caused them to be downloaded again without <literal>-d</"
+"literal>."
+msgstr ""
+"Zachowanie programu <command>apt-get</command> można kontrolować za pomocą "
+"opcji linii poleceń szczegółowo opisanych w stronie podręcznika ekranowego "
+"<citerefentry><refentrytitle>apt-get</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>. Najbardziej użyteczną z nich jest <literal>-d</"
+"literal>, która nie instaluje pobranych plików. Jeśli system musi pobrać "
+"dużą liczbę pakietów, instalowanie ich może być niepożądane, jeśli coś "
+"pójdzie nie tak. Jeśli użyto <literal>-d</literal>, to pobrane archiwa można "
+"zainstalować, ponownie uruchamiając polecenie, które spowodowało ich "
+"pobranie, tym razem bez opcji <literal>-d</literal>."
+
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:199
 msgid "DSelect"
 msgstr "DSelect"
 
-#. type: <p></p>
-#: guide.sgml:173
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:201
 msgid ""
-"The APT <prgn>dselect</prgn> method provides the complete APT system with "
-"the <prgn>dselect</prgn> package selection GUI. <prgn>dselect</prgn> is used "
-"to select the packages to be installed or removed and APT actually installs "
-"them."
+"The APT <command>dselect</command> method provides the complete APT system "
+"with the <command>dselect</command> package selection GUI. <command>dselect</"
+"command> is used to select the packages to be installed or removed and APT "
+"actually installs them."
 msgstr ""
-"Metoda APT <prgn>dselect</prgn> dostarcza kompletnego systemu APT w "
-"interfejsie użytkownika programu wyboru pakietów <prgn>dselect</prgn>. "
-"<prgn>dselect</prgn> może być użyty do wybrania pakietów przeznaczonych do "
-"zainstalowania lub usunięcia, a APT zainstaluje lub usunie te pakiety."
+"Metoda APT <command>dselect</command> dostarcza kompletnego systemu APT w "
+"interfejsie użytkownika programu wyboru pakietów <command>dselect</command>. "
+"<command>dselect</command> może być użyty do wybrania pakietów "
+"przeznaczonych do zainstalowania lub usunięcia, a APT zainstaluje lub usunie "
+"te pakiety."
 
-#. type: <p></p>
-#: guide.sgml:184
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:207
 msgid ""
-"To enable the APT method you need to select [A]ccess in <prgn>dselect</prgn> "
-"and then choose the APT method. You will be prompted for a set of "
-"<em>Sources</em> which are places to fetch archives from. These can be "
-"remote Internet sites, local Debian mirrors or CD-ROMs. Each source can "
-"provide a fragment of the total Debian archive, APT will automatically "
+"To enable the APT method you need to select [A]ccess in <command>dselect</"
+"command> and then choose the APT method. You will be prompted for a set of "
+"<emphasis>Sources</emphasis> which are places to fetch archives from. These "
+"can be remote Internet sites, local Debian mirrors or CD-ROMs. Each source "
+"can provide a fragment of the total Debian archive, APT will automatically "
 "combine them to form a complete set of packages. If you have a CD-ROM then "
 "it is a good idea to specify it first and then specify a mirror so that you "
 "have access to the latest bug fixes. APT will automatically use packages on "
 "your CD-ROM before downloading from the Internet."
 msgstr ""
 "Aby włączyć metodę APT należy wybrać opcję \"[A] Dostęp\" w programie "
-"<prgn>dselect</prgn> , a następnie wybrać metodę APT. Użytkownik zostanie "
-"poproszony o skonfigurowanie listy <em>źródeł</em>, będących lokalizacjami, "
-"z których będą pobierane pakiety. Mogą być to strony internetowe, lokalne "
-"serwery lustrzane Debiana lub CD-ROM-y. Każde źródło może dostarczać tylko "
-"fragmentu pełnego archiwum Debiana, a APT automatycznie połączy je w "
-"kompletny zbiór pakietów. Jeśli używany jest CD-ROM, to dobrym pomysłem jest "
-"podanie najpierw jego, a potem podanie mirrorów umożliwiających dostęp do "
-"najnowszych wersji pakietów zawierających poprawki błędów. APT automatycznie "
-"użyje pakietów z CD-ROM-u zanim zacznie pobierać pakiety z Internetu."
-
-#. type: <example></example>
-#: guide.sgml:198
+"<command>dselect</command> , a następnie wybrać metodę APT. Użytkownik "
+"zostanie poproszony o skonfigurowanie listy <emphasis>źródeł</emphasis>, "
+"będących lokalizacjami, z których będą pobierane pakiety. Mogą być to strony "
+"internetowe, lokalne serwery lustrzane Debiana lub CD-ROM-y. Każde źródło "
+"może dostarczać tylko fragmentu pełnego archiwum Debiana, a APT "
+"automatycznie połączy je w kompletny zbiór pakietów. Jeśli używany jest CD-"
+"ROM, to dobrym pomysłem jest podanie najpierw jego, a potem podanie mirrorów "
+"umożliwiających dostęp do najnowszych wersji pakietów zawierających poprawki "
+"błędów. APT automatycznie użyje pakietów z CD-ROM-u zanim zacznie pobierać "
+"pakiety z Internetu."
+
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:218
 #, no-wrap
 msgid ""
 "   Set up a list of distribution source locations\n"
-"\t \n"
+"\n"
 " Please give the base URL of the debian distribution.\n"
 " The access schemes I know about are: http file\n"
-"\t   \n"
+"\n"
 " For example:\n"
 "      file:/mnt/debian,\n"
 "      ftp://ftp.debian.org/debian,\n"
 "      http://ftp.de.debian.org/debian,\n"
-"      \n"
-"      \n"
-" URL [http://llug.sep.bnl.gov/debian]:"
+"\n"
+"\n"
+" URL [http://llug.sep.bnl.gov/debian]:\n"
 msgstr ""
 "  Ustawianie listy źródłowych lokalizacji dystrybucji\n"
-"\t \n"
+"\n"
 " Proszę podać bazowy URL dystrybucji Debiana.\n"
 " Obsługiwane schematy połączeń to: http ftp file\n"
-"\t   \n"
+"\n"
 " Przykłady:\n"
 "      file:/mnt/debian,\n"
 "      ftp://ftp.debian.org/debian,\n"
 "      http://ftp.pl.debian.org/debian,\n"
-"      \n"
-"      \n"
-" URL [http://llug.sep.bnl.gov/debian]:"
+"\n"
+"\n"
+" URL [http://llug.sep.bnl.gov/debian]:\n"
 
-#. type: <p></p>
-#: guide.sgml:205
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:232
 msgid ""
-"The <em>Sources</em> setup starts by asking for the base of the Debian "
-"archive, defaulting to a HTTP mirror. Next it asks for the distribution to "
-"get."
+"The <emphasis>Sources</emphasis> setup starts by asking for the base of the "
+"Debian archive, defaulting to a HTTP mirror. Next it asks for the "
+"distribution to get."
 msgstr ""
 "Ustawianie źródeł zaczyna się od pytania o bazową lokalizację Debiana. "
 "Domyślną wartością jest mirror HTTP. Następnie użytkownik jest pytany o "
 "dystrybucję do pobrania."
 
-#. type: <example></example>
-#: guide.sgml:212
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:237
 #, no-wrap
 msgid ""
 " Please give the distribution tag to get or a path to the\n"
 " package file ending in a /. The distribution\n"
 " tags are typically something like: stable unstable testing non-US\n"
-"   \n"
-" Distribution [stable]:"
+"\n"
+" Distribution [stable]:\n"
 msgstr ""
 " Proszę podać znacznik dystrybucji do pobrania lub ścieżkę do pliku\n"
 " pakietów kończącą się znakiem \"/\". Zazwyczaj znacznikiem dystrybucji\n"
 " jest coś w rodzaju: stable unstable testing non-US\n"
-"   \n"
-" Dystrybucja [stable]:"
-
-#. type: <p></p>
-#: guide.sgml:222
-msgid ""
-"The distribution refers to the Debian version in the archive, <em>stable</"
-"em> refers to the latest released version and <em>unstable</em> refers to "
-"the developmental version. <em>non-US</em> is only available on some mirrors "
-"and refers to packages that contain encryption technology or other things "
-"that cannot be exported from the United States. Importing these packages "
-"into the US is legal however."
-msgstr ""
-"Dystrybucja odnosi się do wersji Debiana: <em>stable</em>(stabilna) to "
-"najnowsza wydana wersja, a <em>unstable</em> (niestabilna) to wersja "
-"rozwojowa. <em>non-US</em> jest dostępna tylko na wybranych serwerach "
-"lustrzanych i zawiera pakiety, które wykorzystują technologie szyfrowania "
-"danych lub inne rzeczy, które nie mogą być eksportowane z serwerów "
-"umieszczonych w Stanach Zjednoczonych. Importowanie tych pakietów do Stanów "
-"Zjednoczonych jest jednakże legalne."
-
-#. type: <example></example>
-#: guide.sgml:228
+"\n"
+" Dystrybucja [stable]:\n"
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:244
+msgid ""
+"The distribution refers to the Debian version in the archive, "
+"<emphasis>stable</emphasis> refers to the latest released version and "
+"<emphasis>unstable</emphasis> refers to the developmental version. "
+"<emphasis>non-US</emphasis> is only available on some mirrors and refers to "
+"packages that contain encryption technology or other things that cannot be "
+"exported from the United States. Importing these packages into the US is "
+"legal however."
+msgstr ""
+"Dystrybucja odnosi się do wersji Debiana: <emphasis>stable</"
+"emphasis>(stabilna) to najnowsza wydana wersja, a <emphasis>unstable</"
+"emphasis> (niestabilna) to wersja rozwojowa. <emphasis>non-US</emphasis> "
+"jest dostępna tylko na wybranych serwerach lustrzanych i zawiera pakiety, "
+"które wykorzystują technologie szyfrowania danych lub inne rzeczy, które nie "
+"mogą być eksportowane z serwerów umieszczonych w Stanach Zjednoczonych. "
+"Importowanie tych pakietów do Stanów Zjednoczonych jest jednakże legalne."
+
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:253
 #, no-wrap
 msgid ""
 " Please give the components to get\n"
 " The components are typically something like: main contrib non-free\n"
-"  \n"
-" Components [main contrib non-free]:"
+"\n"
+" Components [main contrib non-free]:\n"
 msgstr ""
 " Proszę podać komponenty do pobrania\n"
 " Zazwyczaj komponentem jest coś w rodzaju: main contrib non-free\n"
-"  \n"
-" Komponenty [main contrib non-free]:"
+"\n"
+" Komponenty [main contrib non-free]:\n"
 
-#. type: <p></p>
-#: guide.sgml:236
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:259
 msgid ""
 "The components list refers to the list of sub distributions to fetch. The "
 "distribution is split up based on software licenses, main being DFSG free "
@@ -8258,8 +8284,8 @@ msgstr ""
 "\"),contrib i non-free zawierają pakiety, które zawierają restrykcje "
 "związane z ich używaniem lub rozpowszechnianiem."
 
-#. type: <p></p>
-#: guide.sgml:240
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:265
 msgid ""
 "Any number of sources can be added, the setup script will continue to prompt "
 "until you have specified all that you want."
@@ -8268,24 +8294,24 @@ msgstr ""
 "odpytywanie użytkownika dopóty, dopóki nie poda wszystkich źródeł, które "
 "chciał skonfigurować."
 
-#. type: <p></p>
-#: guide.sgml:247
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:269
 msgid ""
-"Before starting to use <prgn>dselect</prgn> it is necessary to update the "
-"available list by selecting [U]pdate from the menu. This is a superset of "
-"<tt>apt-get update</tt> that makes the fetched information available to "
-"<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get update</"
-"tt> has been run before."
+"Before starting to use <command>dselect</command> it is necessary to update "
+"the available list by selecting [U]pdate from the menu. This is a superset "
+"of <literal>apt-get update</literal> that makes the fetched information "
+"available to <command>dselect</command>. [U]pdate must be performed even if "
+"<literal>apt-get update</literal> has been run before."
 msgstr ""
-"Przed rozpoczęciem używania programu <prgn>dselect</prgn> należy w menu tego "
-"programu wybrać \"[U] Aktualizacja\", abyzaktualizować listę dostępnych "
-"pakietów. To polecenie jest nadzbiorem polecenia <tt>apt-get update</tt>, "
-"zapewniającym programowi <prgn>dselect</prgn> dostęp do pobranych informacji "
-"o pakietach. \"[U] Aktualizacja\" musi być wykonana, nawet jeśli wcześniej "
-"uruchomiono <tt>apt-get update</tt>."
+"Przed rozpoczęciem używania programu <command>dselect</command> należy w "
+"menu tego programu wybrać \"[U] Aktualizacja\", abyzaktualizować listę "
+"dostępnych pakietów. To polecenie jest nadzbiorem polecenia <literal>apt-get "
+"update</literal>, zapewniającym programowi <command>dselect</command> dostęp "
+"do pobranych informacji o pakietach. \"[U] Aktualizacja\" musi być wykonana, "
+"nawet jeśli wcześniej uruchomiono <literal>apt-get update</literal>."
 
-#. type: <p></p>
-#: guide.sgml:253
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:276
 msgid ""
 "You can then go on and make your selections using [S]elect and then perform "
 "the installation using [I]nstall. When using the APT method the [C]onfig and "
@@ -8298,76 +8324,83 @@ msgstr ""
 "bezużytecznymi, gdyż \"[I] Instalacja\" przeprowadza również te dwie "
 "operacje."
 
-#. type: <p></p>
-#: guide.sgml:258
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:282
 msgid ""
 "By default APT will automatically remove the package (.deb) files once they "
-"have been successfully installed. To change this behavior place <tt>Dselect::"
-"clean \"prompt\";</tt> in /etc/apt/apt.conf."
+"have been successfully installed. To change this behavior place "
+"<literal>Dselect::clean \"prompt\";</literal> in /etc/apt/apt.conf."
 msgstr ""
 "Domyślnie APT automatycznie usunie pliki pakietów (.deb), gdy tylko zostaną "
-"zainstalowane. Aby zmienić to zachowanie, proszę umieścić  <tt>Dselect::"
-"clean \"prompt\";</tt> w /etc/apt/apt.conf."
+"zainstalowane. Aby zmienić to zachowanie, proszę umieścić  <literal>Dselect::"
+"clean \"prompt\";</literal> w /etc/apt/apt.conf."
 
-#. type: <heading></heading>
-#: guide.sgml:264
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:288
 msgid "The Interface"
 msgstr "Interfejs"
 
-#. type: <p></p>
-#: guide.sgml:278
+#. type: Content of: <book><chapter><para><footnote><para>
+#: guide.dbk:292
+msgid ""
+"The <command>dselect</command> method actually is a set of wrapper scripts "
+"to <command>apt-get</command>. The method actually provides more "
+"functionality than is present in <command>apt-get</command> alone."
+msgstr ""
+"Metoda programu <command>dselect</command> jest tak naprawdę zbiorem "
+"skryptów wywołujących <command>apt-get</command>. Metoda ta ma jednakże "
+"większą funkcjonalność niż sam program <command>apt-get</command>."
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:290
 msgid ""
-"Both that APT <prgn>dselect</prgn> method and <prgn>apt-get</prgn> share the "
-"same interface. It is a simple system that generally tells you what it will "
-"do and then goes and does it. <footnote><p>The <prgn>dselect</prgn> method "
-"actually is a set of wrapper scripts to <prgn>apt-get</prgn>. The method "
-"actually provides more functionality than is present in <prgn>apt-get</prgn> "
-"alone.</p></footnote> After printing out a summary of what will happen APT "
+"Both that APT <command>dselect</command> method and <command>apt-get</"
+"command> share the same interface. It is a simple system that generally "
+"tells you what it will do and then goes and does it. <placeholder type="
+"\"footnote\" id=\"0\"/> After printing out a summary of what will happen APT "
 "then will print out some informative status messages so that you can "
 "estimate how far along it is and how much is left to do."
 msgstr ""
-"Metoda APT programu <prgn>dselect</prgn> i program <prgn>apt-get</prgn> "
-"dzielą wspólny interfejs. Jest to prosty system, który najpierw informuje "
-"użytkownika, co będzie zrobione, a następnie to robi<footnote><p>Metoda "
-"programu <prgn>dselect</prgn> jest tak naprawdę zbiorem skryptów "
-"wywołujących <prgn>apt-get</prgn>. Metoda ta ma jednakże większą "
-"funkcjonalność niż sam program <prgn>apt-get</prgn>.</p></footnote>. Po "
-"wyświetleniu podsumowania informującego o tym, co będzie zrobione, APT "
-"wyświetla komunikaty dotyczące postępu przeprowadzanych operacji, tak żeby "
-"można było oszacować czas pozostały do ich zakończenia."
-
-#. type: <heading></heading>
-#: guide.sgml:280
+"Metoda APT programu <command>dselect</command> i program <command>apt-get</"
+"command> dzielą wspólny interfejs. Jest to prosty system, który najpierw "
+"informuje użytkownika, co będzie zrobione, a następnie to robi. <placeholder "
+"type=\"footnote\" id=\"0\"/> Po wyświetleniu podsumowania informującego o "
+"tym, co będzie zrobione, APT wyświetla komunikaty dotyczące postępu "
+"przeprowadzanych operacji, tak żeby można było oszacować czas pozostały do "
+"ich zakończenia."
+
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:301
 msgid "Startup"
 msgstr "Uruchamianie"
 
-#. type: <p></p>
-#: guide.sgml:284
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:303
 msgid ""
 "Before all operations except update, APT performs a number of actions to "
 "prepare its internal state. It also does some checks of the system's state. "
-"At any time these operations can be performed by running <tt>apt-get check</"
-"tt>."
+"At any time these operations can be performed by running <literal>apt-get "
+"check</literal>."
 msgstr ""
 "Przed każdą operacją, z wyjątkiem update, APT przeprowadza pewne akcje "
 "przygotowujące wewnętrzny stan. Sprawdza również stan systemu. Te same "
-"operacje można przeprowadzić w dowolnej chwili, uruchamiając <tt>apt-get "
-"check</tt>."
+"operacje można przeprowadzić w dowolnej chwili, uruchamiając <literal>apt-"
+"get check</literal>."
 
-#. type: <example></example>
-#: guide.sgml:289
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:309
 #, no-wrap
 msgid ""
 "# apt-get check\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 msgstr ""
 "# apt-get check\n"
 "Czytanie list pakietów... Gotowe\n"
-"Budowanie drzewa zależności... Gotowe"
+"Budowanie drzewa zależności... Gotowe\n"
 
-#. type: <p></p>
-#: guide.sgml:297
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:314
 msgid ""
 "The first thing it does is read all the package files into memory. APT uses "
 "a caching scheme so this operation will be faster the second time it is run. "
@@ -8379,21 +8412,21 @@ msgstr ""
 "następnym uruchomieniu. Jeśli nie znajdzie niektórych plików pakietów, to "
 "wypisze ostrzeżenie, a te pakiety zignoruje."
 
-#. type: <p></p>
-#: guide.sgml:303
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:320
 msgid ""
 "The final operation performs a detailed analysis of the system's "
 "dependencies. It checks every dependency of every installed or unpacked "
 "package and considers if it is OK. Should this find a problem then a report "
-"will be printed out and <prgn>apt-get</prgn> will refuse to run."
+"will be printed out and <command>apt-get</command> will refuse to run."
 msgstr ""
 "Końcową operacją jest szczegółowa analiza zależności w systemie. Sprawdzana "
 "jest każda zależność każdego pakietu zainstalowanego lub rozpakowanego. W "
-"razie wykrycia problemów z zależnościami <prgn>apt-get</prgn> wypisze "
+"razie wykrycia problemów z zależnościami <command>apt-get</command> wypisze "
 "odpowiedni komunikat i odmówi dalszego działania."
 
-#. type: <example></example>
-#: guide.sgml:320
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:326
 #, no-wrap
 msgid ""
 "# apt-get check\n"
@@ -8403,14 +8436,14 @@ msgid ""
 "Sorry, but the following packages have unmet dependencies:\n"
 "  9fonts: Depends: xlib6g but it is not installed\n"
 "  uucp: Depends: mailx but it is not installed\n"
-"  blast: Depends: xlib6g (>= 3.3-5) but it is not installed\n"
+"  blast: Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
 "  adduser: Depends: perl-base but it is not installed\n"
 "  aumix: Depends: libgpmg1 but it is not installed\n"
 "  debiandoc-sgml: Depends: sgml-base but it is not installed\n"
-"  bash-builtins: Depends: bash (>= 2.01) but 2.0-3 is installed\n"
+"  bash-builtins: Depends: bash (&gt;= 2.01) but 2.0-3 is installed\n"
 "  cthugha: Depends: svgalibg1 but it is not installed\n"
-"           Depends: xlib6g (>= 3.3-5) but it is not installed\n"
-"  libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)"
+"           Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
+"  libreadlineg2: Conflicts:libreadline2 (&lt;&lt; 2.1-2.1)\n"
 msgstr ""
 "# apt-get check\n"
 "Czytanie list pakietów... Gotowe\n"
@@ -8419,17 +8452,17 @@ msgstr ""
 "Następujące pakiety mają niespełnione zależności:\n"
 "  9fonts: Wymaga: xlib6g ale nie jest zainstalowany\n"
 "  uucp: Wymaga: mailx ale nie jest zainstalowany\n"
-"  blast: Wymaga: xlib6g (>= 3.3-5) ale nie jest zainstalowany\n"
+"  blast: Wymaga: xlib6g (&gt;= 3.3-5) ale nie jest zainstalowany\n"
 "  adduser: Wymaga: perl-base ale nie jest zainstalowany\n"
 "  aumix: Wymaga: libgpmg1 but ale nie jest zainstalowany\n"
 "  debiandoc-sgml: Wymaga: sgml-base ale nie jest zainstalowany\n"
-"  bash-builtins: Wymaga: bash (>= 2.01) but 2.0-3 is installed\n"
+"  bash-builtins: Wymaga: bash (&gt;= 2.01) but 2.0-3 is installed\n"
 "  cthugha: Wymaga: svgalibg1 but it is not installed\n"
-"           Wymaga: xlib6g (>= 3.3-5) ale nie jest zainstalowany\n"
-"  libreadlineg2: Jest w konflikcie z: libreadline2 (<< 2.1-2.1)"
+"           Wymaga: xlib6g (&gt;= 3.3-5) ale nie jest zainstalowany\n"
+"  libreadlineg2: Jest w konflikcie z: libreadline2 (&lt;&lt; 2.1-2.1)\n"
 
-#. type: <p></p>
-#: guide.sgml:329
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:343
 msgid ""
 "In this example the system has many problems, including a serious problem "
 "with libreadlineg2. For each package that has unmet dependencies a line is "
@@ -8442,87 +8475,98 @@ msgstr ""
 "jest wypisywany w osobnej linii razem z niespełnionymi zależnościami. Podane "
 "jest również krótkie wyjaśnienie dotyczące przyczyny problemu."
 
-#. type: <p></p>
-#: guide.sgml:337
+#. type: Content of: <book><chapter><section><para><footnote><para>
+#: guide.dbk:352
+msgid ""
+"APT however considers all known dependencies and attempts to prevent broken "
+"packages"
+msgstr ""
+"APT rozważa wszystkie znane zależności i próbuje nie dopuścić do zepsucia "
+"pakietów."
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:350
 msgid ""
 "There are two ways a system can get into a broken state like this. The first "
-"is caused by <prgn>dpkg</prgn> missing some subtle relationships between "
-"packages when performing upgrades. <footnote><p>APT however considers all "
-"known dependencies and attempts to prevent broken packages</p></footnote>. "
-"The second is if a package installation fails during an operation. In this "
-"situation a package may have been unpacked without its dependents being "
-"installed."
+"is caused by <command>dpkg</command> missing some subtle relationships "
+"between packages when performing upgrades. <placeholder type=\"footnote\" id="
+"\"0\"/>. The second is if a package installation fails during an operation. "
+"In this situation a package may have been unpacked without its dependents "
+"being installed."
 msgstr ""
 "Są dwie przyczyny, z których powodu system może być zepsuty w powyższy "
-"sposób. Pierwszą jest to, że <prgn>dpkg</prgn> podczas aktualizacji systemu "
-"nie zauważył jakiejś subtelnej relacji między pakietami<footnote><p>APT "
-"rozważa wszystkie znane zależności i próbuje nie dopuścić do zepsucia "
-"pakietów.</p></footnote>. Drugą przyczyną jest wystąpienie błędu w czasie "
-"instalowania pakietu. W takim przypadku pakiet może być rozpakowany, mimo że "
-"pakiety od niego zależące nie są zainstalowane."
+"sposób. Pierwszą jest to, że <command>dpkg</command> podczas aktualizacji "
+"systemu nie zauważył jakiejś subtelnej relacji między pakietami<placeholder "
+"type=\"footnote\" id=\"0\"/>. Drugą przyczyną jest wystąpienie błędu w "
+"czasie instalowania pakietu. W takim przypadku pakiet może być rozpakowany, "
+"mimo że pakiety od niego zależące nie są zainstalowane."
 
-#. type: <p></p>
-#: guide.sgml:345
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:359
 msgid ""
 "The second situation is much less serious than the first because APT places "
 "certain constraints on the order that packages are installed. In both cases "
-"supplying the <tt>-f</tt> option to <prgn>apt-get</prgn> will cause APT to "
-"deduce a possible solution to the problem and then continue on. The APT "
-"<prgn>dselect</prgn> method always supplies the <tt>-f</tt> option to allow "
-"for easy continuation of failed maintainer scripts."
+"supplying the <literal>-f</literal> option to <command>apt-get</command> "
+"will cause APT to deduce a possible solution to the problem and then "
+"continue on. The APT <command>dselect</command> method always supplies the "
+"<literal>-f</literal> option to allow for easy continuation of failed "
+"maintainer scripts."
 msgstr ""
 "Druga przyczyna jest o wiele mniej poważna niż pierwsza, ponieważ APT "
 "wymusza pewne więzy integralności dotyczące kolejności instalowania "
-"pakietów. W obu przypadkach przekazanie programowi <prgn>apt-get</prgn> "
-"opcji <tt>-f</tt> wymusi na APT znalezienie rozwiązania umożliwiającego mu "
-"kontynuowanie działania. Metoda APT programu <prgn>dselect</prgn> zawsze "
-"przekazuje opcję <tt>-f</tt>, aby móc kontynuować po wystąpieniu błędu w "
-"skryptach opiekunów pakietów."
-
-#. type: <p></p>
-#: guide.sgml:351
-msgid ""
-"However, if the <tt>-f</tt> option is used to correct a seriously broken "
-"system caused by the first case then it is possible that it will either fail "
-"immediately or the installation sequence will fail. In either case it is "
-"necessary to manually use dpkg (possibly with forcing options) to correct "
-"the situation enough to allow APT to proceed."
-msgstr ""
-"Jednak gdy opcja <tt>-f</tt> jest używana do poprawienia zależności w "
-"poważnie uszkodzonym systemie (pierwsza z opisanych wyżej przyczyn), możliwe "
-"jest że albo od razu zwróci błąd, albo nie powiedzie się sekwencja "
-"instalowania pakietów. W obu przypadkach należy poprawić zależności ręcznie, "
-"używając do tego dpkg (być może przekazując mu opcje wymuszające \"--"
-"force-...\"), w takim stopniu, aby umożliwić działanie systemowi APT."
-
-#. type: <heading></heading>
-#: guide.sgml:356
+"pakietów. W obu przypadkach przekazanie programowi <command>apt-get</"
+"command> opcji <literal>-f</literal> wymusi na APT znalezienie rozwiązania "
+"umożliwiającego mu kontynuowanie działania. Metoda APT programu "
+"<command>dselect</command> zawsze przekazuje opcję <literal>-f</literal>, "
+"aby móc kontynuować po wystąpieniu błędu w skryptach opiekunów pakietów."
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:368
+msgid ""
+"However, if the <literal>-f</literal> option is used to correct a seriously "
+"broken system caused by the first case then it is possible that it will "
+"either fail immediately or the installation sequence will fail. In either "
+"case it is necessary to manually use dpkg (possibly with forcing options) to "
+"correct the situation enough to allow APT to proceed."
+msgstr ""
+"Jednak gdy opcja <literal>-f</literal> jest używana do poprawienia "
+"zależności w poważnie uszkodzonym systemie (pierwsza z opisanych wyżej "
+"przyczyn), możliwe jest że albo od razu zwróci błąd, albo nie powiedzie się "
+"sekwencja instalowania pakietów. W obu przypadkach należy poprawić "
+"zależności ręcznie, używając do tego dpkg (być może przekazując mu opcje "
+"wymuszające \"--force-...\"), w takim stopniu, aby umożliwić działanie "
+"systemowi APT."
+
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:376
 msgid "The Status Report"
 msgstr "Raport stanu"
 
-#. type: <p></p>
-#: guide.sgml:363
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:378
 msgid ""
-"Before proceeding <prgn>apt-get</prgn> will present a report on what will "
-"happen. Generally the report reflects the type of operation being performed "
-"but there are several common elements. In all cases the lists reflect the "
-"final state of things, taking into account the <tt>-f</tt> option and any "
-"other relevant activities to the command being executed."
+"Before proceeding <command>apt-get</command> will present a report on what "
+"will happen. Generally the report reflects the type of operation being "
+"performed but there are several common elements. In all cases the lists "
+"reflect the final state of things, taking into account the <literal>-f</"
+"literal> option and any other relevant activities to the command being "
+"executed."
 msgstr ""
-"Przed rozpoczęciem przetwarzania <prgn>apt-get</prgn> wyświetli raport "
+"Przed rozpoczęciem przetwarzania <command>apt-get</command> wyświetli raport "
 "zawierający informacje o tym, co będzie zrobione. W ogólności raport ten "
 "zależy od typu wykonywanej operacji, jednakże występuje w nim kilka "
 "elementów wspólnych dla wszystkich typów. We wszystkich wypadkach "
-"wyświetlane są informacje o końcowym stanie, brana jest pod uwagę opcja <tt>-"
-"f</tt>, a także wszystkie istotne działania wykonywanego polecenia."
+"wyświetlane są informacje o końcowym stanie, brana jest pod uwagę opcja "
+"<literal>-f</literal>, a także wszystkie istotne działania wykonywanego "
+"polecenia."
 
-#. type: <heading></heading>
-#: guide.sgml:364
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:385
 msgid "The Extra Package list"
 msgstr "Lista dodatkowych pakietów"
 
-#. type: <example></example>
-#: guide.sgml:372
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:387
 #, no-wrap
 msgid ""
 "The following extra packages will be installed:\n"
@@ -8530,86 +8574,86 @@ msgid ""
 "  mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
 "  bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
 "  squake pgp-i python-base debmake ldso perl libreadlineg2\n"
-"  ssh"
+"  ssh\n"
 msgstr ""
 "Zostaną zainstalowane następujące dodatkowe pakiety:\n"
 "  libdbd-mysql-perl xlib6 zlib1 xzx libreadline2 libdbd-msql-perl\n"
 "  mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
 "  bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
 "  squake pgp-i python-base debmake ldso perl libreadlineg2\n"
-"  ssh"
+"  ssh\n"
 
-#. type: <p></p>
-#: guide.sgml:379
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:395
 msgid ""
 "The Extra Package list shows all of the packages that will be installed or "
 "upgraded in excess of the ones mentioned on the command line. It is only "
-"generated for an <tt>install</tt> command. The listed packages are often the "
-"result of an Auto Install."
+"generated for an <literal>install</literal> command. The listed packages are "
+"often the result of an Auto Install."
 msgstr ""
 "Lista dodatkowych pakietów wyświetla wszystkie pakiety, które będą "
 "zainstalowane lub zaktualizowane oprócz tych wymienionych w linii poleceń. "
-"Jest generowana tylko dla polecenia <tt>install</tt>. Wymienione pakiety są "
-"najczęściej wynikiem automatycznej instalacji."
+"Jest generowana tylko dla polecenia <literal>install</literal>. Wymienione "
+"pakiety są najczęściej wynikiem automatycznej instalacji."
 
-#. type: <heading></heading>
-#: guide.sgml:382
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:402
 msgid "The Packages to Remove"
 msgstr "Pakiety przeznaczone do usunięcia"
 
-#. type: <example></example>
-#: guide.sgml:389
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:404
 #, no-wrap
 msgid ""
 "The following packages will be REMOVED:\n"
 "  xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
 "  xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
 "  xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
-"  nas xpilot xfig"
+"  nas xpilot xfig\n"
 msgstr ""
 "Następujące pakiety zostaną USUNIĘTE:\n"
 "  xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
 "  xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
 "  xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
-"  nas xpilot xfig"
+"  nas xpilot xfig\n"
 
-#. type: <p></p>
-#: guide.sgml:399
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:411
 msgid ""
 "The Packages to Remove list shows all of the packages that will be removed "
 "from the system. It can be shown for any of the operations and should be "
 "given a careful inspection to ensure nothing important is to be taken off. "
-"The <tt>-f</tt> option is especially good at generating packages to remove "
-"so extreme care should be used in that case. The list may contain packages "
-"that are going to be removed because they are only partially installed, "
-"possibly due to an aborted installation."
+"The <literal>-f</literal> option is especially good at generating packages "
+"to remove so extreme care should be used in that case. The list may contain "
+"packages that are going to be removed because they are only partially "
+"installed, possibly due to an aborted installation."
 msgstr ""
 "Lista pakietów przeznaczonych do usunięcia wyświetla wszystkie pakiety, "
 "które zostaną usunięte z systemu. Może być pokazana dla każdej operacji i "
 "powinna być szczegółowo przeanalizowana, aby zapewnić, że żaden istotny "
-"pakiet nie będzie usunięty. W szczególności opcja <tt>-f</tt> może "
+"pakiet nie będzie usunięty. W szczególności opcja <literal>-f</literal> może "
 "wygenerować sporo pakietów do usunięcia, także w przypadku jej użycia należy "
 "szczególnie dokładnie przeanalizować wyświetlany raport. Lista może zawierać "
 "pakiety usuwane z powodu ich tylko częściowego zainstalowania, wynikającego "
 "być może z przerwania wcześniejszej instalacji."
 
-#. type: <heading></heading>
-#: guide.sgml:402
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:421
 msgid "The New Packages list"
 msgstr "Lista nowych pakietów"
 
-#. type: <example></example>
-#: guide.sgml:406
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:423
 #, no-wrap
 msgid ""
 "The following NEW packages will installed:\n"
-"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
+"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base\n"
 msgstr ""
 "Zostaną zainstalowane następujące NOWE pakiety:\n"
-"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
+"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base\n"
 
-#. type: <p></p>
-#: guide.sgml:411
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:427
 msgid ""
 "The New Packages list is simply a reminder of what will happen. The packages "
 "listed are not presently installed in the system but will be when APT is "
@@ -8619,58 +8663,58 @@ msgstr ""
 "pakiety nie są obecnie zainstalowane w systemie, ale będą, kiedy APT skończy "
 "działanie."
 
-#. type: <heading></heading>
-#: guide.sgml:414
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:432
 msgid "The Kept Back list"
 msgstr "Lista zatrzymanych pakietów"
 
-#. type: <example></example>
-#: guide.sgml:419
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:434
 #, no-wrap
 msgid ""
 "The following packages have been kept back\n"
 "  compface man-db tetex-base msql libpaper svgalib1\n"
-"  gs snmp arena lynx xpat2 groff xscreensaver"
+"  gs snmp arena lynx xpat2 groff xscreensaver\n"
 msgstr ""
 "Następujące pakiety zostały zatrzymane:\n"
 "  compface man-db tetex-base msql libpaper svgalib1\n"
-"  gs snmp arena lynx xpat2 groff xscreensaver"
+"  gs snmp arena lynx xpat2 groff xscreensaver\n"
 
-#. type: <p></p>
-#: guide.sgml:428
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:439
 msgid ""
 "Whenever the whole system is being upgraded there is the possibility that "
 "new versions of packages cannot be installed because they require new things "
 "or conflict with already installed things. In this case the package will "
 "appear in the Kept Back list. The best way to convince packages listed there "
-"to install is with <tt>apt-get install</tt> or by using <prgn>dselect</prgn> "
-"to resolve their problems."
+"to install is with <literal>apt-get install</literal> or by using "
+"<command>dselect</command> to resolve their problems."
 msgstr ""
 "Jeśli aktualizowany jest cały system, to jest możliwe, że nowe wersje "
 "pakietów nie będą mogły być zainstalowane, ponieważ wymagają nowych pakietów "
 "lub są w konflikcie z już zainstalowanymi pakietami. W takim wypadku pakiet "
 "pojawi się na liście pakietów zatrzymanych. Najlepszym sposobem na "
-"zainstalowanie takich pakietów jest użycie <tt>apt-get install</tt> lub "
-"rozwiązanie problemów z zależnościami za pomocą programu <prgn>dselect</"
-"prgn>."
+"zainstalowanie takich pakietów jest użycie <literal>apt-get install</"
+"literal> lub rozwiązanie problemów z zależnościami za pomocą programu "
+"<command>dselect</command>."
 
-#. type: <heading></heading>
-#: guide.sgml:431
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:448
 msgid "Held Packages warning"
 msgstr "Ostrzeżenie o zmianie zatrzymanych pakietów"
 
-#. type: <example></example>
-#: guide.sgml:435
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:450
 #, no-wrap
 msgid ""
 "The following held packages will be changed:\n"
-"  cvs"
+"  cvs\n"
 msgstr ""
 "Zostaną zmienione następujące zatrzymane pakiety:\n"
-"  cvs"
+"  cvs\n"
 
-#. type: <p></p>
-#: guide.sgml:441
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:454
 msgid ""
 "Sometimes you can ask APT to install a package that is on hold, in such a "
 "case it prints out a warning that the held package is going to be changed. "
@@ -8680,32 +8724,32 @@ msgstr ""
 "W takim przypadku wypisywane jest ostrzeżenie o zmianie zatrzymanego "
 "pakietu. Może się to zdarzyć tylko podczas dist-upgrade lub install."
 
-#. type: <heading></heading>
-#: guide.sgml:444
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:460
 msgid "Final summary"
 msgstr "Podsumowanie"
 
-#. type: <p></p>
-#: guide.sgml:447
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:462
 msgid ""
 "Finally, APT will print out a summary of all the changes that will occur."
 msgstr ""
 "APT zakończy raport podsumowaniem wszystkich zmian, które przeprowadzi."
 
-#. type: <example></example>
-#: guide.sgml:452
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:465
 #, no-wrap
 msgid ""
 "206 packages upgraded, 8 newly installed, 23 to remove and 51 not upgraded.\n"
 "12 packages not fully installed or removed.\n"
-"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used."
+"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used.\n"
 msgstr ""
 "206 aktualizowanych, 8 nowo instalowanych, 25 usuwanych i 51 nieaktualizowanych.\n"
 "12 nie w pełni zainstalowanych lub usuniętych.\n"
-"Konieczne pobranie 65.7M/66.7M archiwów. Po rozpakowaniu zostanie użyte 26.5M."
+"Konieczne pobranie 65.7M/66.7M archiwów. Po rozpakowaniu zostanie użyte 26.5M.\n"
 
-#. type: <p></p>
-#: guide.sgml:470
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:470
 msgid ""
 "The first line of the summary simply is a reduced version of all of the "
 "lists and includes the number of upgrades - that is packages already "
@@ -8734,8 +8778,8 @@ msgstr ""
 "będzie zajęta w /usr po zakończeniu instalacji. Wartość ta może wskazywać na "
 "zwolnienie miejsca na dysku, jeśli usuwana jest duża liczba pakietów."
 
-#. type: <p></p>
-#: guide.sgml:473
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:484
 msgid ""
 "Some other reports can be generated by using the -u option to show packages "
 "to upgrade, they are similar to the previous examples."
@@ -8743,13 +8787,13 @@ msgstr ""
 "Używając opcji -u, można wygenerować raport pokazujący pakiety przeznaczone "
 "do aktualizacji, podobny do tego pokazanego w poprzednim przykładzie."
 
-#. type: <heading></heading>
-#: guide.sgml:477
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:491
 msgid "The Status Display"
 msgstr "Wyświetlanie stanu przetwarzania"
 
-#. type: <p></p>
-#: guide.sgml:481
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:493
 msgid ""
 "During the download of archives and package files APT prints out a series of "
 "status messages."
@@ -8757,8 +8801,8 @@ msgstr ""
 "Podczas pobierania archiwów i plików pakietów APT wyświetla serię "
 "komunikatów o stanie."
 
-#. type: <example></example>
-#: guide.sgml:490
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:497
 #, no-wrap
 msgid ""
 "# apt-get update\n"
@@ -8767,7 +8811,7 @@ msgid ""
 "Hit http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
 "Get:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
 "Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
-"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s"
+"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s\n"
 msgstr ""
 "# apt-get update\n"
 "Pob:1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages\n"
@@ -8775,127 +8819,126 @@ msgstr ""
 "Traf http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
 "Pob:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
 "Pob:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
-"11% [5 testing/non-free `Oczekiwane na nagłówki' 0/32.1k 0%] 2203b/s 1m52s"
+"11% [5 testing/non-free `Oczekiwane na nagłówki' 0/32.1k 0%] 2203b/s 1m52s\n"
 
-#. type: <p></p>
-#: guide.sgml:500
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:506
 msgid ""
-"The lines starting with <em>Get</em> are printed out when APT begins to "
-"fetch a file while the last line indicates the progress of the download. The "
-"first percent value on the progress line indicates the total percent done of "
-"all files. Unfortunately since the size of the Package files is unknown "
-"<tt>apt-get update</tt> estimates the percent done which causes some "
-"inaccuracies."
+"The lines starting with <emphasis>Get</emphasis> are printed out when APT "
+"begins to fetch a file while the last line indicates the progress of the "
+"download. The first percent value on the progress line indicates the total "
+"percent done of all files. Unfortunately since the size of the Package files "
+"is unknown <literal>apt-get update</literal> estimates the percent done "
+"which causes some inaccuracies."
 msgstr ""
-"Linie zaczynające się od <em>Pob:</em> są wypisywane, kiedy APT zaczyna "
-"pobierać plik, a ostatnia linia oznacza postęp pobierania. Pierwsza wartość "
-"podana w procentach określa całkowity procent pobierania wszystkich plików. "
-"Niestety rozmiar plików Package nie jest znany, tak więc <tt>apt-get update</"
-"tt> estymuje procent wykonanego pobierania, co powoduje pewne nieścisłości."
+"Linie zaczynające się od <emphasis>Pob:</emphasis> są wypisywane, kiedy APT "
+"zaczyna pobierać plik, a ostatnia linia oznacza postęp pobierania. Pierwsza "
+"wartość podana w procentach określa całkowity procent pobierania wszystkich "
+"plików. Niestety rozmiar plików Package nie jest znany, tak więc "
+"<literal>apt-get update</literal> estymuje procent wykonanego pobierania, co "
+"powoduje pewne nieścisłości."
 
-#. type: <p></p>
-#: guide.sgml:509
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:514
 msgid ""
 "The next section of the status line is repeated once for each download "
 "thread and indicates the operation being performed and some useful "
 "information about what is happening. Sometimes this section will simply read "
-"<em>Forking</em> which means the OS is loading the download module. The "
-"first word after the [ is the fetch number as shown on the history lines. "
-"The next word is the short form name of the object being downloaded. For "
-"archives it will contain the name of the package that is being fetched."
+"<emphasis>Forking</emphasis> which means the OS is loading the download "
+"module. The first word after the [ is the fetch number as shown on the "
+"history lines. The next word is the short form name of the object being "
+"downloaded. For archives it will contain the name of the package that is "
+"being fetched."
 msgstr ""
 "Następna sekcja linii statusu powtarza się dla każdego wątku pobierania, "
 "oznacza przeprowadzanie operacji i podaje kilka użytecznych informacji na "
-"temat tego, co się dzieje. Czasem sekcja ta zawiera komunikat <em>Tworzenie "
-"procesu potomnego</em>, co oznacza, że system operacyjny ładuje moduł "
-"pobierania. Pierwszym słowem po znaku \"[\" jest liczba pobrań, dokładnie "
-"taka jaka jest pokazana liczba linii historii pobrań. Następnie w skróconej "
-"formie wyświetlana jest nazwa pobieranego obiektu. W przypadku archiwów "
-"nazwa ta będzie zawierać nazwę pobieranego pakietu."
+"temat tego, co się dzieje. Czasem sekcja ta zawiera komunikat "
+"<emphasis>Tworzenie procesu potomnego</emphasis>, co oznacza, że system "
+"operacyjny ładuje moduł pobierania. Pierwszym słowem po znaku \"[\" jest "
+"liczba pobrań, dokładnie taka jaka jest pokazana liczba linii historii "
+"pobrań. Następnie w skróconej formie wyświetlana jest nazwa pobieranego "
+"obiektu. W przypadku archiwów nazwa ta będzie zawierać nazwę pobieranego "
+"pakietu."
 
-#. type: <p></p>
-#: guide.sgml:524
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:524
 msgid ""
 "Inside of the single quote is an informative string indicating the progress "
 "of the negotiation phase of the download. Typically it progresses from "
-"<em>Connecting</em> to <em>Waiting for file</em> to <em>Downloading</em> or "
-"<em>Resuming</em>. The final value is the number of bytes downloaded from "
-"the remote site. Once the download begins this is represented as "
-"<tt>102/10.2k</tt> indicating that 102 bytes have been fetched and 10.2 "
-"kilobytes is expected. The total size is always shown in 4 figure notation "
-"to preserve space. After the size display is a percent meter for the file "
-"itself. The second last element is the instantaneous average speed. This "
-"values is updated every 5 seconds and reflects the rate of data transfer for "
-"that period. Finally is shown the estimated transfer time. This is updated "
-"regularly and reflects the time to complete everything at the shown transfer "
-"rate."
+"<emphasis>Connecting</emphasis> to <emphasis>Waiting for file</emphasis> to "
+"<emphasis>Downloading</emphasis> or <emphasis>Resuming</emphasis>. The final "
+"value is the number of bytes downloaded from the remote site. Once the "
+"download begins this is represented as <literal>102/10.2k</literal> "
+"indicating that 102 bytes have been fetched and 10.2 kilobytes is expected. "
+"The total size is always shown in 4 figure notation to preserve space. After "
+"the size display is a percent meter for the file itself. The second last "
+"element is the instantaneous average speed. This values is updated every 5 "
+"seconds and reflects the rate of data transfer for that period. Finally is "
+"shown the estimated transfer time. This is updated regularly and reflects "
+"the time to complete everything at the shown transfer rate."
 msgstr ""
 "W pojedynczych cudzysłowach podawany jest komunikat wskazujący na postęp "
 "tworzenia połączenia pobierania danych. Zazwyczaj postęp ten jest sekwencją "
-"zdarzeń od <em>Podłączanie</em> przez <em>Oczekiwanie na nagłówki</em> do "
-"<em>Pobieranie</em> lub <em>Wznawianie</em>. Końcową wartością jest liczba "
-"bajtów pobranych ze zdalnego serwera. Kiedy tylko pobieranie się rozpocznie, "
-"wartość ta jest wyświetlana jw formacie typu <tt>102/10.2k</tt>, co oznacza, "
-"że pobrano 102 bajty, a oczekuje się jeszcze pobrania 10.2 kilobajtów. Aby "
-"zaoszczędzić miejsce, całkowity rozmiar jest zawsze wyświetlany jako w "
-"postaci 4-znakowej. Po rozmiarze następuje procentowy wskaźnik postępu "
-"pobierania danego pliku. Przedostatnim elementem jest bieżąca średnia "
-"prędkość pobierania, która jest aktualizowane co każde 5 sekund i "
-"odzwierciedla tempo pobierania w tym okresie. W końcu wyświetlany jest "
-"estymowany czas pobierania, regularnie aktualizowany i odzwierciedlający "
-"czas pozostały do zakończenia pobierania przy założeniu utrzymania się "
-"pokazanego tempa pobierania."
-
-#. type: <p></p>
-#: guide.sgml:530
+"zdarzeń od <emphasis>Podłączanie</emphasis> przez <emphasis>Oczekiwanie na "
+"nagłówki</emphasis> do <emphasis>Pobieranie</emphasis> lub "
+"<emphasis>Wznawianie</emphasis>. Końcową wartością jest liczba bajtów "
+"pobranych ze zdalnego serwera. Kiedy tylko pobieranie się rozpocznie, "
+"wartość ta jest wyświetlana jw formacie typu <literal>102/10.2k</literal>, "
+"co oznacza, że pobrano 102 bajty, a oczekuje się jeszcze pobrania 10.2 "
+"kilobajtów. Aby zaoszczędzić miejsce, całkowity rozmiar jest zawsze "
+"wyświetlany jako w postaci 4-znakowej. Po rozmiarze następuje procentowy "
+"wskaźnik postępu pobierania danego pliku. Przedostatnim elementem jest "
+"bieżąca średnia prędkość pobierania, która jest aktualizowane co każde 5 "
+"sekund i odzwierciedla tempo pobierania w tym okresie. W końcu wyświetlany "
+"jest estymowany czas pobierania, regularnie aktualizowany i "
+"odzwierciedlający czas pozostały do zakończenia pobierania przy założeniu "
+"utrzymania się pokazanego tempa pobierania."
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:539
 msgid ""
 "The status display updates every half second to provide a constant feedback "
 "on the download progress while the Get lines scroll back whenever a new file "
 "is started. Since the status display is constantly updated it is unsuitable "
-"for logging to a file, use the <tt>-q</tt> option to remove the status "
-"display."
+"for logging to a file, use the <literal>-q</literal> option to remove the "
+"status display."
 msgstr ""
 "Linia stanu jest aktualizowana co każde pół sekundy, aby na bieżąco "
 "informować użytkownika o postępie pobierania, podczas gdy linie \"Pob:\" są "
 "przesuwane w dół, gdy tylko zacznie się pobieranie nowego pliku. Ponieważ "
 "linia stanu jest ciągle zmieniana, wyjście programu nie jest odpowiednie do "
-"przekierowania do pliku. Aby usunąć linie stanu, należy użyć opcji <tt>-q</"
-"tt>."
+"przekierowania do pliku. Aby usunąć linie stanu, należy użyć opcji <literal>-"
+"q</literal>."
 
-#. type: <heading></heading>
-#: guide.sgml:535
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:547
 msgid "Dpkg"
 msgstr "Dpkg"
 
-#. type: <p></p>
-#: guide.sgml:542
-msgid ""
-"APT uses <prgn>dpkg</prgn> for installing the archives and will switch over "
-"to the <prgn>dpkg</prgn> interface once downloading is completed. "
-"<prgn>dpkg</prgn> will also ask a number of questions as it processes the "
-"packages and the packages themselves may also ask several questions. Before "
-"each question there is usually a description of what it is asking and the "
-"questions are too varied to discuss completely here."
-msgstr ""
-"APT używa programu <prgn>dpkg</prgn> do instalowania archiwów i przełączy "
-"się do interfejsu <prgn>dpkg</prgn>, gdy tylko zakończy pobieranie plików. "
-"<prgn>dpkg</prgn> może również zadawać pytania podczas przetwarzania "
-"pakietów, a same pakiety także mogą zadawać pytania. Każde pytanie zazwyczaj "
-"jest poprzedzone opisem, a same pytania są zbyt zróżnicowane, by je tutaj "
-"opisać."
-
-#. type: <title></title>
-#: offline.sgml:4
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:549
+msgid ""
+"APT uses <command>dpkg</command> for installing the archives and will switch "
+"over to the <command>dpkg</command> interface once downloading is completed. "
+"<command>dpkg</command> will also ask a number of questions as it processes "
+"the packages and the packages themselves may also ask several questions. "
+"Before each question there is usually a description of what it is asking and "
+"the questions are too varied to discuss completely here."
+msgstr ""
+"APT używa programu <command>dpkg</command> do instalowania archiwów i "
+"przełączy się do interfejsu <command>dpkg</command>, gdy tylko zakończy "
+"pobieranie plików. <command>dpkg</command> może również zadawać pytania "
+"podczas przetwarzania pakietów, a same pakiety także mogą zadawać pytania. "
+"Każde pytanie zazwyczaj jest poprzedzone opisem, a same pytania są zbyt "
+"zróżnicowane, by je tutaj opisać."
+
+#. type: Content of: <book><title>
+#: offline.dbk:10
 msgid "Using APT Offline"
 msgstr "Używanie APT w trybie offline"
 
-#. type: <version></version>
-#: offline.sgml:7
-msgid "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
-msgstr "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
-
-#. type: <abstract></abstract>
-#: offline.sgml:12
+#. type: Content of: <book><bookinfo><abstract><para>
+#: offline.dbk:24
 msgid ""
 "This document describes how to use APT in a non-networked environment, "
 "specifically a 'sneaker-net' approach for performing upgrades."
@@ -8904,23 +8947,24 @@ msgstr ""
 "dostępu, do sieci, a w szczególności metodę pozwalającą na przeprowadzanie "
 "aktualizacji systemu."
 
-#. type: <copyrightsummary></copyrightsummary>
-#: offline.sgml:16
-msgid "Copyright &copy; Jason Gunthorpe, 1999."
-msgstr "Copyright &copy; Jason Gunthorpe, 1999."
+#. type: Content of: <book><bookinfo>
+#: offline.dbk:29
+msgid ""
+"<copyright><year>1999</year><holder>Jason Gunthorpe</holder></copyright>"
+msgstr ""
 
-#. type: <heading></heading>
-#: offline.sgml:32
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:47
 msgid "Introduction"
 msgstr "Wstęp"
 
-#. type: <heading></heading>
-#: offline.sgml:34 offline.sgml:65 offline.sgml:180
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:49 offline.dbk:79 offline.dbk:191
 msgid "Overview"
 msgstr "Wprowadzenie"
 
-#. type: <p></p>
-#: offline.sgml:40
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:51
 msgid ""
 "Normally APT requires direct access to a Debian archive, either from a local "
 "media or through a network. Another common complaint is that a Debian "
@@ -8932,8 +8976,8 @@ msgstr ""
 "że nasz komputer, który pracuje na powolnym łączu takim jak modem, jest "
 "znacznie oddalony od innego komputera z szybkim łączem."
 
-#. type: <p></p>
-#: offline.sgml:51
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:57
 msgid ""
 "The solution to this is to use large removable media such as a Zip disc or a "
 "SuperDisk disc. These discs are not large enough to store the entire Debian "
@@ -8941,9 +8985,9 @@ msgid ""
 "to use APT to generate a list of packages that are required and then fetch "
 "them onto the disc using another machine with good connectivity. It is even "
 "possible to use another Debian machine with APT or to use a completely "
-"different OS and a download tool like wget. Let <em>remote host</em> mean "
-"the machine downloading the packages, and <em>target host</em> the one with "
-"bad or no connection."
+"different OS and a download tool like wget. Let <emphasis>remote host</"
+"emphasis> mean the machine downloading the packages, and <emphasis>target "
+"host</emphasis> the one with bad or no connection."
 msgstr ""
 "Rozwiązaniem tego problemu jest użycie pojemnych przenośnych nośników takich "
 "jak dyskietka Zip lub dysk SuperDisk. Nośniki te nie są wystarczająco "
@@ -8956,8 +9000,8 @@ msgstr ""
 "innym systemem operacyjnym i programem narzędziowym do pobierania plików "
 "takim jak wget."
 
-#. type: <p></p>
-#: offline.sgml:57
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:68
 msgid ""
 "This is achieved by creatively manipulating the APT configuration file. The "
 "essential premise to tell APT to look on a disc for it's archive files. Note "
@@ -8970,13 +9014,13 @@ msgstr ""
 "sformatowany do obsługi systemu plików pozwalającego posługiwać się długimi "
 "nazwami plików (np. ext2, fat32 albo vfat)."
 
-#. type: <heading></heading>
-#: offline.sgml:63
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:77
 msgid "Using APT on both machines"
 msgstr "Używanie programu APT na obu komputerach"
 
-#. type: <p><example>
-#: offline.sgml:71
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:81
 msgid ""
 "APT being available on both machines gives the simplest configuration. The "
 "basic idea is to place a copy of the status file on the disc and use the "
@@ -8989,8 +9033,8 @@ msgstr ""
 "które pakiety trzeba pobrać. Struktura katalogów na dysku powinna wyglądać "
 "następująco:"
 
-#. type: <example></example>
-#: offline.sgml:80
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:87
 #, no-wrap
 msgid ""
 "  /disc/\n"
@@ -9000,7 +9044,7 @@ msgid ""
 "       partial/\n"
 "    status\n"
 "    sources.list\n"
-"    apt.conf"
+"    apt.conf\n"
 msgstr ""
 "  /disc/\n"
 "    archives/\n"
@@ -9009,40 +9053,42 @@ msgstr ""
 "       partial/\n"
 "    status\n"
 "    sources.list\n"
-"    apt.conf"
+"    apt.conf\n"
 
-#. type: <heading></heading>
-#: offline.sgml:88
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:98
 msgid "The configuration file"
 msgstr "Plik konfiguracyjny"
 
-#. type: <p></p>
-#: offline.sgml:96
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:100
 msgid ""
 "The configuration file should tell APT to store its files on the disc and to "
 "use the configuration files on the disc as well. The sources.list should "
 "contain the proper sites that you wish to use from the remote machine, and "
-"the status file should be a copy of <em>/var/lib/dpkg/status</em> from the "
-"<em>target host</em>. Please note, if you are using a local archive you must "
-"use copy URIs, the syntax is identical to file URIs."
+"the status file should be a copy of <emphasis>/var/lib/dpkg/status</"
+"emphasis> from the <emphasis>target host</emphasis>. Please note, if you are "
+"using a local archive you must use copy URIs, the syntax is identical to "
+"file URIs."
 msgstr ""
 "Plik konfiguracyjny powinien informować program APT, aby przechowywał swoje "
 "pliki na dysku, a także używał plików konfiguracyjnych z dysku. Plik sources."
 "list powinien zawierać prawidłowe odnośniki, których należy użyć na zdalnym "
-"komputerze, a plik status powinien być kopią <em>/var/lib/dpkg/status</em>. "
-"Należy zauważyć, że podczas używania lokalnego archiwum trzeba użyć tych "
-"samych odnośników o identycznej składni."
+"komputerze, a plik status powinien być kopią <emphasis>/var/lib/dpkg/status</"
+"emphasis>. Należy zauważyć, że podczas używania lokalnego archiwum trzeba "
+"użyć tych samych odnośników o identycznej składni."
 
-#. type: <p><example>
-#: offline.sgml:100
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:108
 msgid ""
-"<em>apt.conf</em> must contain the necessary information to make APT use the "
-"disc:"
+"<emphasis>apt.conf</emphasis> must contain the necessary information to make "
+"APT use the disc:"
 msgstr ""
-"<em>apt.conf</em> musi zawierać niezbędne wpisy, by APT korzystał z dysku:"
+"<emphasis>apt.conf</emphasis> musi zawierać niezbędne wpisy, by APT "
+"korzystał z dysku:"
 
-#. type: <example></example>
-#: offline.sgml:124
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:112
 #, no-wrap
 msgid ""
 " APT\n"
@@ -9050,10 +9096,10 @@ msgid ""
 "   /* This is not necessary if the two machines are the same arch, it tells\n"
 "      the remote APT what architecture the target machine is */\n"
 "   Architecture \"i386\";\n"
-"   \n"
+"\n"
 "   Get::Download-Only \"true\";\n"
 " };\n"
-" \n"
+"\n"
 " Dir\n"
 " {\n"
 "   /* Use the disc for state information and redirect the status file from\n"
@@ -9064,20 +9110,20 @@ msgid ""
 "   // Binary caches will be stored locally\n"
 "   Cache::archives \"/disc/archives/\";\n"
 "   Cache \"/tmp/\";\n"
-"   \n"
+"\n"
 "   // Location of the source list.\n"
 "   Etc \"/disc/\";\n"
-" };"
+" };\n"
 msgstr ""
 " APT\n"
 " {\n"
 "   /* Wpis nie jest wymagany, jeśli oba komputery mają tę samą architekturę;\n"
 "    podaje architekturę naszego komputera programowi APT na odległym komputerze */\n"
 "   Architecture \"i386\";\n"
-"   \n"
+"\n"
 "   Get::Download-Only \"true\";\n"
 " };\n"
-" \n"
+"\n"
 " Dir\n"
 " {\n"
 "   /* Używaj katalogu disc na informacje stanu i przekieruj plik status\n"
@@ -9088,68 +9134,71 @@ msgstr ""
 "   // Katalog lokalnie przechowywanych pakietów binarnych\n"
 "   Cache::archives \"/disc/archives/\";\n"
 "   Cache \"/tmp/\";\n"
-"   \n"
+"\n"
 "   // Lokalizacja pliku sources.list.\n"
 "   Etc \"/disc\";\n"
-" };"
+" };\n"
 
-#. type: </example></p>
-#: offline.sgml:129
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:137
 msgid ""
 "More details can be seen by examining the apt.conf man page and the sample "
-"configuration file in <em>/usr/share/doc/apt/examples/apt.conf</em>."
+"configuration file in <emphasis>/usr/share/doc/apt/examples/apt.conf</"
+"emphasis>."
 msgstr ""
 "Więcej szczegółów można zobaczyć w stronie podręcznika apt.conf i w "
-"przykładowym pliku konfiguracyjnym <em>/usr/share/doc/apt/examples/apt.conf</"
-"em>."
+"przykładowym pliku konfiguracyjnym <emphasis>/usr/share/doc/apt/examples/apt."
+"conf</emphasis>."
 
-#. type: <p><example>
-#: offline.sgml:136
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:142
 msgid ""
-"On the target machine the first thing to do is mount the disc and copy <em>/"
-"var/lib/dpkg/status</em> to it. You will also need to create the directories "
-"outlined in the Overview, <em>archives/partial/</em> and <em>lists/partial/</"
-"em>. Then take the disc to the remote machine and configure the sources."
-"list. On the remote machine execute the following:"
+"On the target machine the first thing to do is mount the disc and copy "
+"<emphasis>/var/lib/dpkg/status</emphasis> to it. You will also need to "
+"create the directories outlined in the Overview, <emphasis>archives/partial/"
+"</emphasis> and <emphasis>lists/partial/</emphasis>. Then take the disc to "
+"the remote machine and configure the sources.list. On the remote machine "
+"execute the following:"
 msgstr ""
 "Pierwszą rzeczą, jaką należy zrobić na oddalonym komputerze z Debianem to "
-"zamontować dysk i przekopiować na niego plik <em>/var/lib/dpkg/status</em>. "
-"Trzeba także utworzyć strukturę katalogów przedstawioną we \"Wprowadzeniu\": "
-"<em>archives/partial/</em> i <em>lists/partial/</em>. Następnie należy "
-"przenieść dysk do oddalonego komputera z szybkim łączem i skonfigurować plik "
-"sources.list. Na oddalonym komputerze wykonujemy kolejno:"
-
-#. type: <example></example>
-#: offline.sgml:142
+"zamontować dysk i przekopiować na niego plik <emphasis>/var/lib/dpkg/status</"
+"emphasis>. Trzeba także utworzyć strukturę katalogów przedstawioną we "
+"\"Wprowadzeniu\": <emphasis>archives/partial/</emphasis> i <emphasis>lists/"
+"partial/</emphasis>. Następnie należy przenieść dysk do oddalonego komputera "
+"z szybkim łączem i skonfigurować plik sources.list. Na oddalonym komputerze "
+"wykonujemy kolejno:"
+
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:151
 #, no-wrap
 msgid ""
 " # export APT_CONFIG=\"/disc/apt.conf\"\n"
 " # apt-get update\n"
 " [ APT fetches the package files ]\n"
 " # apt-get dist-upgrade\n"
-" [ APT fetches all the packages needed to upgrade the target machine ]"
+" [ APT fetches all the packages needed to upgrade the target machine ]\n"
 msgstr ""
 " # export APT_CONFIG=\"/disc/apt.conf\"\n"
 " # apt-get update\n"
 " [ APT aktualizuje ustawienia ]\n"
 " # apt-get dist-upgrade\n"
-" [ APT pobiera wszystkie pakiety potrzebne do aktualizacji Twojego systemu ]"
+" [ APT pobiera wszystkie pakiety potrzebne do aktualizacji Twojego systemu ]\n"
 
-#. type: </example></p>
-#: offline.sgml:149
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:158
 msgid ""
 "The dist-upgrade command can be replaced with any other standard APT "
 "commands, particularly dselect-upgrade. You can even use an APT front end "
-"such as <em>dselect</em>. However this presents a problem in communicating "
-"your selections back to the local computer."
+"such as <emphasis>dselect</emphasis>. However this presents a problem in "
+"communicating your selections back to the local computer."
 msgstr ""
 "Polecenie dist-upgrade można zastąpić każdym innym podstawowym poleceniem "
 "APT, w szczególności dselect-upgrade. Można nawet użyć APT jako metody "
-"dostępu dla <em>dselect</em>. Jednak stworzy to problem w przeniesieniu "
-"Twoich operacji wyborów z powrotem na lokalny komputer."
+"dostępu dla <emphasis>dselect</emphasis>. Jednak stworzy to problem w "
+"przeniesieniu Twoich operacji wyborów z powrotem na lokalny komputer."
 
-#. type: <p><example>
-#: offline.sgml:153
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:164
 msgid ""
 "Now the disc contains all of the index files and archives needed to upgrade "
 "the target machine. Take the disc back and run:"
@@ -9158,24 +9207,24 @@ msgstr ""
 "niezbędne do aktualizacji maszyny z Debianem. Bierzemy dysk z powrotem do "
 "siebie i wpisujemy:"
 
-#. type: <example></example>
-#: offline.sgml:159
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:168
 #, no-wrap
 msgid ""
 "  # export APT_CONFIG=\"/disc/apt.conf\"\n"
 "  # apt-get check\n"
 "  [ APT generates a local copy of the cache files ]\n"
 "  # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
-"  [ Or any other APT command ]"
+"  [ Or any other APT command ]\n"
 msgstr ""
 "  # export APT_CONFIG=\"/disc/apt.conf\"\n"
 "  # apt-get check\n"
 "  [ APT tworzy lokalną kopię plików cache ]\n"
 "  # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
-"  [ Może też być inne polecenie programu APT ]"
+"  [ Może też być inne polecenie programu APT ]\n"
 
-#. type: <p></p>
-#: offline.sgml:165
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:175
 msgid ""
 "It is necessary for proper function to re-specify the status file to be the "
 "local one. This is very important!"
@@ -9183,8 +9232,8 @@ msgstr ""
 "Do prawidłowego działania koniecznie należy podać plik status z lokalnej "
 "maszyny. To jest bardzo ważne!"
 
-#. type: <p></p>
-#: offline.sgml:172
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:179
 msgid ""
 "If you are using dselect you can do the very risky operation of copying disc/"
 "status to /var/lib/dpkg/status so that any selections you made on the remote "
@@ -9199,25 +9248,25 @@ msgstr ""
 "to możliwe. NIE podmieniaj pliku status, jeśli dpkg lub APT były uruchamiane "
 "w międzyczasie!"
 
-#. type: <heading></heading>
-#: offline.sgml:178
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:189
 msgid "Using APT and wget"
 msgstr "Używanie programów APT i wget"
 
-#. type: <p></p>
-#: offline.sgml:185
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:193
 msgid ""
-"<em>wget</em> is a popular and portable download tool that can run on nearly "
-"any machine. Unlike the method above this requires that the Debian machine "
-"already has a list of available packages."
+"<emphasis>wget</emphasis> is a popular and portable download tool that can "
+"run on nearly any machine. Unlike the method above this requires that the "
+"Debian machine already has a list of available packages."
 msgstr ""
-"<em>wget</em> jest popularnym i przenośnym programem narzędziowym pobierania "
-"plików, który działa prawie na każdym komputerze. W przeciwieństwie do "
-"metody opisanej powyżej ta wymaga, aby na lokalnym komputerze była aktualna "
-"lista dostępnych pakietów."
+"<emphasis>wget</emphasis> jest popularnym i przenośnym programem "
+"narzędziowym pobierania plików, który działa prawie na każdym komputerze. W "
+"przeciwieństwie do metody opisanej powyżej ta wymaga, aby na lokalnym "
+"komputerze była aktualna lista dostępnych pakietów."
 
-#. type: <p></p>
-#: offline.sgml:190
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:198
 msgid ""
 "The basic idea is to create a disc that has only the archive files "
 "downloaded from the remote site. This is done by using the --print-uris "
@@ -9229,13 +9278,13 @@ msgstr ""
 "następnie przygotujemy skrypt dla programu wget, który pobierze właściwe "
 "pakiety."
 
-#. type: <heading></heading>
-#: offline.sgml:196
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:204
 msgid "Operation"
 msgstr "Kolejne kroki"
 
-#. type: <p><example>
-#: offline.sgml:200
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:206
 msgid ""
 "Unlike the previous technique no special configuration files are required. "
 "We merely use the standard APT commands to generate the file list."
@@ -9244,22 +9293,22 @@ msgstr ""
 "plików konfiguracyjnych. Używamy jedynie podstawowych poleceń APT, by "
 "wygenerować listę plików."
 
-#. type: <example></example>
-#: offline.sgml:205
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:210
 #, no-wrap
 msgid ""
-" # apt-get dist-upgrade \n"
+" # apt-get dist-upgrade\n"
 " [ Press no when prompted, make sure you are happy with the actions ]\n"
-" # apt-get -qq --print-uris dist-upgrade > uris\n"
-" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
+" # apt-get -qq --print-uris dist-upgrade &gt; uris\n"
+" # awk '{print \"wget -O \" $2 \" \" $1}' &lt; uris &gt; /disc/wget-script\n"
 msgstr ""
 " # apt-get dist-upgrade \n"
 " [ Wybierz \"no\" po znaku zachęty, upewnij się, czy to właściwy wybór ]\n"
-" # apt-get -qq --print-uris dist-upgrade > uris\n"
-" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
+" # apt-get -qq --print-uris dist-upgrade &gt; uris\n"
+" # awk '{print \"wget -O \" $2 \" \" $1}' &lt; uris &gt; /disc/wget-script\n"
 
-#. type: </example></p>
-#: offline.sgml:210
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:216
 msgid ""
 "Any command other than dist-upgrade could be used here, including dselect-"
 "upgrade."
@@ -9267,8 +9316,8 @@ msgstr ""
 "Można tu użyć także polecenia innego niż dist-upgrade, na przykład dselect-"
 "upgrade."
 
-#. type: <p></p>
-#: offline.sgml:216
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:220
 msgid ""
 "The /disc/wget-script file will now contain a list of wget commands to "
 "execute in order to fetch the necessary archives. This script should be run "
@@ -9280,25 +9329,25 @@ msgstr ""
 "uruchomić w bieżącym katalogu o punkcie montowania disc, tak aby zapisywał "
 "dane na tym dysku."
 
-#. type: <p><example>
-#: offline.sgml:219
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:226
 msgid "The remote machine would do something like"
 msgstr "Na oddalonym komputerze należy wykonać coś takiego"
 
-#. type: <example></example>
-#: offline.sgml:223
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:229
 #, no-wrap
 msgid ""
 "  # cd /disc\n"
 "  # sh -x ./wget-script\n"
-"  [ wait.. ]"
+"  [ wait.. ]\n"
 msgstr ""
 "  # cd /disc\n"
 "  # sh -x ./wget-script\n"
-"  [ czekaj.. ]"
+"  [ czekaj.. ]\n"
 
-#. type: </example><example>
-#: offline.sgml:228
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:234
 msgid ""
 "Once the archives are downloaded and the disc returned to the Debian machine "
 "installation can proceed using,"
@@ -9306,14 +9355,14 @@ msgstr ""
 "Gdy archiwa zostaną pobrane i dysk wróci do komputera z Debianem, "
 "instalowanie można prowadzić dalej poleceniem:"
 
-#. type: <example></example>
-#: offline.sgml:230
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:238
 #, no-wrap
-msgid "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
-msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
+msgid "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
+msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 
-#. type: </example></p>
-#: offline.sgml:234
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:241
 msgid "Which will use the already fetched archives on the disc."
 msgstr "Które użyje pobranych uprzednio archiwów z dysku."
 
@@ -9329,14 +9378,12 @@ msgstr "Które użyje pobranych uprzednio archiwów z dysku."
 #~ msgid "NAME"
 #~ msgstr "NAZWA"
 
-#
 #~ msgid "apt - Advanced Package Tool"
 #~ msgstr "apt - Zaawansowane narzędzie zarządzania pakietami"
 
 #~ msgid "SYNOPSIS"
 #~ msgstr "SKŁADNIA"
 
-#
 #~ msgid "B<apt>"
 #~ msgstr "B<apt>"
 
@@ -9364,7 +9411,6 @@ msgstr "Które użyje pobranych uprzednio archiwów z dysku."
 #~ msgid "SEE ALSO"
 #~ msgstr "ZOBACZ TAKŻE"
 
-#
 #, fuzzy
 #~| msgid ""
 #~| "B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), "
@@ -9379,7 +9425,6 @@ msgstr "Które użyje pobranych uprzednio archiwów z dysku."
 #~ msgid "DIAGNOSTICS"
 #~ msgstr "DIAGNOSTYKA"
 
-#
 #~ msgid "apt returns zero on normal operation, decimal 100 on error."
 #~ msgstr ""
 #~ "apt zwraca zero, jeżeli zakończyło się pomyślnie, 100 dziesiętnie w "
@@ -9388,11 +9433,9 @@ msgstr "Które użyje pobranych uprzednio archiwów z dysku."
 #~ msgid "BUGS"
 #~ msgstr "BŁĘDY"
 
-#
 #~ msgid "This manpage isn't even started."
 #~ msgstr "Ta strona podręcznika nie jest nawet zaczęta."
 
-#
 #~ msgid ""
 #~ "See E<lt>http://bugs.debian.org/aptE<gt>.  If you wish to report a bug in "
 #~ "B<apt>, please see I</usr/share/doc/debian/bug-reporting.txt> or the "
@@ -9405,7 +9448,6 @@ msgstr "Które użyje pobranych uprzednio archiwów z dysku."
 #~ msgid "AUTHOR"
 #~ msgstr "AUTOR"
 
-#
 #~ msgid "apt was written by the APT team E<lt>apt@packages.debian.orgE<gt>."
 #~ msgstr ""
 #~ "apt zostało napisane przez zespół APT E<lt>apt@packages.debian.orgE<gt>."
@@ -9445,7 +9487,6 @@ msgstr "Które użyje pobranych uprzednio archiwów z dysku."
 #~ "Universal Resource Locator - URL). Pozostała część linii może być "
 #~ "komentarzem, jeśli zaczyna się od znaku \"#\"."
 
-#
 #~ msgid ""
 #~ "<literal>gencaches</literal> performs the same operation as <command>apt-"
 #~ "get check</command>. It builds the source and package caches from the "
@@ -9457,7 +9498,6 @@ msgstr "Które użyje pobranych uprzednio archiwów z dysku."
 #~ "podstawie źródeł wymienionych w &sources-list; oraz pliku <filename>/var/"
 #~ "lib/dpkg/status</filename>."
 
-#
 #~ msgid ""
 #~ "Unless the <option>-h</option>, or <option>--help</option> option is "
 #~ "given one of the commands below must be present.  <placeholder type="
@@ -9467,14 +9507,12 @@ msgstr "Które użyje pobranych uprzednio archiwów z dysku."
 #~ "<option>-h</option> lub <option>--help</option>. <placeholder type="
 #~ "\"variablelist\" id=\"0\"/>"
 
-#
 #~ msgid "APT package handling utility -- cache manipulator"
 #~ msgstr "Narzędzie zarządzania pakietami APT -- manipulator bufora"
 
 #~ msgid "add <replaceable>file(s)</replaceable>"
 #~ msgstr "add <replaceable>plik(i)</replaceable>"
 
-#
 #~ msgid ""
 #~ "<literal>add</literal> adds the named package index files to the package "
 #~ "cache.  This is for debugging only."
diff --git a/doc/po/pt.po b/doc/po/pt.po
index b10890ec..cb082ab8 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -2,20 +2,20 @@
 # Copyright (C) 2009 Free Software Foundation, Inc.
 # This file is distributed under the same license as the apt package.
 #
-# Américo Monteiro <a_monteiro@netcabo.pt>, 2009, 2010, 2012.
+# Américo Monteiro <a_monteiro@gmx.com>, 2009 - 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 0.9.7.1\n"
+"Project-Id-Version: apt 1.0.6\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-04-01 14:24+0200\n"
-"PO-Revision-Date: 2014-04-01 13:59+0200\n"
-"Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
-"Language-Team: Portuguese <l10n@debianpt.org>\n"
+"POT-Creation-Date: 2014-07-10 10:52+0200\n"
+"PO-Revision-Date: 2014-07-27 14:14+0100\n"
+"Last-Translator: Américo Monteiro <a_monteiro@gmx.com>\n"
+"Language-Team: Portuguese <traduz@debianpt.org>\n"
 "Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 1.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
@@ -70,7 +70,8 @@ msgstr ""
 "<!-- Boiler plate Bug reporting section -->\n"
 "<!ENTITY manbugs \"\n"
 " <refsect1><title>Bugs</title>\n"
-"   <para><ulink url='http://bugs.debian.org/src:apt'>página de bugs do APT</ulink>. \n"
+"   <para><ulink url='http://bugs.debian.org/src:apt'>página de bugs do APT<"
+"/ulink>. \n"
 "   Se deseja reportar um bug no APT, por favor veja\n"
 "   <filename>/usr/share/doc/debian/bug-reporting.txt</filename> ou o\n"
 "   comando &reportbug;.\n"
@@ -85,7 +86,8 @@ msgid ""
 "<!-- Boiler plate Author section -->\n"
 "<!ENTITY manauthor \"\n"
 " <refsect1><title>Author</title>\n"
-"   <para>APT was written by the APT team <email>apt@packages.debian.org</email>.\n"
+"   <para>APT was written by the APT team <email>apt@packages.debian.org<"
+"/email>.\n"
 "   </para>\n"
 " </refsect1>\n"
 "\">\n"
@@ -93,7 +95,8 @@ msgstr ""
 "<!-- Boiler plate Author section -->\n"
 "<!ENTITY manauthor \"\n"
 " <refsect1><title>Autor</title>\n"
-"   <para>APT foi escrito pela equipa do APT <email>apt@packages.debian.org</email>.\n"
+"   <para>APT foi escrito pela equipa do APT <email>apt@packages.debian.org<"
+"/email>.\n"
 "   </para>\n"
 " </refsect1>\n"
 "\">\n"
@@ -149,10 +152,12 @@ msgid ""
 "     <varlistentry>\n"
 "      <term><option>-c</option></term>\n"
 "      <term><option>--config-file</option></term>\n"
-"     <listitem><para>Configuration File; Specify a configuration file to use. \n"
+"     <listitem><para>Configuration File; Specify a configuration file to use. "
+"\n"
 "     The program will read the default configuration file and then this \n"
 "     configuration file. If configuration settings need to be set before the\n"
-"     default configuration files are parsed specify a file with the <envar>APT_CONFIG</envar>\n"
+"     default configuration files are parsed specify a file with the <envar>"
+"APT_CONFIG</envar>\n"
 "     environment variable. See &apt-conf; for syntax information.\n"
 "     </para>\n"
 "     </listitem>\n"
@@ -163,8 +168,10 @@ msgstr ""
 "      <term><option>--config-file</option></term>\n"
 "     <listitem><para>Ficheiro de Configuração; Especifica o ficheiro de \n"
 "     configuração a usar. \n"
-"     O programa irá ler o ficheiro de configuração predefinido e depois este \n"
-"     ficheiro de configuração. Se as definições de configuração precisarem de \n"
+"     O programa irá ler o ficheiro de configuração predefinido e depois este "
+"\n"
+"     ficheiro de configuração. Se as definições de configuração precisarem de "
+"\n"
 "     ser definidas antes, os ficheiros de configuração predefinidos são \n"
 "     analisados especificando um ficheiro com a variável de ambiente \n"
 "     <envar>APT_CONFIG</envar>. Veja &apt-conf; para informação de sintaxe.\n"
@@ -191,9 +198,12 @@ msgstr ""
 "     <varlistentry>\n"
 "      <term><option>-o</option></term>\n"
 "      <term><option>--option</option></term>\n"
-"     <listitem><para>Define uma Opção de Configuração; Isto irá definir uma opção\n"
-"      de configuração arbitrária. A sintaxe é <option>-o Foo::Bar=bar</option>.\n"
-"      <option>-o</option> e <option>--option</option> podem ser usadas várias\n"
+"     <listitem><para>Define uma Opção de Configuração; Isto irá definir uma "
+"opção\n"
+"      de configuração arbitrária. A sintaxe é <option>-o Foo::Bar=bar</option>"
+".\n"
+"      <option>-o</option> e <option>--option</option> podem ser usadas "
+"várias\n"
 "      vezes para definir opções diferentes.\n"
 "     </para>\n"
 "     </listitem>\n"
@@ -207,7 +217,8 @@ msgid ""
 "<!-- Should be used within the option section of the text to\n"
 "     put in the blurb about -h, -v, -c and -o -->\n"
 "<!ENTITY apt-cmdblurb \"\n"
-"   <para>All command line options may be set using the configuration file, the\n"
+"   <para>All command line options may be set using the configuration file, "
+"the\n"
 "   descriptions indicate the configuration option to set. For boolean\n"
 "   options you can override the config file by using something like \n"
 "   <option>-f-</option>,<option>--no-f</option>, <option>-f=no</option>\n"
@@ -218,9 +229,11 @@ msgstr ""
 "<!-- Should be used within the option section of the text to\n"
 "     put in the blurb about -h, -v, -c and -o -->\n"
 "<!ENTITY apt-cmdblurb \"\n"
-"   <para>Todas as opções de linha de comandos podem ser definidas usando o ficheiro de configuração, as\n"
+"   <para>Todas as opções de linha de comandos podem ser definidas usando o "
+"ficheiro de configuração, as\n"
 "   descrições indicam a opção de configuração a definir. Para opções\n"
-"   booleanas você pode sobre por o ficheiro de configuração usando algo como \n"
+"   booleanas você pode sobre por o ficheiro de configuração usando algo como "
+"\n"
 "   <option>-f-</option>,<option>--no-f</option>, <option>-f=no</option>\n"
 "   ou várias outras variantes.\n"
 "   </para>\n"
@@ -233,13 +246,15 @@ msgid ""
 "<!ENTITY file-aptconf \"\n"
 "     <varlistentry><term><filename>/etc/apt/apt.conf</filename></term>\n"
 "     <listitem><para>APT configuration file.\n"
-"     Configuration Item: <literal>Dir::Etc::Main</literal>.</para></listitem>\n"
+"     Configuration Item: <literal>Dir::Etc::Main</literal>.</para></listitem>"
+"\n"
 "     </varlistentry>\n"
 msgstr ""
 "<!ENTITY file-aptconf \"\n"
 "     <varlistentry><term><filename>/etc/apt/apt.conf</filename></term>\n"
 "     <listitem><para>Ficheiro de configuração do APT.\n"
-"     Item de Configuração: <literal>Dir::Etc::Main</literal>.</para></listitem>\n"
+"     Item de Configuração: <literal>Dir::Etc::Main</literal>.</para><"
+"/listitem>\n"
 "     </varlistentry>\n"
 
 #. type: Plain text
@@ -248,13 +263,15 @@ msgstr ""
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"
 "     <listitem><para>APT configuration file fragments.\n"
-"     Configuration Item: <literal>Dir::Etc::Parts</literal>.</para></listitem>\n"
+"     Configuration Item: <literal>Dir::Etc::Parts</literal>.</para></listitem>"
+"\n"
 "     </varlistentry>\n"
 "\">\n"
 msgstr ""
 "     <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"
 "     <listitem><para>Ficheiros de configuração fragmentados do APT.\n"
-"     Item de Configuração: <literal>Dir::Etc::Parts</literal>.</para></listitem>\n"
+"     Item de Configuração: <literal>Dir::Etc::Parts</literal>.</para><"
+"/listitem>\n"
 "     </varlistentry>\n"
 "\">\n"
 
@@ -265,28 +282,36 @@ msgid ""
 "<!ENTITY file-cachearchives \"\n"
 "     <varlistentry><term><filename>&cachedir;/archives/</filename></term>\n"
 "     <listitem><para>Storage area for retrieved package files.\n"
-"     Configuration Item: <literal>Dir::Cache::Archives</literal>.</para></listitem>\n"
+"     Configuration Item: <literal>Dir::Cache::Archives</literal>.</para><"
+"/listitem>\n"
 "     </varlistentry>\n"
 msgstr ""
 "<!ENTITY file-cachearchives \"\n"
 "     <varlistentry><term><filename>&cachedir;/archives/</filename></term>\n"
-"     <listitem><para>Área de armazenamento para ficheiros de pacotes obtidos.\n"
-"     Item de Configuração: <literal>Dir::Cache::Archives</literal>.</para></listitem>\n"
+"     <listitem><para>Área de armazenamento para ficheiros de pacotes "
+"obtidos.\n"
+"     Item de Configuração: <literal>Dir::Cache::Archives</literal>.</para><"
+"/listitem>\n"
 "     </varlistentry>\n"
 
 #. type: Plain text
 #: apt.ent:109
 #, no-wrap
 msgid ""
-"     <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
+"     <varlistentry><term><filename>&cachedir;/archives/partial/</filename><"
+"/term>\n"
 "     <listitem><para>Storage area for package files in transit.\n"
-"     Configuration Item: <literal>Dir::Cache::Archives</literal> (<filename>partial</filename> will be implicitly appended)</para></listitem>\n"
+"     Configuration Item: <literal>Dir::Cache::Archives</literal> (<filename>"
+"partial</filename> will be implicitly appended)</para></listitem>\n"
 "     </varlistentry>\n"
 "\">\n"
 msgstr ""
-"     <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
-"     <listitem><para>Área de armazenamento para ficheiros de pacotes em curso.\n"
-"     Item de Configuração: <literal>Dir::Cache::Archives</literal> será implicitamente acrescentado (<filename>partial</filename>)</para></listitem>\n"
+"     <varlistentry><term><filename>&cachedir;/archives/partial/</filename><"
+"/term>\n"
+"     <listitem><para>Área de armazenamento para ficheiros de pacotes em "
+"curso.\n"
+"     Item de Configuração: <literal>Dir::Cache::Archives</literal> será "
+"implicitamente acrescentado (<filename>partial</filename>)</para></listitem>\n"
 "     </varlistentry>\n"
 "\">\n"
 
@@ -301,7 +326,8 @@ msgid ""
 "     i.e. a preference to get certain packages\n"
 "     from a separate source\n"
 "     or from a different version of a distribution.\n"
-"     Configuration Item: <literal>Dir::Etc::Preferences</literal>.</para></listitem>\n"
+"     Configuration Item: <literal>Dir::Etc::Preferences</literal>.</para><"
+"/listitem>\n"
 "     </varlistentry>\n"
 msgstr ""
 "<!ENTITY file-preferences \"\n"
@@ -311,7 +337,8 @@ msgstr ""
 "     isto é, uma preferência para obter certos pacotes\n"
 "     A partir de uma fonte separada\n"
 "     ou a partir duma versão diferente de uma distribuição.\n"
-"     Item de Configuração: <literal>Dir::Etc::Preferences</literal>.</para></listitem>\n"
+"     Item de Configuração: <literal>Dir::Etc::Preferences</literal>.</para><"
+"/listitem>\n"
 "     </varlistentry>\n"
 
 #. type: Plain text
@@ -320,13 +347,15 @@ msgstr ""
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/preferences.d/</filename></term>\n"
 "     <listitem><para>File fragments for the version preferences.\n"
-"     Configuration Item: <literal>Dir::Etc::PreferencesParts</literal>.</para></listitem>\n"
+"     Configuration Item: <literal>Dir::Etc::PreferencesParts</literal>.</para>"
+"</listitem>\n"
 "     </varlistentry>\n"
 "\">\n"
 msgstr ""
 "     <varlistentry><term><filename>/etc/apt/preferences.d/</filename></term>\n"
 "     <listitem><para>Ficheiros fragmentados para as preferências de versão.\n"
-"     Item de Configuração: <literal>Dir::Etc::PreferencesParts</literal>.</para></listitem>\n"
+"     Item de Configuração: <literal>Dir::Etc::PreferencesParts</literal>.<"
+"/para></listitem>\n"
 "     </varlistentry>\n"
 "\">\n"
 
@@ -337,28 +366,35 @@ msgid ""
 "<!ENTITY file-sourceslist \"\n"
 "     <varlistentry><term><filename>/etc/apt/sources.list</filename></term>\n"
 "     <listitem><para>Locations to fetch packages from.\n"
-"     Configuration Item: <literal>Dir::Etc::SourceList</literal>.</para></listitem>\n"
+"     Configuration Item: <literal>Dir::Etc::SourceList</literal>.</para><"
+"/listitem>\n"
 "     </varlistentry>\n"
 msgstr ""
 "<!ENTITY file-sourceslist \"\n"
 "     <varlistentry><term><filename>/etc/apt/sources.list</filename></term>\n"
 "     <listitem><para>Localizações de onde obter pacotes.\n"
-"     Item de Configuração: <literal>Dir::Etc::SourceList</literal>.</para></listitem>\n"
+"     Item de Configuração: <literal>Dir::Etc::SourceList</literal>.</para><"
+"/listitem>\n"
 "     </varlistentry>\n"
 
 #. type: Plain text
 #: apt.ent:137
 #, no-wrap
 msgid ""
-"     <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
+"     <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>"
+"\n"
 "     <listitem><para>File fragments for locations to fetch packages from.\n"
-"     Configuration Item: <literal>Dir::Etc::SourceParts</literal>.</para></listitem>\n"
+"     Configuration Item: <literal>Dir::Etc::SourceParts</literal>.</para><"
+"/listitem>\n"
 "     </varlistentry>\n"
 "\">\n"
 msgstr ""
-"     <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
-"     <listitem><para>Ficheiros fragmentados para localizações de onde obter pacotes.\n"
-"     Item de Configuração: <literal>Dir::Etc::SourceParts</literal>.</para></listitem>\n"
+"     <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>"
+"\n"
+"     <listitem><para>Ficheiros fragmentados para localizações de onde obter "
+"pacotes.\n"
+"     Item de Configuração: <literal>Dir::Etc::SourceParts</literal>.</para><"
+"/listitem>\n"
 "     </varlistentry>\n"
 "\">\n"
 
@@ -368,31 +404,40 @@ msgstr ""
 msgid ""
 "<!ENTITY file-statelists \"\n"
 "     <varlistentry><term><filename>&statedir;/lists/</filename></term>\n"
-"     <listitem><para>Storage area for state information for each package resource specified in\n"
+"     <listitem><para>Storage area for state information for each package "
+"resource specified in\n"
 "     &sources-list;\n"
-"     Configuration Item: <literal>Dir::State::Lists</literal>.</para></listitem>\n"
+"     Configuration Item: <literal>Dir::State::Lists</literal>.</para><"
+"/listitem>\n"
 "     </varlistentry>\n"
 msgstr ""
 "<!ENTITY file-statelists \"\n"
 "     <varlistentry><term><filename>&statedir;/lists/</filename></term>\n"
-"     <listitem><para>Área de armazenamento para informação de estado para cada recurso de pacote especificado em\n"
+"     <listitem><para>Área de armazenamento para informação de estado para "
+"cada recurso de pacote especificado em\n"
 "     &sources-list;\n"
-"     Tem de Configuração: <literal>Dir::State::Lists</literal>.</para></listitem>\n"
+"     Tem de Configuração: <literal>Dir::State::Lists</literal>.</para><"
+"/listitem>\n"
 "     </varlistentry>\n"
 
 #. type: Plain text
 #: apt.ent:150
 #, no-wrap
 msgid ""
-"     <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
+"     <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>"
+"\n"
 "     <listitem><para>Storage area for state information in transit.\n"
-"     Configuration Item: <literal>Dir::State::Lists</literal> (<filename>partial</filename> will be implicitly appended)</para></listitem>\n"
+"     Configuration Item: <literal>Dir::State::Lists</literal> (<filename>"
+"partial</filename> will be implicitly appended)</para></listitem>\n"
 "     </varlistentry>\n"
 "\">\n"
 msgstr ""
-"     <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
-"     <listitem><para>Área de armazenamento para informação de estado em trânsito.\n"
-"     Item de Configuração: <literal>Dir::State::Lists</literal> será implicitamente acrescentado (<filename>partial</filename>)</para></listitem>\n"
+"     <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>"
+"\n"
+"     <listitem><para>Área de armazenamento para informação de estado em "
+"trânsito.\n"
+"     Item de Configuração: <literal>Dir::State::Lists</literal> será "
+"implicitamente acrescentado (<filename>partial</filename>)</para></listitem>\n"
 "     </varlistentry>\n"
 "\">\n"
 
@@ -402,14 +447,18 @@ msgstr ""
 msgid ""
 "<!ENTITY file-trustedgpg \"\n"
 "     <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>\n"
-"     <listitem><para>Keyring of local trusted keys, new keys will be added here.\n"
-"     Configuration Item: <literal>Dir::Etc::Trusted</literal>.</para></listitem>\n"
+"     <listitem><para>Keyring of local trusted keys, new keys will be added "
+"here.\n"
+"     Configuration Item: <literal>Dir::Etc::Trusted</literal>.</para><"
+"/listitem>\n"
 "     </varlistentry>\n"
 msgstr ""
 "<!ENTITY file-trustedgpg \"\n"
 "     <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>\n"
-"     <listitem><para>Chaveiro de chaves de confiança locais, as novas chaves serão adicionadas aqui.\n"
-"     Item de Configuração: <literal>Dir::Etc::Trusted</literal>.</para></listitem>\n"
+"     <listitem><para>Chaveiro de chaves de confiança locais, as novas chaves "
+"serão adicionadas aqui.\n"
+"     Item de Configuração: <literal>Dir::Etc::Trusted</literal>.</para><"
+"/listitem>\n"
 "     </varlistentry>\n"
 
 #. type: Plain text
@@ -417,16 +466,20 @@ msgstr ""
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
-"     <listitem><para>File fragments for the trusted keys, additional keyrings can\n"
+"     <listitem><para>File fragments for the trusted keys, additional keyrings "
+"can\n"
 "     be stored here (by other packages or the administrator).\n"
-"     Configuration Item <literal>Dir::Etc::TrustedParts</literal>.</para></listitem>\n"
+"     Configuration Item <literal>Dir::Etc::TrustedParts</literal>.</para><"
+"/listitem>\n"
 "     </varlistentry>\n"
 "\">\n"
 msgstr ""
 "     <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
-"     <listitem><para>Fragmentos de ficheiro para as chaves de confiança, chaveiros adicionais podem\n"
+"     <listitem><para>Fragmentos de ficheiro para as chaves de confiança, "
+"chaveiros adicionais podem\n"
 "     ser armazenados aqui (por outros pacotes ou pelo administrador).\n"
-"     Item de Configuração <literal>Dir::Etc::TrustedParts</literal>.</para></listitem>\n"
+"     Item de Configuração <literal>Dir::Etc::TrustedParts</literal>.</para><"
+"/listitem>\n"
 "     </varlistentry>\n"
 "\">\n"
 
@@ -435,7 +488,8 @@ msgstr ""
 #, no-wrap
 msgid ""
 "<!ENTITY file-extended_states \"\n"
-"      <varlistentry><term><filename>/var/lib/apt/extended_states</filename></term>\n"
+"      <varlistentry><term><filename>/var/lib/apt/extended_states</filename><"
+"/term>\n"
 "      <listitem><para>Status list of auto-installed packages.\n"
 "      Configuration Item: <literal>Dir::State::extended_states</literal>.\n"
 "      </para></listitem>\n"
@@ -443,7 +497,8 @@ msgid ""
 "\">\n"
 msgstr ""
 "<!ENTITY file-extended_states \"\n"
-"      <varlistentry><term><filename>/var/lib/apt/extended_states</filename></term>\n"
+"      <varlistentry><term><filename>/var/lib/apt/extended_states</filename><"
+"/term>\n"
 "      <listitem><para>Lista de estado de pacotes auto-instalados.\n"
 "      Item de Configuração: <literal>Dir::State::extended_states</literal>.\n"
 "      </para></listitem>\n"
@@ -454,40 +509,55 @@ msgstr ""
 #: apt.ent:175
 #, no-wrap
 msgid ""
-"<!-- TRANSLATOR: This is the section header for the following paragraphs - comparable\n"
-"     to the other headers like NAME and DESCRIPTION and should therefore be uppercase. -->\n"
+"<!-- TRANSLATOR: This is the section header for the following paragraphs - "
+"comparable\n"
+"     to the other headers like NAME and DESCRIPTION and should therefore be "
+"uppercase. -->\n"
 "<!ENTITY translation-title \"TRANSLATION\">\n"
 msgstr ""
-"<!-- TRANSLATOR: This is the section header for the following paragraphs - comparable\n"
-"     to the other headers like NAME and DESCRIPTION and should therefore be uppercase. -->\n"
+"<!-- TRANSLATOR: This is the section header for the following paragraphs - "
+"comparable\n"
+"     to the other headers like NAME and DESCRIPTION and should therefore be "
+"uppercase. -->\n"
 "<!ENTITY translation-title \"TRADUÇÂO\">\n"
 
 #. type: Plain text
 #: apt.ent:184
 #, no-wrap
 msgid ""
-"<!-- TRANSLATOR: This is a placeholder. You should write here who has contributed\n"
-"     to the translation in the past, who is responsible now and maybe further information\n"
+"<!-- TRANSLATOR: This is a placeholder. You should write here who has "
+"contributed\n"
+"     to the translation in the past, who is responsible now and maybe further "
+"information\n"
 "     specially related to your translation. -->\n"
 "<!ENTITY translation-holder \"\n"
-"     The english translation was done by John Doe <email>john@doe.org</email> in 2009,\n"
-"     2010 and Daniela Acme <email>daniela@acme.us</email> in 2010 together with the\n"
-"     Debian Dummy l10n Team <email>debian-l10n-dummy@lists.debian.org</email>.\n"
+"     The english translation was done by John Doe <email>john@doe.org</email> "
+"in 2009,\n"
+"     2010 and Daniela Acme <email>daniela@acme.us</email> in 2010 together "
+"with the\n"
+"     Debian Dummy l10n Team <email>debian-l10n-dummy@lists.debian.org</email>"
+".\n"
 "\">\n"
 msgstr ""
 "<!ENTITY translation-holder \"\n"
-"     A tradução Portuguesa foi feita por Américo Monteiro <email>a_monteiro@netcabo.pt</email> de 2009 a 2012.\n"
-"     A tradução foi revista pela equipa de traduções portuguesas da Debian <email>traduz@debianpt.org</email>.\n"
+"     A tradução Portuguesa foi feita por Américo Monteiro <email>"
+"a_monteiro@netcabo.pt</email> de 2009 a 2012.\n"
+"     A tradução foi revista pela equipa de traduções portuguesas da Debian <"
+"email>traduz@debianpt.org</email>.\n"
 "\">\n"
 
 #. type: Plain text
 #: apt.ent:195
 #, no-wrap
 msgid ""
-"<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
-"     in a shipped manpage newer/modified paragraphs will maybe appear in english in\n"
-"     the generated manpage. This sentence is therefore here to tell the reader that this\n"
-"     is not a mistake by the translator - obviously the target is that at least for stable\n"
+"<!-- TRANSLATOR: As a translation is allowed to have 20% of "
+"untranslated/fuzzy strings\n"
+"     in a shipped manpage newer/modified paragraphs will maybe appear in "
+"english in\n"
+"     the generated manpage. This sentence is therefore here to tell the "
+"reader that this\n"
+"     is not a mistake by the translator - obviously the target is that at "
+"least for stable\n"
 "     releases this sentence is not needed. :) -->\n"
 "<!ENTITY translation-english \"\n"
 "     Note that this translated document may contain untranslated parts.\n"
@@ -495,10 +565,13 @@ msgid ""
 "     translation is lagging behind the original content.\n"
 "\">\n"
 msgstr ""
-"<!-- TRANSLATOR: É permitido que uma tradução tenha 20% de strings não traduzidas/aproximadas\n"
-"     num manual publicado os parágrafos novos/modificados irão talvez aparecer em inglês\n"
+"<!-- TRANSLATOR: É permitido que uma tradução tenha 20% de strings não "
+"traduzidas/aproximadas\n"
+"     num manual publicado os parágrafos novos/modificados irão talvez "
+"aparecer em inglês\n"
 "     no manual gerado. Isto está aqui para dizer ao leitor que isto não\n"
-"     é um erro do tradutor - obviamente o objectivo é que pelo menos para as versões estáveis\n"
+"     é um erro do tradutor - obviamente o objectivo é que pelo menos para as "
+"versões estáveis\n"
 "     esta declaração não é necessária. :) -->\n"
 "<!ENTITY translation-english \"\n"
 "     Note que este documento traduzido pode conter partes não traduzidas.\n"
@@ -678,7 +751,7 @@ msgstr "APT"
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt.8.xml:32
 msgid "command-line interface"
-msgstr ""
+msgstr "interface de linha de comandos"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.8.xml:37 apt-get.8.xml:40 apt-cache.8.xml:40 apt-key.8.xml:39
@@ -697,6 +770,10 @@ msgid ""
 "management of the system.  See also &apt-get; and &apt-cache; for more low-"
 "level command options."
 msgstr ""
+"<command>apt</command> (Advanced Package Tool) é uma ferramenta de linha "
+"de comandos para manuseamento de pacotes. Disponibiliza uma interface de "
+"linha de comandos para a gestão de pacotes do sistema. Veja também "
+"&apt-get; e &apt-cache; para mais opções de baixo nível dos comandos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml:47
@@ -706,6 +783,10 @@ msgid ""
 "<option>--installed</option>, <option>--upgradable</option>, <option>--all-"
 "versions</option> are supported."
 msgstr ""
+"<literal>list</literal> é usado para mostrar uma lista de pacotes. Suporta "
+"padrões da shell para corresponder aos nomes de pacotes e são suportadas "
+"as seguintes opções <option>--installed</option>, "
+"<option>--upgradable</option>, <option>--all-versions</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml:58
@@ -713,10 +794,11 @@ msgid ""
 "<literal>search</literal> searches for the given term(s) and display "
 "matching packages."
 msgstr ""
+"<literal>search</literal> procura por termo(s) determinado(s) e mostra "
+"os pacotes correspondentes."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml:64
-#, fuzzy
 #| msgid ""
 #| "<literal>rdepends</literal> shows a listing of each reverse dependency a "
 #| "package has."
@@ -724,8 +806,8 @@ msgid ""
 "<literal>show</literal> shows the package information for the given "
 "package(s)."
 msgstr ""
-"<literal>rdepends</literal> mostra uma listagem de cada dependência reversa "
-"que um pacote tem."
+"<literal>show</literal> mostra a informação do pacote para o(s) pacote(s) "
+"determinado(s)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml:71
@@ -733,6 +815,8 @@ msgid ""
 "<literal>install</literal> is followed by one or more package names desired "
 "for installation or upgrading."
 msgstr ""
+"<literal>install</literal> é seguido por um ou mais nomes de pacotes que "
+"se deseja instalar ou actualizar."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml:75 apt-get.8.xml:118
@@ -772,10 +856,11 @@ msgid ""
 "<literal>edit-sources</literal> lets you edit your sources.list file and "
 "provides basic sanity checks."
 msgstr ""
+"<literal>edit-sources</literal> permite-lhe editar o seu ficheiro "
+"sources.list e disponibiliza verificações de sanidade básicas."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml:99
-#, fuzzy
 #| msgid ""
 #| "<literal>showhold</literal> is used to print a list of packages on hold "
 #| "in the same way as for the other show commands."
@@ -783,8 +868,8 @@ msgid ""
 "<literal>update</literal> is used to resynchronize the package index files "
 "from their sources."
 msgstr ""
-"<literal>showhold</literal> é usado para escrever uma lista dos pacotes em "
-"retenção do mesmo modo que os outros comandos show."
+"<literal>update</literal> é usado para re-sincronizar o índice dos pacotes "
+"a partir das suas fontes."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml:105
@@ -794,6 +879,10 @@ msgid ""
 "<filename>/etc/apt/sources.list</filename>. New package will be installed, "
 "but existing package will never removed."
 msgstr ""
+"<literal>upgrade</literal> é usado para instalar as versões mais recentes "
+"de todos os pacotes actualmente instalados no sistema a partir das fontes "
+"enumeradas em <filename>/etc/apt/sources.list</filename>. Serão instalados "
+"novos pacotes, mas pacotes existentes nunca serão removidos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml:114
@@ -802,6 +891,9 @@ msgid ""
 "also remove installed packages if that is required in order to resolve a "
 "package conflict."
 msgstr ""
+"<literal>full-upgrade</literal> executa a função de upgrade mas pode "
+"também remover pacotes instalados se tal for necessário de modo a resolver "
+"um conflito de pacotes."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.8.xml:124 apt-get.8.xml:257 apt-cache.8.xml:250 apt-mark.8.xml:110
@@ -813,7 +905,7 @@ msgstr "opções"
 #. type: Content of: <refentry><refsect1><title>
 #: apt.8.xml:134
 msgid "Script usage"
-msgstr ""
+msgstr "Utilização de script"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml:136
@@ -824,33 +916,40 @@ msgid ""
 "&apt-cache; and &apt-get; via APT options. Please prefer using these "
 "commands in your scripts."
 msgstr ""
+"A linha de comandos do &apt; foi desenhada como ferramenta de utilizador "
+"final e pode variar os textos mostrados entre versões. Apesar de tentar "
+"não perder a compatibilidade com versões anteriores, não há garantia disso. "
+"Todas as funcionalidades do &apt; estão disponíveis em &apt-cache; e "
+"&apt-get; via opções do APT. Por favor dê preferência a usar estes comandos "
+"nos seus scripts."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.8.xml:144
 msgid "Differences to &apt-get;"
-msgstr ""
+msgstr "Diferenças para o &apt-get;"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml:145
 msgid ""
 "The <command>apt</command> command is meant to be pleasant for end users and "
-"does not need to be backward compatilbe like &apt-get;. Therefore some "
+"does not need to be backward compatible like &apt-get;. Therefore some "
 "options are different:"
 msgstr ""
+"O comando  <command>apt</command> destina-se a ser agradável para os "
+"utilizadores finais e não precisa de ser compatível com as versões "
+"anteriores como o &apt-get;. Por isso algumas opções são diferentes."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: apt.8.xml:151
-#, fuzzy
 #| msgid "the <literal>Package:</literal> line"
-msgid "The option <literal>DPkgPM::Progress-Fancy</literal> is enabled."
-msgstr "a linha <literal>Package:</literal>"
+msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
+msgstr "A opção <literal>DPkg::Progress-Fancy</literal> está activada."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: apt.8.xml:155
-#, fuzzy
 #| msgid "the <literal>Component:</literal> line"
 msgid "The option <literal>APT::Color</literal> is enabled."
-msgstr "a linha <literal>Component:</literal>"
+msgstr "A opção <literal>APT::Color</literal> está activada."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: apt.8.xml:159
@@ -858,20 +957,23 @@ msgid ""
 "A new <literal>list</literal> command is available similar to <literal>dpkg "
 "--list</literal>."
 msgstr ""
+"Está disponível um novo comando <literal>list</literal> de modo "
+"semelhante a <literal>dpkg --list</literal>."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: apt.8.xml:164
-#, fuzzy
 #| msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
 msgid ""
 "The option <literal>upgrade</literal> has <literal>--with-new-pkgs</literal> "
 "enabled by default."
-msgstr "a linha <literal>Archive:</literal> ou <literal>Suite:</literal>"
+msgstr ""
+"A opção <literal>upgrade</literal> tem <literal>--with-new-pkgs</literal> "
+"activado por predefinição."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.8.xml:174 apt-get.8.xml:558 apt-cache.8.xml:352 apt-key.8.xml:197
 #: apt-mark.8.xml:133 apt-secure.8.xml:193 apt-cdrom.8.xml:154
-#: apt-config.8.xml:111 apt.conf.5.xml:1227 apt_preferences.5.xml:707
+#: apt-config.8.xml:111 apt.conf.5.xml:1228 apt_preferences.5.xml:707
 #: sources.list.5.xml:280 apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65
 #: apt-ftparchive.1.xml:609
 msgid "See Also"
@@ -879,7 +981,6 @@ msgstr "Veja também"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml:175
-#, fuzzy
 #| msgid ""
 #| "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
 #| "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
@@ -888,9 +989,8 @@ msgid ""
 "&apt-get;, &apt-cache;, &sources-list;, &apt-conf;, &apt-config;, The APT "
 "User's guide in &guidesdir;, &apt-preferences;, the APT Howto."
 msgstr ""
-"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
-"&apt-config;, &apt-secure;, O guia de utilizadores do The APT em "
-"&guidesdir;, &apt-preferences;, o Howto do APT."
+"&apt-get;, &apt-cache;, &sources-list;, &apt-conf;, &apt-config;, O guia de "
+"utilizadores do The APT em &guidesdir;, &apt-preferences;, o Howto do APT."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.8.xml:180 apt-get.8.xml:564 apt-cache.8.xml:357 apt-mark.8.xml:137
@@ -901,7 +1001,6 @@ msgstr "Diagnóstico"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml:181
-#, fuzzy
 #| msgid ""
 #| "<command>apt-get</command> returns zero on normal operation, decimal 100 "
 #| "on error."
@@ -909,7 +1008,7 @@ msgid ""
 "<command>apt</command> returns zero on normal operation, decimal 100 on "
 "error."
 msgstr ""
-"<command>apt-get</command> devolve zero na operação normal, 100 decimal em "
+"<command>apt</command> devolve zero na operação normal, 100 decimal em "
 "erro."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
@@ -921,7 +1020,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-get.8.xml:41
-#, fuzzy
 #| msgid ""
 #| "<command>apt-get</command> is the command-line tool for handling "
 #| "packages, and may be considered the user's \"back-end\" to other tools "
@@ -936,7 +1034,7 @@ msgstr ""
 "<command>apt-get</command> é a ferramenta de linha de comandos para lidar "
 "com pacotes, e pode ser considerada o \"back-end\" dos utilizadores para "
 "outras ferramentas que usam a biblioteca APT. Existem várias interfaces "
-"\"front-end\" como o &dselect;, &aptitude;, &synaptic; e &wajig;."
+"\"front-end\" como o &aptitude;, &synaptic; e &wajig;."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-get.8.xml:46 apt-cache.8.xml:46 apt-cdrom.8.xml:53 apt-config.8.xml:46
@@ -1247,7 +1345,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:217
-#, fuzzy
 #| msgid ""
 #| "<literal>clean</literal> clears out the local repository of retrieved "
 #| "package files. It removes everything but the lock file from "
@@ -1264,11 +1361,7 @@ msgid ""
 msgstr ""
 "<literal>clean</literal> limpa o repositório local dos ficheiros de pacotes "
 "obtidos. Remove tudo excepto o ficheiro lock de <filename>&cachedir;/"
-"archives/</filename> e <filename>&cachedir;/archives/partial/</filename>. "
-"Quando o APT é usado com um método &dselect;, <literal>clean</literal> é "
-"executado automaticamente. Aqueles que não usam o dselect irão provavelmente "
-"querer executar <literal>apt-get clean</literal> de tempos a tempos para "
-"libertar espaço do disco."
+"archives/</filename> e <filename>&cachedir;/archives/partial/</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:224
@@ -1353,7 +1446,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:277
-#, fuzzy
 #| msgid ""
 #| "Fix; attempt to correct a system with broken dependencies in place. This "
 #| "option, when used with install/remove, can omit any packages to permit "
@@ -1387,9 +1479,9 @@ msgstr ""
 "permite que existam num sistema dependências de pacotes quebradas. É "
 "possível que uma estrutura de dependências de um sistema esteja tão "
 "corrompida ao ponto de requerer intervenção manual (o que normalmente "
-"significa usar o &dselect; ou <command>dpkg --remove</command> para eliminar "
-"alguns dos pacotes ofensivos). O uso desta opção juntamente com <option>-m</"
-"option> pode produzir um erro em algumas situações. Item de Configuração: "
+"significa usar o <command>dpkg --remove</command> para eliminar alguns dos "
+"pacotes ofensivos). O uso desta opção juntamente com <option>-m</option> "
+"pode produzir um erro em algumas situações. Item de Configuração: "
 "<literal>APT::Get::Fix-Broken</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1533,7 +1625,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:370
-#, fuzzy
 #| msgid ""
 #| "This option controls the architecture packages are built for by "
 #| "<command>apt-get source --compile</command> and how cross-"
@@ -1558,7 +1649,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:380
-#, fuzzy
 #| msgid ""
 #| "This option controls the architecture packages are built for by "
 #| "<command>apt-get source --compile</command> and how cross-"
@@ -1573,12 +1663,12 @@ msgid ""
 "than one build profile can be activated at a time by concatenating them with "
 "a comma.  Configuration Item: <literal>APT::Build-Profiles</literal>."
 msgstr ""
-"Esta opção controla a arquitectura para que os pacotes são compilados pelo "
-"<command>apt-get source --compile</command> e como as dependências cruzadas "
-"de compilação são satisfeitas. Por predefinição não está activa o que "
-"significa que a arquitectura anfitriã é a mesma que a arquitectura de "
-"compilação (a qual é definida por <literal>APT::Architecture</literal>).  "
-"item de Configuração: <literal>APT::Get::Host-Architecture</literal>"
+"Esta opção controla perfis de compilação activados pelos quais um pacote "
+"fonte é compilado por <command>apt-get source --compile</command> e como "
+"as dependências de compilação são satisfeitas. Por predefinição, nenhum "
+"perfil de compilação está activo. Podem ser activados ao mesmo tempo mais "
+"do que um perfil de compilação ao concatená-los com uma vírgula. Item de "
+"configuração: <literal>APT::Build-Profiles</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:391
@@ -1613,6 +1703,13 @@ msgid ""
 "will never remove packages, only allow adding new ones.  Configuration Item: "
 "<literal>APT::Get::Upgrade-Allow-New</literal>."
 msgstr ""
+"Permite a instalação de novos pacotes quando usado em conjunto com "
+"<literal>upgrade</literal>. Isto é útil se a actualização de um pacote "
+"instalado requerer que sejam instaladas novas dependências. Em vez de "
+"reter o pacote, o <literal>upgrade</literal>irá actualizar o pacote e "
+"instalar as novas dependências. Note que <literal>upgrade</literal> com "
+"esta opção nunca irá remover pacotes, apenas permitir adicionar novos. "
+"Item de configuração: <literal>APT::Get::Upgrade-Allow-New</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:415
@@ -1831,19 +1928,23 @@ msgid ""
 "Show user friendly progress information in the terminal window when packages "
 "are installed, upgraded or removed. For a machine parsable version of this "
 "data see README.progress-reporting in the apt doc directory.  Configuration "
-"Item: <literal>DpkgPM::Progress</literal> and <literal>Dpkg::Progress-Fancy</"
+"Item: <literal>Dpkg::Progress</literal> and <literal>Dpkg::Progress-Fancy</"
 "literal>."
 msgstr ""
+"Mostra informação de progresso compreensível para o utilizador na janela "
+"de terminal quando os pacotes são instalados, actualizados ou removidos. "
+"Para uma versão \"analisável por máquina\" destes dados veja o "
+" README.progress-reporting no directório doc do apt. Item de Configuração: "
+" <literal>Dpkg::Progress</literal> e <literal>Dpkg::Progress-Fancy</literal>."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml:548 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127
-#: apt.conf.5.xml:1221 apt_preferences.5.xml:700
+#: apt.conf.5.xml:1222 apt_preferences.5.xml:700
 msgid "Files"
 msgstr "Ficheiros"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-get.8.xml:559
-#, fuzzy
 #| msgid ""
 #| "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
 #| "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
@@ -1853,9 +1954,9 @@ msgid ""
 "&apt-secure;, The APT User's guide in &guidesdir;, &apt-preferences;, the "
 "APT Howto."
 msgstr ""
-"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
-"&apt-config;, &apt-secure;, O guia de utilizadores do The APT em "
-"&guidesdir;, &apt-preferences;, o Howto do APT."
+"&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-config;, "
+"&apt-secure;, O guia de utilizadores do The APT em &guidesdir;, "
+"&apt-preferences;, o Howto do APT."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-get.8.xml:565
@@ -3042,10 +3143,10 @@ msgstr ""
 #: apt-secure.8.xml:195
 msgid ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
 msgstr ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml:199
@@ -3145,7 +3246,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:87
-#, fuzzy
 #| msgid ""
 #| "Mount point; specify the location to mount the CD-ROM. This mount point "
 #| "must be listed in <filename>/etc/fstab</filename> and properly "
@@ -3155,10 +3255,9 @@ msgid ""
 "<option>--cdrom</option> option.  Configuration Item: <literal>Acquire::"
 "cdrom::AutoDetect</literal>."
 msgstr ""
-"Ponto de Montagem; especifica a localização para montar o cdrom. Este ponto "
-"de montagem deve estar listado em <filename>/etc/fstab</filename> e "
-"configurado apropriadamente. Item de configuração: <literal>Acquire::cdrom::"
-"mount</literal>."
+"Não tente a auto-detecção do caminho do CD-ROM. Normalmente combinada "
+"com a opção <option>--cdrom</option>.  Item de Configuração: "
+"<literal>Acquire::cdrom::AutoDetect</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:95
@@ -3706,6 +3805,11 @@ msgid ""
 "is empty. The <envar>DEB_BUILD_PROFILES</envar> as used by &dpkg-"
 "buildpackage; overrides the list notation."
 msgstr ""
+"Lista todos os perfis de compilação activos para resolução de dependências "
+"de compilação, sem o prefixo \"<literal>profile.</literal>\" no espaço do "
+"nome. Por predefinição esta lista está vazia. "
+"O <envar>DEB_BUILD_PROFILES</envar> usado pelo &dpkg-buildpackage; "
+"sobrepõe a notação da lista."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:190
@@ -4127,7 +4231,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:400
-#, fuzzy
 #| msgid ""
 #| "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
 #| "literal> which accepts integer values in kilobytes. The default value is "
@@ -4142,10 +4245,10 @@ msgid ""
 "multiple servers at the same time."
 msgstr ""
 "A largura de banda usada pode ser limitada com <literal>Acquire::http::Dl-"
-"Limit</literal> que aceita valores inteiros em kilobytes. O valor "
-"predefinido é 0 que desactiva o limite e tenta usar toda a largura de banda "
-"disponível (note que esta opção implicitamente desactiva a descarga a partir "
-"de múltiplos servidores ao mesmo tempo.)"
+"Limit</literal> que aceita valores inteiros em kilobytes por segundo. O "
+"valor predefinido é 0 que desactiva o limite e tenta usar toda a largura de "
+"banda disponível. Note que esta opção implicitamente desactiva a descarga "
+"a partir de múltiplos servidores ao mesmo tempo."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:407
@@ -4172,6 +4275,15 @@ msgid ""
 "takes precedence over the legacy option name <literal>ProxyAutoDetect</"
 "literal>."
 msgstr ""
+"<literal>Acquire::http::Proxy-Auto-Detect</literal> pode ser usado para "
+"especificar um comando externo para descobrir o proxy http a usar. O apt "
+"espera que o comando forneça o resultado do proxy no stdout ao estilo "
+"<literal>http://proxy:port/</literal>. Isto irá sobrepor o <literal>Acquire::"
+"http::Proxy</literal> genérico mas não qualquer configuração especifica "
+"da máquina proxy definida via <literal>Acquire::http::Proxy::$HOST</"
+"literal>. Veja o pacote &squid-deb-proxy-client; para um exemplo de "
+"implementação que usa avahi. Esta opção toma precedência sobre "
+"o nome de opção antigo <literal>ProxyAutoDetect</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:429
@@ -4347,8 +4459,12 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
 #: apt.conf.5.xml:523
 #, no-wrap
-msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
-msgstr "Acquire::CompressionTypes::<replaceable>Extensão de Ficheiro</replaceable> \"<replaceable>Nome de método</replaceable>\";"
+msgid ""
+"Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<"
+"replaceable>Methodname</replaceable>\";"
+msgstr ""
+"Acquire::CompressionTypes::<replaceable>Extensão de Ficheiro</replaceable> "
+"\"<replaceable>Nome de método</replaceable>\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:518
@@ -4493,8 +4609,10 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
 #: apt.conf.5.xml:575
 #, no-wrap
-msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
-msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
+msgid ""
+"Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
+msgstr ""
+"Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:563
@@ -4552,12 +4670,12 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:585
 msgid "When downloading, force to use only the IPv4 protocol."
-msgstr ""
+msgstr "Ao descarregar, força o uso exclusivo do protocolo IPv4."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:591
 msgid "When downloading, force to use only the IPv6 protocol."
-msgstr ""
+msgstr "Ao descarregar, força o uso exclusivo do protocolo IPv6."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml:598
@@ -4585,28 +4703,40 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:607
+#| msgid ""
+#| "<literal>Dir::Cache</literal> contains locations pertaining to local "
+#| "cache information, such as the two package caches <literal>srcpkgcache</"
+#| "literal> and <literal>pkgcache</literal> as well as the location to place "
+#| "downloaded archives, <literal>Dir::Cache::archives</literal>. Generation "
+#| "of caches can be turned off by setting their names to the empty string. "
+#| "This will slow down startup but save disk space. It is probably "
+#| "preferable to turn off the pkgcache rather than the srcpkgcache. Like "
+#| "<literal>Dir::State</literal> the default directory is contained in "
+#| "<literal>Dir::Cache</literal>"
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
 "and <literal>pkgcache</literal> as well as the location to place downloaded "
 "archives, <literal>Dir::Cache::archives</literal>. Generation of caches can "
-"be turned off by setting their names to the empty string. This will slow "
+"be turned off by setting <literal>pkgcache</literal> or "
+"<literal>srcpkgcache</literal> to <literal>\"\"</literal>.  This will slow "
 "down startup but save disk space. It is probably preferable to turn off the "
-"pkgcache rather than the srcpkgcache. Like <literal>Dir::State</literal> the "
-"default directory is contained in <literal>Dir::Cache</literal>"
+"pkgcache rather than the srcpkgcache.  Like <literal>Dir::State</literal> "
+"the default directory is contained in <literal>Dir::Cache</literal>"
 msgstr ""
 "<literal>Dir::Cache</literal> contém localizações pertencentes a informação "
 "da cache local, como as caches de dois pacotes <literal>srcpkgcache</"
 "literal> e <literal>pkgcache</literal> assim como a localização onde colocar "
 "arquivos descarregados, <literal>Dir::Cache::archives</literal>. A geração "
-"de caches pode ser desligada ao definir os seus nomes para uma string vazia. "
-"Isto irá abrandar o arranque mas poupar espaço em disco. Provavelmente é "
-"preferível desligar o pkgcache em vez do srcpkgcache. Tal como <literal>Dir::"
-"State</literal> o directório predefinido é contido em <literal>Dir::Cache</"
-"literal>"
+"de caches pode ser desligada ao definir <literal>pkgcache</literal> ou "
+"<literal>srcpkgcache</literal> para <literal>\"\"</literal>. Isto irá "
+"abrandar "
+"o arranque mas poupar espaço em disco. Provavelmente é preferível desligar "
+"o pkgcache em vez do srcpkgcache. Tal como <literal>Dir::State</literal> o "
+"directório predefinido é contido em <literal>Dir::Cache</literal>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:616
+#: apt.conf.5.xml:617
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4621,7 +4751,7 @@ msgstr ""
 "ficheiro de configuração especificado por <envar>APT_CONFIG</envar>)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:622
+#: apt.conf.5.xml:623
 msgid ""
 "The <literal>Dir::Parts</literal> setting reads in all the config fragments "
 "in lexical order from the directory specified. After this is done then the "
@@ -4632,7 +4762,7 @@ msgstr ""
 "estar feito então é carregado o ficheiro de configuração principal."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:626
+#: apt.conf.5.xml:627
 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4650,7 +4780,7 @@ msgstr ""
 "respectivos programas."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:634
+#: apt.conf.5.xml:635
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4671,7 +4801,7 @@ msgstr ""
 "procurado em <filename>/tmp/staging/var/lib/dpkg/status</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:647
+#: apt.conf.5.xml:648
 msgid ""
 "The <literal>Ignore-Files-Silently</literal> list can be used to specify "
 "which files APT should silently ignore while parsing the files in the "
@@ -4689,12 +4819,12 @@ msgstr ""
 "expressão regular."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:656
+#: apt.conf.5.xml:657
 msgid "APT in DSelect"
 msgstr "APT em DSelect"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:658
+#: apt.conf.5.xml:659
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behavior. These are in the <literal>DSelect</literal> "
@@ -4705,7 +4835,7 @@ msgstr ""
 "<literal>DSelect</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:663
+#: apt.conf.5.xml:664
 msgid ""
 "Cache Clean mode; this value may be one of <literal>always</literal>, "
 "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -4727,7 +4857,7 @@ msgstr ""
 "pacotes."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:677
+#: apt.conf.5.xml:678
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the install phase."
@@ -4736,7 +4866,7 @@ msgstr ""
 "comandos quando é corrido para a fase de instalação."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:682
+#: apt.conf.5.xml:683
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the update phase."
@@ -4745,7 +4875,7 @@ msgstr ""
 "comandos quando é executado para a fase de actualização."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:687
+#: apt.conf.5.xml:688
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
@@ -4754,12 +4884,12 @@ msgstr ""
 "continuar. A predefinição é avisar apenas em caso de erro."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:693
+#: apt.conf.5.xml:694
 msgid "How APT calls &dpkg;"
 msgstr "Como o APT chama o &dpkg;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:694
+#: apt.conf.5.xml:695
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
@@ -4768,7 +4898,7 @@ msgstr ""
 "&dpkg;. Estas estão na secção <literal>DPkg</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:699
+#: apt.conf.5.xml:700
 msgid ""
 "This is a list of options to pass to &dpkg;. The options must be specified "
 "using the list notation and each list item is passed as a single argument to "
@@ -4779,7 +4909,7 @@ msgstr ""
 "um argumento único ao &dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:705
+#: apt.conf.5.xml:706
 msgid ""
 "This is a list of shell commands to run before/after invoking &dpkg;.  Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -4792,8 +4922,7 @@ msgstr ""
 "bin/sh</filename>, caso algum deles falhe, o APT irá abortar."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:712
-#, fuzzy
+#: apt.conf.5.xml:713
 #| msgid ""
 #| "This is a list of shell commands to run before invoking &dpkg;. Like "
 #| "<literal>options</literal> this must be specified in list notation. The "
@@ -4813,11 +4942,11 @@ msgstr ""
 "notação listada. Os  comandos são invocados em ordem usando <filename>/bin/"
 "sh</filename>, caso algum deles falhe, o APT irá abortar. O APT irá passar "
 "para os comandos os nomes de ficheiros de todos os ficheiros .deb que vai "
-"instalar, um por cada linha na entrada standard."
+"instalar, um por cada linha no descritor de ficheiro requisitado, usando "
+"por predefinição a entrada standard."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:719
-#, fuzzy
+#: apt.conf.5.xml:720
 #| msgid ""
 #| "Version 2 of this protocol dumps more information, including the protocol "
 #| "version, the APT configuration space and the packages, files and versions "
@@ -4832,12 +4961,11 @@ msgid ""
 msgstr ""
 "A versão 2 deste protocolo despeja mais informação, incluindo a versão de "
 "protocolo, o espaço de configuração do APT e os pacotes, ficheiros e versões "
-"que foram alteradas. A versão 2 é activada ao definir <literal>DPkg::Tools::"
-"options::cmd::Version</literal> a 2. <literal>cmd</literal> é um comando "
-"dado ao <literal>Pre-Install-Pkgs</literal>."
+"que foram alteradas. A versão 3 adiciona a arquitectura e a bandeira "
+"<literal>MultiArch</literal> a cada versão a ser despejada."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:724
+#: apt.conf.5.xml:725
 msgid ""
 "The version of the protocol to be used for the command "
 "<literal><replaceable>cmd</replaceable></literal> can be chosen by setting "
@@ -4846,9 +4974,14 @@ msgid ""
 "the requested version it will send the information in the highest version it "
 "has support for instead."
 msgstr ""
+"A versão do protocolo a ser usado para o comando <literal><replaceable>cmd</"
+"replaceable></literal> pode ser escolhida ao definir <literal>DPkg::Tools::"
+"options::<replaceable>cmd</replaceable>::Version</literal> correctamente, "
+"sendo a predefinição a versão 1. Se o APT não suportar a versão requisitada "
+"irá então enviar a informação na versão mais alta que suporta."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:731
+#: apt.conf.5.xml:732
 msgid ""
 "The file descriptor to be used to send the information can be requested with "
 "<literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::InfoFD</"
@@ -4857,9 +4990,16 @@ msgid ""
 "looking for the environment variable <envar>APT_HOOK_INFO_FD</envar> which "
 "contains the number of the used file descriptor as a confirmation."
 msgstr ""
+"O descritor de ficheiro a ser usado para enviar a informação pode ser "
+"requisitado com <literal>DPkg::Tools::options::<replaceable>cmd</"
+"replaceable>::InfoFD</literal> o qual usa <literal>0</literal> por "
+"predefinição para a saída standard e está disponível desde a versão "
+"0.9.11. como confirmação pode ser detectado o suporte para a opção ao "
+"observar a variável de ambiente <envar>APT_HOOK_INFO_FD</envar> que "
+"contém o número do descritor de ficheiro usado."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:741
+#: apt.conf.5.xml:742
 msgid ""
 "APT chdirs to this directory before invoking &dpkg;, the default is "
 "<filename>/</filename>."
@@ -4868,7 +5008,7 @@ msgstr ""
 "predefinição é <filename>/</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:746
+#: apt.conf.5.xml:747
 msgid ""
 "These options are passed to &dpkg-buildpackage; when compiling packages; the "
 "default is to disable signing and produce all binaries."
@@ -4877,12 +5017,12 @@ msgstr ""
 "predefinição é desactivar a assinatura e produzir todos os binários."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:751
+#: apt.conf.5.xml:752
 msgid "dpkg trigger usage (and related options)"
 msgstr "Utilização trigger do dpkg (e opções relacionadas)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:752
+#: apt.conf.5.xml:753
 msgid ""
 "APT can call &dpkg; in such a way as to let it make aggressive use of "
 "triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
@@ -4908,7 +5048,7 @@ msgstr ""
 "100% enquanto na realidade está a configurar todos os pacotes."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:767
+#: apt.conf.5.xml:768
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -4922,7 +5062,7 @@ msgstr ""
 "DPkg::TriggersPending \"true\";"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:761
+#: apt.conf.5.xml:762
 msgid ""
 "Note that it is not guaranteed that APT will support these options or that "
 "these options will not cause (big) trouble in the future. If you have "
@@ -4946,7 +5086,7 @@ msgstr ""
 "\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:774
+#: apt.conf.5.xml:775
 msgid ""
 "Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
 "call).  See &dpkg; if you are interested in what this actually means. In "
@@ -4968,7 +5108,7 @@ msgstr ""
 "chamadas unpack e remove."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:782
+#: apt.conf.5.xml:783
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
@@ -4998,7 +5138,7 @@ msgstr ""
 "arrancar."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:797
+#: apt.conf.5.xml:798
 msgid ""
 "If this option is set APT will call <command>dpkg --configure --pending</"
 "command> to let &dpkg; handle all required configurations and triggers. This "
@@ -5016,7 +5156,7 @@ msgstr ""
 "esta opção em todas excepto na última execução."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:804
+#: apt.conf.5.xml:805
 msgid ""
 "Useful for the <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal>, and "
@@ -5032,7 +5172,7 @@ msgstr ""
 "configurar este pacote."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:817
+#: apt.conf.5.xml:818
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -5050,7 +5190,7 @@ msgstr ""
 "};"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:810
+#: apt.conf.5.xml:811
 msgid ""
 "Essential packages (and their dependencies) should be configured immediately "
 "after unpacking. It is a good idea to do this quite early in the upgrade "
@@ -5074,12 +5214,12 @@ msgstr ""
 "predefinidos. <placeholder type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:830
+#: apt.conf.5.xml:831
 msgid "Periodic and Archives options"
 msgstr "Opções Periodic e Archives"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:831
+#: apt.conf.5.xml:832
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by the "
@@ -5092,12 +5232,12 @@ msgstr ""
 "Veja o cabeçalho deste script para uma breve documentação das suas opções."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:839
+#: apt.conf.5.xml:840
 msgid "Debug options"
 msgstr "Opções de depuração"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:841
+#: apt.conf.5.xml:842
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -5114,7 +5254,7 @@ msgstr ""
 "interesse para o utilizador normal, mas algumas podem ter:"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:852
+#: apt.conf.5.xml:853
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -5125,7 +5265,7 @@ msgstr ""
 "remove, purge</literal>."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:860
+#: apt.conf.5.xml:861
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"
@@ -5136,7 +5276,7 @@ msgstr ""
 "<literal>apt-get -s install</literal>) como um utilizador não root."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:869
+#: apt.conf.5.xml:870
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -5146,9 +5286,9 @@ msgstr ""
 
 #.  TODO: provide a
 #. 	   motivating example, except I haven't a clue why you'd want
-#. 	   to do this. 
+#. 	   to do this.
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:877
+#: apt.conf.5.xml:878
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CD-ROM IDs."
@@ -5157,12 +5297,12 @@ msgstr ""
 "IDs de CD-ROM."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:887
+#: apt.conf.5.xml:888
 msgid "A full list of debugging options to apt follows."
 msgstr "Segue-se uma lista completa de opções de depuração para o apt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:896
+#: apt.conf.5.xml:897
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
@@ -5170,25 +5310,25 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:907
+#: apt.conf.5.xml:908
 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 "Escreve informação relacionada com o descarregamento de pacotes usando FTP."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:918
+#: apt.conf.5.xml:919
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 "Escreve informação relacionada com o descarregamento de pacotes usando HTTP."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:929
+#: apt.conf.5.xml:930
 msgid "Print information related to downloading packages using HTTPS."
 msgstr ""
 "Escreve informação relacionada com o descarregamento de pacotes usando HTTPS."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:940
+#: apt.conf.5.xml:941
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
@@ -5197,7 +5337,7 @@ msgstr ""
 "criptográficas usando <literal>gpg</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:951
+#: apt.conf.5.xml:952
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
@@ -5206,13 +5346,13 @@ msgstr ""
 "armazenados em CD-ROMs."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:961
+#: apt.conf.5.xml:962
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 "Descreve os processos de resolver dependências de compilação no &apt-get;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:971
+#: apt.conf.5.xml:972
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
@@ -5221,7 +5361,7 @@ msgstr ""
 "<literal>apt</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:981
+#: apt.conf.5.xml:982
 msgid ""
 "Do not include information from <literal>statfs</literal>, namely the number "
 "of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -5232,7 +5372,7 @@ msgstr ""
 "para um CD-ROM."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:992
+#: apt.conf.5.xml:993
 msgid ""
 "Disable all file locking.  For instance, this will allow two instances of "
 "<quote><literal>apt-get update</literal></quote> to run at the same time."
@@ -5242,14 +5382,14 @@ msgstr ""
 "literal></quote> ao mesmo tempo."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1004
+#: apt.conf.5.xml:1005
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 "Regista no log quando os items são adicionados ou removidos da fila de "
 "download global."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1014
+#: apt.conf.5.xml:1015
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
@@ -5258,7 +5398,7 @@ msgstr ""
 "checksums e assinaturas criptográficas dos ficheiros descarregados."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1024
+#: apt.conf.5.xml:1025
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
@@ -5268,7 +5408,7 @@ msgstr ""
 "pacote."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1036
+#: apt.conf.5.xml:1037
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
@@ -5277,7 +5417,7 @@ msgstr ""
 "do apt quando se descarrega diffs de índice em vez de índices completos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1047
+#: apt.conf.5.xml:1048
 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
@@ -5285,7 +5425,7 @@ msgstr ""
 "downloads."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1058
+#: apt.conf.5.xml:1059
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
@@ -5294,7 +5434,7 @@ msgstr ""
 "de pacotes e com a remoção de pacotes não utilizados."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1068
+#: apt.conf.5.xml:1069
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
@@ -5309,7 +5449,7 @@ msgstr ""
 "literal>; veja <literal>Debug::pkgProblemResolver</literal> para isso."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1082
+#: apt.conf.5.xml:1083
 msgid ""
 "Generate debug messages describing which packages are marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
@@ -5340,7 +5480,7 @@ msgstr ""
 "pacote aparece."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1103
+#: apt.conf.5.xml:1104
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
@@ -5350,7 +5490,7 @@ msgstr ""
 "único."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1114
+#: apt.conf.5.xml:1115
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
@@ -5359,7 +5499,7 @@ msgstr ""
 "estado e quaisquer erros encontrados enquanto os analisa."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1125
+#: apt.conf.5.xml:1126
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
@@ -5368,7 +5508,7 @@ msgstr ""
 "literal> deve passar os pacotes ao &dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1137
+#: apt.conf.5.xml:1138
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""
@@ -5376,12 +5516,12 @@ msgstr ""
 "&dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1148
+#: apt.conf.5.xml:1149
 msgid "Output the priority of each package list on startup."
 msgstr "Escreve a prioridade da cada lista de pacote no arranque."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1158
+#: apt.conf.5.xml:1159
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
@@ -5390,7 +5530,7 @@ msgstr ""
 "acontece quando é encontrado um problema de dependências complexo)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1169
+#: apt.conf.5.xml:1170
 msgid ""
 "Display a list of all installed packages with their calculated score used by "
 "the pkgProblemResolver. The description of the package is the same as "
@@ -5401,7 +5541,7 @@ msgstr ""
 "mesma que é descrita em <literal>Debug::pkgDepCache::Marker</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1181
+#: apt.conf.5.xml:1182
 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
@@ -5410,21 +5550,24 @@ msgstr ""
 "vendors.list</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1191
+#: apt.conf.5.xml:1192
 msgid ""
 "Display the external commands that are called by apt hooks.  This includes e."
 "g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or "
 "<literal>APT::Update::{Pre,Post}-Invoke</literal>."
 msgstr ""
+"Mostra os comandos externos que são chamados por hooks do apt. Isto "
+"inclui por exemplo as opções de configuração <literal>DPkg::{Pre,Post}"
+"-Invoke</literal> ou <literal>APT::Update::{Pre,Post}-Invoke</literal>."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1215 apt_preferences.5.xml:547 sources.list.5.xml:239
+#: apt.conf.5.xml:1216 apt_preferences.5.xml:547 sources.list.5.xml:239
 #: apt-ftparchive.1.xml:598
 msgid "Examples"
 msgstr "Exemplos"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1216
+#: apt.conf.5.xml:1217
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -5432,9 +5575,9 @@ msgstr ""
 "&configureindex; é um ficheiro de configuração que mostra valores exemplo "
 "para todas as opções possíveis."
 
-#.  ? reading apt.conf 
+#.  ? reading apt.conf
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1228
+#: apt.conf.5.xml:1229
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
 
@@ -5547,8 +5690,12 @@ msgstr "Atribuições de Prioridade Predefinidas do APT"
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #: apt_preferences.5.xml:96
 #, no-wrap
-msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
-msgstr "<command>apt-get install -t testing <replaceable>algum-pacote</replaceable></command>\n"
+msgid ""
+"<command>apt-get install -t testing <replaceable>some-package</replaceable><"
+"/command>\n"
+msgstr ""
+"<command>apt-get install -t testing <replaceable>algum-pacote</replaceable><"
+"/command>\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #: apt_preferences.5.xml:99
@@ -6700,8 +6847,10 @@ msgstr "Acompanhando a evolução de um nome de código de lançamento"
 #: apt_preferences.5.xml:656
 #, no-wrap
 msgid ""
-"Explanation: Uninstall or do not install any Debian-originated package versions\n"
-"Explanation: other than those in the distribution codenamed with &testing-codename; or sid\n"
+"Explanation: Uninstall or do not install any Debian-originated package "
+"versions\n"
+"Explanation: other than those in the distribution codenamed with "
+"&testing-codename; or sid\n"
 "Package: *\n"
 "Pin: release n=&testing-codename;\n"
 "Pin-Priority: 900\n"
@@ -6715,8 +6864,10 @@ msgid ""
 "Pin: release o=Debian\n"
 "Pin-Priority: -10\n"
 msgstr ""
-"Explicação: Desinstala ou não instala nenhumas versões de pacotes originais Debian\n"
-"Explicação: para além daquelas da distribuição com nome de código &testing-codename; ou sid\n"
+"Explicação: Desinstala ou não instala nenhumas versões de pacotes originais "
+"Debian\n"
+"Explicação: para além daquelas da distribuição com nome de código "
+"&testing-codename; ou sid\n"
 "Package: *\n"
 "Pin: release n=&testing-codename;\n"
 "Pin-Priority: 900\n"
@@ -6904,10 +7055,10 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml:82
-#, fuzzy, no-wrap
+#, no-wrap
 #| msgid "deb [ options ] uri distribution [component1] [component2] [...]"
 msgid "deb [ options ] uri suite [component1] [component2] [...]"
-msgstr "deb [ opções ] uri distribuição [componente1] [componente2] [...]"
+msgstr "deb [ opções ] uri suite [componente1] [componente2] [...]"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
 #: sources.list.5.xml:86
@@ -6931,6 +7082,23 @@ msgid ""
 "     [option1]: [option1-value]\n"
 "   "
 msgstr ""
+"     Tipos: deb deb-src\n"
+"     URIs: http://exemplo.com\n"
+"     Suites: stable testing\n"
+"     Secções: component1 component2\n"
+"     Descrição: curta\n"
+"      longa longa longa\n"
+"     [opção1]: [opção1-valor]\n"
+"\n"
+"     Tipos: deb\n"
+"     URIs: http://outro.exemlo.com\n"
+"     Suites: experimental\n"
+"     Secções: component1 component2\n"
+"     Activo: não\n"
+"     Descrição: curta\n"
+"      longa longa longa\n"
+"     [opção1]: [opção1-valor]\n"
+"   "
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:84
@@ -6938,10 +7106,11 @@ msgid ""
 "Alternatively a rfc822 style format is also supported: <placeholder type="
 "\"literallayout\" id=\"0\"/>"
 msgstr ""
+"Em alternativa, é também suportado um formato estilo rfc822: <placeholder "
+"type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:105
-#, fuzzy
 #| msgid ""
 #| "The URI for the <literal>deb</literal> type must specify the base of the "
 #| "Debian distribution, from which APT will find the information it needs.  "
@@ -6963,17 +7132,15 @@ msgid ""
 msgstr ""
 "O URI para o tipo <literal>deb</literal> tem de especificar a base da "
 "distribuição Debian, a partir do qual o APT irá encontrar a informação que "
-"precisa. <literal>distribution</literal> pode especificar um caminho exacto, "
-"que no caso os componente têm de ser omitidos e <literal>distribution</"
-"literal> deve terminar com uma barra (<literal>/</literal>). Isto é útil "
-"para o caso de apenas ser de interesse uma sub-secção particular do arquivo "
-"denotado pelo URI. Se <literal>distribution</literal> não especificar um "
-"caminho exacto, pelo menos um <literal>component</literal> tem de estar "
-"presente."
+"precisa. <literal>suite</literal> pode especificar um caminho exacto, "
+"que no caso os componente têm de ser omitidos e <literal>suite</literal> "
+"deve terminar com uma barra (<literal>/</literal>). Isto é útil para o caso "
+"de apenas ser de interesse uma sub-secção particular do arquivo denotado "
+"pelo URI. Se <literal>suite</literal> não especificar um caminho exacto, "
+"pelo menos um <literal>component</literal> tem de estar presente."
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:114
-#, fuzzy
 #| msgid ""
 #| "<literal>distribution</literal> may also contain a variable, <literal>"
 #| "$(ARCH)</literal> which expands to the Debian architecture (such as "
@@ -6991,7 +7158,7 @@ msgid ""
 "<literal>APT</literal> will automatically generate a URI with the current "
 "architecture otherwise."
 msgstr ""
-"<literal>distribution</literal> também pode conter uma variável. <literal>"
+"<literal>suite</literal> também pode conter uma variável. <literal>"
 "$(ARCH)</literal> a qual se expande à arquitectura Debian (tal como "
 "<literal>amd64</literal> ou <literal>armel</literal>) usada no sistema. Isto "
 "permite que seja usados ficheiros <filename>sources.list</filename> "
@@ -7001,7 +7168,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:122
-#, fuzzy
 #| msgid ""
 #| "Since only one distribution can be specified per line it may be necessary "
 #| "to have multiple lines for the same URI, if a subset of all available "
@@ -7027,17 +7193,18 @@ msgid ""
 "users. APT also parallelizes connections to different hosts to more "
 "effectively deal with sites with low bandwidth."
 msgstr ""
-"Como apenas pode ser especificada por linha uma distribuição, pode ser "
-"necessário ter várias linhas para o mesmo URI, se só for desejado um sub-"
-"conjunto de todas as distribuições e componentes dessa localização. O APT "
-"irá ordenar a lista de URI após ter gerado internamente um conjunto "
-"completo, e irá desabar as várias referências à mesma máquina na Internet, "
-"por exemplo, numa única ligação, para que não estabeleça uma ligação FTP "
-"ineficiente, a feche, faça outra coisa, e depois volte a estabelecer ligação "
-"à mesma máquina. Esta funcionalidade é útil para aceder a sites FTP ocupados "
-"que limitam o número de utilizadores anónimos em simultâneo. O APT também "
-"paraleliza ligações a máquinas diferentes para lidar mais eficientemente com "
-"sites com baixa largura de banda."
+"No estilo tradicional, o formato do sources.list, como apenas pode ser "
+"especificada por linha uma distribuição, pode ser necessário ter várias "
+"linhas para o mesmo URI, se só for desejado um sub-conjunto de todas as "
+"distribuições e componentes dessa localização. O APT irá ordenar a lista de "
+"URI após ter gerado internamente um conjunto completo, e irá desabar as "
+"várias referências à mesma máquina na Internet, por exemplo, numa única "
+"ligação, para que não estabeleça uma ligação FTP ineficiente, a feche, faça "
+"outra coisa, e depois volte a estabelecer ligação à mesma máquina. Esta "
+"funcionalidade é útil para aceder a sites FTP ocupados que limitam o número "
+"de utilizadores anónimos em simultâneo. O APT também paraleliza ligações "
+"a máquinas diferentes para lidar mais eficientemente com sites com largura "
+"de banda baixa."
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:136
@@ -7073,7 +7240,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: sources.list.5.xml:146
-#, fuzzy
 #| msgid ""
 #| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
 #| "replaceable>,…</literal> can be used to specify for which architectures "
@@ -7086,11 +7252,10 @@ msgid ""
 "<replaceable>arch2</replaceable>,…</literal> which can be used to add/remove "
 "architectures from the set which will be downloaded."
 msgstr ""
-"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
-"replaceable>,…</literal> pode ser usado para especificar para quais "
-"arquitecturas deve ser descarregada a informação. Se esta opção não estiver "
-"definida, serão descarregadas todas as arquitecturas definidas pela opção "
-"<literal>APT::Architectures</literal>."
+"<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</"
+"replaceable>,…</literal> e <literal>arch-=<replaceable>arch1</replaceable>,"
+"<replaceable>arch2</replaceable>,…</literal> que podem ser usadas para "
+"adicionar/remover arquitecturas do conjunto que será descarregado."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: sources.list.5.xml:149
@@ -7133,11 +7298,13 @@ msgstr "Alguns exemplos:"
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
-"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
+"deb http://security.debian.org/ &stable-codename;/updates main contrib "
+"non-free\n"
 "   "
 msgstr ""
 "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
-"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
+"deb http://security.debian.org/ &stable-codename;/updates main contrib "
+"non-free\n"
 "   "
 
 #. type: Content of: <refentry><refsect1><title>
@@ -8450,8 +8617,12 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><programlisting>
 #: apt-ftparchive.1.xml:604
 #, no-wrap
-msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
-msgstr "<command>apt-ftparchive</command> pacotes <replaceable>directório</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
+msgid ""
+"<command>apt-ftparchive</command> packages <replaceable>directory<"
+"/replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
+msgstr ""
+"<command>apt-ftparchive</command> pacotes <replaceable>directório<"
+"/replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-ftparchive.1.xml:600
@@ -8471,49 +8642,66 @@ msgstr ""
 "<command>apt-ftparchive</command> devolve zero na operação normal, 100 "
 "decimal em erro."
 
-#. type: <title></title>
-#: guide.sgml:4
+#. type: Attribute 'lang' of: <book>
+#: guide.dbk:8 offline.dbk:8
+msgid "en"
+msgstr "pt"
+
+#. type: Content of: <book><title>
+#: guide.dbk:10
 msgid "APT User's Guide"
 msgstr "Guia de Utilizador do APT"
 
-#. type: <author></author>
-#: guide.sgml:6 offline.sgml:6
-msgid "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
-msgstr "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
+#. type: Content of: <book><bookinfo><authorgroup><author><personname>
+#: guide.dbk:16 offline.dbk:16
+msgid "Jason Gunthorpe"
+msgstr "Jason Gunthorpe"
+
+#. type: Content of: <book><bookinfo><authorgroup><author><email>
+#: guide.dbk:16 offline.dbk:16
+msgid "jgg@debian.org"
+msgstr "jgg@debian.org"
 
-#. type: <version></version>
-#: guide.sgml:7
-msgid "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
-msgstr "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
+#. type: Content of: <book><bookinfo><releaseinfo>
+#: guide.dbk:20 offline.dbk:20
+msgid "Version &apt-product-version;"
+msgstr "Versão &apt-product-version;"
 
-#. type: <abstract></abstract>
-#: guide.sgml:11
+#. type: Content of: <book><bookinfo><abstract><para>
+#: guide.dbk:24
 msgid ""
 "This document provides an overview of how to use the the APT package manager."
 msgstr ""
 "Este documento disponibiliza uma visão geral de como usar o gestor de "
 "pacotes APT."
 
-#. type: <copyrightsummary></copyrightsummary>
-#: guide.sgml:15
-msgid "Copyright &copy; Jason Gunthorpe, 1998."
-msgstr "Copyright &copy; Jason Gunthorpe, 1998."
+#. type: Content of: <book><bookinfo>
+#: guide.dbk:28
+msgid ""
+"<copyright><year>1998</year><holder>Jason Gunthorpe</holder></copyright>"
+msgstr ""
+"<copyright><year>1998</year><holder>Jason Gunthorpe</holder></copyright>"
 
-#. type: <p></p>
-#: guide.sgml:21 offline.sgml:22
+#. type: Content of: <book><bookinfo><legalnotice><title>
+#: guide.dbk:31 offline.dbk:32
+msgid "License Notice"
+msgstr "Aviso de Licença"
+
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: guide.dbk:33 offline.dbk:34
 msgid ""
 "\"APT\" and this document are free software; you can redistribute them and/"
 "or modify them under the terms of the GNU General Public License as "
 "published by the Free Software Foundation; either version 2 of the License, "
 "or (at your option) any later version."
 msgstr ""
-"\"APT\" and this document are free software; you can redistribute them and/"
-"or modify them under the terms of the GNU General Public License as "
-"published by the Free Software Foundation; either version 2 of the License, "
-"or (at your option) any later version."
+"\"APT\" e este documento são software livre; você pode distribuí-lo e/ou "
+"modificá-lo sob os termos da GNU General Public License como publicada "
+"pela Free Software Foundation; seja na versão 2 da Licença, ou (por sua "
+"opção) qualquer versão posterior."
 
-#. type: <p></p>
-#: guide.sgml:24 offline.sgml:25
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: guide.dbk:42 offline.dbk:40
 msgid ""
 "For more details, on Debian systems, see the file /usr/share/common-licenses/"
 "GPL for the full license."
@@ -8521,31 +8709,31 @@ msgstr ""
 "Para mais detalhes em sistemas Debian, veja o ficheiro /usr/share/common-"
 "licenses/GPL para a licença completa."
 
-#. type: <heading></heading>
-#: guide.sgml:32
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:49
 msgid "General"
 msgstr "Geral"
 
-#. type: <p></p>
-#: guide.sgml:38
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:51
 msgid ""
-"The APT package currently contains two sections, the APT <prgn>dselect</"
-"prgn> method and the <prgn>apt-get</prgn> command line user interface. Both "
-"provide a way to install and remove packages as well as download new "
-"packages from the Internet."
+"The APT package currently contains two sections, the APT <command>dselect</"
+"command> method and the <command>apt-get</command> command line user "
+"interface. Both provide a way to install and remove packages as well as "
+"download new packages from the Internet."
 msgstr ""
-"O pacote APT contém actualmente duas secções, o método <prgn>dselect</prgn> "
-"do APT e a interface de utilizador de linha de comandos <prgn>apt-get</"
-"prgn>. Ambos disponibilizam uma maneira de instalar e remover pacotes assim "
-"como descarregar novos pacotes da Internet."
+"O pacote APT contém actualmente duas secções, o método <command>dselect</"
+"command> do APT e a interface de utilizador de linha de comandos "
+"<command>apt-get</command>. Ambos disponibilizam uma maneira de instalar e "
+"remover pacotes assim como descarregar novos pacotes da Internet."
 
-#. type: <heading></heading>
-#: guide.sgml:39
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:57
 msgid "Anatomy of the Package System"
 msgstr "Anatomia do Sistema de Pacotes"
 
-#. type: <p></p>
-#: guide.sgml:44
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:59
 msgid ""
 "The Debian packaging system has a large amount of information associated "
 "with each package to help assure that it integrates cleanly and easily into "
@@ -8556,8 +8744,8 @@ msgstr ""
 "limpo e fácil no sistema. A mais proeminente das suas funcionalidades é o "
 "sistema de dependências."
 
-#. type: <p></p>
-#: guide.sgml:52
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:64
 msgid ""
 "The dependency system allows individual programs to make use of shared "
 "elements in the system such as libraries. It simplifies placing infrequently "
@@ -8572,8 +8760,8 @@ msgstr ""
 "médio. Também permite opções em agentes de transporte de mail, servidores X "
 "e mais."
 
-#. type: <p></p>
-#: guide.sgml:57
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:71
 msgid ""
 "The first step to understanding the dependency system is to grasp the "
 "concept of a simple dependency. The meaning of a simple dependency is that a "
@@ -8585,8 +8773,8 @@ msgstr ""
 "simples é que um pacote requer outro pacote seja instalado ao mesmo tempo "
 "para funcionar correctamente."
 
-#. type: <p></p>
-#: guide.sgml:63
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:76
 msgid ""
 "For instance, mailcrypt is an emacs extension that aids in encrypting email "
 "with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a "
@@ -8598,8 +8786,8 @@ msgstr ""
 "uma dependência simples do GPG. Também, porque é uma extensão do emacs, tem "
 "uma dependência simples do emacs, e sem o emacs é completamente inútil."
 
-#. type: <p></p>
-#: guide.sgml:73
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:82
 msgid ""
 "The other important dependency to understand is a conflicting dependency. It "
 "means that a package, when installed with another package, will not work and "
@@ -8620,8 +8808,8 @@ msgstr ""
 "de mail têm uma dependência de conflito com todos os outros agentes de "
 "transporte de mail."
 
-#. type: <p></p>
-#: guide.sgml:83
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:92
 msgid ""
 "As an added complication there is the possibility for a package to pretend "
 "to be another package. Consider that exim and sendmail for many intents are "
@@ -8641,8 +8829,8 @@ msgstr ""
 "agente de transporte de mail dependem de um mail-transport-agent. Isto pode "
 "adicionar uma grande confusão quando se tenta corrigir pacotes manualmente."
 
-#. type: <p></p>
-#: guide.sgml:88
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:102
 msgid ""
 "At any given time a single dependency may be met by packages that are "
 "already installed or it may not be. APT attempts to help resolve dependency "
@@ -8654,77 +8842,85 @@ msgstr ""
 "problemas com dependências ao disponibilizar um número de algoritmos "
 "automáticos que ajudam a seleccionar os pacotes para instalação."
 
-#. type: <heading></heading>
-#: guide.sgml:96
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:111
 msgid "apt-get"
 msgstr "apt-get"
 
-#. type: <p></p>
-#: guide.sgml:102
-msgid ""
-"<prgn>apt-get</prgn> provides a simple way to install packages from the "
-"command line. Unlike <prgn>dpkg</prgn>, <prgn>apt-get</prgn> does not "
-"understand .deb files, it works with the package's proper name and can only "
-"install .deb archives from a <em>Source</em>."
-msgstr ""
-"<prgn>apt-get</prgn> fornece uma maneira simples de instalar pacotes a "
-"partir da linha de comandos. Ao contrário do <prgn>dpkg</prgn>, o <prgn>apt-"
-"get</prgn> não compreende os ficheiros .deb, funciona com o nome próprio do "
-"pacote e apenas pode instalar arquivos .deb a partir de uma <em>Source</em>."
-
-#. type: <p></p>
-#: guide.sgml:109
-msgid ""
-"The first <footnote><p>If you are using an http proxy server you must set "
-"the http_proxy environment variable first, see sources.list(5)</p></"
-"footnote> thing that should be done before using <prgn>apt-get</prgn> is to "
-"fetch the package lists from the <em>Sources</em> so that it knows what "
-"packages are available. This is done with <tt>apt-get update</tt>. For "
-"instance,"
-msgstr ""
-"O primeira <footnote><p>se você está a usar um servidor proxy http você tem "
-"que definir a variável de ambiente http_proxy primeiro, veja sources."
-"list(5)</p></footnote> coisa que deve ser feita antes de usar <prgn>apt-get</"
-"prgn> é obter as listas de pacotes a partir das <em>Sources</em> para que "
-"ele saiba que pacotes estão disponíveis. Isto é feito com <tt>apt-get "
-"update</tt>. Por exemplo,"
-
-#. type: <example></example>
-#: guide.sgml:116
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:113
+msgid ""
+"<command>apt-get</command> provides a simple way to install packages from "
+"the command line. Unlike <command>dpkg</command>, <command>apt-get</command> "
+"does not understand .deb files, it works with the package's proper name and "
+"can only install .deb archives from a <emphasis>Source</emphasis>."
+msgstr ""
+"<command>apt-get</command> fornece uma maneira simples de instalar pacotes a "
+"partir da linha de comandos. Ao contrário do <command>dpkg</command>, o "
+"<command>apt-get</command> não compreende os ficheiros .deb, funciona com o "
+"nome próprio do pacote e apenas pode instalar arquivos .deb a partir de uma "
+"<emphasis>Source</emphasis>."
+
+#. type: Content of: <book><chapter><para><footnote><para>
+#: guide.dbk:119
+msgid ""
+"If you are using an http proxy server you must set the http_proxy "
+"environment variable first, see sources.list(5)"
+msgstr ""
+"se você está a usar um servidor proxy http você tem que definir a variável "
+"de ambiente http_proxy primeiro, veja sources.list(5)"
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:119
+msgid ""
+"The first <placeholder type=\"footnote\" id=\"0\"/> thing that should be "
+"done before using <command>apt-get</command> is to fetch the package lists "
+"from the <emphasis>Sources</emphasis> so that it knows what packages are "
+"available. This is done with <literal>apt-get update</literal>. For instance,"
+msgstr ""
+"O primeira <placeholder type=\"footnote\" id=\"0\"/> coisa que deve ser "
+"feita antes de usar <command>apt-get</command> é obter as listas de pacotes "
+"a partir das <emphasis>Sources</emphasis> para que ele saiba que pacotes "
+"estão disponíveis. Isto é feito com <literal>apt-get update</literal>. Por "
+"exemplo,"
+
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:127
 #, no-wrap
 msgid ""
 "# apt-get update\n"
 "Get http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
 "Get http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 msgstr ""
 "# apt-get update\n"
 "Get http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
 "Get http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 
-#. type: <p><taglist>
-#: guide.sgml:120
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:134
 msgid "Once updated there are several commands that can be used:"
 msgstr "Uma vez actualizado existem vários comandos que podem ser usados:"
 
-#. type: <tag></tag>
-#: guide.sgml:121
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:138
 msgid "upgrade"
 msgstr "upgrade"
 
-#. type: <p></p>
-#: guide.sgml:131
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:141
 msgid ""
 "Upgrade will attempt to gently upgrade the whole system. Upgrade will never "
 "install a new package or remove an existing package, nor will it ever "
 "upgrade a package that might cause some other package to break. This can be "
 "used daily to relatively safely upgrade the system. Upgrade will list all of "
 "the packages that it could not upgrade, this usually means that they depend "
-"on new packages or conflict with some other package. <prgn>dselect</prgn> or "
-"<tt>apt-get install</tt> can be used to force these packages to install."
+"on new packages or conflict with some other package. <command>dselect</"
+"command> or <literal>apt-get install</literal> can be used to force these "
+"packages to install."
 msgstr ""
 "Upgrade irá tentar actualizar gentilmente todo o sistema. Upgrade nunca irá "
 "instalar um pacote novo ou remover um pacote existente, nem nunca irá "
@@ -8732,16 +8928,16 @@ msgstr ""
 "ser usado diariamente para actualizar o sistema com relativa segurança. "
 "Upgrade ira listar todos os pacotes que não pode actualizar, isto geralmente "
 "significa que eles dependem de novos pacotes ou entram em conflito com algum "
-"outro pacote. <prgn>dselect</prgn> ou <tt>apt-get install</tt> podem ser "
-"usados para forçar estes pacotes a instalar."
+"outro pacote. <command>dselect</command> ou <literal>apt-get install</"
+"literal> podem ser usados para forçar estes pacotes a instalar."
 
-#. type: <tag></tag>
-#: guide.sgml:131
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:153
 msgid "install"
 msgstr "install"
 
-#. type: <p></p>
-#: guide.sgml:140
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:156
 msgid ""
 "Install is used to install packages by name. The package is automatically "
 "fetched and installed. This can be useful if you already know the name of "
@@ -8759,33 +8955,34 @@ msgstr ""
 "com os pacotes listados e irá escrever um sumário e pedir confirmação se "
 "algo mais que os seus argumentos serão alterados."
 
-#. type: <tag></tag>
-#: guide.sgml:140
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:167
 msgid "dist-upgrade"
 msgstr "dist-upgrade"
 
-#. type: <p></p>
-#: guide.sgml:149
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:170
 msgid ""
 "Dist-upgrade is a complete upgrader designed to simplify upgrading between "
 "releases of Debian. It uses a sophisticated algorithm to determine the best "
 "set of packages to install, upgrade and remove to get as much of the system "
 "to the newest release. In some situations it may be desired to use dist-"
 "upgrade rather than spend the time manually resolving dependencies in "
-"<prgn>dselect</prgn>. Once dist-upgrade has completed then <prgn>dselect</"
-"prgn> can be used to install any packages that may have been left out."
+"<command>dselect</command>. Once dist-upgrade has completed then "
+"<command>dselect</command> can be used to install any packages that may have "
+"been left out."
 msgstr ""
 "Dist-upgrade é um actualizador completo desenhado para simplificar a "
 "actualização entre lançamentos da Debian. Usa um algoritmo sofisticado para "
 "determinar o melhor conjunto de pacotes a instalar, actualizar ou remover "
 "para obter o máximo do sistema para o novo lançamento. Em algumas situações "
 "pode ser desejável usar o dist-upgrade em vez de passar o tempo a resolver "
-"dependências manualmente no <prgn>dselect</prgn>. Assim que o dist-upgrade "
-"tiver terminado então pode ser usado o <prgn>dselect</prgn> para instalar "
-"quaisquer pacotes que tenham ficado de fora."
+"dependências manualmente no <command>dselect</command>. Assim que o dist-"
+"upgrade tiver terminado então pode ser usado o <command>dselect</command> "
+"para instalar quaisquer pacotes que tenham ficado de fora."
 
-#. type: <p></p>
-#: guide.sgml:152
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:180
 msgid ""
 "It is important to closely look at what dist-upgrade is going to do, its "
 "decisions may sometimes be quite surprising."
@@ -8793,166 +8990,161 @@ msgstr ""
 "É importante observar de perto o que o dist-upgrade vai fazer, as suas "
 "decisões podem por vezes ser bastante surpreendentes."
 
-#. type: <p></p>
-#: guide.sgml:163
-#, fuzzy
-#| msgid ""
-#| "<prgn>apt-get</prgn> has several command line options that are detailed "
-#| "in its man page, <manref section=\"8\" name=\"apt-get\">. The most useful "
-#| "option is <tt>-d</tt> which does not install the fetched files. If the "
-#| "system has to download a large number of package it would be undesired to "
-#| "start installing them in case something goes wrong. When <tt>-d</tt> is "
-#| "used the downloaded archives can be installed by simply running the "
-#| "command that caused them to be downloaded again without <tt>-d</tt>."
-msgid ""
-"<prgn>apt-get</prgn> has several command line options that are detailed in "
-"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful "
-"option is <tt>-d</tt> which does not install the fetched files. If the "
-"system has to download a large number of package it would be undesired to "
-"start installing them in case something goes wrong. When <tt>-d</tt> is used "
-"the downloaded archives can be installed by simply running the command that "
-"caused them to be downloaded again without <tt>-d</tt>."
-msgstr ""
-"<prgn>apt-get</prgn> tem várias opções de linha de comandos que estão "
-"detalhados no seu manual, <manref section=\"8\" name=\"apt-get\">. A opção "
-"mais útil é <tt>-d</tt> que não instala os pacotes obtidos, Se o sistema "
-"tiver que descarregar um grande número de pacotes seria indesejável começar "
-"a instalá-los no caso de algo correr mal. Quando se usa <tt>-d</tt> os "
-"arquivos descarregados podem ser instalados simplesmente ao correr de novo "
-"comando que s descarregou mas sem o <tt>-d</tt>."
-
-#. type: <heading></heading>
-#: guide.sgml:168
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:187
+msgid ""
+"<command>apt-get</command> has several command line options that are "
+"detailed in its man page, <citerefentry><refentrytitle>apt-get</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>. The most useful "
+"option is <literal>-d</literal> which does not install the fetched files. If "
+"the system has to download a large number of package it would be undesired "
+"to start installing them in case something goes wrong. When <literal>-d</"
+"literal> is used the downloaded archives can be installed by simply running "
+"the command that caused them to be downloaded again without <literal>-d</"
+"literal>."
+msgstr ""
+"<command>apt-get</command> tem várias opções de linha de comandos que estão "
+"detalhados no seu manual, <citerefentry><refentrytitle>apt-get</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>. A opção mais útil é "
+"<literal>-d</literal> que não instala os pacotes obtidos, Se o sistema tiver "
+"que descarregar um grande número de pacotes seria indesejável começar a "
+"instalá-los no caso de algo correr mal. Quando se usa <literal>-d</literal> "
+"os arquivos descarregados podem ser instalados simplesmente ao correr de "
+"novo comando que s descarregou mas sem o <literal>-d</literal>."
+
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:199
 msgid "DSelect"
 msgstr "DSelect"
 
-#. type: <p></p>
-#: guide.sgml:173
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:201
 msgid ""
-"The APT <prgn>dselect</prgn> method provides the complete APT system with "
-"the <prgn>dselect</prgn> package selection GUI. <prgn>dselect</prgn> is used "
-"to select the packages to be installed or removed and APT actually installs "
-"them."
+"The APT <command>dselect</command> method provides the complete APT system "
+"with the <command>dselect</command> package selection GUI. <command>dselect</"
+"command> is used to select the packages to be installed or removed and APT "
+"actually installs them."
 msgstr ""
-"O método <prgn>dselect</prgn> do APT disponibiliza o sistema APT completo "
-"com a GUI de selecção de pacotes <prgn>dselect</prgn>. O  <prgn>dselect</"
-"prgn> é usado para seleccionar os pacotes a serem instalados ou removidos e "
-"o APT instala-os."
+"O método <command>dselect</command> do APT disponibiliza o sistema APT "
+"completo com a GUI de selecção de pacotes <command>dselect</command>. O  "
+"<command>dselect</command> é usado para seleccionar os pacotes a serem "
+"instalados ou removidos e o APT instala-os."
 
-#. type: <p></p>
-#: guide.sgml:184
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:207
 msgid ""
-"To enable the APT method you need to select [A]ccess in <prgn>dselect</prgn> "
-"and then choose the APT method. You will be prompted for a set of "
-"<em>Sources</em> which are places to fetch archives from. These can be "
-"remote Internet sites, local Debian mirrors or CD-ROMs. Each source can "
-"provide a fragment of the total Debian archive, APT will automatically "
+"To enable the APT method you need to select [A]ccess in <command>dselect</"
+"command> and then choose the APT method. You will be prompted for a set of "
+"<emphasis>Sources</emphasis> which are places to fetch archives from. These "
+"can be remote Internet sites, local Debian mirrors or CD-ROMs. Each source "
+"can provide a fragment of the total Debian archive, APT will automatically "
 "combine them to form a complete set of packages. If you have a CD-ROM then "
 "it is a good idea to specify it first and then specify a mirror so that you "
 "have access to the latest bug fixes. APT will automatically use packages on "
 "your CD-ROM before downloading from the Internet."
 msgstr ""
 "Para activar o método APT você precisa de seleccionar [A]ccess no "
-"<prgn>dselect</prgn> e depois escolher o método APT. Ser-lhe-à perguntado "
-"por um conjunto de <em>Sources</em> que são os lugares de onde obter os "
-"arquivos. Estes podem ser sites remotos da Internet, mirrors Debian locais "
-"ou CD-ROMs. Cada source pode disponibilizar um fragmento do arquivo Debian "
-"total. O APT irá automaticamente combiná-los para formar um conjunto "
-"completo de pacotes. Se tem um CD-ROM, então é boa ideia especificá-lo em "
-"primeiro lugar e depois especificar um mirror para ter acesso às correcções "
-"de bugs mais recentes. O APT irá automaticamente usar os pacotes no seu CD-"
-"ROM antes de descarregar da Internet."
-
-#. type: <example></example>
-#: guide.sgml:198
+"<command>dselect</command> e depois escolher o método APT. Ser-lhe-à "
+"perguntado por um conjunto de <emphasis>Sources</emphasis> que são os "
+"lugares de onde obter os arquivos. Estes podem ser sites remotos da "
+"Internet, mirrors Debian locais ou CD-ROMs. Cada source pode disponibilizar "
+"um fragmento do arquivo Debian total. O APT irá automaticamente combiná-los "
+"para formar um conjunto completo de pacotes. Se tem um CD-ROM, então é boa "
+"ideia especificá-lo em primeiro lugar e depois especificar um mirror para "
+"ter acesso às correcções de bugs mais recentes. O APT irá automaticamente "
+"usar os pacotes no seu CD-ROM antes de descarregar da Internet."
+
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:218
 #, no-wrap
 msgid ""
 "   Set up a list of distribution source locations\n"
-"\t \n"
+"\n"
 " Please give the base URL of the debian distribution.\n"
 " The access schemes I know about are: http file\n"
-"\t   \n"
+"\n"
 " For example:\n"
 "      file:/mnt/debian,\n"
 "      ftp://ftp.debian.org/debian,\n"
 "      http://ftp.de.debian.org/debian,\n"
-"      \n"
-"      \n"
-" URL [http://llug.sep.bnl.gov/debian]:"
+"\n"
+"\n"
+" URL [http://llug.sep.bnl.gov/debian]:\n"
 msgstr ""
 "   Configurar uma lista de localizações fonte da distribuição\n"
-"\t \n"
+"\n"
 " Por favor forneça o URL base da distribuição Debian.\n"
 " Os esquemas de acesso que conheço são: http file\n"
-"\t   \n"
+"\n"
 " Por exemplo:\n"
 "      file:/mnt/debian,\n"
 "      ftp://ftp.debian.org/debian,\n"
 "      http://ftp.de.debian.org/debian,\n"
-"      \n"
-"      \n"
-" URL [http://llug.sep.bnl.gov/debian]:"
+"\n"
+"\n"
+" URL [http://llug.sep.bnl.gov/debian]:\n"
 
-#. type: <p></p>
-#: guide.sgml:205
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:232
 msgid ""
-"The <em>Sources</em> setup starts by asking for the base of the Debian "
-"archive, defaulting to a HTTP mirror. Next it asks for the distribution to "
-"get."
+"The <emphasis>Sources</emphasis> setup starts by asking for the base of the "
+"Debian archive, defaulting to a HTTP mirror. Next it asks for the "
+"distribution to get."
 msgstr ""
-"A configuração de <em>Sources</em> começa por perguntar pela base do arquivo "
-"Debian, usando por predefinição um mirror HTTP. Depois pergunta qual a "
-"distribuição a obter."
+"A configuração de <emphasis>Sources</emphasis> começa por perguntar pela "
+"base do arquivo Debian, usando por predefinição um mirror HTTP. Depois "
+"pergunta qual a distribuição a obter."
 
-#. type: <example></example>
-#: guide.sgml:212
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:237
 #, no-wrap
 msgid ""
 " Please give the distribution tag to get or a path to the\n"
 " package file ending in a /. The distribution\n"
 " tags are typically something like: stable unstable testing non-US\n"
-"   \n"
-" Distribution [stable]:"
+"\n"
+" Distribution [stable]:\n"
 msgstr ""
 " Por favor forneça a etiqueta da distribuição a obter ou um caminho para o\n"
 " ficheiro package terminando com um /. As etiquetas da\n"
 " distribuição são tipicamente algo como: stable unstable testing non-US\n"
-"   \n"
-" Distribution [stable]:"
-
-#. type: <p></p>
-#: guide.sgml:222
-msgid ""
-"The distribution refers to the Debian version in the archive, <em>stable</"
-"em> refers to the latest released version and <em>unstable</em> refers to "
-"the developmental version. <em>non-US</em> is only available on some mirrors "
-"and refers to packages that contain encryption technology or other things "
-"that cannot be exported from the United States. Importing these packages "
-"into the US is legal however."
-msgstr ""
-"A distribuição refere-se à versão Debian no arquivo, <em>stable</em> refere-"
-"se à última versão lançada e <em>unstable</em> refere-se à versão de "
-"desenvolvimento. <em>non-US</em> apenas está disponível em alguns mirrors e "
-"refere-se a pacotes que contém tecnologia de encriptação ou outras coisas "
-"que não podem ser exportadas dos Estados Unidos. No entanto importar estes "
-"pacotes para os US é legal."
-
-#. type: <example></example>
-#: guide.sgml:228
+"\n"
+" Distribution [stable]:\n"
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:244
+msgid ""
+"The distribution refers to the Debian version in the archive, "
+"<emphasis>stable</emphasis> refers to the latest released version and "
+"<emphasis>unstable</emphasis> refers to the developmental version. "
+"<emphasis>non-US</emphasis> is only available on some mirrors and refers to "
+"packages that contain encryption technology or other things that cannot be "
+"exported from the United States. Importing these packages into the US is "
+"legal however."
+msgstr ""
+"A distribuição refere-se à versão Debian no arquivo, <emphasis>stable</"
+"emphasis> refere-se à última versão lançada e <emphasis>unstable</emphasis> "
+"refere-se à versão de desenvolvimento. <emphasis>non-US</emphasis> apenas "
+"está disponível em alguns mirrors e refere-se a pacotes que contém "
+"tecnologia de encriptação ou outras coisas que não podem ser exportadas dos "
+"Estados Unidos. No entanto importar estes pacotes para os US é legal."
+
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:253
 #, no-wrap
 msgid ""
 " Please give the components to get\n"
 " The components are typically something like: main contrib non-free\n"
-"  \n"
-" Components [main contrib non-free]:"
+"\n"
+" Components [main contrib non-free]:\n"
 msgstr ""
 " Por favor forneça os componentes a obter\n"
 " Tipicamente os componentes são algo como: main contrib non-free\n"
-"  \n"
-" Componentes [main contrib non-free]:"
+"\n"
+" Componentes [main contrib non-free]:\n"
 
-#. type: <p></p>
-#: guide.sgml:236
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:259
 msgid ""
 "The components list refers to the list of sub distributions to fetch. The "
 "distribution is split up based on software licenses, main being DFSG free "
@@ -8964,8 +9156,8 @@ msgstr ""
 "pacotes livres DFSG enquanto contrib e non-free contêm coisas que têm várias "
 "restrições colocadas no seu uso e distribuição."
 
-#. type: <p></p>
-#: guide.sgml:240
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:265
 msgid ""
 "Any number of sources can be added, the setup script will continue to prompt "
 "until you have specified all that you want."
@@ -8973,23 +9165,23 @@ msgstr ""
 "Pode ser adicionado qualquer número de fontes, o script de configuração irá "
 "continuar a perguntar-lhe até que tenha especificado todas as que deseja."
 
-#. type: <p></p>
-#: guide.sgml:247
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:269
 msgid ""
-"Before starting to use <prgn>dselect</prgn> it is necessary to update the "
-"available list by selecting [U]pdate from the menu. This is a superset of "
-"<tt>apt-get update</tt> that makes the fetched information available to "
-"<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get update</"
-"tt> has been run before."
+"Before starting to use <command>dselect</command> it is necessary to update "
+"the available list by selecting [U]pdate from the menu. This is a superset "
+"of <literal>apt-get update</literal> that makes the fetched information "
+"available to <command>dselect</command>. [U]pdate must be performed even if "
+"<literal>apt-get update</literal> has been run before."
 msgstr ""
-"Antes de começar a usar o <prgn>dselect</prgn> é necessário actualizar a "
-"lista disponível ao seleccionar [U]pdate no menu. Isto é um super-conjunto "
-"do <tt>apt-get update</tt> que torna a informação obtida disponível ao "
-"<prgn>dselect</prgn>. Deve ser executado o [U]pdate mesmo que tenha sido "
-"feito <tt>apt-get update</tt> antes."
+"Antes de começar a usar o <command>dselect</command> é necessário actualizar "
+"a lista disponível ao seleccionar [U]pdate no menu. Isto é um super-conjunto "
+"do <literal>apt-get update</literal> que torna a informação obtida "
+"disponível ao <command>dselect</command>. Deve ser executado o [U]pdate "
+"mesmo que tenha sido feito <literal>apt-get update</literal> antes."
 
-#. type: <p></p>
-#: guide.sgml:253
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:276
 msgid ""
 "You can then go on and make your selections using [S]elect and then perform "
 "the installation using [I]nstall. When using the APT method the [C]onfig and "
@@ -9000,76 +9192,83 @@ msgstr ""
 "instalação usando [I]nstall. Quando se usa o método APT os comandos [C]onfig "
 "e [R]emove não fazem sentido, o comando [I]nstall executa ambos juntamente."
 
-#. type: <p></p>
-#: guide.sgml:258
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:282
 msgid ""
 "By default APT will automatically remove the package (.deb) files once they "
-"have been successfully installed. To change this behavior place <tt>Dselect::"
-"clean \"prompt\";</tt> in /etc/apt/apt.conf."
+"have been successfully installed. To change this behavior place "
+"<literal>Dselect::clean \"prompt\";</literal> in /etc/apt/apt.conf."
 msgstr ""
 "Por predefinição o APT irá automaticamente remover o ficheiro de pacote (."
 "deb) assim que ele tenha sido instalado com sucesso. Para alterar este "
-"comportamento coloque <tt>Dselect::clean \"prompt\";</tt> em /etc/apt/apt."
-"conf."
+"comportamento coloque <literal>Dselect::clean \"prompt\";</literal> em /etc/"
+"apt/apt.conf."
 
-#. type: <heading></heading>
-#: guide.sgml:264
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:288
 msgid "The Interface"
 msgstr "A Interface"
 
-#. type: <p></p>
-#: guide.sgml:278
+#. type: Content of: <book><chapter><para><footnote><para>
+#: guide.dbk:292
 msgid ""
-"Both that APT <prgn>dselect</prgn> method and <prgn>apt-get</prgn> share the "
-"same interface. It is a simple system that generally tells you what it will "
-"do and then goes and does it. <footnote><p>The <prgn>dselect</prgn> method "
-"actually is a set of wrapper scripts to <prgn>apt-get</prgn>. The method "
-"actually provides more functionality than is present in <prgn>apt-get</prgn> "
-"alone.</p></footnote> After printing out a summary of what will happen APT "
+"The <command>dselect</command> method actually is a set of wrapper scripts "
+"to <command>apt-get</command>. The method actually provides more "
+"functionality than is present in <command>apt-get</command> alone."
+msgstr ""
+"O método <command>dselect</command> na verdade é um conjunto de scripts "
+"wrapper para o <command>apt-get</command>. O método disponibiliza mais "
+"funcionalidades que aquelas presentes no <command>apt-get</command> sozinho."
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:290
+msgid ""
+"Both that APT <command>dselect</command> method and <command>apt-get</"
+"command> share the same interface. It is a simple system that generally "
+"tells you what it will do and then goes and does it. <placeholder type="
+"\"footnote\" id=\"0\"/> After printing out a summary of what will happen APT "
 "then will print out some informative status messages so that you can "
 "estimate how far along it is and how much is left to do."
 msgstr ""
-"Ambos método <prgn>dselect</prgn> do APT e <prgn>apt-get</prgn> partilham a "
-"mesma interface. É um sistema simples que geralmente lhe diz o que vai fazer "
-"e depois fá-lo. <footnote><p> O método <prgn>dselect</prgn> na verdade é um "
-"conjunto de scripts wrapper para o <prgn>apt-get</prgn>. O método "
-"disponibiliza mais funcionalidades que aquelas presentes no <prgn>apt-get</"
-"prgn> sozinho.</p></footnote> Após escrever um sumário do que vai acontecer, "
-"o APT depois irá escrever algumas mensagens de estado informativo para que "
-"você possa estimar o progresso e quanto falta fazer."
-
-#. type: <heading></heading>
-#: guide.sgml:280
+"Ambos método <command>dselect</command> do APT e <command>apt-get</command> "
+"partilham a mesma interface. É um sistema simples que geralmente lhe diz o "
+"que vai fazer e depois fá-lo. <placeholder type=\"footnote\" id=\"0\"/> Após "
+"escrever um sumário do que vai acontecer, o APT depois irá escrever algumas "
+"mensagens de estado informativo para que você possa estimar o progresso e "
+"quanto falta fazer."
+
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:301
 msgid "Startup"
 msgstr "Arranque"
 
-#. type: <p></p>
-#: guide.sgml:284
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:303
 msgid ""
 "Before all operations except update, APT performs a number of actions to "
 "prepare its internal state. It also does some checks of the system's state. "
-"At any time these operations can be performed by running <tt>apt-get check</"
-"tt>."
+"At any time these operations can be performed by running <literal>apt-get "
+"check</literal>."
 msgstr ""
 "Antes de todas as operações, excepto a update, o APT executa um número de "
 "acções para preparar o seu estado interno. Também faz algumas verificações "
 "do estado do sistema. A qualquer altura estas operações pode ser executadas "
-"correndo <tt>apt-get check</tt>."
+"correndo <literal>apt-get check</literal>."
 
-#. type: <example></example>
-#: guide.sgml:289
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:309
 #, no-wrap
 msgid ""
 "# apt-get check\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 msgstr ""
 "# apt-get check\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 
-#. type: <p></p>
-#: guide.sgml:297
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:314
 msgid ""
 "The first thing it does is read all the package files into memory. APT uses "
 "a caching scheme so this operation will be faster the second time it is run. "
@@ -9082,21 +9281,21 @@ msgstr ""
 "encontrados serão ignorados e será mostrado um aviso quando o apt-get "
 "terminar."
 
-#. type: <p></p>
-#: guide.sgml:303
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:320
 msgid ""
 "The final operation performs a detailed analysis of the system's "
 "dependencies. It checks every dependency of every installed or unpacked "
 "package and considers if it is OK. Should this find a problem then a report "
-"will be printed out and <prgn>apt-get</prgn> will refuse to run."
+"will be printed out and <command>apt-get</command> will refuse to run."
 msgstr ""
 "A operação final executa uma análise detalhada das dependências do sistema. "
 "Verifica cada dependência de cada pacote instalado ou desempacotado e "
 "considera se está OK. Caso isto encontre um problema, então é escrito um "
-"relatório e o <prgn>apt-get</prgn> recusa-se a funcionar."
+"relatório e o <command>apt-get</command> recusa-se a funcionar."
 
-#. type: <example></example>
-#: guide.sgml:320
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:326
 #, no-wrap
 msgid ""
 "# apt-get check\n"
@@ -9106,14 +9305,14 @@ msgid ""
 "Sorry, but the following packages have unmet dependencies:\n"
 "  9fonts: Depends: xlib6g but it is not installed\n"
 "  uucp: Depends: mailx but it is not installed\n"
-"  blast: Depends: xlib6g (>= 3.3-5) but it is not installed\n"
+"  blast: Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
 "  adduser: Depends: perl-base but it is not installed\n"
 "  aumix: Depends: libgpmg1 but it is not installed\n"
 "  debiandoc-sgml: Depends: sgml-base but it is not installed\n"
-"  bash-builtins: Depends: bash (>= 2.01) but 2.0-3 is installed\n"
+"  bash-builtins: Depends: bash (&gt;= 2.01) but 2.0-3 is installed\n"
 "  cthugha: Depends: svgalibg1 but it is not installed\n"
-"           Depends: xlib6g (>= 3.3-5) but it is not installed\n"
-"  libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)"
+"           Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
+"  libreadlineg2: Conflicts:libreadline2 (&lt;&lt; 2.1-2.1)\n"
 msgstr ""
 "# apt-get check\n"
 "Reading Package Lists... Done\n"
@@ -9122,17 +9321,17 @@ msgstr ""
 "Sorry, but the following packages have unmet dependencies:\n"
 "  9fonts: Depends: xlib6g but it is not installed\n"
 "  uucp: Depends: mailx but it is not installed\n"
-"  blast: Depends: xlib6g (>= 3.3-5) but it is not installed\n"
+"  blast: Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
 "  adduser: Depends: perl-base but it is not installed\n"
 "  aumix: Depends: libgpmg1 but it is not installed\n"
 "  debiandoc-sgml: Depends: sgml-base but it is not installed\n"
-"  bash-builtins: Depends: bash (>= 2.01) but 2.0-3 is installed\n"
+"  bash-builtins: Depends: bash (&gt;= 2.01) but 2.0-3 is installed\n"
 "  cthugha: Depends: svgalibg1 but it is not installed\n"
-"           Depends: xlib6g (>= 3.3-5) but it is not installed\n"
-"  libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)"
+"           Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
+"  libreadlineg2: Conflicts:libreadline2 (&lt;&lt; 2.1-2.1)\n"
 
-#. type: <p></p>
-#: guide.sgml:329
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:343
 msgid ""
 "In this example the system has many problems, including a serious problem "
 "with libreadlineg2. For each package that has unmet dependencies a line is "
@@ -9146,84 +9345,95 @@ msgstr ""
 "não estão satisfeitas. É também incluída uma explicação curta de porquê o "
 "pacote tem um problema de dependência."
 
-#. type: <p></p>
-#: guide.sgml:337
+#. type: Content of: <book><chapter><section><para><footnote><para>
+#: guide.dbk:352
+msgid ""
+"APT however considers all known dependencies and attempts to prevent broken "
+"packages"
+msgstr ""
+"No entanto o APT considera todas as dependências conhecidas e tenta prevenir "
+"pacotes quebrados"
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:350
 msgid ""
 "There are two ways a system can get into a broken state like this. The first "
-"is caused by <prgn>dpkg</prgn> missing some subtle relationships between "
-"packages when performing upgrades. <footnote><p>APT however considers all "
-"known dependencies and attempts to prevent broken packages</p></footnote>. "
-"The second is if a package installation fails during an operation. In this "
-"situation a package may have been unpacked without its dependents being "
-"installed."
+"is caused by <command>dpkg</command> missing some subtle relationships "
+"between packages when performing upgrades. <placeholder type=\"footnote\" id="
+"\"0\"/>. The second is if a package installation fails during an operation. "
+"In this situation a package may have been unpacked without its dependents "
+"being installed."
 msgstr ""
 "Existem duas maneiras de um sistema entrar num estado de quebra como este. A "
-"primeira é causada pelo <prgn>dpkg</prgn> que não vê algumas relações subtis "
-"entre pacotes quando executa actualizações. <footnote><p>No entanto o APT "
-"considera todas as dependências conhecidas e tenta prevenir pacotes "
-"quebrados</p></footnote>. A segunda é se uma instalação de pacote falha "
+"primeira é causada pelo <command>dpkg</command> que não vê algumas relações "
+"subtis entre pacotes quando executa actualizações. <placeholder type="
+"\"footnote\" id=\"0\"/>. A segunda é se uma instalação de pacote falha "
 "durante uma operação. Nesta situação um pacote pode ter sido desempacotado "
 "sem que as suas dependências tenham sido instaladas."
 
-#. type: <p></p>
-#: guide.sgml:345
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:359
 msgid ""
 "The second situation is much less serious than the first because APT places "
 "certain constraints on the order that packages are installed. In both cases "
-"supplying the <tt>-f</tt> option to <prgn>apt-get</prgn> will cause APT to "
-"deduce a possible solution to the problem and then continue on. The APT "
-"<prgn>dselect</prgn> method always supplies the <tt>-f</tt> option to allow "
-"for easy continuation of failed maintainer scripts."
+"supplying the <literal>-f</literal> option to <command>apt-get</command> "
+"will cause APT to deduce a possible solution to the problem and then "
+"continue on. The APT <command>dselect</command> method always supplies the "
+"<literal>-f</literal> option to allow for easy continuation of failed "
+"maintainer scripts."
 msgstr ""
 "A segunda situação é muito menos séria que a primeira porque o APT coloca "
 "certos constrangimentos na ordem que os pacotes são instalados. Em ambos os "
-"casos, fornecer a opção <tt>-f</tt> ao <prgn>apt-get</prgn> irá fazer com "
-"que o APT deduza uma solução possível para o problema e depois continue. O "
-"método <prgn>dselect</prgn> do APT fornece sempre a opção <tt>-f</tt> para "
-"permitir uma continuação fácil de scripts do responsável com falhas."
-
-#. type: <p></p>
-#: guide.sgml:351
-msgid ""
-"However, if the <tt>-f</tt> option is used to correct a seriously broken "
-"system caused by the first case then it is possible that it will either fail "
-"immediately or the installation sequence will fail. In either case it is "
-"necessary to manually use dpkg (possibly with forcing options) to correct "
-"the situation enough to allow APT to proceed."
-msgstr ""
-"No entanto, se for usada a opção <tt>-f</tt> para corrigir um sistema "
-"seriamente quebrado causado pelo primeiro caso, então é possível que ou "
-"falhe imediatamente ou falhe na sequência de instalação. Em qualquer dos "
+"casos, fornecer a opção <literal>-f</literal> ao <command>apt-get</command> "
+"irá fazer com que o APT deduza uma solução possível para o problema e depois "
+"continue. O método <command>dselect</command> do APT fornece sempre a opção "
+"<literal>-f</literal> para permitir uma continuação fácil de scripts do "
+"responsável com falhas."
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:368
+msgid ""
+"However, if the <literal>-f</literal> option is used to correct a seriously "
+"broken system caused by the first case then it is possible that it will "
+"either fail immediately or the installation sequence will fail. In either "
+"case it is necessary to manually use dpkg (possibly with forcing options) to "
+"correct the situation enough to allow APT to proceed."
+msgstr ""
+"No entanto, se for usada a opção <literal>-f</literal> para corrigir um "
+"sistema seriamente quebrado causado pelo primeiro caso, então é possível que "
+"ou falhe imediatamente ou falhe na sequência de instalação. Em qualquer dos "
 "casos é necessário usar o dpkg manualmente (possivelmente com opções de "
 "forçar) para corrigir a situação o suficiente para permitir ao APT continuar."
 
-#. type: <heading></heading>
-#: guide.sgml:356
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:376
 msgid "The Status Report"
 msgstr "O Relatório de Estado"
 
-#. type: <p></p>
-#: guide.sgml:363
-msgid ""
-"Before proceeding <prgn>apt-get</prgn> will present a report on what will "
-"happen. Generally the report reflects the type of operation being performed "
-"but there are several common elements. In all cases the lists reflect the "
-"final state of things, taking into account the <tt>-f</tt> option and any "
-"other relevant activities to the command being executed."
-msgstr ""
-"Antes de prosseguir, o <prgn>apt-get</prgn> irá apresentar um relatório do "
-"que irá acontecer. Geralmente o relatório reflecte o tipo de operações a ser "
-"executadas mas há vários elementos comuns. Em todos os casos a lista "
-"reflecte o estado final das coisas, tendo em conta a opção <tt>-f</tt> e "
-"quaisquer outras actividades relevantes ao comando que vai ser executado."
-
-#. type: <heading></heading>
-#: guide.sgml:364
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:378
+msgid ""
+"Before proceeding <command>apt-get</command> will present a report on what "
+"will happen. Generally the report reflects the type of operation being "
+"performed but there are several common elements. In all cases the lists "
+"reflect the final state of things, taking into account the <literal>-f</"
+"literal> option and any other relevant activities to the command being "
+"executed."
+msgstr ""
+"Antes de prosseguir, o <command>apt-get</command> irá apresentar um "
+"relatório do que irá acontecer. Geralmente o relatório reflecte o tipo de "
+"operações a ser executadas mas há vários elementos comuns. Em todos os casos "
+"a lista reflecte o estado final das coisas, tendo em conta a opção <literal>-"
+"f</literal> e quaisquer outras actividades relevantes ao comando que vai ser "
+"executado."
+
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:385
 msgid "The Extra Package list"
 msgstr "A lista de Pacotes Extra"
 
-#. type: <example></example>
-#: guide.sgml:372
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:387
 #, no-wrap
 msgid ""
 "The following extra packages will be installed:\n"
@@ -9231,85 +9441,85 @@ msgid ""
 "  mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
 "  bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
 "  squake pgp-i python-base debmake ldso perl libreadlineg2\n"
-"  ssh"
+"  ssh\n"
 msgstr ""
 "Os seguinte pacotes extra serão instalados:\n"
 "  libdbd-mysql-perl xlib6 zlib1 xzx libreadline2 libdbd-msql-perl\n"
 "  mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
 "  bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
 "  squake pgp-i python-base debmake ldso perl libreadlineg2\n"
-"  ssh"
+"  ssh\n"
 
-#. type: <p></p>
-#: guide.sgml:379
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:395
 msgid ""
 "The Extra Package list shows all of the packages that will be installed or "
 "upgraded in excess of the ones mentioned on the command line. It is only "
-"generated for an <tt>install</tt> command. The listed packages are often the "
-"result of an Auto Install."
+"generated for an <literal>install</literal> command. The listed packages are "
+"often the result of an Auto Install."
 msgstr ""
 "A lista de Pacotes Extra mostra todos os pacotes que irão ser instalados ou "
 "actualizados em excesso daqueles mencionados na linha de comandos. É apenas "
-"gerada para um comando <tt>install</tt>. Os pacotes listados são geralmente "
-"o resultado de uma Auto instalação."
+"gerada para um comando <literal>install</literal>. Os pacotes listados são "
+"geralmente o resultado de uma Auto instalação."
 
-#. type: <heading></heading>
-#: guide.sgml:382
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:402
 msgid "The Packages to Remove"
 msgstr "Os Pacotes para Remover"
 
-#. type: <example></example>
-#: guide.sgml:389
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:404
 #, no-wrap
 msgid ""
 "The following packages will be REMOVED:\n"
 "  xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
 "  xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
 "  xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
-"  nas xpilot xfig"
+"  nas xpilot xfig\n"
 msgstr ""
 "Os seguintes pacotes irão ser REMOVIDOS:\n"
 "  xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
 "  xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
 "  xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
-"  nas xpilot xfig"
+"  nas xpilot xfig\n"
 
-#. type: <p></p>
-#: guide.sgml:399
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:411
 msgid ""
 "The Packages to Remove list shows all of the packages that will be removed "
 "from the system. It can be shown for any of the operations and should be "
 "given a careful inspection to ensure nothing important is to be taken off. "
-"The <tt>-f</tt> option is especially good at generating packages to remove "
-"so extreme care should be used in that case. The list may contain packages "
-"that are going to be removed because they are only partially installed, "
-"possibly due to an aborted installation."
+"The <literal>-f</literal> option is especially good at generating packages "
+"to remove so extreme care should be used in that case. The list may contain "
+"packages that are going to be removed because they are only partially "
+"installed, possibly due to an aborted installation."
 msgstr ""
 "A lista Pacotes para Remover mostra todos os pacotes que irão ser removidos "
 "do sistema. Pode ser mostrada para qualquer das operações e deve ser-lhe "
 "dada uma inspecção cuidadosa para assegurar que nada de importante vai ser "
-"removido. A opção <tt>-f</tt> é especialmente boa a gerar pacotes para "
-"remover, portanto neste caso deve-se usar cuidados extremos. A lista pode "
-"conter pacotes que vão ser removidos porque estão apenas parcialmente "
+"removido. A opção <literal>-f</literal> é especialmente boa a gerar pacotes "
+"para remover, portanto neste caso deve-se usar cuidados extremos. A lista "
+"pode conter pacotes que vão ser removidos porque estão apenas parcialmente "
 "instalados, possivelmente devido a uma instalação abortada."
 
-#. type: <heading></heading>
-#: guide.sgml:402
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:421
 msgid "The New Packages list"
 msgstr "A lista de Novos Pacotes"
 
-#. type: <example></example>
-#: guide.sgml:406
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:423
 #, no-wrap
 msgid ""
 "The following NEW packages will installed:\n"
-"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
+"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base\n"
 msgstr ""
 "Os seguintes pacotes NOVOS irão ser instalados:\n"
-"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
+"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base\n"
 
-#. type: <p></p>
-#: guide.sgml:411
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:427
 msgid ""
 "The New Packages list is simply a reminder of what will happen. The packages "
 "listed are not presently installed in the system but will be when APT is "
@@ -9319,57 +9529,57 @@ msgstr ""
 "pacotes listados não estão instalados presentemente no sistema mas irão "
 "estar quando o APT terminar."
 
-#. type: <heading></heading>
-#: guide.sgml:414
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:432
 msgid "The Kept Back list"
 msgstr "A lista Kept Back"
 
-#. type: <example></example>
-#: guide.sgml:419
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:434
 #, no-wrap
 msgid ""
 "The following packages have been kept back\n"
 "  compface man-db tetex-base msql libpaper svgalib1\n"
-"  gs snmp arena lynx xpat2 groff xscreensaver"
+"  gs snmp arena lynx xpat2 groff xscreensaver\n"
 msgstr ""
 "Os seguintes pacotes formam mantidos na versão antiga\n"
 "  compface man-db tetex-base msql libpaper svgalib1\n"
-"  gs snmp arena lynx xpat2 groff xscreensaver"
+"  gs snmp arena lynx xpat2 groff xscreensaver\n"
 
-#. type: <p></p>
-#: guide.sgml:428
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:439
 msgid ""
 "Whenever the whole system is being upgraded there is the possibility that "
 "new versions of packages cannot be installed because they require new things "
 "or conflict with already installed things. In this case the package will "
 "appear in the Kept Back list. The best way to convince packages listed there "
-"to install is with <tt>apt-get install</tt> or by using <prgn>dselect</prgn> "
-"to resolve their problems."
+"to install is with <literal>apt-get install</literal> or by using "
+"<command>dselect</command> to resolve their problems."
 msgstr ""
 "Sempre que todo o sistema é actualizado existe a possibilidade que novas "
 "versões de pacotes não possam ser instaladas porque requerem coisas novas ou "
 "entram em conflito com coisas já instaladas. Nestes casos o pacote irá "
 "aparecer na lista Kept Back. A melhor maneira de convencer os pacotes "
-"listados aqui a instalarem é com o  <tt>apt-get install</tt> ou usando o "
-"<prgn>dselect</prgn> para resolver os seus problemas."
+"listados aqui a instalarem é com o  <literal>apt-get install</literal> ou "
+"usando o <command>dselect</command> para resolver os seus problemas."
 
-#. type: <heading></heading>
-#: guide.sgml:431
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:448
 msgid "Held Packages warning"
 msgstr "Aviso de Pacotes Mantidos"
 
-#. type: <example></example>
-#: guide.sgml:435
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:450
 #, no-wrap
 msgid ""
 "The following held packages will be changed:\n"
-"  cvs"
+"  cvs\n"
 msgstr ""
 "Os seguintes pacotes mantidos irão ser alterados:\n"
-"  cvs"
+"  cvs\n"
 
-#. type: <p></p>
-#: guide.sgml:441
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:454
 msgid ""
 "Sometimes you can ask APT to install a package that is on hold, in such a "
 "case it prints out a warning that the held package is going to be changed. "
@@ -9379,33 +9589,35 @@ msgstr ""
 "nestes casos ele mostra um aviso que o pacote retido vai ser alterado. Isto "
 "apenas deve acontecer durante um dist-upgrade ou install."
 
-#. type: <heading></heading>
-#: guide.sgml:444
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:460
 msgid "Final summary"
 msgstr "Sumário final"
 
-#. type: <p></p>
-#: guide.sgml:447
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:462
 msgid ""
 "Finally, APT will print out a summary of all the changes that will occur."
 msgstr ""
 "Finalmente, o APT irá escrever um sumário de todas as alterações que irão "
 "acontecer."
 
-#. type: <example></example>
-#: guide.sgml:452
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:465
 #, no-wrap
 msgid ""
 "206 packages upgraded, 8 newly installed, 23 to remove and 51 not upgraded.\n"
 "12 packages not fully installed or removed.\n"
-"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used."
+"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used.\n"
 msgstr ""
-"206 pacotes actualizados, 8 instalados de novo, 23 para remover e 51 não actualizados.\n"
+"206 pacotes actualizados, 8 instalados de novo, 23 para remover e 51 não "
+"actualizados.\n"
 "12 pacotes não totalmente instalados ou removidos.\n"
-"É necessário obter 65.7M/66.7M de arquivos. Após desempacotamento será usado 26.5M."
+"É necessário obter 65.7M/66.7M de arquivos. Após desempacotamento será usado "
+"26.5M.\n"
 
-#. type: <p></p>
-#: guide.sgml:470
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:470
 msgid ""
 "The first line of the summary simply is a reduced version of all of the "
 "lists and includes the number of upgrades - that is packages already "
@@ -9435,8 +9647,8 @@ msgstr ""
 "estar feito. Se forem removidos um grande número de pacotes então o valor "
 "pode indicar a quantidade de espaço que irá ser libertado."
 
-#. type: <p></p>
-#: guide.sgml:473
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:484
 msgid ""
 "Some other reports can be generated by using the -u option to show packages "
 "to upgrade, they are similar to the previous examples."
@@ -9444,13 +9656,13 @@ msgstr ""
 "Outros relatórios podem ser gerados ao usar a opção -u para mostrar os "
 "pacotes a actualizar, e são semelhantes aos exemplos prévios."
 
-#. type: <heading></heading>
-#: guide.sgml:477
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:491
 msgid "The Status Display"
 msgstr "O Mostrador de Estado"
 
-#. type: <p></p>
-#: guide.sgml:481
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:493
 msgid ""
 "During the download of archives and package files APT prints out a series of "
 "status messages."
@@ -9458,8 +9670,8 @@ msgstr ""
 "Durante a descarga dos arquivos e ficheiros de pacotes, o APT escreve uma "
 "série de mensagens de estado."
 
-#. type: <example></example>
-#: guide.sgml:490
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:497
 #, no-wrap
 msgid ""
 "# apt-get update\n"
@@ -9468,7 +9680,7 @@ msgid ""
 "Hit http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
 "Get:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
 "Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
-"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s"
+"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s\n"
 msgstr ""
 "# apt-get update\n"
 "Get:1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages\n"
@@ -9476,68 +9688,70 @@ msgstr ""
 "Hit http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
 "Get:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
 "Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
-"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s"
+"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s\n"
 
-#. type: <p></p>
-#: guide.sgml:500
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:506
 msgid ""
-"The lines starting with <em>Get</em> are printed out when APT begins to "
-"fetch a file while the last line indicates the progress of the download. The "
-"first percent value on the progress line indicates the total percent done of "
-"all files. Unfortunately since the size of the Package files is unknown "
-"<tt>apt-get update</tt> estimates the percent done which causes some "
-"inaccuracies."
+"The lines starting with <emphasis>Get</emphasis> are printed out when APT "
+"begins to fetch a file while the last line indicates the progress of the "
+"download. The first percent value on the progress line indicates the total "
+"percent done of all files. Unfortunately since the size of the Package files "
+"is unknown <literal>apt-get update</literal> estimates the percent done "
+"which causes some inaccuracies."
 msgstr ""
-"A linhas iniciadas com <em>Get</em> são escritas quando o APT começa a obter "
-"um ficheiro enquanto a última linha indica o progresso da descarga. O "
-"primeiro valor percentual na linha de progresso indica a percentagem total "
-"completa de todos os ficheiros. Infelizmente como o tamanho dos ficheiros de "
-"Pacotes é desconhecido o <tt>apt-get update</tt> estima a percentagem de "
-"pronto o que causa algumas imprecisões."
+"A linhas iniciadas com <emphasis>Get</emphasis> são escritas quando o APT "
+"começa a obter um ficheiro enquanto a última linha indica o progresso da "
+"descarga. O primeiro valor percentual na linha de progresso indica a "
+"percentagem total completa de todos os ficheiros. Infelizmente como o "
+"tamanho dos ficheiros de Pacotes é desconhecido o <literal>apt-get update</"
+"literal> estima a percentagem de pronto o que causa algumas imprecisões."
 
-#. type: <p></p>
-#: guide.sgml:509
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:514
 msgid ""
 "The next section of the status line is repeated once for each download "
 "thread and indicates the operation being performed and some useful "
 "information about what is happening. Sometimes this section will simply read "
-"<em>Forking</em> which means the OS is loading the download module. The "
-"first word after the [ is the fetch number as shown on the history lines. "
-"The next word is the short form name of the object being downloaded. For "
-"archives it will contain the name of the package that is being fetched."
+"<emphasis>Forking</emphasis> which means the OS is loading the download "
+"module. The first word after the [ is the fetch number as shown on the "
+"history lines. The next word is the short form name of the object being "
+"downloaded. For archives it will contain the name of the package that is "
+"being fetched."
 msgstr ""
 "A secção seguinte da linha de estado é repetida para cada processo de "
 "descarga e indica a operação a ser executada e alguma informação útil acerca "
 "do que está a acontecer. Por vezes esta secção irá simplesmente ler "
-"<em>Forking</em> o que representa que o SO está a carregar o módulo de "
-"download. A primeira palavra após o [ é o número de obtenção como mostrado "
-"nas linhas de histórico. A palavra seguinte é o nome em formato curto do "
-"objecto a ser descarregado. Para os arquivos irá conter o nome do pacote que "
-"está a ser descarregado."
+"<emphasis>Forking</emphasis> o que representa que o SO está a carregar o "
+"módulo de download. A primeira palavra após o [ é o número de obtenção como "
+"mostrado nas linhas de histórico. A palavra seguinte é o nome em formato "
+"curto do objecto a ser descarregado. Para os arquivos irá conter o nome do "
+"pacote que está a ser descarregado."
 
-#. type: <p></p>
-#: guide.sgml:524
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:524
 msgid ""
 "Inside of the single quote is an informative string indicating the progress "
 "of the negotiation phase of the download. Typically it progresses from "
-"<em>Connecting</em> to <em>Waiting for file</em> to <em>Downloading</em> or "
-"<em>Resuming</em>. The final value is the number of bytes downloaded from "
-"the remote site. Once the download begins this is represented as "
-"<tt>102/10.2k</tt> indicating that 102 bytes have been fetched and 10.2 "
-"kilobytes is expected. The total size is always shown in 4 figure notation "
-"to preserve space. After the size display is a percent meter for the file "
-"itself. The second last element is the instantaneous average speed. This "
-"values is updated every 5 seconds and reflects the rate of data transfer for "
-"that period. Finally is shown the estimated transfer time. This is updated "
-"regularly and reflects the time to complete everything at the shown transfer "
-"rate."
+"<emphasis>Connecting</emphasis> to <emphasis>Waiting for file</emphasis> to "
+"<emphasis>Downloading</emphasis> or <emphasis>Resuming</emphasis>. The final "
+"value is the number of bytes downloaded from the remote site. Once the "
+"download begins this is represented as <literal>102/10.2k</literal> "
+"indicating that 102 bytes have been fetched and 10.2 kilobytes is expected. "
+"The total size is always shown in 4 figure notation to preserve space. After "
+"the size display is a percent meter for the file itself. The second last "
+"element is the instantaneous average speed. This values is updated every 5 "
+"seconds and reflects the rate of data transfer for that period. Finally is "
+"shown the estimated transfer time. This is updated regularly and reflects "
+"the time to complete everything at the shown transfer rate."
 msgstr ""
 "Dentro da única citação está uma string de informação que indica o progresso "
-"da fase de negociação do download. Progride tipicamente de <em>A Ligar</em> "
-"para <em>À espera do ficheiro</em> para <em>A descarregar</em> ou <em>A "
-"resumir</em>. O valor final é o número de bytes descarregados a partir do "
-"site remoto. Uma vez começado a descarga isto é representado como "
-"<tt>102/10.2k</tt> indicando que 102 bytes foram obtidos e são esperados "
+"da fase de negociação do download. Progride tipicamente de <emphasis>A "
+"Ligar</emphasis> para <emphasis>À espera do ficheiro</emphasis> para "
+"<emphasis>A descarregar</emphasis> ou <emphasis>A resumir</emphasis>. O "
+"valor final é o número de bytes descarregados a partir do site remoto. Uma "
+"vez começado a descarga isto é representado como <literal>102/10.2k</"
+"literal> indicando que 102 bytes foram obtidos e são esperados "
 "10.2kilobytes. O tamanho total é sempre representado numa anotação de 4 "
 "figuras para preservar espaço. Após a amostragem do tamanho está um medidor "
 "de percentagem para o próprio ficheiro. O segundo último elemento é a "
@@ -9547,56 +9761,52 @@ msgstr ""
 "regularmente e reflecte o tempo para completar tudo ao ritmo de "
 "transferência mostrado."
 
-#. type: <p></p>
-#: guide.sgml:530
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:539
 msgid ""
 "The status display updates every half second to provide a constant feedback "
 "on the download progress while the Get lines scroll back whenever a new file "
 "is started. Since the status display is constantly updated it is unsuitable "
-"for logging to a file, use the <tt>-q</tt> option to remove the status "
-"display."
+"for logging to a file, use the <literal>-q</literal> option to remove the "
+"status display."
 msgstr ""
 "O mostrador de estado actualiza-se a cada meio segundo para disponibilizar "
 "uma informação de retorno constante do progresso de descarga enquanto as "
 "linhas Get deslocam-se para trás sempre que uma nova linha é iniciada. Como "
 "o mostrador de estado é constantemente actualizado não é apropriado para "
-"registar num ficheiro, use a opção <tt>-q</tt> para remover o mostrador de "
-"estado."
+"registar num ficheiro, use a opção <literal>-q</literal> para remover o "
+"mostrador de estado."
 
-#. type: <heading></heading>
-#: guide.sgml:535
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:547
 msgid "Dpkg"
 msgstr "Dpkg"
 
-#. type: <p></p>
-#: guide.sgml:542
-msgid ""
-"APT uses <prgn>dpkg</prgn> for installing the archives and will switch over "
-"to the <prgn>dpkg</prgn> interface once downloading is completed. "
-"<prgn>dpkg</prgn> will also ask a number of questions as it processes the "
-"packages and the packages themselves may also ask several questions. Before "
-"each question there is usually a description of what it is asking and the "
-"questions are too varied to discuss completely here."
-msgstr ""
-"O APT usa o <prgn>dpkg</prgn> para instalar os arquivos e irá mudar para a "
-"interface do <prgn>dpkg</prgn> assim que a descarga estiver completa. O "
-"<prgn>dpkg</prgn> irá também fazer um número de perguntas conforme vai "
-"processando os pacotes e os próprios pacotes podem também fazer várias "
-"questões. Antes de cada pergunta há geralmente uma descrição do que se está "
-"a perguntar e as perguntas são demasiado variadas para serem discutidas aqui."
-
-#. type: <title></title>
-#: offline.sgml:4
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:549
+msgid ""
+"APT uses <command>dpkg</command> for installing the archives and will switch "
+"over to the <command>dpkg</command> interface once downloading is completed. "
+"<command>dpkg</command> will also ask a number of questions as it processes "
+"the packages and the packages themselves may also ask several questions. "
+"Before each question there is usually a description of what it is asking and "
+"the questions are too varied to discuss completely here."
+msgstr ""
+"O APT usa o <command>dpkg</command> para instalar os arquivos e irá mudar "
+"para a interface do <command>dpkg</command> assim que a descarga estiver "
+"completa. O <command>dpkg</command> irá também fazer um número de perguntas "
+"conforme vai processando os pacotes e os próprios pacotes podem também fazer "
+"várias questões. Antes de cada pergunta há geralmente uma descrição do que "
+"se está a perguntar e as perguntas são demasiado variadas para serem "
+"discutidas aqui."
+
+#. type: Content of: <book><title>
+#: offline.dbk:10
 msgid "Using APT Offline"
 msgstr "Usando o APT Offline"
 
-#. type: <version></version>
-#: offline.sgml:7
-msgid "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
-msgstr "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
-
-#. type: <abstract></abstract>
-#: offline.sgml:12
+#. type: Content of: <book><bookinfo><abstract><para>
+#: offline.dbk:24
 msgid ""
 "This document describes how to use APT in a non-networked environment, "
 "specifically a 'sneaker-net' approach for performing upgrades."
@@ -9604,23 +9814,25 @@ msgstr ""
 "Este documento descreve como usar o APT num ambiente sem rede, "
 "especificamente uma aproximação 'sneaker-net' para executar actualizações."
 
-#. type: <copyrightsummary></copyrightsummary>
-#: offline.sgml:16
-msgid "Copyright &copy; Jason Gunthorpe, 1999."
-msgstr "Copyright &copy; Jason Gunthorpe, 1999."
+#. type: Content of: <book><bookinfo>
+#: offline.dbk:29
+msgid ""
+"<copyright><year>1999</year><holder>Jason Gunthorpe</holder></copyright>"
+msgstr ""
+"<copyright><year>1999</year><holder>Jason Gunthorpe</holder></copyright>"
 
-#. type: <heading></heading>
-#: offline.sgml:32
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:47
 msgid "Introduction"
 msgstr "Introdução"
 
-#. type: <heading></heading>
-#: offline.sgml:34 offline.sgml:65 offline.sgml:180
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:49 offline.dbk:79 offline.dbk:191
 msgid "Overview"
 msgstr "Visão geral"
 
-#. type: <p></p>
-#: offline.sgml:40
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:51
 msgid ""
 "Normally APT requires direct access to a Debian archive, either from a local "
 "media or through a network. Another common complaint is that a Debian "
@@ -9632,8 +9844,8 @@ msgstr ""
 "numa ligação lenta, como um modem e outra máquina tem uma ligação muito "
 "rápida mas estão fisicamente distantes."
 
-#. type: <p></p>
-#: offline.sgml:51
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:57
 msgid ""
 "The solution to this is to use large removable media such as a Zip disc or a "
 "SuperDisk disc. These discs are not large enough to store the entire Debian "
@@ -9641,9 +9853,9 @@ msgid ""
 "to use APT to generate a list of packages that are required and then fetch "
 "them onto the disc using another machine with good connectivity. It is even "
 "possible to use another Debian machine with APT or to use a completely "
-"different OS and a download tool like wget. Let <em>remote host</em> mean "
-"the machine downloading the packages, and <em>target host</em> the one with "
-"bad or no connection."
+"different OS and a download tool like wget. Let <emphasis>remote host</"
+"emphasis> mean the machine downloading the packages, and <emphasis>target "
+"host</emphasis> the one with bad or no connection."
 msgstr ""
 "A solução para isto é usar grandes médias amovíveis como um disco Zip ou um "
 "disco SuperDisk. Estes discos não são suficientemente grandes para armazenar "
@@ -9652,12 +9864,12 @@ msgstr ""
 "para gerar uma lista de pacotes que são necessários e depois obter-los para "
 "o disco usando outra máquina com boa ligação. É até possível usar outra "
 "máquina Debian com APT ou usar um SO completamente diferente e uma "
-"ferramenta de download como o wget. Deixe <em>remote host</em> representar a "
-"máquina que descarrega os pacotes, e <em>target host</em> aquela com má ou "
-"nenhuma ligação."
+"ferramenta de download como o wget. Deixe <emphasis>remote host</emphasis> "
+"representar a máquina que descarrega os pacotes, e <emphasis>target host</"
+"emphasis> aquela com má ou nenhuma ligação."
 
-#. type: <p></p>
-#: offline.sgml:57
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:68
 msgid ""
 "This is achieved by creatively manipulating the APT configuration file. The "
 "essential premise to tell APT to look on a disc for it's archive files. Note "
@@ -9670,13 +9882,13 @@ msgstr ""
 "sistema de ficheiros que saiba lidar com nomes de ficheiros longos como o "
 "ext2, fat32 ou vfat."
 
-#. type: <heading></heading>
-#: offline.sgml:63
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:77
 msgid "Using APT on both machines"
 msgstr "Usando o APT em ambas máquinas"
 
-#. type: <p><example>
-#: offline.sgml:71
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:81
 msgid ""
 "APT being available on both machines gives the simplest configuration. The "
 "basic idea is to place a copy of the status file on the disc and use the "
@@ -9689,8 +9901,8 @@ msgstr ""
 "quais pacotes descarregar. A estrutura de directórios do disco deverá "
 "parecer-se com:"
 
-#. type: <example></example>
-#: offline.sgml:80
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:87
 #, no-wrap
 msgid ""
 "  /disc/\n"
@@ -9700,7 +9912,7 @@ msgid ""
 "       partial/\n"
 "    status\n"
 "    sources.list\n"
-"    apt.conf"
+"    apt.conf\n"
 msgstr ""
 "  /disc/\n"
 "    archives/\n"
@@ -9709,41 +9921,43 @@ msgstr ""
 "       partial/\n"
 "    status\n"
 "    sources.list\n"
-"    apt.conf"
+"    apt.conf\n"
 
-#. type: <heading></heading>
-#: offline.sgml:88
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:98
 msgid "The configuration file"
 msgstr "O ficheiro de configuração"
 
-#. type: <p></p>
-#: offline.sgml:96
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:100
 msgid ""
 "The configuration file should tell APT to store its files on the disc and to "
 "use the configuration files on the disc as well. The sources.list should "
 "contain the proper sites that you wish to use from the remote machine, and "
-"the status file should be a copy of <em>/var/lib/dpkg/status</em> from the "
-"<em>target host</em>. Please note, if you are using a local archive you must "
-"use copy URIs, the syntax is identical to file URIs."
+"the status file should be a copy of <emphasis>/var/lib/dpkg/status</"
+"emphasis> from the <emphasis>target host</emphasis>. Please note, if you are "
+"using a local archive you must use copy URIs, the syntax is identical to "
+"file URIs."
 msgstr ""
 "O ficheiro de configuração deve dizer ao APT para armazenar os seus ficheiro "
 "no disco e usar os ficheiros de configuração do disco também. O sources.list "
 "deve conter os sites apropriados que deseja usar a partir da máquina remota, "
-"e o ficheiro de estado deve ser uma cópia de <em>/var/lib/dpkg/status</em> a "
-"partir do <em>target host</em>. Por favor note, se está a usar um arquivo "
-"local você deve usar copy URIs, a sintaxe é idêntica a file URIs."
+"e o ficheiro de estado deve ser uma cópia de <emphasis>/var/lib/dpkg/status</"
+"emphasis> a partir do <emphasis>target host</emphasis>. Por favor note, se "
+"está a usar um arquivo local você deve usar copy URIs, a sintaxe é idêntica "
+"a file URIs."
 
-#. type: <p><example>
-#: offline.sgml:100
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:108
 msgid ""
-"<em>apt.conf</em> must contain the necessary information to make APT use the "
-"disc:"
+"<emphasis>apt.conf</emphasis> must contain the necessary information to make "
+"APT use the disc:"
 msgstr ""
-"<em>apt.conf</em> tem de conter a informação necessária para fazer o APT "
-"usar o disco:"
+"<emphasis>apt.conf</emphasis> tem de conter a informação necessária para "
+"fazer o APT usar o disco:"
 
-#. type: <example></example>
-#: offline.sgml:124
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:112
 #, no-wrap
 msgid ""
 " APT\n"
@@ -9751,10 +9965,10 @@ msgid ""
 "   /* This is not necessary if the two machines are the same arch, it tells\n"
 "      the remote APT what architecture the target machine is */\n"
 "   Architecture \"i386\";\n"
-"   \n"
+"\n"
 "   Get::Download-Only \"true\";\n"
 " };\n"
-" \n"
+"\n"
 " Dir\n"
 " {\n"
 "   /* Use the disc for state information and redirect the status file from\n"
@@ -9765,23 +9979,25 @@ msgid ""
 "   // Binary caches will be stored locally\n"
 "   Cache::archives \"/disc/archives/\";\n"
 "   Cache \"/tmp/\";\n"
-"   \n"
+"\n"
 "   // Location of the source list.\n"
 "   Etc \"/disc/\";\n"
-" };"
+" };\n"
 msgstr ""
 " APT\n"
 " {\n"
-"   /* Isto não é necessário se as duas máquinas forem da mesma arquitectura, diz\n"
+"   /* Isto não é necessário se as duas máquinas forem da mesma arquitectura, "
+"diz\n"
 "      ao APT remoto que arquitectura tem a máquina de destino */\n"
 "   Architecture \"i386\";\n"
-"   \n"
+"\n"
 "   Get::Download-Only \"true\";\n"
 " };\n"
-" \n"
+"\n"
 " Dir\n"
 " {\n"
-"   /* Usa o disco para informação de estado e redirecciona o ficheiro de estado a partir de\n"
+"   /* Usa o disco para informação de estado e redirecciona o ficheiro de "
+"estado a partir de\n"
 "      the /var/lib/dpkg default */\n"
 "   State \"/disc/\";\n"
 "   State::status \"status\";\n"
@@ -9789,66 +10005,71 @@ msgstr ""
 "   // Caches binárias serão armazenadas localmente\n"
 "   Cache::archives \"/disc/archives/\";\n"
 "   Cache \"/tmp/\";\n"
-"   \n"
+"\n"
 "   // Localização da lista de fontes.\n"
 "   Etc \"/disc/\";\n"
-" };"
+" };\n"
 
-#. type: </example></p>
-#: offline.sgml:129
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:137
 msgid ""
 "More details can be seen by examining the apt.conf man page and the sample "
-"configuration file in <em>/usr/share/doc/apt/examples/apt.conf</em>."
+"configuration file in <emphasis>/usr/share/doc/apt/examples/apt.conf</"
+"emphasis>."
 msgstr ""
 "Mais detalhes podem ser vistos ao examinar o manual do apt.conf e o exemplo "
-"de ficheiro de configuração em <em>/usr/share/doc/apt/examples/apt.conf</em>."
+"de ficheiro de configuração em <emphasis>/usr/share/doc/apt/examples/apt."
+"conf</emphasis>."
 
-#. type: <p><example>
-#: offline.sgml:136
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:142
 msgid ""
-"On the target machine the first thing to do is mount the disc and copy <em>/"
-"var/lib/dpkg/status</em> to it. You will also need to create the directories "
-"outlined in the Overview, <em>archives/partial/</em> and <em>lists/partial/</"
-"em>. Then take the disc to the remote machine and configure the sources."
-"list. On the remote machine execute the following:"
+"On the target machine the first thing to do is mount the disc and copy "
+"<emphasis>/var/lib/dpkg/status</emphasis> to it. You will also need to "
+"create the directories outlined in the Overview, <emphasis>archives/partial/"
+"</emphasis> and <emphasis>lists/partial/</emphasis>. Then take the disc to "
+"the remote machine and configure the sources.list. On the remote machine "
+"execute the following:"
 msgstr ""
 "Na máquina de destino a primeira coisa a fazer é montar o disco e copiar "
-"<em>/var/lib/dpkg/status</em> para ele. Você também precisa de criar os "
-"directórios delineados na Visão Geral, <em>archives/partial/</em> e "
-"<em>lists/partial/</em>. Depois leve o disco até à máquina remota e "
-"configure o sources.list. Na máquina remota execute o seguinte:"
-
-#. type: <example></example>
-#: offline.sgml:142
+"<emphasis>/var/lib/dpkg/status</emphasis> para ele. Você também precisa de "
+"criar os directórios delineados na Visão Geral, <emphasis>archives/partial/</"
+"emphasis> e <emphasis>lists/partial/</emphasis>. Depois leve o disco até à "
+"máquina remota e configure o sources.list. Na máquina remota execute o "
+"seguinte:"
+
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:151
 #, no-wrap
 msgid ""
 " # export APT_CONFIG=\"/disc/apt.conf\"\n"
 " # apt-get update\n"
 " [ APT fetches the package files ]\n"
 " # apt-get dist-upgrade\n"
-" [ APT fetches all the packages needed to upgrade the target machine ]"
+" [ APT fetches all the packages needed to upgrade the target machine ]\n"
 msgstr ""
 " # export APT_CONFIG=\"/disc/apt.conf\"\n"
 " # apt-get update\n"
 " [ APT obtém os ficheiros de pacotes ]\n"
 " # apt-get dist-upgrade\n"
-" [ APT obtém todos os pacotes necessários para actualizar a máquina de destino ]"
+" [ APT obtém todos os pacotes necessários para actualizar a máquina de "
+"destino ]\n"
 
-#. type: </example></p>
-#: offline.sgml:149
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:158
 msgid ""
 "The dist-upgrade command can be replaced with any other standard APT "
 "commands, particularly dselect-upgrade. You can even use an APT front end "
-"such as <em>dselect</em>. However this presents a problem in communicating "
-"your selections back to the local computer."
+"such as <emphasis>dselect</emphasis>. However this presents a problem in "
+"communicating your selections back to the local computer."
 msgstr ""
 "O comando dist-upgrade pode ser substituído por qualquer outro comando APT "
 "standard, particularmente dselect-upgrade. Você até pode usar um front-end "
-"do APT como o <em>dselect</em>. No entanto isto apresenta um problema ao "
-"comunicar as suas selecções de volta ao computador local."
+"do APT como o <emphasis>dselect</emphasis>. No entanto isto apresenta um "
+"problema ao comunicar as suas selecções de volta ao computador local."
 
-#. type: <p><example>
-#: offline.sgml:153
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:164
 msgid ""
 "Now the disc contains all of the index files and archives needed to upgrade "
 "the target machine. Take the disc back and run:"
@@ -9856,24 +10077,24 @@ msgstr ""
 "Agora o disco contém todos os ficheiros de índice e os arquivos necessários "
 "para actualizar a máquina de destino. Devolva o disco e corra:"
 
-#. type: <example></example>
-#: offline.sgml:159
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:168
 #, no-wrap
 msgid ""
 "  # export APT_CONFIG=\"/disc/apt.conf\"\n"
 "  # apt-get check\n"
 "  [ APT generates a local copy of the cache files ]\n"
 "  # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
-"  [ Or any other APT command ]"
+"  [ Or any other APT command ]\n"
 msgstr ""
 "  # export APT_CONFIG=\"/disc/apt.conf\"\n"
 "  # apt-get check\n"
 "  [ APT gera uma cópia local dos ficheiros de cache ]\n"
 "  # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
-"  [ Ou qualquer outro comando APT ]"
+"  [ Ou qualquer outro comando APT ]\n"
 
-#. type: <p></p>
-#: offline.sgml:165
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:175
 msgid ""
 "It is necessary for proper function to re-specify the status file to be the "
 "local one. This is very important!"
@@ -9881,8 +10102,8 @@ msgstr ""
 "Para uma função apropriada é necessário re-especificar que o ficheiro de "
 "estado seja o ficheiro local. Isto é muito importante!"
 
-#. type: <p></p>
-#: offline.sgml:172
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:179
 msgid ""
 "If you are using dselect you can do the very risky operation of copying disc/"
 "status to /var/lib/dpkg/status so that any selections you made on the remote "
@@ -9897,24 +10118,25 @@ msgstr ""
 "possível. NÃO copie o ficheiro de estado se entretanto correu o dpkg ou o "
 "APT!!"
 
-#. type: <heading></heading>
-#: offline.sgml:178
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:189
 msgid "Using APT and wget"
 msgstr "Usando APT e wget"
 
-#. type: <p></p>
-#: offline.sgml:185
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:193
 msgid ""
-"<em>wget</em> is a popular and portable download tool that can run on nearly "
-"any machine. Unlike the method above this requires that the Debian machine "
-"already has a list of available packages."
+"<emphasis>wget</emphasis> is a popular and portable download tool that can "
+"run on nearly any machine. Unlike the method above this requires that the "
+"Debian machine already has a list of available packages."
 msgstr ""
-"<em>wget</em> é uma ferramenta popular e portável de download que pode "
-"correr praticamente em qualquer máquina. Ao contrário do método acima, este "
-"requer que a máquina Debian já tenha uma lista de pacotes disponíveis."
+"<emphasis>wget</emphasis> é uma ferramenta popular e portável de download "
+"que pode correr praticamente em qualquer máquina. Ao contrário do método "
+"acima, este requer que a máquina Debian já tenha uma lista de pacotes "
+"disponíveis."
 
-#. type: <p></p>
-#: offline.sgml:190
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:198
 msgid ""
 "The basic idea is to create a disc that has only the archive files "
 "downloaded from the remote site. This is done by using the --print-uris "
@@ -9925,13 +10147,13 @@ msgstr ""
 "descarregados do site remoto. Isto é feito ao usar a opção --print-uris no "
 "apt-get e depois preparar um script wget para realmente ir buscar os pacotes."
 
-#. type: <heading></heading>
-#: offline.sgml:196
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:204
 msgid "Operation"
 msgstr "Operação"
 
-#. type: <p><example>
-#: offline.sgml:200
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:206
 msgid ""
 "Unlike the previous technique no special configuration files are required. "
 "We merely use the standard APT commands to generate the file list."
@@ -9940,22 +10162,23 @@ msgstr ""
 "configuração especiais. Nós usamos meramente os comandos standard do APT "
 "para gerar a lista de ficheiros."
 
-#. type: <example></example>
-#: offline.sgml:205
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:210
 #, no-wrap
 msgid ""
-" # apt-get dist-upgrade \n"
+" # apt-get dist-upgrade\n"
 " [ Press no when prompted, make sure you are happy with the actions ]\n"
-" # apt-get -qq --print-uris dist-upgrade > uris\n"
-" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
+" # apt-get -qq --print-uris dist-upgrade &gt; uris\n"
+" # awk '{print \"wget -O \" $2 \" \" $1}' &lt; uris &gt; /disc/wget-script\n"
 msgstr ""
 " # apt-get dist-upgrade \n"
-" [ Escolha não quando perguntado, certifique-se que está contente com as acções ]\n"
-" # apt-get -qq --print-uris dist-upgrade > uris\n"
-" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
+" [ Escolha não quando perguntado, certifique-se que está contente com as "
+"acções ]\n"
+" # apt-get -qq --print-uris dist-upgrade &gt; uris\n"
+" # awk '{print \"wget -O \" $2 \" \" $1}' &lt; uris &gt; /disc/wget-script\n"
 
-#. type: </example></p>
-#: offline.sgml:210
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:216
 msgid ""
 "Any command other than dist-upgrade could be used here, including dselect-"
 "upgrade."
@@ -9963,8 +10186,8 @@ msgstr ""
 "Qualquer comando além do dist-upgrade pode ser usado aqui, incluindo dselect-"
 "upgrade."
 
-#. type: <p></p>
-#: offline.sgml:216
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:220
 msgid ""
 "The /disc/wget-script file will now contain a list of wget commands to "
 "execute in order to fetch the necessary archives. This script should be run "
@@ -9976,25 +10199,25 @@ msgstr ""
 "corrido com o directório actual sendo o ponto de montagem do disco para que "
 "grave os resultados no disco."
 
-#. type: <p><example>
-#: offline.sgml:219
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:226
 msgid "The remote machine would do something like"
 msgstr "A máquina remota deverá fazer algo como"
 
-#. type: <example></example>
-#: offline.sgml:223
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:229
 #, no-wrap
 msgid ""
 "  # cd /disc\n"
 "  # sh -x ./wget-script\n"
-"  [ wait.. ]"
+"  [ wait.. ]\n"
 msgstr ""
 "  # cd /disc\n"
 "  # sh -x ./wget-script\n"
-"  [ wait.. ]"
+"  [ wait.. ]\n"
 
-#. type: </example><example>
-#: offline.sgml:228
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:234
 msgid ""
 "Once the archives are downloaded and the disc returned to the Debian machine "
 "installation can proceed using,"
@@ -10002,14 +10225,14 @@ msgstr ""
 "Após os arquivos serem descarregados e o disco retornado à máquina Debian, a "
 "instalação pode prosseguir usando,"
 
-#. type: <example></example>
-#: offline.sgml:230
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:238
 #, no-wrap
-msgid "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
-msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
+msgid "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
+msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 
-#. type: </example></p>
-#: offline.sgml:234
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:241
 msgid "Which will use the already fetched archives on the disc."
 msgstr "O qual irá usar os arquivos já obtidos e que estão no disco."
 
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index ef5c757b..fb0dde77 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -5,16 +5,15 @@
 # Translators:
 # André Luís Lopes <andrelop@ig.com.br>
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-04-01 14:24+0200\n"
+"POT-Creation-Date: 2014-07-10 10:52+0200\n"
 "PO-Revision-Date: 2004-09-20 17:02+0000\n"
 "Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
 "Language-Team: <debian-l10n-portuguese@lists.debian.org>\n"
-"Language: \n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -632,14 +631,14 @@ msgstr ""
 #: apt.8.xml:145
 msgid ""
 "The <command>apt</command> command is meant to be pleasant for end users and "
-"does not need to be backward compatilbe like &apt-get;. Therefore some "
+"does not need to be backward compatible like &apt-get;. Therefore some "
 "options are different:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: apt.8.xml:151
 #, fuzzy
-msgid "The option <literal>DPkgPM::Progress-Fancy</literal> is enabled."
+msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
 msgstr "a linha <literal>Package:</literal>"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
@@ -666,7 +665,7 @@ msgstr "a linha <literal>Archive:</literal>"
 #. type: Content of: <refentry><refsect1><title>
 #: apt.8.xml:174 apt-get.8.xml:558 apt-cache.8.xml:352 apt-key.8.xml:197
 #: apt-mark.8.xml:133 apt-secure.8.xml:193 apt-cdrom.8.xml:154
-#: apt-config.8.xml:111 apt.conf.5.xml:1227 apt_preferences.5.xml:707
+#: apt-config.8.xml:111 apt.conf.5.xml:1228 apt_preferences.5.xml:707
 #: sources.list.5.xml:280 apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65
 #: apt-ftparchive.1.xml:609
 #, fuzzy
@@ -1278,13 +1277,13 @@ msgid ""
 "Show user friendly progress information in the terminal window when packages "
 "are installed, upgraded or removed. For a machine parsable version of this "
 "data see README.progress-reporting in the apt doc directory.  Configuration "
-"Item: <literal>DpkgPM::Progress</literal> and <literal>Dpkg::Progress-Fancy</"
+"Item: <literal>Dpkg::Progress</literal> and <literal>Dpkg::Progress-Fancy</"
 "literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml:548 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127
-#: apt.conf.5.xml:1221 apt_preferences.5.xml:700
+#: apt.conf.5.xml:1222 apt_preferences.5.xml:700
 msgid "Files"
 msgstr ""
 
@@ -2159,7 +2158,7 @@ msgstr ""
 #: apt-secure.8.xml:195
 msgid ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -3214,14 +3213,15 @@ msgid ""
 "information, such as the two package caches <literal>srcpkgcache</literal> "
 "and <literal>pkgcache</literal> as well as the location to place downloaded "
 "archives, <literal>Dir::Cache::archives</literal>. Generation of caches can "
-"be turned off by setting their names to the empty string. This will slow "
+"be turned off by setting <literal>pkgcache</literal> or "
+"<literal>srcpkgcache</literal> to <literal>\"\"</literal>.  This will slow "
 "down startup but save disk space. It is probably preferable to turn off the "
-"pkgcache rather than the srcpkgcache. Like <literal>Dir::State</literal> the "
-"default directory is contained in <literal>Dir::Cache</literal>"
+"pkgcache rather than the srcpkgcache.  Like <literal>Dir::State</literal> "
+"the default directory is contained in <literal>Dir::Cache</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:616
+#: apt.conf.5.xml:617
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -3231,7 +3231,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:622
+#: apt.conf.5.xml:623
 msgid ""
 "The <literal>Dir::Parts</literal> setting reads in all the config fragments "
 "in lexical order from the directory specified. After this is done then the "
@@ -3239,7 +3239,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:626
+#: apt.conf.5.xml:627
 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "
@@ -3250,7 +3250,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:634
+#: apt.conf.5.xml:635
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -3263,7 +3263,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:647
+#: apt.conf.5.xml:648
 msgid ""
 "The <literal>Ignore-Files-Silently</literal> list can be used to specify "
 "which files APT should silently ignore while parsing the files in the "
@@ -3274,12 +3274,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:656
+#: apt.conf.5.xml:657
 msgid "APT in DSelect"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:658
+#: apt.conf.5.xml:659
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behavior. These are in the <literal>DSelect</literal> "
@@ -3287,7 +3287,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:663
+#: apt.conf.5.xml:664
 msgid ""
 "Cache Clean mode; this value may be one of <literal>always</literal>, "
 "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -3300,40 +3300,40 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:677
+#: apt.conf.5.xml:678
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the install phase."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:682
+#: apt.conf.5.xml:683
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the update phase."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:687
+#: apt.conf.5.xml:688
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:693
+#: apt.conf.5.xml:694
 msgid "How APT calls &dpkg;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:694
+#: apt.conf.5.xml:695
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:699
+#: apt.conf.5.xml:700
 msgid ""
 "This is a list of options to pass to &dpkg;. The options must be specified "
 "using the list notation and each list item is passed as a single argument to "
@@ -3341,7 +3341,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:705
+#: apt.conf.5.xml:706
 msgid ""
 "This is a list of shell commands to run before/after invoking &dpkg;.  Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -3350,7 +3350,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:712
+#: apt.conf.5.xml:713
 msgid ""
 "This is a list of shell commands to run before invoking &dpkg;. Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -3361,7 +3361,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:719
+#: apt.conf.5.xml:720
 msgid ""
 "Version 2 of this protocol dumps more information, including the protocol "
 "version, the APT configuration space and the packages, files and versions "
@@ -3370,7 +3370,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:724
+#: apt.conf.5.xml:725
 msgid ""
 "The version of the protocol to be used for the command "
 "<literal><replaceable>cmd</replaceable></literal> can be chosen by setting "
@@ -3381,7 +3381,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:731
+#: apt.conf.5.xml:732
 msgid ""
 "The file descriptor to be used to send the information can be requested with "
 "<literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::InfoFD</"
@@ -3392,26 +3392,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:741
+#: apt.conf.5.xml:742
 msgid ""
 "APT chdirs to this directory before invoking &dpkg;, the default is "
 "<filename>/</filename>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:746
+#: apt.conf.5.xml:747
 msgid ""
 "These options are passed to &dpkg-buildpackage; when compiling packages; the "
 "default is to disable signing and produce all binaries."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:751
+#: apt.conf.5.xml:752
 msgid "dpkg trigger usage (and related options)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:752
+#: apt.conf.5.xml:753
 msgid ""
 "APT can call &dpkg; in such a way as to let it make aggressive use of "
 "triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
@@ -3426,7 +3426,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:767
+#: apt.conf.5.xml:768
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -3436,7 +3436,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:761
+#: apt.conf.5.xml:762
 msgid ""
 "Note that it is not guaranteed that APT will support these options or that "
 "these options will not cause (big) trouble in the future. If you have "
@@ -3450,7 +3450,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:774
+#: apt.conf.5.xml:775
 msgid ""
 "Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
 "call).  See &dpkg; if you are interested in what this actually means. In "
@@ -3463,7 +3463,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:782
+#: apt.conf.5.xml:783
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
@@ -3480,7 +3480,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:797
+#: apt.conf.5.xml:798
 msgid ""
 "If this option is set APT will call <command>dpkg --configure --pending</"
 "command> to let &dpkg; handle all required configurations and triggers. This "
@@ -3491,7 +3491,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:804
+#: apt.conf.5.xml:805
 msgid ""
 "Useful for the <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal>, and "
@@ -3501,7 +3501,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:817
+#: apt.conf.5.xml:818
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -3513,7 +3513,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:810
+#: apt.conf.5.xml:811
 msgid ""
 "Essential packages (and their dependencies) should be configured immediately "
 "after unpacking. It is a good idea to do this quite early in the upgrade "
@@ -3527,12 +3527,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:830
+#: apt.conf.5.xml:831
 msgid "Periodic and Archives options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:831
+#: apt.conf.5.xml:832
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by the "
@@ -3541,12 +3541,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:839
+#: apt.conf.5.xml:840
 msgid "Debug options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:841
+#: apt.conf.5.xml:842
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -3557,7 +3557,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:852
+#: apt.conf.5.xml:853
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -3565,7 +3565,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:860
+#: apt.conf.5.xml:861
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"
@@ -3573,7 +3573,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:869
+#: apt.conf.5.xml:870
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -3583,66 +3583,66 @@ msgstr ""
 #. 	   motivating example, except I haven't a clue why you'd want
 #. 	   to do this. 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:877
+#: apt.conf.5.xml:878
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CD-ROM IDs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:887
+#: apt.conf.5.xml:888
 msgid "A full list of debugging options to apt follows."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:896
+#: apt.conf.5.xml:897
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:907
+#: apt.conf.5.xml:908
 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:918
+#: apt.conf.5.xml:919
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:929
+#: apt.conf.5.xml:930
 msgid "Print information related to downloading packages using HTTPS."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:940
+#: apt.conf.5.xml:941
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:951
+#: apt.conf.5.xml:952
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:961
+#: apt.conf.5.xml:962
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:971
+#: apt.conf.5.xml:972
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:981
+#: apt.conf.5.xml:982
 msgid ""
 "Do not include information from <literal>statfs</literal>, namely the number "
 "of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -3650,53 +3650,53 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:992
+#: apt.conf.5.xml:993
 msgid ""
 "Disable all file locking.  For instance, this will allow two instances of "
 "<quote><literal>apt-get update</literal></quote> to run at the same time."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1004
+#: apt.conf.5.xml:1005
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1014
+#: apt.conf.5.xml:1015
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1024
+#: apt.conf.5.xml:1025
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1036
+#: apt.conf.5.xml:1037
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1047
+#: apt.conf.5.xml:1048
 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1058
+#: apt.conf.5.xml:1059
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1068
+#: apt.conf.5.xml:1069
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
@@ -3706,7 +3706,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1082
+#: apt.conf.5.xml:1083
 msgid ""
 "Generate debug messages describing which packages are marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
@@ -3724,46 +3724,46 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1103
+#: apt.conf.5.xml:1104
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1114
+#: apt.conf.5.xml:1115
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1125
+#: apt.conf.5.xml:1126
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1137
+#: apt.conf.5.xml:1138
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1148
+#: apt.conf.5.xml:1149
 msgid "Output the priority of each package list on startup."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1158
+#: apt.conf.5.xml:1159
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1169
+#: apt.conf.5.xml:1170
 msgid ""
 "Display a list of all installed packages with their calculated score used by "
 "the pkgProblemResolver. The description of the package is the same as "
@@ -3771,14 +3771,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1181
+#: apt.conf.5.xml:1182
 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1191
+#: apt.conf.5.xml:1192
 msgid ""
 "Display the external commands that are called by apt hooks.  This includes e."
 "g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or "
@@ -3786,14 +3786,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1215 apt_preferences.5.xml:547 sources.list.5.xml:239
+#: apt.conf.5.xml:1216 apt_preferences.5.xml:547 sources.list.5.xml:239
 #: apt-ftparchive.1.xml:598
 #, fuzzy
 msgid "Examples"
 msgstr "Exemplos"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1216
+#: apt.conf.5.xml:1217
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -3801,7 +3801,7 @@ msgstr ""
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1228
+#: apt.conf.5.xml:1229
 #, fuzzy
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -6412,34 +6412,50 @@ msgid ""
 "100 on error."
 msgstr ""
 
-#. type: <title></title>
-#: guide.sgml:4
+#. type: Attribute 'lang' of: <book>
+#: guide.dbk:8 offline.dbk:8
+msgid "en"
+msgstr ""
+
+#. type: Content of: <book><title>
+#: guide.dbk:10
 msgid "APT User's Guide"
 msgstr ""
 
-#. type: <author></author>
-#: guide.sgml:6 offline.sgml:6
-msgid "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
+#. type: Content of: <book><bookinfo><authorgroup><author><personname>
+#: guide.dbk:16 offline.dbk:16
+msgid "Jason Gunthorpe"
+msgstr ""
+
+#. type: Content of: <book><bookinfo><authorgroup><author><email>
+#: guide.dbk:16 offline.dbk:16
+msgid "jgg@debian.org"
 msgstr ""
 
-#. type: <version></version>
-#: guide.sgml:7
-msgid "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
+#. type: Content of: <book><bookinfo><releaseinfo>
+#: guide.dbk:20 offline.dbk:20
+msgid "Version &apt-product-version;"
 msgstr ""
 
-#. type: <abstract></abstract>
-#: guide.sgml:11
+#. type: Content of: <book><bookinfo><abstract><para>
+#: guide.dbk:24
 msgid ""
 "This document provides an overview of how to use the the APT package manager."
 msgstr ""
 
-#. type: <copyrightsummary></copyrightsummary>
-#: guide.sgml:15
-msgid "Copyright &copy; Jason Gunthorpe, 1998."
+#. type: Content of: <book><bookinfo>
+#: guide.dbk:28
+msgid ""
+"<copyright><year>1998</year><holder>Jason Gunthorpe</holder></copyright>"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:21 offline.sgml:22
+#. type: Content of: <book><bookinfo><legalnotice><title>
+#: guide.dbk:31 offline.dbk:32
+msgid "License Notice"
+msgstr ""
+
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: guide.dbk:33 offline.dbk:34
 msgid ""
 "\"APT\" and this document are free software; you can redistribute them and/"
 "or modify them under the terms of the GNU General Public License as "
@@ -6447,42 +6463,42 @@ msgid ""
 "or (at your option) any later version."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:24 offline.sgml:25
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: guide.dbk:42 offline.dbk:40
 msgid ""
 "For more details, on Debian systems, see the file /usr/share/common-licenses/"
 "GPL for the full license."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:32
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:49
 msgid "General"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:38
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:51
 msgid ""
-"The APT package currently contains two sections, the APT <prgn>dselect</"
-"prgn> method and the <prgn>apt-get</prgn> command line user interface. Both "
-"provide a way to install and remove packages as well as download new "
-"packages from the Internet."
+"The APT package currently contains two sections, the APT <command>dselect</"
+"command> method and the <command>apt-get</command> command line user "
+"interface. Both provide a way to install and remove packages as well as "
+"download new packages from the Internet."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:39
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:57
 msgid "Anatomy of the Package System"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:44
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:59
 msgid ""
 "The Debian packaging system has a large amount of information associated "
 "with each package to help assure that it integrates cleanly and easily into "
 "the system. The most prominent of its features is the dependency system."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:52
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:64
 msgid ""
 "The dependency system allows individual programs to make use of shared "
 "elements in the system such as libraries. It simplifies placing infrequently "
@@ -6491,8 +6507,8 @@ msgid ""
 "in mail transport agents, X servers and so on."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:57
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:71
 msgid ""
 "The first step to understanding the dependency system is to grasp the "
 "concept of a simple dependency. The meaning of a simple dependency is that a "
@@ -6500,8 +6516,8 @@ msgid ""
 "properly."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:63
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:76
 msgid ""
 "For instance, mailcrypt is an emacs extension that aids in encrypting email "
 "with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a "
@@ -6509,8 +6525,8 @@ msgid ""
 "simple dependency on emacs, without emacs it is completely useless."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:73
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:82
 msgid ""
 "The other important dependency to understand is a conflicting dependency. It "
 "means that a package, when installed with another package, will not work and "
@@ -6522,8 +6538,8 @@ msgid ""
 "other mail transport agents."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:83
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:92
 msgid ""
 "As an added complication there is the possibility for a package to pretend "
 "to be another package. Consider that exim and sendmail for many intents are "
@@ -6535,8 +6551,8 @@ msgid ""
 "trying to manually fix packages."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:88
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:102
 msgid ""
 "At any given time a single dependency may be met by packages that are "
 "already installed or it may not be. APT attempts to help resolve dependency "
@@ -6544,71 +6560,77 @@ msgid ""
 "packages for installation."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:96
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:111
 msgid "apt-get"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:102
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:113
+msgid ""
+"<command>apt-get</command> provides a simple way to install packages from "
+"the command line. Unlike <command>dpkg</command>, <command>apt-get</command> "
+"does not understand .deb files, it works with the package's proper name and "
+"can only install .deb archives from a <emphasis>Source</emphasis>."
+msgstr ""
+
+#. type: Content of: <book><chapter><para><footnote><para>
+#: guide.dbk:119
 msgid ""
-"<prgn>apt-get</prgn> provides a simple way to install packages from the "
-"command line. Unlike <prgn>dpkg</prgn>, <prgn>apt-get</prgn> does not "
-"understand .deb files, it works with the package's proper name and can only "
-"install .deb archives from a <em>Source</em>."
+"If you are using an http proxy server you must set the http_proxy "
+"environment variable first, see sources.list(5)"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:109
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:119
 msgid ""
-"The first <footnote><p>If you are using an http proxy server you must set "
-"the http_proxy environment variable first, see sources.list(5)</p></"
-"footnote> thing that should be done before using <prgn>apt-get</prgn> is to "
-"fetch the package lists from the <em>Sources</em> so that it knows what "
-"packages are available. This is done with <tt>apt-get update</tt>. For "
-"instance,"
+"The first <placeholder type=\"footnote\" id=\"0\"/> thing that should be "
+"done before using <command>apt-get</command> is to fetch the package lists "
+"from the <emphasis>Sources</emphasis> so that it knows what packages are "
+"available. This is done with <literal>apt-get update</literal>. For instance,"
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:116
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:127
 #, no-wrap
 msgid ""
 "# apt-get update\n"
 "Get http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
 "Get http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 msgstr ""
 
-#. type: <p><taglist>
-#: guide.sgml:120
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:134
 msgid "Once updated there are several commands that can be used:"
 msgstr ""
 
-#. type: <tag></tag>
-#: guide.sgml:121
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:138
 msgid "upgrade"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:131
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:141
 msgid ""
 "Upgrade will attempt to gently upgrade the whole system. Upgrade will never "
 "install a new package or remove an existing package, nor will it ever "
 "upgrade a package that might cause some other package to break. This can be "
 "used daily to relatively safely upgrade the system. Upgrade will list all of "
 "the packages that it could not upgrade, this usually means that they depend "
-"on new packages or conflict with some other package. <prgn>dselect</prgn> or "
-"<tt>apt-get install</tt> can be used to force these packages to install."
+"on new packages or conflict with some other package. <command>dselect</"
+"command> or <literal>apt-get install</literal> can be used to force these "
+"packages to install."
 msgstr ""
 
-#. type: <tag></tag>
-#: guide.sgml:131
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:153
 msgid "install"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:140
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:156
 msgid ""
 "Install is used to install packages by name. The package is automatically "
 "fetched and installed. This can be useful if you already know the name of "
@@ -6619,130 +6641,134 @@ msgid ""
 "anything other than its arguments are changed."
 msgstr ""
 
-#. type: <tag></tag>
-#: guide.sgml:140
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:167
 msgid "dist-upgrade"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:149
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:170
 msgid ""
 "Dist-upgrade is a complete upgrader designed to simplify upgrading between "
 "releases of Debian. It uses a sophisticated algorithm to determine the best "
 "set of packages to install, upgrade and remove to get as much of the system "
 "to the newest release. In some situations it may be desired to use dist-"
 "upgrade rather than spend the time manually resolving dependencies in "
-"<prgn>dselect</prgn>. Once dist-upgrade has completed then <prgn>dselect</"
-"prgn> can be used to install any packages that may have been left out."
+"<command>dselect</command>. Once dist-upgrade has completed then "
+"<command>dselect</command> can be used to install any packages that may have "
+"been left out."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:152
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:180
 msgid ""
 "It is important to closely look at what dist-upgrade is going to do, its "
 "decisions may sometimes be quite surprising."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:163
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:187
 msgid ""
-"<prgn>apt-get</prgn> has several command line options that are detailed in "
-"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful "
-"option is <tt>-d</tt> which does not install the fetched files. If the "
-"system has to download a large number of package it would be undesired to "
-"start installing them in case something goes wrong. When <tt>-d</tt> is used "
-"the downloaded archives can be installed by simply running the command that "
-"caused them to be downloaded again without <tt>-d</tt>."
+"<command>apt-get</command> has several command line options that are "
+"detailed in its man page, <citerefentry><refentrytitle>apt-get</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>. The most useful "
+"option is <literal>-d</literal> which does not install the fetched files. If "
+"the system has to download a large number of package it would be undesired "
+"to start installing them in case something goes wrong. When <literal>-d</"
+"literal> is used the downloaded archives can be installed by simply running "
+"the command that caused them to be downloaded again without <literal>-d</"
+"literal>."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:168
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:199
 msgid "DSelect"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:173
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:201
 msgid ""
-"The APT <prgn>dselect</prgn> method provides the complete APT system with "
-"the <prgn>dselect</prgn> package selection GUI. <prgn>dselect</prgn> is used "
-"to select the packages to be installed or removed and APT actually installs "
-"them."
+"The APT <command>dselect</command> method provides the complete APT system "
+"with the <command>dselect</command> package selection GUI. <command>dselect</"
+"command> is used to select the packages to be installed or removed and APT "
+"actually installs them."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:184
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:207
 msgid ""
-"To enable the APT method you need to select [A]ccess in <prgn>dselect</prgn> "
-"and then choose the APT method. You will be prompted for a set of "
-"<em>Sources</em> which are places to fetch archives from. These can be "
-"remote Internet sites, local Debian mirrors or CD-ROMs. Each source can "
-"provide a fragment of the total Debian archive, APT will automatically "
+"To enable the APT method you need to select [A]ccess in <command>dselect</"
+"command> and then choose the APT method. You will be prompted for a set of "
+"<emphasis>Sources</emphasis> which are places to fetch archives from. These "
+"can be remote Internet sites, local Debian mirrors or CD-ROMs. Each source "
+"can provide a fragment of the total Debian archive, APT will automatically "
 "combine them to form a complete set of packages. If you have a CD-ROM then "
 "it is a good idea to specify it first and then specify a mirror so that you "
 "have access to the latest bug fixes. APT will automatically use packages on "
 "your CD-ROM before downloading from the Internet."
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:198
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:218
 #, no-wrap
 msgid ""
 "   Set up a list of distribution source locations\n"
-"\t \n"
+"\n"
 " Please give the base URL of the debian distribution.\n"
 " The access schemes I know about are: http file\n"
-"\t   \n"
+"\n"
 " For example:\n"
 "      file:/mnt/debian,\n"
 "      ftp://ftp.debian.org/debian,\n"
 "      http://ftp.de.debian.org/debian,\n"
-"      \n"
-"      \n"
-" URL [http://llug.sep.bnl.gov/debian]:"
+"\n"
+"\n"
+" URL [http://llug.sep.bnl.gov/debian]:\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:205
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:232
 msgid ""
-"The <em>Sources</em> setup starts by asking for the base of the Debian "
-"archive, defaulting to a HTTP mirror. Next it asks for the distribution to "
-"get."
+"The <emphasis>Sources</emphasis> setup starts by asking for the base of the "
+"Debian archive, defaulting to a HTTP mirror. Next it asks for the "
+"distribution to get."
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:212
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:237
 #, no-wrap
 msgid ""
 " Please give the distribution tag to get or a path to the\n"
 " package file ending in a /. The distribution\n"
 " tags are typically something like: stable unstable testing non-US\n"
-"   \n"
-" Distribution [stable]:"
+"\n"
+" Distribution [stable]:\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:222
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:244
 msgid ""
-"The distribution refers to the Debian version in the archive, <em>stable</"
-"em> refers to the latest released version and <em>unstable</em> refers to "
-"the developmental version. <em>non-US</em> is only available on some mirrors "
-"and refers to packages that contain encryption technology or other things "
-"that cannot be exported from the United States. Importing these packages "
-"into the US is legal however."
+"The distribution refers to the Debian version in the archive, "
+"<emphasis>stable</emphasis> refers to the latest released version and "
+"<emphasis>unstable</emphasis> refers to the developmental version. "
+"<emphasis>non-US</emphasis> is only available on some mirrors and refers to "
+"packages that contain encryption technology or other things that cannot be "
+"exported from the United States. Importing these packages into the US is "
+"legal however."
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:228
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:253
 #, no-wrap
 msgid ""
 " Please give the components to get\n"
 " The components are typically something like: main contrib non-free\n"
-"  \n"
-" Components [main contrib non-free]:"
+"\n"
+" Components [main contrib non-free]:\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:236
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:259
 msgid ""
 "The components list refers to the list of sub distributions to fetch. The "
 "distribution is split up based on software licenses, main being DFSG free "
@@ -6750,25 +6776,25 @@ msgid ""
 "restrictions placed on their use and distribution."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:240
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:265
 msgid ""
 "Any number of sources can be added, the setup script will continue to prompt "
 "until you have specified all that you want."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:247
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:269
 msgid ""
-"Before starting to use <prgn>dselect</prgn> it is necessary to update the "
-"available list by selecting [U]pdate from the menu. This is a superset of "
-"<tt>apt-get update</tt> that makes the fetched information available to "
-"<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get update</"
-"tt> has been run before."
+"Before starting to use <command>dselect</command> it is necessary to update "
+"the available list by selecting [U]pdate from the menu. This is a superset "
+"of <literal>apt-get update</literal> that makes the fetched information "
+"available to <command>dselect</command>. [U]pdate must be performed even if "
+"<literal>apt-get update</literal> has been run before."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:253
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:276
 msgid ""
 "You can then go on and make your selections using [S]elect and then perform "
 "the installation using [I]nstall. When using the APT method the [C]onfig and "
@@ -6776,57 +6802,63 @@ msgid ""
 "them together."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:258
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:282
 msgid ""
 "By default APT will automatically remove the package (.deb) files once they "
-"have been successfully installed. To change this behavior place <tt>Dselect::"
-"clean \"prompt\";</tt> in /etc/apt/apt.conf."
+"have been successfully installed. To change this behavior place "
+"<literal>Dselect::clean \"prompt\";</literal> in /etc/apt/apt.conf."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:264
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:288
 msgid "The Interface"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:278
+#. type: Content of: <book><chapter><para><footnote><para>
+#: guide.dbk:292
 msgid ""
-"Both that APT <prgn>dselect</prgn> method and <prgn>apt-get</prgn> share the "
-"same interface. It is a simple system that generally tells you what it will "
-"do and then goes and does it. <footnote><p>The <prgn>dselect</prgn> method "
-"actually is a set of wrapper scripts to <prgn>apt-get</prgn>. The method "
-"actually provides more functionality than is present in <prgn>apt-get</prgn> "
-"alone.</p></footnote> After printing out a summary of what will happen APT "
+"The <command>dselect</command> method actually is a set of wrapper scripts "
+"to <command>apt-get</command>. The method actually provides more "
+"functionality than is present in <command>apt-get</command> alone."
+msgstr ""
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:290
+msgid ""
+"Both that APT <command>dselect</command> method and <command>apt-get</"
+"command> share the same interface. It is a simple system that generally "
+"tells you what it will do and then goes and does it. <placeholder type="
+"\"footnote\" id=\"0\"/> After printing out a summary of what will happen APT "
 "then will print out some informative status messages so that you can "
 "estimate how far along it is and how much is left to do."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:280
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:301
 msgid "Startup"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:284
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:303
 msgid ""
 "Before all operations except update, APT performs a number of actions to "
 "prepare its internal state. It also does some checks of the system's state. "
-"At any time these operations can be performed by running <tt>apt-get check</"
-"tt>."
+"At any time these operations can be performed by running <literal>apt-get "
+"check</literal>."
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:289
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:309
 #, no-wrap
 msgid ""
 "# apt-get check\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:297
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:314
 msgid ""
 "The first thing it does is read all the package files into memory. APT uses "
 "a caching scheme so this operation will be faster the second time it is run. "
@@ -6834,17 +6866,17 @@ msgid ""
 "warning will be printed when apt-get exits."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:303
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:320
 msgid ""
 "The final operation performs a detailed analysis of the system's "
 "dependencies. It checks every dependency of every installed or unpacked "
 "package and considers if it is OK. Should this find a problem then a report "
-"will be printed out and <prgn>apt-get</prgn> will refuse to run."
+"will be printed out and <command>apt-get</command> will refuse to run."
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:320
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:326
 #, no-wrap
 msgid ""
 "# apt-get check\n"
@@ -6854,18 +6886,18 @@ msgid ""
 "Sorry, but the following packages have unmet dependencies:\n"
 "  9fonts: Depends: xlib6g but it is not installed\n"
 "  uucp: Depends: mailx but it is not installed\n"
-"  blast: Depends: xlib6g (>= 3.3-5) but it is not installed\n"
+"  blast: Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
 "  adduser: Depends: perl-base but it is not installed\n"
 "  aumix: Depends: libgpmg1 but it is not installed\n"
 "  debiandoc-sgml: Depends: sgml-base but it is not installed\n"
-"  bash-builtins: Depends: bash (>= 2.01) but 2.0-3 is installed\n"
+"  bash-builtins: Depends: bash (&gt;= 2.01) but 2.0-3 is installed\n"
 "  cthugha: Depends: svgalibg1 but it is not installed\n"
-"           Depends: xlib6g (>= 3.3-5) but it is not installed\n"
-"  libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)"
+"           Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
+"  libreadlineg2: Conflicts:libreadline2 (&lt;&lt; 2.1-2.1)\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:329
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:343
 msgid ""
 "In this example the system has many problems, including a serious problem "
 "with libreadlineg2. For each package that has unmet dependencies a line is "
@@ -6874,61 +6906,69 @@ msgid ""
 "problem is also included."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:337
+#. type: Content of: <book><chapter><section><para><footnote><para>
+#: guide.dbk:352
+msgid ""
+"APT however considers all known dependencies and attempts to prevent broken "
+"packages"
+msgstr ""
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:350
 msgid ""
 "There are two ways a system can get into a broken state like this. The first "
-"is caused by <prgn>dpkg</prgn> missing some subtle relationships between "
-"packages when performing upgrades. <footnote><p>APT however considers all "
-"known dependencies and attempts to prevent broken packages</p></footnote>. "
-"The second is if a package installation fails during an operation. In this "
-"situation a package may have been unpacked without its dependents being "
-"installed."
+"is caused by <command>dpkg</command> missing some subtle relationships "
+"between packages when performing upgrades. <placeholder type=\"footnote\" id="
+"\"0\"/>. The second is if a package installation fails during an operation. "
+"In this situation a package may have been unpacked without its dependents "
+"being installed."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:345
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:359
 msgid ""
 "The second situation is much less serious than the first because APT places "
 "certain constraints on the order that packages are installed. In both cases "
-"supplying the <tt>-f</tt> option to <prgn>apt-get</prgn> will cause APT to "
-"deduce a possible solution to the problem and then continue on. The APT "
-"<prgn>dselect</prgn> method always supplies the <tt>-f</tt> option to allow "
-"for easy continuation of failed maintainer scripts."
+"supplying the <literal>-f</literal> option to <command>apt-get</command> "
+"will cause APT to deduce a possible solution to the problem and then "
+"continue on. The APT <command>dselect</command> method always supplies the "
+"<literal>-f</literal> option to allow for easy continuation of failed "
+"maintainer scripts."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:351
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:368
 msgid ""
-"However, if the <tt>-f</tt> option is used to correct a seriously broken "
-"system caused by the first case then it is possible that it will either fail "
-"immediately or the installation sequence will fail. In either case it is "
-"necessary to manually use dpkg (possibly with forcing options) to correct "
-"the situation enough to allow APT to proceed."
+"However, if the <literal>-f</literal> option is used to correct a seriously "
+"broken system caused by the first case then it is possible that it will "
+"either fail immediately or the installation sequence will fail. In either "
+"case it is necessary to manually use dpkg (possibly with forcing options) to "
+"correct the situation enough to allow APT to proceed."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:356
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:376
 msgid "The Status Report"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:363
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:378
 msgid ""
-"Before proceeding <prgn>apt-get</prgn> will present a report on what will "
-"happen. Generally the report reflects the type of operation being performed "
-"but there are several common elements. In all cases the lists reflect the "
-"final state of things, taking into account the <tt>-f</tt> option and any "
-"other relevant activities to the command being executed."
+"Before proceeding <command>apt-get</command> will present a report on what "
+"will happen. Generally the report reflects the type of operation being "
+"performed but there are several common elements. In all cases the lists "
+"reflect the final state of things, taking into account the <literal>-f</"
+"literal> option and any other relevant activities to the command being "
+"executed."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:364
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:385
 msgid "The Extra Package list"
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:372
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:387
 #, no-wrap
 msgid ""
 "The following extra packages will be installed:\n"
@@ -6936,135 +6976,135 @@ msgid ""
 "  mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
 "  bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
 "  squake pgp-i python-base debmake ldso perl libreadlineg2\n"
-"  ssh"
+"  ssh\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:379
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:395
 msgid ""
 "The Extra Package list shows all of the packages that will be installed or "
 "upgraded in excess of the ones mentioned on the command line. It is only "
-"generated for an <tt>install</tt> command. The listed packages are often the "
-"result of an Auto Install."
+"generated for an <literal>install</literal> command. The listed packages are "
+"often the result of an Auto Install."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:382
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:402
 msgid "The Packages to Remove"
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:389
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:404
 #, no-wrap
 msgid ""
 "The following packages will be REMOVED:\n"
 "  xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
 "  xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
 "  xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
-"  nas xpilot xfig"
+"  nas xpilot xfig\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:399
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:411
 msgid ""
 "The Packages to Remove list shows all of the packages that will be removed "
 "from the system. It can be shown for any of the operations and should be "
 "given a careful inspection to ensure nothing important is to be taken off. "
-"The <tt>-f</tt> option is especially good at generating packages to remove "
-"so extreme care should be used in that case. The list may contain packages "
-"that are going to be removed because they are only partially installed, "
-"possibly due to an aborted installation."
+"The <literal>-f</literal> option is especially good at generating packages "
+"to remove so extreme care should be used in that case. The list may contain "
+"packages that are going to be removed because they are only partially "
+"installed, possibly due to an aborted installation."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:402
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:421
 msgid "The New Packages list"
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:406
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:423
 #, no-wrap
 msgid ""
 "The following NEW packages will installed:\n"
-"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
+"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:411
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:427
 msgid ""
 "The New Packages list is simply a reminder of what will happen. The packages "
 "listed are not presently installed in the system but will be when APT is "
 "done."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:414
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:432
 msgid "The Kept Back list"
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:419
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:434
 #, no-wrap
 msgid ""
 "The following packages have been kept back\n"
 "  compface man-db tetex-base msql libpaper svgalib1\n"
-"  gs snmp arena lynx xpat2 groff xscreensaver"
+"  gs snmp arena lynx xpat2 groff xscreensaver\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:428
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:439
 msgid ""
 "Whenever the whole system is being upgraded there is the possibility that "
 "new versions of packages cannot be installed because they require new things "
 "or conflict with already installed things. In this case the package will "
 "appear in the Kept Back list. The best way to convince packages listed there "
-"to install is with <tt>apt-get install</tt> or by using <prgn>dselect</prgn> "
-"to resolve their problems."
+"to install is with <literal>apt-get install</literal> or by using "
+"<command>dselect</command> to resolve their problems."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:431
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:448
 msgid "Held Packages warning"
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:435
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:450
 #, no-wrap
 msgid ""
 "The following held packages will be changed:\n"
-"  cvs"
+"  cvs\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:441
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:454
 msgid ""
 "Sometimes you can ask APT to install a package that is on hold, in such a "
 "case it prints out a warning that the held package is going to be changed. "
 "This should only happen during dist-upgrade or install."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:444
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:460
 msgid "Final summary"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:447
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:462
 msgid ""
 "Finally, APT will print out a summary of all the changes that will occur."
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:452
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:465
 #, no-wrap
 msgid ""
 "206 packages upgraded, 8 newly installed, 23 to remove and 51 not upgraded.\n"
 "12 packages not fully installed or removed.\n"
-"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used."
+"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used.\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:470
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:470
 msgid ""
 "The first line of the summary simply is a reduced version of all of the "
 "lists and includes the number of upgrades - that is packages already "
@@ -7081,27 +7121,27 @@ msgid ""
 "the amount of space that will be freed."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:473
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:484
 msgid ""
 "Some other reports can be generated by using the -u option to show packages "
 "to upgrade, they are similar to the previous examples."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:477
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:491
 msgid "The Status Display"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:481
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:493
 msgid ""
 "During the download of archives and package files APT prints out a series of "
 "status messages."
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:490
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:497
 #, no-wrap
 msgid ""
 "# apt-get update\n"
@@ -7110,110 +7150,107 @@ msgid ""
 "Hit http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
 "Get:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
 "Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
-"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s"
+"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:500
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:506
 msgid ""
-"The lines starting with <em>Get</em> are printed out when APT begins to "
-"fetch a file while the last line indicates the progress of the download. The "
-"first percent value on the progress line indicates the total percent done of "
-"all files. Unfortunately since the size of the Package files is unknown "
-"<tt>apt-get update</tt> estimates the percent done which causes some "
-"inaccuracies."
+"The lines starting with <emphasis>Get</emphasis> are printed out when APT "
+"begins to fetch a file while the last line indicates the progress of the "
+"download. The first percent value on the progress line indicates the total "
+"percent done of all files. Unfortunately since the size of the Package files "
+"is unknown <literal>apt-get update</literal> estimates the percent done "
+"which causes some inaccuracies."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:509
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:514
 msgid ""
 "The next section of the status line is repeated once for each download "
 "thread and indicates the operation being performed and some useful "
 "information about what is happening. Sometimes this section will simply read "
-"<em>Forking</em> which means the OS is loading the download module. The "
-"first word after the [ is the fetch number as shown on the history lines. "
-"The next word is the short form name of the object being downloaded. For "
-"archives it will contain the name of the package that is being fetched."
+"<emphasis>Forking</emphasis> which means the OS is loading the download "
+"module. The first word after the [ is the fetch number as shown on the "
+"history lines. The next word is the short form name of the object being "
+"downloaded. For archives it will contain the name of the package that is "
+"being fetched."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:524
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:524
 msgid ""
 "Inside of the single quote is an informative string indicating the progress "
 "of the negotiation phase of the download. Typically it progresses from "
-"<em>Connecting</em> to <em>Waiting for file</em> to <em>Downloading</em> or "
-"<em>Resuming</em>. The final value is the number of bytes downloaded from "
-"the remote site. Once the download begins this is represented as "
-"<tt>102/10.2k</tt> indicating that 102 bytes have been fetched and 10.2 "
-"kilobytes is expected. The total size is always shown in 4 figure notation "
-"to preserve space. After the size display is a percent meter for the file "
-"itself. The second last element is the instantaneous average speed. This "
-"values is updated every 5 seconds and reflects the rate of data transfer for "
-"that period. Finally is shown the estimated transfer time. This is updated "
-"regularly and reflects the time to complete everything at the shown transfer "
-"rate."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:530
+"<emphasis>Connecting</emphasis> to <emphasis>Waiting for file</emphasis> to "
+"<emphasis>Downloading</emphasis> or <emphasis>Resuming</emphasis>. The final "
+"value is the number of bytes downloaded from the remote site. Once the "
+"download begins this is represented as <literal>102/10.2k</literal> "
+"indicating that 102 bytes have been fetched and 10.2 kilobytes is expected. "
+"The total size is always shown in 4 figure notation to preserve space. After "
+"the size display is a percent meter for the file itself. The second last "
+"element is the instantaneous average speed. This values is updated every 5 "
+"seconds and reflects the rate of data transfer for that period. Finally is "
+"shown the estimated transfer time. This is updated regularly and reflects "
+"the time to complete everything at the shown transfer rate."
+msgstr ""
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:539
 msgid ""
 "The status display updates every half second to provide a constant feedback "
 "on the download progress while the Get lines scroll back whenever a new file "
 "is started. Since the status display is constantly updated it is unsuitable "
-"for logging to a file, use the <tt>-q</tt> option to remove the status "
-"display."
+"for logging to a file, use the <literal>-q</literal> option to remove the "
+"status display."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:535
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:547
 msgid "Dpkg"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:542
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:549
 msgid ""
-"APT uses <prgn>dpkg</prgn> for installing the archives and will switch over "
-"to the <prgn>dpkg</prgn> interface once downloading is completed. "
-"<prgn>dpkg</prgn> will also ask a number of questions as it processes the "
-"packages and the packages themselves may also ask several questions. Before "
-"each question there is usually a description of what it is asking and the "
-"questions are too varied to discuss completely here."
+"APT uses <command>dpkg</command> for installing the archives and will switch "
+"over to the <command>dpkg</command> interface once downloading is completed. "
+"<command>dpkg</command> will also ask a number of questions as it processes "
+"the packages and the packages themselves may also ask several questions. "
+"Before each question there is usually a description of what it is asking and "
+"the questions are too varied to discuss completely here."
 msgstr ""
 
-#. type: <title></title>
-#: offline.sgml:4
+#. type: Content of: <book><title>
+#: offline.dbk:10
 msgid "Using APT Offline"
 msgstr ""
 
-#. type: <version></version>
-#: offline.sgml:7
-msgid "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
-msgstr ""
-
-#. type: <abstract></abstract>
-#: offline.sgml:12
+#. type: Content of: <book><bookinfo><abstract><para>
+#: offline.dbk:24
 msgid ""
 "This document describes how to use APT in a non-networked environment, "
 "specifically a 'sneaker-net' approach for performing upgrades."
 msgstr ""
 
-#. type: <copyrightsummary></copyrightsummary>
-#: offline.sgml:16
-msgid "Copyright &copy; Jason Gunthorpe, 1999."
+#. type: Content of: <book><bookinfo>
+#: offline.dbk:29
+msgid ""
+"<copyright><year>1999</year><holder>Jason Gunthorpe</holder></copyright>"
 msgstr ""
 
-#. type: <heading></heading>
-#: offline.sgml:32
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:47
 msgid "Introduction"
 msgstr ""
 
-#. type: <heading></heading>
-#: offline.sgml:34 offline.sgml:65 offline.sgml:180
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:49 offline.dbk:79 offline.dbk:191
 msgid "Overview"
 msgstr ""
 
-#. type: <p></p>
-#: offline.sgml:40
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:51
 msgid ""
 "Normally APT requires direct access to a Debian archive, either from a local "
 "media or through a network. Another common complaint is that a Debian "
@@ -7221,8 +7258,8 @@ msgid ""
 "fast connection but they are physically distant."
 msgstr ""
 
-#. type: <p></p>
-#: offline.sgml:51
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:57
 msgid ""
 "The solution to this is to use large removable media such as a Zip disc or a "
 "SuperDisk disc. These discs are not large enough to store the entire Debian "
@@ -7230,13 +7267,13 @@ msgid ""
 "to use APT to generate a list of packages that are required and then fetch "
 "them onto the disc using another machine with good connectivity. It is even "
 "possible to use another Debian machine with APT or to use a completely "
-"different OS and a download tool like wget. Let <em>remote host</em> mean "
-"the machine downloading the packages, and <em>target host</em> the one with "
-"bad or no connection."
+"different OS and a download tool like wget. Let <emphasis>remote host</"
+"emphasis> mean the machine downloading the packages, and <emphasis>target "
+"host</emphasis> the one with bad or no connection."
 msgstr ""
 
-#. type: <p></p>
-#: offline.sgml:57
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:68
 msgid ""
 "This is achieved by creatively manipulating the APT configuration file. The "
 "essential premise to tell APT to look on a disc for it's archive files. Note "
@@ -7244,13 +7281,13 @@ msgid ""
 "names such as ext2, fat32 or vfat."
 msgstr ""
 
-#. type: <heading></heading>
-#: offline.sgml:63
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:77
 msgid "Using APT on both machines"
 msgstr ""
 
-#. type: <p><example>
-#: offline.sgml:71
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:81
 msgid ""
 "APT being available on both machines gives the simplest configuration. The "
 "basic idea is to place a copy of the status file on the disc and use the "
@@ -7258,8 +7295,8 @@ msgid ""
 "to download. The disk directory structure should look like:"
 msgstr ""
 
-#. type: <example></example>
-#: offline.sgml:80
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:87
 #, no-wrap
 msgid ""
 "  /disc/\n"
@@ -7269,34 +7306,35 @@ msgid ""
 "       partial/\n"
 "    status\n"
 "    sources.list\n"
-"    apt.conf"
+"    apt.conf\n"
 msgstr ""
 
-#. type: <heading></heading>
-#: offline.sgml:88
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:98
 msgid "The configuration file"
 msgstr ""
 
-#. type: <p></p>
-#: offline.sgml:96
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:100
 msgid ""
 "The configuration file should tell APT to store its files on the disc and to "
 "use the configuration files on the disc as well. The sources.list should "
 "contain the proper sites that you wish to use from the remote machine, and "
-"the status file should be a copy of <em>/var/lib/dpkg/status</em> from the "
-"<em>target host</em>. Please note, if you are using a local archive you must "
-"use copy URIs, the syntax is identical to file URIs."
+"the status file should be a copy of <emphasis>/var/lib/dpkg/status</"
+"emphasis> from the <emphasis>target host</emphasis>. Please note, if you are "
+"using a local archive you must use copy URIs, the syntax is identical to "
+"file URIs."
 msgstr ""
 
-#. type: <p><example>
-#: offline.sgml:100
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:108
 msgid ""
-"<em>apt.conf</em> must contain the necessary information to make APT use the "
-"disc:"
+"<emphasis>apt.conf</emphasis> must contain the necessary information to make "
+"APT use the disc:"
 msgstr ""
 
-#. type: <example></example>
-#: offline.sgml:124
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:112
 #, no-wrap
 msgid ""
 " APT\n"
@@ -7304,10 +7342,10 @@ msgid ""
 "   /* This is not necessary if the two machines are the same arch, it tells\n"
 "      the remote APT what architecture the target machine is */\n"
 "   Architecture \"i386\";\n"
-"   \n"
+"\n"
 "   Get::Download-Only \"true\";\n"
 " };\n"
-" \n"
+"\n"
 " Dir\n"
 " {\n"
 "   /* Use the disc for state information and redirect the status file from\n"
@@ -7318,76 +7356,78 @@ msgid ""
 "   // Binary caches will be stored locally\n"
 "   Cache::archives \"/disc/archives/\";\n"
 "   Cache \"/tmp/\";\n"
-"   \n"
+"\n"
 "   // Location of the source list.\n"
 "   Etc \"/disc/\";\n"
-" };"
+" };\n"
 msgstr ""
 
-#. type: </example></p>
-#: offline.sgml:129
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:137
 msgid ""
 "More details can be seen by examining the apt.conf man page and the sample "
-"configuration file in <em>/usr/share/doc/apt/examples/apt.conf</em>."
+"configuration file in <emphasis>/usr/share/doc/apt/examples/apt.conf</"
+"emphasis>."
 msgstr ""
 
-#. type: <p><example>
-#: offline.sgml:136
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:142
 msgid ""
-"On the target machine the first thing to do is mount the disc and copy <em>/"
-"var/lib/dpkg/status</em> to it. You will also need to create the directories "
-"outlined in the Overview, <em>archives/partial/</em> and <em>lists/partial/</"
-"em>. Then take the disc to the remote machine and configure the sources."
-"list. On the remote machine execute the following:"
+"On the target machine the first thing to do is mount the disc and copy "
+"<emphasis>/var/lib/dpkg/status</emphasis> to it. You will also need to "
+"create the directories outlined in the Overview, <emphasis>archives/partial/"
+"</emphasis> and <emphasis>lists/partial/</emphasis>. Then take the disc to "
+"the remote machine and configure the sources.list. On the remote machine "
+"execute the following:"
 msgstr ""
 
-#. type: <example></example>
-#: offline.sgml:142
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:151
 #, no-wrap
 msgid ""
 " # export APT_CONFIG=\"/disc/apt.conf\"\n"
 " # apt-get update\n"
 " [ APT fetches the package files ]\n"
 " # apt-get dist-upgrade\n"
-" [ APT fetches all the packages needed to upgrade the target machine ]"
+" [ APT fetches all the packages needed to upgrade the target machine ]\n"
 msgstr ""
 
-#. type: </example></p>
-#: offline.sgml:149
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:158
 msgid ""
 "The dist-upgrade command can be replaced with any other standard APT "
 "commands, particularly dselect-upgrade. You can even use an APT front end "
-"such as <em>dselect</em>. However this presents a problem in communicating "
-"your selections back to the local computer."
+"such as <emphasis>dselect</emphasis>. However this presents a problem in "
+"communicating your selections back to the local computer."
 msgstr ""
 
-#. type: <p><example>
-#: offline.sgml:153
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:164
 msgid ""
 "Now the disc contains all of the index files and archives needed to upgrade "
 "the target machine. Take the disc back and run:"
 msgstr ""
 
-#. type: <example></example>
-#: offline.sgml:159
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:168
 #, no-wrap
 msgid ""
 "  # export APT_CONFIG=\"/disc/apt.conf\"\n"
 "  # apt-get check\n"
 "  [ APT generates a local copy of the cache files ]\n"
 "  # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
-"  [ Or any other APT command ]"
+"  [ Or any other APT command ]\n"
 msgstr ""
 
-#. type: <p></p>
-#: offline.sgml:165
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:175
 msgid ""
 "It is necessary for proper function to re-specify the status file to be the "
 "local one. This is very important!"
 msgstr ""
 
-#. type: <p></p>
-#: offline.sgml:172
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:179
 msgid ""
 "If you are using dselect you can do the very risky operation of copying disc/"
 "status to /var/lib/dpkg/status so that any selections you made on the remote "
@@ -7396,21 +7436,21 @@ msgid ""
 "status file if dpkg or APT have been run in the mean time!!"
 msgstr ""
 
-#. type: <heading></heading>
-#: offline.sgml:178
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:189
 msgid "Using APT and wget"
 msgstr ""
 
-#. type: <p></p>
-#: offline.sgml:185
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:193
 msgid ""
-"<em>wget</em> is a popular and portable download tool that can run on nearly "
-"any machine. Unlike the method above this requires that the Debian machine "
-"already has a list of available packages."
+"<emphasis>wget</emphasis> is a popular and portable download tool that can "
+"run on nearly any machine. Unlike the method above this requires that the "
+"Debian machine already has a list of available packages."
 msgstr ""
 
-#. type: <p></p>
-#: offline.sgml:190
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:198
 msgid ""
 "The basic idea is to create a disc that has only the archive files "
 "downloaded from the remote site. This is done by using the --print-uris "
@@ -7418,38 +7458,38 @@ msgid ""
 "packages."
 msgstr ""
 
-#. type: <heading></heading>
-#: offline.sgml:196
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:204
 #, fuzzy
 msgid "Operation"
 msgstr "Descrição"
 
-#. type: <p><example>
-#: offline.sgml:200
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:206
 msgid ""
 "Unlike the previous technique no special configuration files are required. "
 "We merely use the standard APT commands to generate the file list."
 msgstr ""
 
-#. type: <example></example>
-#: offline.sgml:205
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:210
 #, no-wrap
 msgid ""
-" # apt-get dist-upgrade \n"
+" # apt-get dist-upgrade\n"
 " [ Press no when prompted, make sure you are happy with the actions ]\n"
-" # apt-get -qq --print-uris dist-upgrade > uris\n"
-" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
+" # apt-get -qq --print-uris dist-upgrade &gt; uris\n"
+" # awk '{print \"wget -O \" $2 \" \" $1}' &lt; uris &gt; /disc/wget-script\n"
 msgstr ""
 
-#. type: </example></p>
-#: offline.sgml:210
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:216
 msgid ""
 "Any command other than dist-upgrade could be used here, including dselect-"
 "upgrade."
 msgstr ""
 
-#. type: <p></p>
-#: offline.sgml:216
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:220
 msgid ""
 "The /disc/wget-script file will now contain a list of wget commands to "
 "execute in order to fetch the necessary archives. This script should be run "
@@ -7457,35 +7497,35 @@ msgid ""
 "output on the disc."
 msgstr ""
 
-#. type: <p><example>
-#: offline.sgml:219
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:226
 msgid "The remote machine would do something like"
 msgstr ""
 
-#. type: <example></example>
-#: offline.sgml:223
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:229
 #, no-wrap
 msgid ""
 "  # cd /disc\n"
 "  # sh -x ./wget-script\n"
-"  [ wait.. ]"
+"  [ wait.. ]\n"
 msgstr ""
 
-#. type: </example><example>
-#: offline.sgml:228
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:234
 msgid ""
 "Once the archives are downloaded and the disc returned to the Debian machine "
 "installation can proceed using,"
 msgstr ""
 
-#. type: <example></example>
-#: offline.sgml:230
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:238
 #, no-wrap
-msgid "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
+msgid "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 msgstr ""
 
-#. type: </example></p>
-#: offline.sgml:234
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:241
 msgid "Which will use the already fetched archives on the disc."
 msgstr ""
 
diff --git a/doc/po4a.conf b/doc/po4a.conf
index 3f92c198..636cac9b 100644
--- a/doc/po4a.conf
+++ b/doc/po4a.conf
@@ -27,18 +27,18 @@
 [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: sgml]    guide.sgml $lang:$lang/guide.$lang.sgml
-#                 add_$lang::$lang/addendum/debiandoc_$lang.add
-[type: sgml]    offline.sgml $lang:$lang/offline.$lang.sgml
-#                 add_$lang::$lang/addendum/debiandoc_$lang.add
-#[type: sgml]    cache.sgml $lang:$lang/cache.$lang.sgml \
-#                add_$lang::$lang/addendum/debiandoc_$lang.add
-#[type: sgml]    design.sgml $lang:$lang/design.$lang.sgml\
-#                add_$lang::$lang/addendum/debiandoc_$lang.add
-#[type: sgml]    dpkg-tech.sgml $lang:$lang/dpkg-tech.$lang.sgml\
-#                add_$lang::$lang/addendum/debiandoc_$lang.add
-#[type: sgml]    files.sgml $lang:$lang/files.$lang.sgml\
-#                add_$lang::$lang/addendum/debiandoc_$lang.add
-#[type: sgml]    method.sgml $lang:$lang/method.$lang.sgml\
-#                add_$lang::$lang/addendum/debiandoc_$lang.add
+[type: docbook] guide.dbk $lang:$lang/guide.$lang.dbk
+#                add_$lang::$lang/addendum/docbook_$lang.add
+[type: docbook] offline.dbk $lang:$lang/offline.$lang.dbk
+#                add_$lang::$lang/addendum/docbook_$lang.add
+#[type: docbook] cache.dbk $lang:$lang/cache.$lang.dbk \
+#                add_$lang::$lang/addendum/docbook_$lang.add
+#[type: docbook] design.dbk $lang:$lang/design.$lang.dbk\
+#                add_$lang::$lang/addendum/docbook_$lang.add
+#[type: docbook] dpkg-tech.dbk $lang:$lang/dpkg-tech.$lang.dbk\
+#                add_$lang::$lang/addendum/docbook_$lang.add
+#[type: docbook] files.dbk $lang:$lang/files.$lang.dbk\
+#                add_$lang::$lang/addendum/docbook_$lang.add
+#[type: docbook] method.dbk $lang:$lang/method.$lang.dbk\
+#                add_$lang::$lang/addendum/docbook_$lang.add