[SCM] live-manual branch, debian-next, updated. debian/3.0_a15-1-46-gb8ee38b

[Ben Armstrong]

The following commit has been merged in the debian-next branch:
commit b8ee38b5e0e409aaad0be5ef737960efdc967d3e
Author: Ben Armstrong <synrg at debian.org>
Date:   Mon Sep 10 18:06:11 2012 -0300

    Expanding passing options to apt/aptitude section.

diff --git a/manual/en/user_customization-packages.ssi b/manual/en/user_customization-packages.ssi
index 5e1a7c9..f57c020 100644
--- a/manual/en/user_customization-packages.ssi
+++ b/manual/en/user_customization-packages.ssi
@@ -299,7 +299,17 @@ The more general consequence is that if you don't install recommended packages f
 
 3~ Passing options to apt or aptitude
 
-If there is not a #{lb config}# option to alter APT's behaviour in the way you need, use #{--apt-options}# or #{--aptitude-options}# to pass any options through to your configured APT tool. See the man pages for #{apt}# and #{aptitude}# for details.
+If there is not a #{lb config}# option to alter APT's behaviour in the way you need, use #{--apt-options}# or #{--aptitude-options}# to pass any options through to your configured APT tool. See the man pages for #{apt}# and #{aptitude}# for details. Note that both options have default values that you will need to retain in addition to any overrides you may provide. So, for example, suppose you have included something from #{snapshot.debian.org}# for testing purposes and want to specify #{Acquire::Check-Valid-Until=false}# to make APT happy with the stale #{Release}# file, you would do so as per the following example, appending the new option after the default value #{--yes}#:
+
+code{
+
+ $ lb config --apt-options "--yes -oAcquire::Check-Valid-Until=false"
+
+}code
+
+Please check the man pages to fully understand these options and when to use them. This is an example only and should not be construed as advice to configure your image this way. This option would not be appropriate for, say, a final release of a live image.
+
+For more complicated APT configurations involving #{apt.conf}# options you might want to create a #{config/chroot_apt/apt.conf}# file instead. See also the other #{apt-*}# options for a few convenient shortcuts for frequently needed options.
 
 3~apt-pinning APT pinning
 

-- 
live-manual