diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/apt-get.8.yo | 17 | ||||
| -rw-r--r-- | doc/apt.conf.5.yo | 10 |
2 files changed, 15 insertions, 12 deletions
diff --git a/doc/apt-get.8.yo b/doc/apt-get.8.yo index d46eb9bcb..4983b2581 100644 --- a/doc/apt-get.8.yo +++ b/doc/apt-get.8.yo @@ -139,14 +139,15 @@ Configuration Item: bf(APT::Get::Download-Only). dit(bf(-f, --fix-broken)) Fix; attempt to correct a system with broken dependencies in -place. This option may be used alone or in conjunction with any of the -command actions, and 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 dpkg --remove to eliminate some of the offending -packages). Use of this option together with -m may produce an error in -some situations. Configuration Item: bf(APT::Get::Fix-Broken). +place. This option, when used with install/remove, can omit any packages +to permit APT to deduce a likely soltion. Any Package that are specified +must completly 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 dpkg --remove to eliminate some of +the offending packages). Use of this option together with -m may produce an +error in some situations. Configuration Item: bf(APT::Get::Fix-Broken). dit(bf(-h, --help)) Help; display a helpful usage message and exits. diff --git a/doc/apt.conf.5.yo b/doc/apt.conf.5.yo index 996de3a42..6b5ba8575 100644 --- a/doc/apt.conf.5.yo +++ b/doc/apt.conf.5.yo @@ -33,7 +33,9 @@ with newlines placed to make it more readable. Lists can be created by opening a scope an including a single word enclosed in quotes followed by a semicolon. In general the sample configuration file in -em(/usr/doc/apt/examples/apt.conf) is a good guide for how it should look. +em(/usr/doc/apt/examples/apt.conf) and +em(/usr/doc/apt/examples/configure-index) +is a good guide for how it should look. All of the APT tools take a -o option which allows an arbitary configuration directive to be specified on the command line. The syntax is a full option @@ -141,7 +143,7 @@ standard form of em(ftp://[[user][:pass]@]host[:port]/) and is overriden by the ftp_proxy environment variable. To use a ftp proxy you will have to set the ftp::ProxyLogin script in the configuration file. This entry specifies the commands to send to tell the proxy server what to connect -to. Please see em(/usr/doc/apt/examples/apt.conf) for an example of how +to. Please see em(/usr/doc/apt/examples/configure-index) for an example of how to do this. The subsitution variables available are $(PROXY_USER), $(PROXY_PASS), $(SITE_USER), $(SITE_PASS), $(SITE), and $(SITE_PORT). Each is taken from it's respective URI component. @@ -254,8 +256,8 @@ invokation. bf(Debug::IdentCdrom) will disable the inclusion of statfs data in CDROM IDs. manpagesection(EXAMPLES) -bf(/usr/doc/apt/examples/apt.conf) contains a sample configuration file -showing the default values for all possible options. +bf(/usr/doc/apt/examples/configure-index.gz) contains a sample configuration +file showing the default values for all possible options. manpagesection(FILES) /etc/apt/apt.conf |