diff options
| author | Matt Zimmerman <matt.zimmerman@canonical.com> | 2004-11-13 18:27:46 +0000 |
|---|---|---|
| committer | Matt Zimmerman <matt.zimmerman@canonical.com> | 2004-11-13 18:27:46 +0000 |
| commit | 640c5d948afa27a8e71eb6c03f1e0d55f81773c5 (patch) | |
| tree | 02bffabc3d80410d347322a83a6adc86c8544208 /doc/apt.conf.5.xml | |
| parent | e91cfaca9f2a4ba23f89f91ad21e63095b50bdb3 (diff) | |
Merge from CVS
Patches applied:
* apt@arch.ubuntu.com/apt--MAIN--0--patch-1304
Basque correction.
* apt@arch.ubuntu.com/apt--MAIN--0--patch-1305
Updated Brazilian Portuguese and Greek (256396 and 2567...
* apt@arch.ubuntu.com/apt--MAIN--0--patch-1306
New Korean translation from Changwoo Ryu <cwryu@debian....
* apt@arch.ubuntu.com/apt--MAIN--0--patch-1307
German translation now available in two flavours: with ...
* apt@arch.ubuntu.com/apt--MAIN--0--patch-1308
Finalize 0.5.26
* apt@arch.ubuntu.com/apt--MAIN--0--patch-1309
Remove duplicate entry
* apt@arch.ubuntu.com/apt--MAIN--0--patch-1310
Note about archtable when architecture test fails
* apt@arch.ubuntu.com/apt--MAIN--0--patch-1311
0.5.26 (really)
* apt@arch.ubuntu.com/apt--MAIN--0--patch-1312
German translation now available in two flavours: with ...
* apt@arch.ubuntu.com/apt--MAIN--0--patch-1313
New Finnish translation from Tapio Lehtonen <tale@debia...
* apt@arch.ubuntu.com/apt--MAIN--0--patch-1314
New Bosnian translation from Safir ��e��erovi�� <sapphi...
* apt@arch.ubuntu.com/apt--MAIN--0--patch-1315
Fix Italian incontrario
* apt@arch.ubuntu.com/apt--MAIN--0--patch-1316
* Bring configure-index up to date with documented opti...
* apt@arch.ubuntu.com/apt--MAIN--0--patch-1317
configure-index contains example values, not strictly d...
* apt@arch.ubuntu.com/apt--MAIN--0--patch-1318
Updated Spanish from Ruben Porras (Closes:#260483)
* apt@arch.ubuntu.com/apt--MAIN--0--patch-1319
Updated Danish from Claus Hindsgaul (Closes: #260569)
* apt@arch.ubuntu.com/apt--MAIN--0--patch-1320
Updated Slovak from Peter Mann (Closes: #260627)
* apt@arch.ubuntu.com/apt--MAIN--0--patch-1321
Updated Portuguese from Miguel Figueiredo (Closes: #261423)
* apt@arch.ubuntu.com/apt--MAIN--0--patch-1322
* Add Polish translation of offline.sgml (Closes: #259229)
* apt@arch.ubuntu.com/apt--MAIN--0--patch-1323
urgency=high
* apt@arch.ubuntu.com/apt--MAIN--0--patch-1324
Sync with new POT.
* apt@arch.ubuntu.com/apt--MAIN--0--patch-1325
Updated Hungarian from Kelemen G��bor <kelemeng@gnome.hu>.
* apt@arch.ubuntu.com/apt--MAIN--0--patch-1326
Updated Greek from George Papamichelakis (Closes: #265004)
* apt@arch.ubuntu.com/apt--MAIN--0--patch-1327
Updated Simplified Chinese from Tchaikov (Closes: #265190)
* apt@arch.ubuntu.com/apt--MAIN--0--patch-1328
Updated French by Christian Perrier (Closes: #265816)
* apt@arch.ubuntu.com/apt--MAIN--0--patch-1329
Updated Japanese by Kenshi Muto (Closes: #265630)
* apt@arch.ubuntu.com/apt--MAIN--0--patch-1330
Updated French by Christian Perrier (Closes: #265816)
* apt@arch.ubuntu.com/apt--MAIN--0--patch-1331
- Updated Catalan from Jordi Mallach
* apt@arch.ubuntu.com/apt--MAIN--0--patch-1332
Updated Dutch from Bart Cornelis (Closes: #268258)
* apt@arch.ubuntu.com/apt--MAIN--0--patch-1333
Updated Portuguese from Miguel Figueiredo (Closes: #268265)
* apt@arch.ubuntu.com/apt--MAIN--0--patch-1334
Updated Dutch from Bart Cornelis (Closes: #268258)
* apt@arch.ubuntu.com/apt--MAIN--0--patch-1335
APT::Get::APT::Get::No-List-Cleanup -> APT::Get::List-C...
* apt@arch.ubuntu.com/apt--MAIN--0--patch-1336
Updated Polish from Robert Luberda <robert@debian.org> ...
* apt@arch.ubuntu.com/apt--MAIN--0--patch-1337
Updated Danish from Claus Hindsgaul (Closes: #269417)
* apt@arch.ubuntu.com/apt--MAIN--0--patch-1338
Updated Norwegian Nynorsk from H��vard Korsvoll <korsvo...
* apt@arch.ubuntu.com/apt--MAIN--0--patch-1339
Updated Russian from Yuri Kozlov <yuray@id.ru> (Closes:...
* apt@arch.ubuntu.com/apt--MAIN--0--patch-1340
Updated Italian from Samuele Giovanni Tonon (Closes: #2...
* apt@arch.ubuntu.com/apt--MAIN--0--patch-1341
Updated Dutch from Bart Cornelis (Closes: #278697)
* apt@arch.ubuntu.com/apt--MAIN--0--patch-1342
Updated Slovak from Peter Mann (Closes: #279481)
Diffstat (limited to 'doc/apt.conf.5.xml')
| -rw-r--r-- | doc/apt.conf.5.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index eed5b8d52..b5d223372 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -377,8 +377,8 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; </refsect1> <refsect1><title>Examples</title> - <para>&configureindex; contains a - sample configuration file showing the default values for all possible + <para>&configureindex; is a + configuration file showing example values for all possible options.</para> </refsect1> |