Merge remote-tracking branch 'origin/5.4' 40/10840/1
Sylvestre Ledru [Fri, 15 Mar 2013 10:10:20 +0000 (11:10 +0100)]
Change-Id: I84b83164250c67ca37d469aa49ed1b7d700eaf2a

1  2 
scilab/CHANGES_5.4.X
scilab/modules/helptools/etc/images_md5.txt
scilab/modules/helptools/src/java/org/scilab/modules/helptools/DocbookTagConverter.java

Simple merge
@@@ -296,10 -296,10 +296,10 @@@ public class DocbookTagConverter extend
          } else {
              ExternalXMLHandler h = externalHandlers.get(uri);
              if (h == null) {
 -                exceptionOccured(new SAXException("uri " + uri + " not handled"));
 +                exceptionOccurred(new SAXException("uri " + uri + " not handled"));
                  return;
              }
-             StringBuilder buf = h.startExternalXML(localName, attributes);
+             StringBuilder buf = h.startExternalXML(localName, attributes, locator);
              if (buf != null) {
                  DocbookElement elem = baseElement.getNewInstance(localName, uri, null);
                  elem.setStringBuilder(buf);