]> git.saurik.com Git - apt.git/log
apt.git
12 years agoadd option to send Content-Type based on file extension
David Kalnischkies [Wed, 11 Jul 2012 17:11:24 +0000 (19:11 +0200)] 
add option to send Content-Type based on file extension

12 years agomake the server a little more robust against write errors (e.g. broken pipe)
David Kalnischkies [Wed, 11 Jul 2012 16:43:53 +0000 (18:43 +0200)] 
make the server a little more robust against write errors (e.g. broken pipe)

12 years agorework parsing of the first request-line to be more robust
David Kalnischkies [Wed, 11 Jul 2012 15:11:26 +0000 (17:11 +0200)] 
rework parsing of the first request-line to be more robust

12 years agoadd simple url rewriting to the webserver
David Kalnischkies [Wed, 11 Jul 2012 09:07:54 +0000 (11:07 +0200)] 
add simple url rewriting to the webserver

12 years agodo not hardcode /dev/null in changetowebserver so it can be changed
David Kalnischkies [Wed, 11 Jul 2012 08:39:51 +0000 (10:39 +0200)] 
do not hardcode /dev/null in changetowebserver so it can be changed
for debugging easily

12 years agoensure that directories are accessed with a slash at the end of the url
David Kalnischkies [Tue, 10 Jul 2012 22:46:27 +0000 (00:46 +0200)] 
ensure that directories are accessed with a slash at the end of the url

12 years agohttp get requests need to be dequoted
David Kalnischkies [Tue, 10 Jul 2012 18:08:58 +0000 (20:08 +0200)] 
http get requests need to be dequoted

12 years agoinclude our usual config.h in the webserver
David Kalnischkies [Tue, 10 Jul 2012 18:05:05 +0000 (20:05 +0200)] 
include our usual config.h in the webserver

12 years agoimplement directory listing in your webserver
David Kalnischkies [Tue, 10 Jul 2012 18:03:00 +0000 (20:03 +0200)] 
implement directory listing in your webserver

12 years agoreformat the aptwebserver code to look more like the rest of APT
David Kalnischkies [Tue, 10 Jul 2012 16:00:11 +0000 (18:00 +0200)] 
reformat the aptwebserver code to look more like the rest of APT

12 years agorename the paywall testcase and reformat it a bit
David Kalnischkies [Tue, 10 Jul 2012 13:28:28 +0000 (15:28 +0200)] 
rename the paywall testcase and reformat it a bit

12 years ago cherry pick -r1847 from bzr+ssh://bazaar.launchpad.net/~mvo/apt/lp346386/
Michael Vogt [Tue, 10 Jul 2012 13:19:09 +0000 (15:19 +0200)] 
 cherry pick -r1847 from bzr+ssh://bazaar.launchpad.net/~mvo/apt/lp346386/

12 years agocherry pick -r1846 from bzr+ssh://bazaar.launchpad.net/~mvo/apt/lp346386/
Michael Vogt [Tue, 10 Jul 2012 13:08:06 +0000 (15:08 +0200)] 
cherry pick -r1846 from bzr+ssh://bazaar.launchpad.net/~mvo/apt/lp346386/

12 years agoimprove test some more
Michael Vogt [Tue, 10 Jul 2012 12:10:19 +0000 (14:10 +0200)] 
improve test some more

12 years agomerged the relevant bits from lp:~mvo/apt/lp346386
Michael Vogt [Tue, 10 Jul 2012 11:26:11 +0000 (13:26 +0200)] 
merged the relevant bits from  lp:~mvo/apt/lp346386

12 years agocleanup, thanks to donkult for his feedback
Michael Vogt [Tue, 10 Jul 2012 11:19:54 +0000 (13:19 +0200)] 
cleanup, thanks to donkult for his feedback

12 years agoalways send content-length via the new addDataHeaders() to ensure w3m/curl are happy...
Michael Vogt [Tue, 10 Jul 2012 10:26:15 +0000 (12:26 +0200)] 
always send content-length via the new addDataHeaders() to ensure w3m/curl are happy too for 404 pages and to comply with the http 1.1 spec

12 years agoadd failing regression test for bug #346386
Michael Vogt [Tue, 10 Jul 2012 10:01:46 +0000 (12:01 +0200)] 
add failing regression test for bug  #346386

12 years agoadd commandline, add configurable port, add --simulate-paywall to simulate a broken...
Michael Vogt [Tue, 10 Jul 2012 09:35:56 +0000 (11:35 +0200)] 
add commandline, add configurable port, add --simulate-paywall to simulate a broken webserver that intercepts connections and returns nonsese

12 years agostart implementing an extremely simple webserver for testing APT
David Kalnischkies [Mon, 9 Jul 2012 15:38:40 +0000 (17:38 +0200)] 
start implementing an extremely simple webserver for testing APT

12 years ago* apt-pkg/contrib/strutl.cc:
David Kalnischkies [Mon, 9 Jul 2012 15:38:06 +0000 (17:38 +0200)] 
* apt-pkg/contrib/strutl.cc:
  - support \n and \r\n line endings in ReadMessages

12 years agomerged from donkult 0.9.7.1
Michael Vogt [Fri, 29 Jun 2012 13:14:44 +0000 (15:14 +0200)] 
merged from donkult

12 years agomerged from donkult
Michael Vogt [Fri, 29 Jun 2012 12:06:40 +0000 (14:06 +0200)] 
merged from donkult

12 years ago* debian/control:
David Kalnischkies [Fri, 29 Jun 2012 11:52:52 +0000 (13:52 +0200)] 
* debian/control:
  - demote debiandoc-sgml to Build-Depends-Indep
* doc/makefile:
  - separate translation building of debiandoc from manpages
    so that we don't need to build debiandoc for binary packages

12 years agoSlovak program translation (Ivan Masár) (Closes: #679448)
Ivan Masár [Thu, 28 Jun 2012 20:38:51 +0000 (22:38 +0200)] 
Slovak program translation (Ivan Masár) (Closes: #679448)

12 years agofinish Slovenian program translation (Andrej Znidarsic)
Andrej Znidarsic [Thu, 28 Jun 2012 10:16:45 +0000 (12:16 +0200)] 
finish Slovenian program translation (Andrej Znidarsic)

12 years agoGerman programn translation (Holger Wansing) (Closes: #679314)
Holger Wansing [Thu, 28 Jun 2012 10:11:13 +0000 (12:11 +0200)] 
German programn translation (Holger Wansing) (Closes: #679314)

12 years ago* debian/control:
David Kalnischkies [Wed, 27 Jun 2012 17:13:10 +0000 (19:13 +0200)] 
* debian/control:
  - libapt-{pkg,inst} packages should be in section 'libs' instead
    of 'admin' as by ftp-master override request in #677596

12 years agomerged from lp:~donkult/apt/sid
Michael Vogt [Wed, 27 Jun 2012 09:59:41 +0000 (11:59 +0200)] 
merged from lp:~donkult/apt/sid

12 years agofix two simple spelling issues found by Christian Perrier,
David Kalnischkies [Wed, 27 Jun 2012 09:21:56 +0000 (11:21 +0200)] 
fix two simple spelling issues found by Christian Perrier,
updating all po's, but as it is a simple transformation no re-call
and instead deal with them on merge

12 years agoSlovenian program translation (Andrej Znidarsic)
Andrej Znidarsic [Wed, 27 Jun 2012 08:19:34 +0000 (10:19 +0200)] 
Slovenian program translation (Andrej Znidarsic)

12 years agoItalian program translation (Milo Casagrande)
Milo Casagrande [Wed, 27 Jun 2012 07:57:33 +0000 (09:57 +0200)] 
Italian program translation (Milo Casagrande)

12 years agomerged from donkult
Michael Vogt [Tue, 26 Jun 2012 11:49:55 +0000 (13:49 +0200)] 
merged from donkult

12 years agoFrench translation update
bubulle@debian.org [Mon, 25 Jun 2012 17:58:47 +0000 (19:58 +0200)] 
French translation update

12 years agoHungarian program translation (Gabor Kelemen)
Gabor Kelemen [Mon, 25 Jun 2012 16:27:05 +0000 (18:27 +0200)] 
Hungarian program translation (Gabor Kelemen)

12 years agoBulgarian program translation (Damyan Ivanov) (Closes: #678983)
Damyan Ivanov [Mon, 25 Jun 2012 16:20:12 +0000 (18:20 +0200)] 
Bulgarian program translation (Damyan Ivanov) (Closes: #678983)

12 years agomake update-po
Michael Vogt [Mon, 25 Jun 2012 07:22:55 +0000 (09:22 +0200)] 
make update-po

12 years agoupdate comments and add one FIXME for the next ABI break
Michael Vogt [Thu, 21 Jun 2012 11:19:04 +0000 (13:19 +0200)] 
update comments and add one FIXME for the next ABI break

12 years agocheck when finished downloading the InRelease file if it has the expected gpg clearsi...
Michael Vogt [Thu, 21 Jun 2012 10:32:56 +0000 (12:32 +0200)] 
check when finished downloading the InRelease file if it has the expected gpg clearsign signature and if not download Release/Release.gpg instead

12 years agoreleasing version 0.9.7 0.9.7
Michael Vogt [Tue, 19 Jun 2012 15:06:49 +0000 (17:06 +0200)] 
releasing version 0.9.7

12 years agomerged from donkult
Michael Vogt [Tue, 19 Jun 2012 11:56:39 +0000 (13:56 +0200)] 
merged from donkult

12 years ago* cmdline/apt-get.cc:
David Kalnischkies [Mon, 18 Jun 2012 11:19:47 +0000 (13:19 +0200)] 
* cmdline/apt-get.cc:
  - print a friendly message in 'download' if a package can't be
    downloaded (Closes: #677887)

12 years ago* buildlib/configure.mak:
David Kalnischkies [Mon, 18 Jun 2012 10:33:53 +0000 (12:33 +0200)] 
* buildlib/configure.mak:
  - print a message detailing how to get config.guess and config.sub
    in case they are not in /usr/share/misc (Closes: #677312)

12 years agodo not dereference the storage for the unique strings as the pointer can
David Kalnischkies [Sat, 16 Jun 2012 17:55:43 +0000 (19:55 +0200)] 
do not dereference the storage for the unique strings as the pointer can
change at the time of writing the strings, so first store it temporary
and then save the index in the (possibily new) pointer location

12 years agoFix previous commit: Do not call memset() if realloc() returned NULL.
Julian Andres Klode [Sat, 16 Jun 2012 13:23:06 +0000 (15:23 +0200)] 
Fix previous commit: Do not call memset() if realloc() returned NULL.

12 years agoZero out the new memory allocated with realloc().
Julian Andres Klode [Sat, 16 Jun 2012 12:38:09 +0000 (14:38 +0200)] 
Zero out the new memory allocated with realloc().

12 years ago* apt-pkg/contrib/mmap.cc:
Julian Andres Klode [Sat, 16 Jun 2012 12:35:15 +0000 (14:35 +0200)] 
* apt-pkg/contrib/mmap.cc:
  - Fix the Fallback option to work correctly, by not calling
    realloc() on a map mapped by mmap(), and by using malloc
    and friends instead of new[].

12 years ago* apt-pkg/pkgcache.cc:
David Kalnischkies [Thu, 14 Jun 2012 17:40:12 +0000 (19:40 +0200)] 
* apt-pkg/pkgcache.cc:
  - do a string comparision for architecture checking in IsMultiArchImplicit
    as 'unique' strings in the pkgcache aren't unique (Closes: #677454)

12 years ago* apt-pkg/pkgcachegen.cc:
Daniel Hartwig [Thu, 14 Jun 2012 17:14:55 +0000 (19:14 +0200)] 
* apt-pkg/pkgcachegen.cc:
  - always reset _error->StackCount in MakeStatusCache (Closes: #677175)

12 years agoadd two tests for architecture specifications
David Kalnischkies [Thu, 14 Jun 2012 17:07:15 +0000 (19:07 +0200)] 
add two tests for architecture specifications

12 years ago* apt-pkg/cacheset.cc:
David Kalnischkies [Thu, 14 Jun 2012 17:03:37 +0000 (19:03 +0200)] 
* apt-pkg/cacheset.cc:
  - add PackageContainerInterface::FromGroup to support
    architecture specifications with wildcards on the commandline

12 years ago* apt-pkg/deb/deblistparser.cc:
David Kalnischkies [Thu, 14 Jun 2012 16:48:23 +0000 (18:48 +0200)] 
* apt-pkg/deb/deblistparser.cc:
  - use PackageArchitectureMatchesSpecification filter
* apt-pkg/cachefilter.cc:
  - add PackageArchitectureMatchesSpecification (Closes: #672603)

12 years ago* deb/deblistparser.cc:
David Kalnischkies [Thu, 14 Jun 2012 13:46:49 +0000 (15:46 +0200)] 
* deb/deblistparser.cc:
  - ensure that mixed positive/negative architecture wildcards
    are handled in the same way as dpkg handles them

12 years agoadd a testcase for #675449, which i forgot to commit
David Kalnischkies [Tue, 12 Jun 2012 13:40:56 +0000 (15:40 +0200)] 
add a testcase for #675449, which i forgot to commit

12 years agoreleasing version 0.9.6 0.9.6
Michael Vogt [Mon, 11 Jun 2012 14:51:43 +0000 (16:51 +0200)] 
releasing version 0.9.6

12 years agomerged from donkult
Michael Vogt [Mon, 11 Jun 2012 12:56:11 +0000 (14:56 +0200)] 
merged from donkult

12 years agoadd a few tests to check that arch-specific qualifiers work
David Kalnischkies [Mon, 11 Jun 2012 00:17:17 +0000 (02:17 +0200)] 
add a few tests to check that arch-specific qualifiers work

12 years ago* apt-pkg/deb/deblistparser.cc:
Thibaut Girka [Mon, 11 Jun 2012 00:06:40 +0000 (02:06 +0200)] 
* apt-pkg/deb/deblistparser.cc:
  - add support for arch-specific qualifiers in dependencies

12 years ago* apt-pkg/cacheiterators.h:
David Kalnischkies [Sun, 10 Jun 2012 23:31:27 +0000 (01:31 +0200)] 
* apt-pkg/cacheiterators.h:
  - add an IsMultiArchImplicit() method for Dep- and PrvIterator

12 years agocheck build-dep candidate if install is forbidden
David Kalnischkies [Sun, 10 Jun 2012 22:16:51 +0000 (00:16 +0200)] 
check build-dep candidate if install is forbidden

12 years ago* cmdline/apt-get.cc:
Thibaut Girka [Sun, 10 Jun 2012 11:06:11 +0000 (13:06 +0200)] 
* cmdline/apt-get.cc:
  - complain correctly about :any build-dep on M-A:none packages

12 years agoshow 'bzr branch' as 'bzr get' is deprecated (LP: #1011032)
David Kalnischkies [Sun, 10 Jun 2012 10:27:24 +0000 (12:27 +0200)] 
show 'bzr branch' as 'bzr get' is deprecated (LP: #1011032)

12 years ago* apt-pkg/aptconfiguration.cc:
David Kalnischkies [Sat, 9 Jun 2012 22:40:55 +0000 (00:40 +0200)] 
* apt-pkg/aptconfiguration.cc:
  - if APT::Languages=none save "none" in allCodes so that the detected
    configuration is cached as intended (Closes: #674690, LP: #1004947)

12 years ago* cmdline/apt-get.cc:
Daniel Hartwig [Sat, 9 Jun 2012 22:18:19 +0000 (00:18 +0200)] 
* cmdline/apt-get.cc:
  - print URIs for all changelogs in case of --print-uris,
    thanks to Daniel Hartwig for the patch! (Closes: #674897)

12 years ago* apt-pkg/deb/deblistparser.cc:
David Kalnischkies [Sat, 9 Jun 2012 22:08:28 +0000 (00:08 +0200)] 
* apt-pkg/deb/deblistparser.cc:
  - set pkgCacheGen::Essential to "all" again (Closes: #675449)
* apt-pkg/algorithms.cc:
  - force install only for one essential package out of a group

12 years ago* ftparchive/apt-ftparchive.cc:
David Kalnischkies [Sat, 9 Jun 2012 21:08:19 +0000 (23:08 +0200)] 
* ftparchive/apt-ftparchive.cc:
  - default to putting the Contents-* files below $(SECTION) as apt-file
    expects them there - thanks Martin-Éric Racine! (Closes: #675827)

12 years agofix segfault with empty LongOpt in --no-* branch
David Kalnischkies [Sat, 9 Jun 2012 20:55:51 +0000 (22:55 +0200)] 
fix segfault with empty LongOpt in --no-* branch

12 years ago* apt-pkg/contrib/cmdline.cc:
Daniel Hartwig [Sat, 9 Jun 2012 20:49:37 +0000 (22:49 +0200)] 
* apt-pkg/contrib/cmdline.cc:
  - apply patch from Daniel Hartwig to fix a segfault in case
    the LongOpt is empty (Closes: #676331)

12 years ago* apt-pkg/cdrom.cc:
David Kalnischkies [Sat, 9 Jun 2012 20:15:51 +0000 (22:15 +0200)] 
* apt-pkg/cdrom.cc:
  - fix regression from 0.9.3 which dumped the main configuration
    _config instead of the cdrom settings (Cnf) as identified and
    tested by Milan Kupcevic, thanks! (Closes: #674100)

12 years agoupdating <date> tags and the po files for the manpages
David Kalnischkies [Sat, 9 Jun 2012 20:05:55 +0000 (22:05 +0200)] 
updating <date> tags and the po files for the manpages

12 years ago* doc/apt.conf.5.xml:
Justin B Rye [Sat, 9 Jun 2012 17:14:57 +0000 (19:14 +0200)] 
* doc/apt.conf.5.xml:
  - review and fix typo, grammar and style issues
  - rephrase APT::Immediate-Configuration and many others

12 years ago* sources.list.5.xml:
Justin B Rye [Thu, 7 Jun 2012 22:17:06 +0000 (00:17 +0200)] 
* sources.list.5.xml:
  - review and fix typo, grammar and style issues

12 years ago* doc/apt-sortpkgs.1.xml:
Justin B Rye [Wed, 6 Jun 2012 22:04:44 +0000 (00:04 +0200)] 
* doc/apt-sortpkgs.1.xml:
  - review and fix typo, grammar and style issues

12 years ago* doc/apt-secure.8.xml:
Justin B Rye [Wed, 6 Jun 2012 21:56:08 +0000 (23:56 +0200)] 
* doc/apt-secure.8.xml:
  - review and fix typo, grammar and style issues

12 years ago* doc/apt-key.8.xml, doc/apt-mark.8.xml,
Justin B Rye [Wed, 6 Jun 2012 16:15:49 +0000 (18:15 +0200)] 
* doc/apt-key.8.xml, doc/apt-mark.8.xml,
  doc/apt_preferences.5.xml:
  - review and fix spelling issues

12 years ago* cmdline/apt-key:
Michael Vogt [Wed, 6 Jun 2012 11:24:13 +0000 (13:24 +0200)] 
* cmdline/apt-key:
  - do not hardcode /etc but use Dir::Etc instead

12 years ago* doc/apt-key.8.xml:
Justin B Rye [Mon, 4 Jun 2012 14:31:19 +0000 (16:31 +0200)] 
* doc/apt-key.8.xml:
  - review and fix spelling issues
* doc/apt-mark.8.xml:
  - review and fix spelling issues

12 years agoreorder the translatable files in the pot in a way that at least partly
David Kalnischkies [Mon, 4 Jun 2012 12:01:13 +0000 (14:01 +0200)] 
reorder the translatable files in the pot in a way that at least partly
resembles importance of the manpage, so that e.g. apt-get and apt-cache
are above the less used apt-ftparchive

12 years ago* doc/apt-ftparchive.8.xml:
Justin B Rye [Mon, 4 Jun 2012 11:49:40 +0000 (13:49 +0200)] 
* doc/apt-ftparchive.8.xml:
  - fix typo, grammar and style issues

12 years agounfuzzy typofixes in th french manpage update
David Kalnischkies [Sat, 2 Jun 2012 21:45:46 +0000 (23:45 +0200)] 
unfuzzy typofixes in th french manpage update

12 years agomerge with debian-sid to get all the updated l10ns
David Kalnischkies [Sat, 2 Jun 2012 20:29:31 +0000 (22:29 +0200)] 
merge with debian-sid to get all the updated l10ns

[ Christian Perrier ]
* French program and manpage translation update
* Danish program translation by Joe Hansen. Closes: #675605

12 years ago* doc/apt-mark.8.xml:
Robert Luberda [Sat, 2 Jun 2012 18:38:05 +0000 (20:38 +0200)] 
* doc/apt-mark.8.xml:
  - in hold, the option name is --file not --filename

12 years agounfuzzy the typos fixed so far in the english review in pl update
David Kalnischkies [Sat, 2 Jun 2012 17:27:02 +0000 (19:27 +0200)] 
unfuzzy the typos fixed so far in the english review in pl update

12 years agoPolish manpage translation update (Closes: #675603)
Robert Luberda [Sat, 2 Jun 2012 17:15:57 +0000 (19:15 +0200)] 
Polish manpage translation update (Closes: #675603)

12 years agoFrench updated by Christian Perrier
bubulle@debian.org [Sat, 2 Jun 2012 16:42:48 +0000 (18:42 +0200)] 
French updated by Christian Perrier

12 years agoDanish by Joe Hansen. Closes: #675605
bubulle@debian.org [Sat, 2 Jun 2012 16:38:59 +0000 (18:38 +0200)] 
Danish by Joe Hansen. Closes: #675605

12 years agoFrench updated by Christian Perrier
bubulle@debian.org [Sat, 2 Jun 2012 16:37:54 +0000 (18:37 +0200)] 
French updated by Christian Perrier

12 years agoPolish updated by Robert Luberda. Closes: #675603
bubulle@debian.org [Sat, 2 Jun 2012 16:26:35 +0000 (18:26 +0200)] 
Polish updated by Robert Luberda. Closes: #675603

12 years ago* doc/apt-get.8.xml:
Justin B Rye [Sat, 2 Jun 2012 16:03:45 +0000 (18:03 +0200)] 
* doc/apt-get.8.xml:
  - review and fix spelling issues

12 years ago* doc/apt-get.8.xml:
David Kalnischkies [Tue, 29 May 2012 14:14:25 +0000 (16:14 +0200)] 
* doc/apt-get.8.xml:
  - use apt-utils as package example instead of libc6

12 years agoReword: "So, <literal>dist-upgrade</literal> command may remove some packages."
Justin B Rye [Tue, 29 May 2012 13:57:01 +0000 (15:57 +0200)] 
Reword: "So, <literal>dist-upgrade</literal> command may remove some packages."
to "The <literal>dist-upgrade</literal> command may therefore remove some packages."

12 years ago* doc/apt-get.8.xml:
Justin B Rye [Tue, 29 May 2012 13:39:41 +0000 (15:39 +0200)] 
* doc/apt-get.8.xml:
  - move dselect-upgrade below dist-upgrade

12 years ago* doc/apt-extracttemplates.1.xml:
Justin B Rye [Sat, 26 May 2012 15:49:29 +0000 (17:49 +0200)] 
* doc/apt-extracttemplates.1.xml:
  - debconf is not DebConf

12 years ago* doc/examples/sources.list:
David Kalnischkies [Sat, 26 May 2012 13:51:15 +0000 (15:51 +0200)] 
* doc/examples/sources.list:
  - use the codename instead of 'stable' in the examples sources.list
    as we do in the manpage and as the debian-installer does

12 years ago* doc/apt-verbatim.ent:
David Kalnischkies [Fri, 25 May 2012 12:11:34 +0000 (14:11 +0200)] 
* doc/apt-verbatim.ent:
  - APT doesn't belong to the product 'Linux', so use 'APT' instead
    as after all APT is a big suite of applications

12 years ago* doc/apt-config.8.xml:
Justin B Rye [Fri, 25 May 2012 11:17:27 +0000 (13:17 +0200)] 
* doc/apt-config.8.xml:
  - review and fix spelling issues

12 years agocorrect one remaining 'cdrom' → 'CD-ROM'
Justin B Rye [Fri, 25 May 2012 09:38:06 +0000 (11:38 +0200)] 
correct one remaining 'cdrom' → 'CD-ROM'

12 years ago* debian/apt-utils.links:
David Kalnischkies [Fri, 25 May 2012 09:03:12 +0000 (11:03 +0200)] 
* debian/apt-utils.links:
  - the internal resolver 'apt' is now directly installed in
    /usr/lib/apt/solvers, so don't instruct dh to create a broken link

12 years ago* doc/apt-cdrom.8.xml:
Justin B Rye [Fri, 25 May 2012 08:53:27 +0000 (10:53 +0200)] 
* doc/apt-cdrom.8.xml:
  - correct disc vs. disk issues

12 years ago* doc/apt-cdrom.8.xml:
Justin B Rye [Fri, 25 May 2012 08:32:07 +0000 (10:32 +0200)] 
* doc/apt-cdrom.8.xml:
  - it's multi-CD and a run-on setence "ends" with;