diff options
| author | Karsten Merker <merker@debian.org> | 2012-09-05 18:43:36 +0000 |
|---|---|---|
| committer | Karsten Merker <merker@debian.org> | 2012-09-05 18:43:36 +0000 |
| commit | a6cc6d853ac598900733d41a82f3e6eaada86433 (patch) | |
| tree | ae9f293a4efaea163971109be60a93bebb3ad69d /en/welcome | |
| parent | f37b7f4a7c08882439ff6eab0d2682c6b0c9fcc2 (diff) | |
| download | installation-guide-a6cc6d853ac598900733d41a82f3e6eaada86433.zip | |
Installation-guide cleanup
removal/rework of outdated parts (chapters 1 and 2, parts of chapter 3)
Diffstat (limited to 'en/welcome')
| -rw-r--r-- | en/welcome/about-copyright.xml | 4 | ||||
| -rw-r--r-- | en/welcome/doc-organization.xml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/en/welcome/about-copyright.xml b/en/welcome/about-copyright.xml index 30ed47ff2..5ebcb41bd 100644 --- a/en/welcome/about-copyright.xml +++ b/en/welcome/about-copyright.xml @@ -21,7 +21,7 @@ and use the system comes directly from &debian; being based on </para><para> Calling software <emphasis>free</emphasis> doesn't mean that the software isn't -copyrighted, and it doesn't mean that CDs containing that software +copyrighted, and it doesn't mean that CDs/DVDs containing that software must be distributed at no charge. Free software, in part, means that the licenses of individual programs do not require you to pay for the privilege of distributing or using those programs. Free software also @@ -36,7 +36,7 @@ does make some packages available that do not meet our criteria for being free. These packages are not part of the official distribution, however, and are only available from the <userinput>contrib</userinput> or <userinput>non-free</userinput> -areas of &debian; mirrors or on third-party CD-ROMs; see the +areas of &debian; mirrors or on third-party CD/DVD-ROMs; see the <ulink url="&url-debian-faq;">Debian FAQ</ulink>, under <quote>The Debian FTP archives</quote>, for more information about the layout and contents of the archives. diff --git a/en/welcome/doc-organization.xml b/en/welcome/doc-organization.xml index 39975d2c1..3ce6ec094 100644 --- a/en/welcome/doc-organization.xml +++ b/en/welcome/doc-organization.xml @@ -59,7 +59,7 @@ Perform the actual installation according to <xref linkend="d-i-intro"/>. This involves choosing your language, configuring peripheral driver modules, configuring your network connection, so that remaining installation files can be obtained -directly from a &debian; server (if you are not installing from a CD), +directly from a &debian; server (if you are not installing from a CD/DVD set), partitioning your hard drives and installation of a base system, then selection and installation of tasks. (Some background about setting up the partitions for your &debian; |