diff options
| author | Michael Vogt <mvo@debian.org> | 2014-05-07 17:55:10 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-05-07 17:55:10 +0200 |
| commit | 38d2959ffb8c6f5f291b2910014a67b1b352ab4c (patch) | |
| tree | c5977b8f34aaf973ed3956952ec3ff43ac59f143 /doc/apt-extracttemplates.1.xml | |
| parent | fce69e7a0f38299c57ef96ae1c1dd9a5379bfd5a (diff) | |
| parent | 3fa4e98f62e469f4292d2811b4e15f4afb678fbd (diff) | |
Merge branch 'debian/sid' into debian/experimental
Conflicts:
apt-pkg/cachefilter.h
apt-pkg/contrib/fileutl.cc
apt-pkg/contrib/netrc.h
apt-pkg/deb/debsrcrecords.cc
apt-pkg/init.h
apt-pkg/pkgcache.cc
debian/apt.install.in
debian/changelog
Diffstat (limited to 'doc/apt-extracttemplates.1.xml')
| -rw-r--r-- | doc/apt-extracttemplates.1.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/apt-extracttemplates.1.xml b/doc/apt-extracttemplates.1.xml index d27e05075..9f9888069 100644 --- a/doc/apt-extracttemplates.1.xml +++ b/doc/apt-extracttemplates.1.xml @@ -47,8 +47,8 @@ <para>template-file and config-script are written to the temporary directory specified by the <option>-t</option> or <option>--tempdir</option> (<literal>APT::ExtractTemplates::TempDir</literal>) directory, - with filenames of the form <filename>package.template.XXXX</filename> and - <filename>package.config.XXXX</filename></para> + with filenames of the form <filename>package.template.XXXXXX</filename> and + <filename>package.config.XXXXXX</filename></para> </refsect1> <refsect1><title>options</title> |