This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch main in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=3efb9004bea9492ad03396f0f9718cf3f382dbf8 commit 3efb9004bea9492ad03396f0f9718cf3f382dbf8 Author: Guillem Jover <[email protected]> AuthorDate: Fri Oct 20 02:57:43 2023 +0200 doc, man: Use media discs instead of CD-ROM The former is more generic and includes any new technology in use, while CD-ROM is very specific and a format that is in disuse. --- dselect/methods/file/setup.sh | 2 +- man/dpkg-scanpackages.pod | 2 +- man/dpkg.pod | 2 +- man/dselect.pod | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dselect/methods/file/setup.sh b/dselect/methods/file/setup.sh index a7212f49e..027c8c8c0 100755 --- a/dselect/methods/file/setup.sh +++ b/dselect/methods/file/setup.sh @@ -240,7 +240,7 @@ If you overlooked it when downloading you should do get it now and return to this installation procedure when you have done so: you will find one Packages file and one Packages.gz file -- either will do -- in the 'binary-$iarch' subdirectory of each area on the FTP sites and -CD-ROMs. Alternatively (and this will be rather slow) the packages in +media discs. Alternatively (and this will be rather slow) the packages in the distribution area can be scanned - say 'scan' if you want to do so. You need a separate Packages file from each of the distribution areas diff --git a/man/dpkg-scanpackages.pod b/man/dpkg-scanpackages.pod index e0f6f4643..6ed0463c4 100644 --- a/man/dpkg-scanpackages.pod +++ b/man/dpkg-scanpackages.pod @@ -42,7 +42,7 @@ L<apt(8)>, L<dselect(1)>, etc, to tell the user what packages are available for installation. These Packages files are the same as those found on Debian archive sites -and CD-ROMs. You might use +and media discs. You might use B<dpkg-scanpackages> yourself if making a directory of local packages to install on a cluster of machines. diff --git a/man/dpkg.pod b/man/dpkg.pod index 89a957427..d2c01a855 100644 --- a/man/dpkg.pod +++ b/man/dpkg.pod @@ -1506,7 +1506,7 @@ To remove an installed elvis package: =back To install a package, you first need to find it in an archive or -CDROM. The I<available> file shows that the vim package is in section +media disc. The I<available> file shows that the vim package is in section B<editors>: =over diff --git a/man/dselect.pod b/man/dselect.pod index 9f309074e..4c815d2b8 100644 --- a/man/dselect.pod +++ b/man/dselect.pod @@ -64,7 +64,7 @@ privileges, packages can be installed, upgraded and removed. Various access methods can be configured to retrieve available package version information and installable packages from package repositories. Depending on the used access method, these repositories can be public -archive servers on the internet, local archive servers or CD-ROMs. +archive servers on the internet, local archive servers or media discs. The recommended access method is I<apt>, which is provided by the package L<apt(8)>. -- Dpkg.Org's dpkg
