diff options
author | Christian Perrier <bubulle@debian.org> | 2005-06-24 20:39:33 +0000 |
---|---|---|
committer | Christian Perrier <bubulle@debian.org> | 2005-06-24 20:39:33 +0000 |
commit | 97720af361b9f208f72ee31749f69f3800265923 (patch) | |
tree | ffdad74b6c88429b1124e9f55c9c96570a6d5e6c /doc | |
parent | 6e93338295f53238bd352424939dd97711c2cbd4 (diff) |
Sync with Andre Luis Lopes and Otavio branches
Patches applied:
* andrelop@debian.org/apt--translation--0--base-0
tag of apt@packages.debian.org/apt--main--0--patch-79
* andrelop@debian.org/apt--translation--0--patch-1
Sync with Matt version.
* andrelop@debian.org/apt--translation--0--patch-2
Update pt_BR translation
* andrelop@debian.org/apt--translation--0--patch-3
Sync with bubulle's branch.
* apt@packages.debian.org/apt--main--0--patch-80
Merge michael.vogt@ubuntu.com--2005/apt--fixes--0
* apt@packages.debian.org/apt--main--0--patch-81
Open 0.6.37
* apt@packages.debian.org/apt--main--0--patch-82
merge bubulle@debian.org--2005/apt--main--0
* apt@packages.debian.org/apt--main--0--patch-83
Update changelog
* apt@packages.debian.org/apt--main--0--patch-84
Fix build of French man pages (now using XML, not SGML)
* apt@packages.debian.org/apt--main--0--patch-85
Merge patch from Philippe Batailler for French man page build
* apt@packages.debian.org/apt--main--0--patch-86
add Welsh translations from Dafydd Harries
* apt@packages.debian.org/apt--main--0--patch-87
Update changelog
* apt@packages.debian.org/apt--main--0--patch-88
Change debian/bugscript to use #!/bin/bash (Closes: #313402)
* apt@packages.debian.org/apt--misc-abi-changes--0--patch-4
Merge from mainline
* apt@packages.debian.org/apt--misc-abi-changes--0--patch-5
Merge from mainline
* apt@packages.debian.org/apt--misc-abi-changes--0--patch-6
Collapse both pkgAcquire::Run() methods into one, with a default value
* daf@muse.19inch.net--2005/apt--main--0--base-0
tag of apt@packages.debian.org/apt--main--0--patch-85
* daf@muse.19inch.net--2005/apt--main--0--patch-1
add Welsh translation
* michael.vogt@ubuntu.com--2005/apt--fixes--0--base-0
tag of apt@packages.debian.org/apt--main--0--patch-79
* michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-1
* merged obvious fixes into the tree to make it easy for matt to merge
* michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-2
* more merges from otavio that looks good/uncritical
* michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-3
* merged Matts misc-abi-changes tree
* michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-4
* finalized the changelog for a ubuntu build
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-26
* fix the cache-control header generation
* otavio@debian.org--2005/apt--fixes--0--base-0
tag of apt@packages.debian.org/apt--main--0--patch-71
* otavio@debian.org--2005/apt--fixes--0--patch-1
Fix comments about the need of xmlto
* otavio@debian.org--2005/apt--fixes--0--patch-2
Fix a compile warning
* otavio@debian.org--2005/apt--fixes--0--patch-3
Sync with apt--main--0--patch-76
* otavio@debian.org--2005/apt--fixes--0--patch-4
Sync with apt--main--0--patch-78
* otavio@debian.org--2005/apt--fixes--0--patch-5
Add fixes that was wrongly included on DDTP changes.
* otavio@debian.org--2005/apt--fixes--0--patch-8
Add information about the other fixes include on this branch now.
* otavio@debian.org--2005/apt--fixes--0--patch-9
Merge last changes from apt--main--0.
* otavio@debian.org--2005/apt--fixes--0--patch-10
Fix warnings about min/max change in gcc-4.0
* otavio@debian.org--2005/apt--fixes--0--patch-11
Fix remaning warnings while compiling gcc-4.0
* otavio@debian.org--2005/apt--fixes--0--patch-12
Add changelog entry about the fixes for warnings while compiling using GCC 4.0 compiler.
* philippe.batailler@free.fr--2005/apt--mainMatt--0--patch-1
fix xml error
Diffstat (limited to 'doc')
-rw-r--r-- | doc/fr/apt.ent.fr | 2 | ||||
-rw-r--r-- | doc/fr/makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/fr/apt.ent.fr b/doc/fr/apt.ent.fr index bf0df1827..075d85698 100644 --- a/doc/fr/apt.ent.fr +++ b/doc/fr/apt.ent.fr @@ -1,4 +1,4 @@ -<!-- -*- mode: sgml; mode: fold -*- --> +<?xml version="1.0" encoding="iso-8859-15"?> <!-- Some common paths.. --> <!ENTITY docdir "/usr/share/doc/apt/"> diff --git a/doc/fr/makefile b/doc/fr/makefile index 2b9278457..6544ee9e0 100644 --- a/doc/fr/makefile +++ b/doc/fr/makefile @@ -10,4 +10,4 @@ SOURCE = apt-cache.fr.8 apt-get.fr.8 apt-cdrom.fr.8 apt.conf.fr.5 \ sources.list.fr.5 apt-config.fr.8 apt-sortpkgs.fr.1 \ apt-ftparchive.fr.1 apt_preferences.fr.5 apt-extracttemplates.fr.1 INCLUDES = apt.ent.fr -include $(SGML_MANPAGE_H) +include $(XML_MANPAGE_H) |