diff options
| author | Samuel Thibault <sthibault@debian.org> | 2013-05-18 20:30:43 +0000 |
|---|---|---|
| committer | Samuel Thibault <sthibault@debian.org> | 2013-05-18 20:30:43 +0000 |
| commit | e8a70b9447584a493f59375800a8da638ffd00fa (patch) | |
| tree | a08ed62cd26e0bd3348624c17f169d1e829fa990 | |
| parent | 5428e9ea83312847bebc4db39daf27e5b658b7f3 (diff) | |
| download | installation-guide-e8a70b9447584a493f59375800a8da638ffd00fa.zip | |
Removal of references to 'volatile'
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | en/appendix/preseed.xml | 3 | ||||
| -rw-r--r-- | en/using-d-i/modules/apt-setup.xml | 8 |
3 files changed, 9 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog index 537817f62..0d5cb3f1c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,11 @@ installation-guide (20130504) UNRELEASED; urgency=low + [ Samuel Thibault ] * Add /run directory to the tree summary. + [ Holger Wansing ] + * Removal of references to 'volatile'. + -- Samuel Thibault <sthibault@debian.org> Sat, 18 May 2013 18:27:53 +0200 installation-guide (20130503) unstable; urgency=low diff --git a/en/appendix/preseed.xml b/en/appendix/preseed.xml index 7a64fca54..011bd727d 100644 --- a/en/appendix/preseed.xml +++ b/en/appendix/preseed.xml @@ -1349,9 +1349,8 @@ earlier questions. You can optionally add other (local) repositories. #d-i apt-setup/use_mirror boolean false # Select which update services to use; define the mirrors to be used. # Values shown below are the normal defaults. -#d-i apt-setup/services-select multiselect security, volatile +#d-i apt-setup/services-select multiselect security, updates #d-i apt-setup/security_host string security.debian.org -#d-i apt-setup/volatile_host string volatile.debian.org # Additional repositories, local[0-9] available #d-i apt-setup/local0/repository string \ diff --git a/en/using-d-i/modules/apt-setup.xml b/en/using-d-i/modules/apt-setup.xml index 16677a902..8d152db5d 100644 --- a/en/using-d-i/modules/apt-setup.xml +++ b/en/using-d-i/modules/apt-setup.xml @@ -42,13 +42,13 @@ take care of the configuration automatically, based on the installation method you are using and possibly using choices made earlier in the installation. In most cases the installer will automatically add a security mirror and, if you are installing the stable distribution, a mirror for the -<quote>volatile</quote> update service. +<quote>stable-updates</quote> service. </para><para> If you are installing at a lower priority (e.g. in expert mode), you will be able to make more decisions yourself. You can choose whether or not to -use the security and/or volatile update services, and you can choose to +use the security and/or stable-updates services, and you can choose to add packages from the <quote>contrib</quote> and <quote>non-free</quote> sections of the archive. @@ -179,7 +179,7 @@ which of those packages are present on the CDs or DVDs you have scanned, and whether any updated versions of packages included on the CDs or DVDs are available from a mirror (either a regular package mirror, or a mirror for -security or volatile updates). +security or stable-updates). </para></listitem> </orderedlist> @@ -188,7 +188,7 @@ security or volatile updates). Note that the last point means that, even if you choose not to use a network mirror, some packages may still be downloaded from the Internet if there is a -security or volatile update available for them and those services have been +security or stable-updates update available for them and those services have been configured. </para> |