diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-12-13 10:27:36 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-12-13 10:27:36 -0500 |
| commit | f49d1f52b2e368ef67dcfececd426de958548f4e (patch) | |
| tree | ce24ced92f2acc976daf4b69e3634c8bd600e44e /etc | |
| parent | 07176b2a9e63a0d3933b167f987475d8a18da5cc (diff) | |
| parent | 11aad4e9f9f54ce8e9ecc66347e512b20a3cdf39 (diff) | |
| download | emacs-f49d1f52b2e368ef67dcfececd426de958548f4e.tar.gz | |
Merge from emacs-23
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/ChangeLog | 5 | ||||
| -rw-r--r-- | etc/schema/schemas.xml | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/etc/ChangeLog b/etc/ChangeLog index eba8529f63d..6fd4b35b810 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,3 +1,8 @@ +2010-12-13 W. Martin Borgert <debacle@debian.org> (tiny change) + + * schema/schemas.xml: Add DocBook (Bug#7491). + +2010-12-13 Ulrich Mueller <ulm@gentoo.org> 2010-12-11 Carsten Dominik <carsten.dominik@gmail.com> * refcards/orgcard.tex: Cleanup. diff --git a/etc/schema/schemas.xml b/etc/schema/schemas.xml index 314bdf1145f..f79d107e2df 100644 --- a/etc/schema/schemas.xml +++ b/etc/schema/schemas.xml @@ -22,6 +22,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. --> <uri pattern="*.html" typeId="XHTML"/> <uri pattern="*.rng" typeId="RELAX NG"/> <uri pattern="*.rdf" typeId="RDF"/> + <uri pattern="*.dbk" typeId="DocBook"/> <namespace ns="http://www.w3.org/1999/XSL/Transform" typeId="XSLT"/> <namespace ns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" typeId="RDF"/> |