Merge branch 'debian/sid' into debian/experimental

[apt.git] / doc / dpkg-tech.sgml

diff --git a/doc/dpkg-tech.sgml b/doc/dpkg-tech.sgml
index 7c6e023ddff02998880a3189d5f5a54579014dd3..1a15f6a4c2bd6582301de19eff5a0da6898bc0e9 100644 (file)
--- a/doc/dpkg-tech.sgml
+++ b/doc/dpkg-tech.sgml
@@ -21,7 +21,7 @@ by the Free Software Foundation; either version 2 of the License, or (at your
 option) any later version.
 
 <p>
 option) any later version.
 
 <p>

-For more details, on Debian GNU/Linux systems, see the file
+For more details, on Debian systems, see the file

 /usr/share/common-licenses/GPL for the full license.
 </copyright>
 
 /usr/share/common-licenses/GPL for the full license.
 </copyright>
 


@@ -164,7 +164,7 @@ not copied into here; it is instead found as part of status or available.
 <item>methods - this directory is reserved for "method"-specific files - each
 "method" has a subdirectory underneath this directory (or at least, it can
 have). In addition, there is another subdirectory "mnt", where misc.
 <item>methods - this directory is reserved for "method"-specific files - each
 "method" has a subdirectory underneath this directory (or at least, it can
 have). In addition, there is another subdirectory "mnt", where misc.

-filesystems (floppies, CDROMs, etc.) are mounted.
+filesystems (floppies, CD-ROMs, etc.) are mounted.

 <item>alternatives - directory used by the "update-alternatives" program. It
 contains one file for each "alternatives" interface, which contains information
 about all the needed symlinked files for each alternative.
 <item>alternatives - directory used by the "update-alternatives" program. It
 contains one file for each "alternatives" interface, which contains information
 about all the needed symlinked files for each alternative.