diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2009-02-09 14:31:39 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2009-02-09 14:31:39 +0100 |
| commit | 3111692d0be3b2dc401180728e51e1b1fd2525a1 (patch) | |
| tree | c66579e132eaf9e299d96e5ad88927e8d219b483 /doc | |
| parent | ebb461fdf02ee3e038d4b3a4ab1a0a60188edf9a (diff) | |
| parent | 651001f7501431b75e967ba060160129d5a7ed74 (diff) | |
merge the latest debian-sid branch
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/.cvsignore | 14 | ||||
| -rw-r--r-- | doc/apt-get.8.xml | 2 | ||||
| -rw-r--r-- | doc/apt.ent | 7 | ||||
| -rw-r--r-- | doc/es/.cvsignore | 14 | ||||
| -rw-r--r-- | doc/fr/.cvsignore | 13 | ||||
| -rw-r--r-- | doc/pt_BR/.cvsignore | 3 |
6 files changed, 8 insertions, 45 deletions
diff --git a/doc/.cvsignore b/doc/.cvsignore deleted file mode 100644 index 94d80ad54..000000000 --- a/doc/.cvsignore +++ /dev/null @@ -1,14 +0,0 @@ -apt-cache.8 -apt-get.8 -apt-cdrom.8 -apt.conf.5 -sources.list.5 -apt-config.8 -apt-sortpkgs.1 -apt-ftparchive.1 -manpage.links -manpage.refs -manpage.log -apt_preferences.5 -apt-extracttemplates.1 -vendors.list.5 diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 64c3a35e4..26bd0aa68 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -589,8 +589,8 @@ <title>CURRENT AUTHORS</title> <para> &apt-author.team; - &apt-qapage; </para> + &apt-qapage; </refsect1> &manbugs; </refentry> diff --git a/doc/apt.ent b/doc/apt.ent index 6594ba1b3..4cfc00069 100644 --- a/doc/apt.ent +++ b/doc/apt.ent @@ -179,6 +179,13 @@ </author> "> +<!ENTITY apt-author.moconnor " + <author> + <firstname>Mike</firstname> + <surname>O'Connor</surname> + </author> +"> + <!ENTITY apt-author.team " <author> <othername>APT team</othername> diff --git a/doc/es/.cvsignore b/doc/es/.cvsignore deleted file mode 100644 index ce363466a..000000000 --- a/doc/es/.cvsignore +++ /dev/null @@ -1,14 +0,0 @@ -apt-cache.es.8 -apt-get.es.8 -apt-cdrom.es.8 -apt.conf.es.5 -sources.list.es.5 -apt-config.es.8 -apt-sortpkgs.es.1 -apt-ftparchive.es.1 -manpage.links -manpage.refs -manpage.log -apt_preferences.es.5 -apt-extracttemplates.es.1 -vendors.list.es.5 diff --git a/doc/fr/.cvsignore b/doc/fr/.cvsignore deleted file mode 100644 index cfa89623e..000000000 --- a/doc/fr/.cvsignore +++ /dev/null @@ -1,13 +0,0 @@ -apt-cdrom.fr.8 -apt-config.fr.8 -apt-extracttemplates.fr.1 -apt-ftparchive.fr.1 -apt-sortpkgs.fr.1 -apt.conf.fr.5 -apt_preferences.fr.5 -manpage.links -manpage.refs -sources.list.fr.5 -apt-cache.fr.8 -apt-get.fr.8 -vendors.list.fr.5 diff --git a/doc/pt_BR/.cvsignore b/doc/pt_BR/.cvsignore deleted file mode 100644 index 8d11bcc88..000000000 --- a/doc/pt_BR/.cvsignore +++ /dev/null @@ -1,3 +0,0 @@ -apt_preferences.pt_BR.5 -manpage.links -manpage.refs |