diff --git a/Doc/Sda1/Ref/Fig/Sda1/Makefile b/Doc/Sda1/Ref/Fig/Makefile similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/Makefile rename to Doc/Sda1/Ref/Fig/Makefile diff --git a/Doc/Sda1/Ref/Fig/Sda1/attribInElement.fig b/Doc/Sda1/Ref/Fig/attribInElement.fig similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/attribInElement.fig rename to Doc/Sda1/Ref/Fig/attribInElement.fig diff --git a/Doc/Sda1/Ref/Fig/Sda1/attributes.fig b/Doc/Sda1/Ref/Fig/attributes.fig similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/attributes.fig rename to Doc/Sda1/Ref/Fig/attributes.fig diff --git a/Doc/Sda1/Ref/Fig/Sda1/blockprop.fo.pdf b/Doc/Sda1/Ref/Fig/blockprop.fo.pdf similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/blockprop.fo.pdf rename to Doc/Sda1/Ref/Fig/blockprop.fo.pdf diff --git a/Doc/Sda1/Ref/Fig/Sda1/booknavigate.fig b/Doc/Sda1/Ref/Fig/booknavigate.fig similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/booknavigate.fig rename to Doc/Sda1/Ref/Fig/booknavigate.fig diff --git a/Doc/Sda1/Ref/Fig/Sda1/clientserv.fig b/Doc/Sda1/Ref/Fig/clientserv.fig similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/clientserv.fig rename to Doc/Sda1/Ref/Fig/clientserv.fig diff --git a/Doc/Sda1/Ref/Fig/Sda1/contentmixed.fig b/Doc/Sda1/Ref/Fig/contentmixed.fig similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/contentmixed.fig rename to Doc/Sda1/Ref/Fig/contentmixed.fig diff --git a/Doc/Sda1/Ref/Fig/Sda1/cpp.fig b/Doc/Sda1/Ref/Fig/cpp.fig similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/cpp.fig rename to Doc/Sda1/Ref/Fig/cpp.fig diff --git a/Doc/Sda1/Ref/Fig/Sda1/crossmedia.fig b/Doc/Sda1/Ref/Fig/crossmedia.fig similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/crossmedia.fig rename to Doc/Sda1/Ref/Fig/crossmedia.fig diff --git a/Doc/Sda1/Ref/Fig/Sda1/dictionary.1.fo.eps b/Doc/Sda1/Ref/Fig/dictionary.1.fo.eps similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/dictionary.1.fo.eps rename to Doc/Sda1/Ref/Fig/dictionary.1.fo.eps diff --git a/Doc/Sda1/Ref/Fig/Sda1/dictionary.2.fo.eps b/Doc/Sda1/Ref/Fig/dictionary.2.fo.eps similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/dictionary.2.fo.eps rename to Doc/Sda1/Ref/Fig/dictionary.2.fo.eps diff --git a/Doc/Sda1/Ref/Fig/Sda1/dictionaryStack.fig b/Doc/Sda1/Ref/Fig/dictionaryStack.fig similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/dictionaryStack.fig rename to Doc/Sda1/Ref/Fig/dictionaryStack.fig diff --git a/Doc/Sda1/Ref/Fig/Sda1/domtree.fig b/Doc/Sda1/Ref/Fig/domtree.fig similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/domtree.fig rename to Doc/Sda1/Ref/Fig/domtree.fig diff --git a/Doc/Sda1/Ref/Fig/Sda1/entityresolve.fig b/Doc/Sda1/Ref/Fig/entityresolve.fig similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/entityresolve.fig rename to Doc/Sda1/Ref/Fig/entityresolve.fig diff --git a/Doc/Sda1/Ref/Fig/Sda1/externalize.fig b/Doc/Sda1/Ref/Fig/externalize.fig similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/externalize.fig rename to Doc/Sda1/Ref/Fig/externalize.fig diff --git a/Doc/Sda1/Ref/Fig/Sda1/filtering.fig b/Doc/Sda1/Ref/Fig/filtering.fig similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/filtering.fig rename to Doc/Sda1/Ref/Fig/filtering.fig diff --git a/Doc/Sda1/Ref/Fig/Sda1/firefoxrender.png b/Doc/Sda1/Ref/Fig/firefoxrender.png similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/firefoxrender.png rename to Doc/Sda1/Ref/Fig/firefoxrender.png diff --git a/Doc/Sda1/Ref/Fig/Sda1/hacker.jpg b/Doc/Sda1/Ref/Fig/hacker.jpg similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/hacker.jpg rename to Doc/Sda1/Ref/Fig/hacker.jpg diff --git a/Doc/Sda1/Ref/Fig/Sda1/headfoot.fig b/Doc/Sda1/Ref/Fig/headfoot.fig similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/headfoot.fig rename to Doc/Sda1/Ref/Fig/headfoot.fig diff --git a/Doc/Sda1/Ref/Fig/Sda1/heartland.fig b/Doc/Sda1/Ref/Fig/heartland.fig similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/heartland.fig rename to Doc/Sda1/Ref/Fig/heartland.fig diff --git a/Doc/Sda1/Ref/Fig/Sda1/impropernest.fig b/Doc/Sda1/Ref/Fig/impropernest.fig similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/impropernest.fig rename to Doc/Sda1/Ref/Fig/impropernest.fig diff --git a/Doc/Sda1/Ref/Fig/Sda1/invoicedata.fig b/Doc/Sda1/Ref/Fig/invoicedata.fig similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/invoicedata.fig rename to Doc/Sda1/Ref/Fig/invoicedata.fig diff --git a/Doc/Sda1/Ref/Fig/Sda1/invoicedataimplement.fig b/Doc/Sda1/Ref/Fig/invoicedataimplement.fig similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/invoicedataimplement.fig rename to Doc/Sda1/Ref/Fig/invoicedataimplement.fig diff --git a/Doc/Sda1/Ref/Fig/Sda1/itemize.fo.pdf b/Doc/Sda1/Ref/Fig/itemize.fo.pdf similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/itemize.fo.pdf rename to Doc/Sda1/Ref/Fig/itemize.fo.pdf diff --git a/Doc/Sda1/Ref/Fig/Sda1/jdbcFourTier.fig b/Doc/Sda1/Ref/Fig/jdbcFourTier.fig similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/jdbcFourTier.fig rename to Doc/Sda1/Ref/Fig/jdbcFourTier.fig diff --git a/Doc/Sda1/Ref/Fig/Sda1/jdbcObjectRelation.fig b/Doc/Sda1/Ref/Fig/jdbcObjectRelation.fig similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/jdbcObjectRelation.fig rename to Doc/Sda1/Ref/Fig/jdbcObjectRelation.fig diff --git a/Doc/Sda1/Ref/Fig/Sda1/jdbcReadWrite.fig b/Doc/Sda1/Ref/Fig/jdbcReadWrite.fig similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/jdbcReadWrite.fig rename to Doc/Sda1/Ref/Fig/jdbcReadWrite.fig diff --git a/Doc/Sda1/Ref/Fig/Sda1/jdbcSniffing.fig b/Doc/Sda1/Ref/Fig/jdbcSniffing.fig similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/jdbcSniffing.fig rename to Doc/Sda1/Ref/Fig/jdbcSniffing.fig diff --git a/Doc/Sda1/Ref/Fig/Sda1/jdbcThreeTier.fig b/Doc/Sda1/Ref/Fig/jdbcThreeTier.fig similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/jdbcThreeTier.fig rename to Doc/Sda1/Ref/Fig/jdbcThreeTier.fig diff --git a/Doc/Sda1/Ref/Fig/Sda1/jdbcarch.fig b/Doc/Sda1/Ref/Fig/jdbcarch.fig similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/jdbcarch.fig rename to Doc/Sda1/Ref/Fig/jdbcarch.fig diff --git a/Doc/Sda1/Ref/Fig/Sda1/jdbcread.fig b/Doc/Sda1/Ref/Fig/jdbcread.fig similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/jdbcread.fig rename to Doc/Sda1/Ref/Fig/jdbcread.fig diff --git a/Doc/Sda1/Ref/Fig/Sda1/jdbcurl.fig b/Doc/Sda1/Ref/Fig/jdbcurl.fig similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/jdbcurl.fig rename to Doc/Sda1/Ref/Fig/jdbcurl.fig diff --git a/Doc/Sda1/Ref/Fig/Sda1/leader.fo.pdf b/Doc/Sda1/Ref/Fig/leader.fo.pdf similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/leader.fo.pdf rename to Doc/Sda1/Ref/Fig/leader.fo.pdf diff --git a/Doc/Sda1/Ref/Fig/Sda1/leadermulti.fo.pdf b/Doc/Sda1/Ref/Fig/leadermulti.fo.pdf similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/leadermulti.fo.pdf rename to Doc/Sda1/Ref/Fig/leadermulti.fo.pdf diff --git a/Doc/Sda1/Ref/Fig/Sda1/memofour.fig b/Doc/Sda1/Ref/Fig/memofour.fig similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/memofour.fig rename to Doc/Sda1/Ref/Fig/memofour.fig diff --git a/Doc/Sda1/Ref/Fig/Sda1/memorelativexpath.fig b/Doc/Sda1/Ref/Fig/memorelativexpath.fig similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/memorelativexpath.fig rename to Doc/Sda1/Ref/Fig/memorelativexpath.fig diff --git a/Doc/Sda1/Ref/Fig/Sda1/memotree.fig b/Doc/Sda1/Ref/Fig/memotree.fig similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/memotree.fig rename to Doc/Sda1/Ref/Fig/memotree.fig diff --git a/Doc/Sda1/Ref/Fig/Sda1/memoxpath.fig b/Doc/Sda1/Ref/Fig/memoxpath.fig similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/memoxpath.fig rename to Doc/Sda1/Ref/Fig/memoxpath.fig diff --git a/Doc/Sda1/Ref/Fig/Sda1/nodeHierarchy.svg b/Doc/Sda1/Ref/Fig/nodeHierarchy.svg similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/nodeHierarchy.svg rename to Doc/Sda1/Ref/Fig/nodeHierarchy.svg diff --git a/Doc/Sda1/Ref/Fig/Sda1/overlay.fig b/Doc/Sda1/Ref/Fig/overlay.fig similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/overlay.fig rename to Doc/Sda1/Ref/Fig/overlay.fig diff --git a/Doc/Sda1/Ref/Fig/Sda1/page.fo.1.eps b/Doc/Sda1/Ref/Fig/page.fo.1.eps similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/page.fo.1.eps rename to Doc/Sda1/Ref/Fig/page.fo.1.eps diff --git a/Doc/Sda1/Ref/Fig/Sda1/page.fo.2.eps b/Doc/Sda1/Ref/Fig/page.fo.2.eps similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/page.fo.2.eps rename to Doc/Sda1/Ref/Fig/page.fo.2.eps diff --git a/Doc/Sda1/Ref/Fig/Sda1/page.fo.3.eps b/Doc/Sda1/Ref/Fig/page.fo.3.eps similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/page.fo.3.eps rename to Doc/Sda1/Ref/Fig/page.fo.3.eps diff --git a/Doc/Sda1/Ref/Fig/Sda1/page.fo.4.eps b/Doc/Sda1/Ref/Fig/page.fo.4.eps similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/page.fo.4.eps rename to Doc/Sda1/Ref/Fig/page.fo.4.eps diff --git a/Doc/Sda1/Ref/Fig/Sda1/pageStack.fig b/Doc/Sda1/Ref/Fig/pageStack.fig similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/pageStack.fig rename to Doc/Sda1/Ref/Fig/pageStack.fig diff --git a/Doc/Sda1/Ref/Fig/Sda1/pageref.1.fo.eps b/Doc/Sda1/Ref/Fig/pageref.1.fo.eps similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/pageref.1.fo.eps rename to Doc/Sda1/Ref/Fig/pageref.1.fo.eps diff --git a/Doc/Sda1/Ref/Fig/Sda1/pageref.2.fo.eps b/Doc/Sda1/Ref/Fig/pageref.2.fo.eps similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/pageref.2.fo.eps rename to Doc/Sda1/Ref/Fig/pageref.2.fo.eps diff --git a/Doc/Sda1/Ref/Fig/Sda1/pagerefStack.fig b/Doc/Sda1/Ref/Fig/pagerefStack.fig similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/pagerefStack.fig rename to Doc/Sda1/Ref/Fig/pagerefStack.fig diff --git a/Doc/Sda1/Ref/Fig/Sda1/pagerefhyper.1.fo.eps b/Doc/Sda1/Ref/Fig/pagerefhyper.1.fo.eps similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/pagerefhyper.1.fo.eps rename to Doc/Sda1/Ref/Fig/pagerefhyper.1.fo.eps diff --git a/Doc/Sda1/Ref/Fig/Sda1/pagerefhyper.2.fo.eps b/Doc/Sda1/Ref/Fig/pagerefhyper.2.fo.eps similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/pagerefhyper.2.fo.eps rename to Doc/Sda1/Ref/Fig/pagerefhyper.2.fo.eps diff --git a/Doc/Sda1/Ref/Fig/Sda1/pagerefhyperStack.fig b/Doc/Sda1/Ref/Fig/pagerefhyperStack.fig similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/pagerefhyperStack.fig rename to Doc/Sda1/Ref/Fig/pagerefhyperStack.fig diff --git a/Doc/Sda1/Ref/Fig/Sda1/persistHandlerStates.fig b/Doc/Sda1/Ref/Fig/persistHandlerStates.fig similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/persistHandlerStates.fig rename to Doc/Sda1/Ref/Fig/persistHandlerStates.fig diff --git a/Doc/Sda1/Ref/Fig/Sda1/persistence.fig b/Doc/Sda1/Ref/Fig/persistence.fig similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/persistence.fig rename to Doc/Sda1/Ref/Fig/persistence.fig diff --git a/Doc/Sda1/Ref/Fig/Sda1/persistentStates.fig b/Doc/Sda1/Ref/Fig/persistentStates.fig similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/persistentStates.fig rename to Doc/Sda1/Ref/Fig/persistentStates.fig diff --git a/Doc/Sda1/Ref/Fig/Sda1/pitr_Syringe_icon.eps b/Doc/Sda1/Ref/Fig/pitr_Syringe_icon.eps similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/pitr_Syringe_icon.eps rename to Doc/Sda1/Ref/Fig/pitr_Syringe_icon.eps diff --git a/Doc/Sda1/Ref/Fig/Sda1/pre.tex b/Doc/Sda1/Ref/Fig/pre.tex similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/pre.tex rename to Doc/Sda1/Ref/Fig/pre.tex diff --git a/Doc/Sda1/Ref/Fig/Sda1/preceding.fig b/Doc/Sda1/Ref/Fig/preceding.fig similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/preceding.fig rename to Doc/Sda1/Ref/Fig/preceding.fig diff --git a/Doc/Sda1/Ref/Fig/Sda1/propernest.fig b/Doc/Sda1/Ref/Fig/propernest.fig similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/propernest.fig rename to Doc/Sda1/Ref/Fig/propernest.fig diff --git a/Doc/Sda1/Ref/Fig/Sda1/regions.fig b/Doc/Sda1/Ref/Fig/regions.fig similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/regions.fig rename to Doc/Sda1/Ref/Fig/regions.fig diff --git a/Doc/Sda1/Ref/Fig/Sda1/saxapparch.odg b/Doc/Sda1/Ref/Fig/saxapparch.odg similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/saxapparch.odg rename to Doc/Sda1/Ref/Fig/saxapparch.odg diff --git a/Doc/Sda1/Ref/Fig/Sda1/saxapparch.pdf b/Doc/Sda1/Ref/Fig/saxapparch.pdf similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/saxapparch.pdf rename to Doc/Sda1/Ref/Fig/saxapparch.pdf diff --git a/Doc/Sda1/Ref/Fig/Sda1/saxcharacter.odg b/Doc/Sda1/Ref/Fig/saxcharacter.odg similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/saxcharacter.odg rename to Doc/Sda1/Ref/Fig/saxcharacter.odg diff --git a/Doc/Sda1/Ref/Fig/Sda1/saxcharacter.pdf b/Doc/Sda1/Ref/Fig/saxcharacter.pdf similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/saxcharacter.pdf rename to Doc/Sda1/Ref/Fig/saxcharacter.pdf diff --git a/Doc/Sda1/Ref/Fig/Sda1/saxmodel.odg b/Doc/Sda1/Ref/Fig/saxmodel.odg similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/saxmodel.odg rename to Doc/Sda1/Ref/Fig/saxmodel.odg diff --git a/Doc/Sda1/Ref/Fig/Sda1/saxmodel.pdf b/Doc/Sda1/Ref/Fig/saxmodel.pdf similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/saxmodel.pdf rename to Doc/Sda1/Ref/Fig/saxmodel.pdf diff --git a/Doc/Sda1/Ref/Fig/Sda1/saxxmlrdbms.fig b/Doc/Sda1/Ref/Fig/saxxmlrdbms.fig similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/saxxmlrdbms.fig rename to Doc/Sda1/Ref/Fig/saxxmlrdbms.fig diff --git a/Doc/Sda1/Ref/Fig/Sda1/separate.fo.pdf b/Doc/Sda1/Ref/Fig/separate.fo.pdf similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/separate.fo.pdf rename to Doc/Sda1/Ref/Fig/separate.fo.pdf diff --git a/Doc/Sda1/Ref/Fig/Sda1/sequenceDomParser.svg b/Doc/Sda1/Ref/Fig/sequenceDomParser.svg similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/sequenceDomParser.svg rename to Doc/Sda1/Ref/Fig/sequenceDomParser.svg diff --git a/Doc/Sda1/Ref/Fig/Sda1/skull.eps b/Doc/Sda1/Ref/Fig/skull.eps similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/skull.eps rename to Doc/Sda1/Ref/Fig/skull.eps diff --git a/Doc/Sda1/Ref/Fig/Sda1/sqlTransport.fig b/Doc/Sda1/Ref/Fig/sqlTransport.fig similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/sqlTransport.fig rename to Doc/Sda1/Ref/Fig/sqlTransport.fig diff --git a/Doc/Sda1/Ref/Fig/Sda1/sqlTransportPrepare.fig b/Doc/Sda1/Ref/Fig/sqlTransportPrepare.fig similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/sqlTransportPrepare.fig rename to Doc/Sda1/Ref/Fig/sqlTransportPrepare.fig diff --git a/Doc/Sda1/Ref/Fig/Sda1/sqlinject.fig b/Doc/Sda1/Ref/Fig/sqlinject.fig similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/sqlinject.fig rename to Doc/Sda1/Ref/Fig/sqlinject.fig diff --git a/Doc/Sda1/Ref/Fig/Sda1/sqrtree.fig b/Doc/Sda1/Ref/Fig/sqrtree.fig similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/sqrtree.fig rename to Doc/Sda1/Ref/Fig/sqrtree.fig diff --git a/Doc/Sda1/Ref/Fig/Sda1/sqrtrender.fig b/Doc/Sda1/Ref/Fig/sqrtrender.fig similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/sqrtrender.fig rename to Doc/Sda1/Ref/Fig/sqrtrender.fig diff --git a/Doc/Sda1/Ref/Fig/Sda1/updateinfo.fig b/Doc/Sda1/Ref/Fig/updateinfo.fig similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/updateinfo.fig rename to Doc/Sda1/Ref/Fig/updateinfo.fig diff --git a/Doc/Sda1/Ref/Fig/Sda1/wellformedandvalid.fig b/Doc/Sda1/Ref/Fig/wellformedandvalid.fig similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/wellformedandvalid.fig rename to Doc/Sda1/Ref/Fig/wellformedandvalid.fig diff --git a/Doc/Sda1/Ref/Fig/Sda1/xhtml.fig b/Doc/Sda1/Ref/Fig/xhtml.fig similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/xhtml.fig rename to Doc/Sda1/Ref/Fig/xhtml.fig diff --git a/Doc/Sda1/Ref/Fig/Sda1/xhtmlexample.fig b/Doc/Sda1/Ref/Fig/xhtmlexample.fig similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/xhtmlexample.fig rename to Doc/Sda1/Ref/Fig/xhtmlexample.fig diff --git a/Doc/Sda1/Ref/Fig/Sda1/xml2fo2pdf.fig b/Doc/Sda1/Ref/Fig/xml2fo2pdf.fig similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/xml2fo2pdf.fig rename to Doc/Sda1/Ref/Fig/xml2fo2pdf.fig diff --git a/Doc/Sda1/Ref/Fig/Sda1/xml2html.fig b/Doc/Sda1/Ref/Fig/xml2html.fig similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/xml2html.fig rename to Doc/Sda1/Ref/Fig/xml2html.fig diff --git a/Doc/Sda1/Ref/Fig/Sda1/xmlattribandjava.fig b/Doc/Sda1/Ref/Fig/xmlattribandjava.fig similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/xmlattribandjava.fig rename to Doc/Sda1/Ref/Fig/xmlattribandjava.fig diff --git a/Doc/Sda1/Ref/Fig/Sda1/xmlbase.fig b/Doc/Sda1/Ref/Fig/xmlbase.fig similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/xmlbase.fig rename to Doc/Sda1/Ref/Fig/xmlbase.fig diff --git a/Doc/Sda1/Ref/Fig/Sda1/xpath.fig b/Doc/Sda1/Ref/Fig/xpath.fig similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/xpath.fig rename to Doc/Sda1/Ref/Fig/xpath.fig diff --git a/Doc/Sda1/Ref/Fig/Sda1/xsl_id.fig b/Doc/Sda1/Ref/Fig/xsl_id.fig similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/xsl_id.fig rename to Doc/Sda1/Ref/Fig/xsl_id.fig diff --git a/Doc/Sda1/Ref/Fig/Sda1/xslconvert.fig b/Doc/Sda1/Ref/Fig/xslconvert.fig similarity index 100% rename from Doc/Sda1/Ref/Fig/Sda1/xslconvert.fig rename to Doc/Sda1/Ref/Fig/xslconvert.fig diff --git a/Doc/Sda1/dom.xml b/Doc/Sda1/dom.xml index 71d95370ce81e567787d2720d558e6f952fb6527..9737da8337b36462e5813f9cfeebc251176978cf 100644 --- a/Doc/Sda1/dom.xml +++ b/Doc/Sda1/dom.xml @@ -169,7 +169,7 @@ public interface Node { <mediaobject> <imageobject> - <imagedata fileref="Ref/Fig/Sda1/domtree.fig" scale="65"/> + <imagedata fileref="Ref/Fig/domtree.fig" scale="65"/> </imageobject> </mediaobject> </figure> @@ -205,7 +205,7 @@ public interface Node { <mediaobject> <imageobject> - <imagedata fileref="Ref/Fig/Sda1/nodeHierarchy.svg"/> + <imagedata fileref="Ref/Fig/nodeHierarchy.svg"/> </imageobject> </mediaobject> </figure> @@ -488,7 +488,7 @@ Article: 200W Stereo Amplifier, order number: 9921</programlisting> <mediaobject> <imageobject> - <imagedata fileref="Ref/Fig/Sda1/sequenceDomParser.svg"/> + <imagedata fileref="Ref/Fig/sequenceDomParser.svg"/> </imageobject> </mediaobject> @@ -1402,7 +1402,7 @@ INSERT INTO Product VALUES('w-124', 110.40);</programlisting> <mediaobject> <imageobject> - <imagedata fileref="Ref/Fig/Sda1/xml2html.fig"/> + <imagedata fileref="Ref/Fig/xml2html.fig"/> </imageobject> </mediaobject> diff --git a/Doc/Sda1/fo.xml b/Doc/Sda1/fo.xml index dc61e258de97c0cee601d2b980985edc337bec75..f40464dd1a27af8fe334300ba9bd9c5f7918b7da 100644 --- a/Doc/Sda1/fo.xml +++ b/Doc/Sda1/fo.xml @@ -182,7 +182,7 @@ <mediaobject> <imageobject> - <imagedata fileref="Ref/Fig/Sda1/regions.fig"/> + <imagedata fileref="Ref/Fig/regions.fig"/> </imageobject> </mediaobject> </figure> @@ -300,7 +300,7 @@ <mediaobject> <imageobject> - <imagedata fileref="Ref/Fig/Sda1/overlay.fig"/> + <imagedata fileref="Ref/Fig/overlay.fig"/> </imageobject> </mediaobject> </figure> @@ -487,7 +487,7 @@ <mediaobject> <imageobject> - <imagedata fileref="Ref/Fig/Sda1/headfoot.fig"/> + <imagedata fileref="Ref/Fig/headfoot.fig"/> </imageobject> </mediaobject> @@ -527,7 +527,7 @@ <mediaobject> <imageobject> - <imagedata fileref="Ref/Fig/Sda1/blockprop.fo.pdf"/> + <imagedata fileref="Ref/Fig/blockprop.fo.pdf"/> </imageobject> </mediaobject> @@ -611,7 +611,7 @@ <mediaobject> <imageobject> - <imagedata align="left" fileref="Ref/Fig/Sda1/itemize.fo.pdf"/> + <imagedata align="left" fileref="Ref/Fig/itemize.fo.pdf"/> </imageobject> </mediaobject> </figure> @@ -649,7 +649,7 @@ page 42</fo:block> ...</programlisting> <mediaobject> <imageobject> - <imagedata align="left" fileref="Ref/Fig/Sda1/leader.fo.pdf"/> + <imagedata align="left" fileref="Ref/Fig/leader.fo.pdf"/> </imageobject> </mediaobject> </figure> @@ -678,7 +678,7 @@ leader-pattern="dots"/>C<fo:leader leader-pattern="dots"/>D</fo:bloc <mediaobject> <imageobject> - <imagedata fileref="Ref/Fig/Sda1/leadermulti.fo.pdf"/> + <imagedata fileref="Ref/Fig/leadermulti.fo.pdf"/> </imageobject> </mediaobject> </figure> @@ -712,7 +712,7 @@ leader-pattern="dots"/>C<fo:leader leader-pattern="dots"/>D</fo:bloc <mediaobject> <imageobject> - <imagedata align="left" fileref="Ref/Fig/Sda1/separate.fo.pdf"/> + <imagedata align="left" fileref="Ref/Fig/separate.fo.pdf"/> </imageobject> </mediaobject> </figure> @@ -771,7 +771,7 @@ leader-pattern="dots"/>C<fo:leader leader-pattern="dots"/>D</fo:bloc <mediaobject> <imageobject> - <imagedata align="left" fileref="Ref/Fig/Sda1/pageStack.fig"/> + <imagedata align="left" fileref="Ref/Fig/pageStack.fig"/> </imageobject> </mediaobject> </figure> @@ -819,7 +819,7 @@ leader-pattern="dots"/>C<fo:leader leader-pattern="dots"/>D</fo:bloc <mediaobject> <imageobject> - <imagedata align="left" fileref="Ref/Fig/Sda1/dictionaryStack.fig"/> + <imagedata align="left" fileref="Ref/Fig/dictionaryStack.fig"/> </imageobject> </mediaobject> </figure> @@ -904,7 +904,7 @@ leader-pattern="dots"/>C<fo:leader leader-pattern="dots"/>D</fo:bloc <mediaobject> <imageobject> - <imagedata align="left" fileref="Ref/Fig/Sda1/pagerefStack.fig"/> + <imagedata align="left" fileref="Ref/Fig/pagerefStack.fig"/> </imageobject> </mediaobject> </figure> @@ -942,7 +942,7 @@ leader-pattern="dots"/>C<fo:leader leader-pattern="dots"/>D</fo:bloc <mediaobject> <imageobject> - <imagedata fileref="Ref/Fig/Sda1/pagerefhyperStack.fig"/> + <imagedata fileref="Ref/Fig/pagerefhyperStack.fig"/> </imageobject> </mediaobject> </figure> @@ -995,7 +995,7 @@ leader-pattern="dots"/>C<fo:leader leader-pattern="dots"/>D</fo:bloc <mediaobject> <imageobject> - <imagedata fileref="Ref/Fig/Sda1/crossmedia.fig" scale="65"/> + <imagedata fileref="Ref/Fig/crossmedia.fig" scale="65"/> </imageobject> <caption> @@ -1128,7 +1128,7 @@ leader-pattern="dots"/>C<fo:leader leader-pattern="dots"/>D</fo:bloc <mediaobject> <imageobject> - <imagedata fileref="Ref/Fig/Sda1/xml2fo2pdf.fig"/> + <imagedata fileref="Ref/Fig/xml2fo2pdf.fig"/> </imageobject> </mediaobject> diff --git a/Doc/Sda1/jdbc.xml b/Doc/Sda1/jdbc.xml index e0cb75819ff86fd8bab6b16e897996c3b7559fcf..4269ad64e228a4019408a935efcabc0309829c7a 100644 --- a/Doc/Sda1/jdbc.xml +++ b/Doc/Sda1/jdbc.xml @@ -49,7 +49,7 @@ <mediaobject> <imageobject> - <imagedata fileref="Ref/Fig/Sda1/persistence.fig" scale="65"/> + <imagedata fileref="Ref/Fig/persistence.fig" scale="65"/> </imageobject> </mediaobject> </figure> @@ -85,7 +85,7 @@ <mediaobject> <imageobject> - <imagedata fileref="Ref/Fig/Sda1/clientserv.fig"/> + <imagedata fileref="Ref/Fig/clientserv.fig"/> </imageobject> </mediaobject> </figure> @@ -105,7 +105,7 @@ <mediaobject> <imageobject> - <imagedata fileref="Ref/Fig/Sda1/jdbcThreeTier.fig"/> + <imagedata fileref="Ref/Fig/jdbcThreeTier.fig"/> </imageobject> </mediaobject> </figure> @@ -126,7 +126,7 @@ <mediaobject> <imageobject> - <imagedata fileref="Ref/Fig/Sda1/jdbcFourTier.fig"/> + <imagedata fileref="Ref/Fig/jdbcFourTier.fig"/> </imageobject> </mediaobject> </figure> @@ -188,7 +188,7 @@ <mediaobject> <imageobject> - <imagedata fileref="Ref/Fig/Sda1/jdbcurl.fig" scale="65"/> + <imagedata fileref="Ref/Fig/jdbcurl.fig" scale="65"/> </imageobject> </mediaobject> </figure> @@ -252,7 +252,7 @@ <mediaobject> <imageobject> - <imagedata fileref="Ref/Fig/Sda1/jdbcarch.fig"/> + <imagedata fileref="Ref/Fig/jdbcarch.fig"/> </imageobject> </mediaobject> </figure> @@ -357,7 +357,7 @@ <mediaobject> <imageobject> - <imagedata fileref="Ref/Fig/Sda1/jdbcObjectRelation.fig"/> + <imagedata fileref="Ref/Fig/jdbcObjectRelation.fig"/> </imageobject> </mediaobject> </figure></para> @@ -937,7 +937,7 @@ public someClass { <mediaobject> <imageobject> - <imagedata fileref="Ref/Fig/Sda1/externalize.fig"/> + <imagedata fileref="Ref/Fig/externalize.fig"/> </imageobject> </mediaobject> </figure> @@ -1427,7 +1427,7 @@ PersistenceHandler.username=foo</pre> <mediaobject> <imageobject> - <imagedata fileref="Ref/Fig/Sda1/persistHandlerStates.fig"/> + <imagedata fileref="Ref/Fig/persistHandlerStates.fig"/> </imageobject> </mediaobject> </figure> @@ -1787,7 +1787,7 @@ public class InsertPerson extends JFrame { <mediaobject> <imageobject> - <imagedata fileref="Ref/Fig/Sda1/jdbcSniffing.fig"/> + <imagedata fileref="Ref/Fig/jdbcSniffing.fig"/> </imageobject> </mediaobject> </figure> @@ -1905,7 +1905,7 @@ public class InsertPerson extends JFrame { <mediaobject> <imageobject> - <imagedata fileref="Ref/Fig/Sda1/heartland.fig"/> + <imagedata fileref="Ref/Fig/heartland.fig"/> </imageobject> </mediaobject> </figure> @@ -1934,7 +1934,7 @@ public class InsertPerson extends JFrame { <mediaobject> <imageobject> - <imagedata fileref="Ref/Fig/Sda1/sqlinject.fig"/> + <imagedata fileref="Ref/Fig/sqlinject.fig"/> </imageobject> </mediaobject> </figure> @@ -2153,7 +2153,7 @@ public class InsertPerson extends JFrame { <mediaobject> <imageobject> - <imagedata fileref="Ref/Fig/Sda1/filtering.fig"/> + <imagedata fileref="Ref/Fig/filtering.fig"/> </imageobject> </mediaobject> </figure> @@ -2451,7 +2451,7 @@ public class InsertPerson extends JFrame { <mediaobject> <imageobject> - <imagedata fileref="Ref/Fig/Sda1/sqlTransport.fig"/> + <imagedata fileref="Ref/Fig/sqlTransport.fig"/> </imageobject> </mediaobject> </figure> @@ -2503,7 +2503,7 @@ INSERT INTO Person VALUES ('Pete', 'p@rr.com') <mediaobject> <imageobject> - <imagedata fileref="Ref/Fig/Sda1/sqlTransportPrepare.fig"/> + <imagedata fileref="Ref/Fig/sqlTransportPrepare.fig"/> </imageobject> </mediaobject> </figure> @@ -2726,7 +2726,7 @@ public class SimpleInsert { <mediaobject> <imageobject> - <imagedata fileref="Ref/Fig/Sda1/jdbcReadWrite.fig"/> + <imagedata fileref="Ref/Fig/jdbcReadWrite.fig"/> </imageobject> </mediaobject> </figure> @@ -2749,7 +2749,7 @@ public class SimpleInsert { <mediaobject> <imageobject> - <imagedata fileref="Ref/Fig/Sda1/jdbcread.fig" scale="65"/> + <imagedata fileref="Ref/Fig/jdbcread.fig" scale="65"/> </imageobject> </mediaobject> </figure> diff --git a/Doc/Sda1/sax.xml b/Doc/Sda1/sax.xml index 712a9107d66047ecf8d2101e6ce5b477dc80cc90..70ce888387eb2f61545640cc624ae74d24c9ccc7 100644 --- a/Doc/Sda1/sax.xml +++ b/Doc/Sda1/sax.xml @@ -31,7 +31,7 @@ <mediaobject> <imageobject> - <imagedata fileref="Ref/Fig/Sda1/saxxmlrdbms.fig" scale="65"/> + <imagedata fileref="Ref/Fig/saxxmlrdbms.fig" scale="65"/> </imageobject> </mediaobject> </figure> @@ -142,7 +142,7 @@ INSERT INTO Product VALUES('<emphasis role="bold">9921</emphasis>', 121.50)</pro <mediaobject> <imageobject> - <imagedata fileref="Ref/Fig/Sda1/updateinfo.fig"/> + <imagedata fileref="Ref/Fig/updateinfo.fig"/> </imageobject> </mediaobject> @@ -191,7 +191,7 @@ INSERT INTO Product VALUES('<emphasis role="bold">9921</emphasis>', 121.50)</pro <mediaobject> <imageobject> - <imagedata fileref="Ref/Fig/Sda1/saxmodel.pdf"/> + <imagedata fileref="Ref/Fig/saxmodel.pdf"/> </imageobject> </mediaobject> </figure> @@ -204,7 +204,7 @@ INSERT INTO Product VALUES('<emphasis role="bold">9921</emphasis>', 121.50)</pro <mediaobject> <imageobject> - <imagedata fileref="Ref/Fig/Sda1/saxapparch.pdf"/> + <imagedata fileref="Ref/Fig/saxapparch.pdf"/> </imageobject> <caption> @@ -526,7 +526,7 @@ Closing Document <mediaobject> <imageobject> - <imagedata fileref="Ref/Fig/Sda1/saxcharacter.pdf"/> + <imagedata fileref="Ref/Fig/saxcharacter.pdf"/> </imageobject> </mediaobject> diff --git a/Doc/Sda1/xmlintro.xml b/Doc/Sda1/xmlintro.xml index 4a8e9d6f33bc0f67a499581b5fb9a5c65a7842a2..b8c0b1f84849c85b58105deedd6c3c6ca7249883 100644 --- a/Doc/Sda1/xmlintro.xml +++ b/Doc/Sda1/xmlintro.xml @@ -36,7 +36,7 @@ <mediaobject> <imageobject> - <imagedata fileref="Ref/Fig/Sda1/xhtml.fig"/> + <imagedata fileref="Ref/Fig/xhtml.fig"/> </imageobject> </mediaobject> </figure> @@ -49,7 +49,7 @@ <mediaobject> <imageobject> - <imagedata fileref="Ref/Fig/Sda1/xhtmlexample.fig" scale="65"/> + <imagedata fileref="Ref/Fig/xhtmlexample.fig" scale="65"/> </imageobject> </mediaobject> </figure> @@ -65,7 +65,7 @@ <mediaobject> <imageobject> - <imagedata fileref="Ref/Fig/Sda1/sqrtrender.fig"/> + <imagedata fileref="Ref/Fig/sqrtrender.fig"/> </imageobject> </mediaobject> </figure> @@ -121,7 +121,7 @@ <mediaobject> <imageobject> - <imagedata fileref="Ref/Fig/Sda1/sqrtree.fig"/> + <imagedata fileref="Ref/Fig/sqrtree.fig"/> </imageobject> </mediaobject> </figure> @@ -132,7 +132,7 @@ <informalfigure> <mediaobject> <imageobject> - <imagedata fileref="Ref/Fig/Sda1/attributes.fig" scale="65"/> + <imagedata fileref="Ref/Fig/attributes.fig" scale="65"/> </imageobject> </mediaobject> </informalfigure> @@ -157,7 +157,7 @@ <mediaobject> <imageobject> - <imagedata fileref="Ref/Fig/Sda1/xmlbase.fig" scale="65"/> + <imagedata fileref="Ref/Fig/xmlbase.fig" scale="65"/> </imageobject> </mediaobject> </figure> @@ -324,7 +324,7 @@ terminated by the matching end-tag "</to>". parsing error</computeroutput> <mediaobject> <imageobject> - <imagedata fileref="Ref/Fig/Sda1/propernest.fig" scale="65"/> + <imagedata fileref="Ref/Fig/propernest.fig" scale="65"/> </imageobject> </mediaobject> </figure> @@ -337,7 +337,7 @@ terminated by the matching end-tag "</to>". parsing error</computeroutput> <mediaobject> <imageobject> - <imagedata fileref="Ref/Fig/Sda1/impropernest.fig"/> + <imagedata fileref="Ref/Fig/impropernest.fig"/> </imageobject> </mediaobject> </figure> @@ -413,7 +413,7 @@ terminated by the matching end-tag "</to>". parsing error</computeroutput> <informalfigure xml:id="memotreeFigureFalse"> <mediaobject> <imageobject> - <imagedata fileref="Ref/Fig/Sda1/memotree.fig"/> + <imagedata fileref="Ref/Fig/memotree.fig"/> </imageobject> </mediaobject> </informalfigure> diff --git a/Doc/Sda1/xmlschema.xml b/Doc/Sda1/xmlschema.xml index adb81863bb7d54c07083681440f9e8e5fce12973..e4f385e408fc2f99b6104354cb05e347c4fc6c05 100644 --- a/Doc/Sda1/xmlschema.xml +++ b/Doc/Sda1/xmlschema.xml @@ -293,7 +293,7 @@ <mediaobject> <imageobject> - <imagedata fileref="Ref/Fig/Sda1/contentmixed.fig"/> + <imagedata fileref="Ref/Fig/contentmixed.fig"/> </imageobject> </mediaobject> </figure> @@ -476,7 +476,7 @@ <mediaobject> <imageobject> - <imagedata fileref="Ref/Fig/Sda1/wellformedandvalid.fig" scale="65"/> + <imagedata fileref="Ref/Fig/wellformedandvalid.fig" scale="65"/> </imageobject> </mediaobject> </figure> @@ -725,7 +725,7 @@ public class Memo { <mediaobject> <imageobject> - <imagedata fileref="Ref/Fig/Sda1/invoicedata.fig" scale="65"/> + <imagedata fileref="Ref/Fig/invoicedata.fig" scale="65"/> </imageobject> </mediaobject> </figure> @@ -737,7 +737,7 @@ public class Memo { <mediaobject> <imageobject> - <imagedata fileref="Ref/Fig/Sda1/invoicedataimplement.fig" scale="65"/> + <imagedata fileref="Ref/Fig/invoicedataimplement.fig" scale="65"/> </imageobject> </mediaobject> </figure> @@ -1102,7 +1102,7 @@ public class Memo { <mediaobject> <imageobject> - <imagedata fileref="Ref/Fig/Sda1/xmlattribandjava.fig" scale="65"/> + <imagedata fileref="Ref/Fig/xmlattribandjava.fig" scale="65"/> </imageobject> </mediaobject> </figure> diff --git a/Doc/Sda1/xslt.xml b/Doc/Sda1/xslt.xml index f382a9c92c20ace2f3cf5eb4dd3223b6313c7995..e0c7a520dc8383fc2eef44f91e5e81c6317e816d 100644 --- a/Doc/Sda1/xslt.xml +++ b/Doc/Sda1/xslt.xml @@ -177,7 +177,7 @@ Martin Goik</computeroutput></programlisting> <mediaobject> <imageobject> - <imagedata fileref="Ref/Fig/Sda1/xslconvert.fig"/> + <imagedata fileref="Ref/Fig/xslconvert.fig"/> </imageobject> </mediaobject> </figure> @@ -338,7 +338,7 @@ Martin Goik</computeroutput></programlisting> <mediaobject> <imageobject> - <imagedata fileref="Ref/Fig/Sda1/xpath.fig" scale="65"/> + <imagedata fileref="Ref/Fig/xpath.fig" scale="65"/> </imageobject> </mediaobject> </figure> @@ -437,7 +437,7 @@ Martin Goik</computeroutput></programlisting> <mediaobject> <imageobject> - <imagedata fileref="Ref/Fig/Sda1/memoxpath.fig"/> + <imagedata fileref="Ref/Fig/memoxpath.fig"/> </imageobject> </mediaobject> </figure> @@ -519,7 +519,7 @@ Martin Goik</computeroutput></programlisting> <mediaobject> <imageobject> - <imagedata fileref="Ref/Fig/Sda1/memorelativexpath.fig"/> + <imagedata fileref="Ref/Fig/memorelativexpath.fig"/> </imageobject> <caption> @@ -1657,7 +1657,7 @@ you need some </emphasis><em>time</em><emphasis role="bold">.</empha <mediaobject> <imageobject> - <imagedata fileref="Ref/Fig/Sda1/xsl_id.fig"/> + <imagedata fileref="Ref/Fig/xsl_id.fig"/> </imageobject> <caption> @@ -1987,7 +1987,7 @@ Jack Eve Jude <----Tolstoi----> <co <mediaobject> <imageobject> - <imagedata fileref="Ref/Fig/Sda1/memofour.fig"/> + <imagedata fileref="Ref/Fig/memofour.fig"/> </imageobject> </mediaobject> </figure> @@ -2060,7 +2060,7 @@ Jack Eve Jude <----Tolstoi----> <co <mediaobject> <imageobject> - <imagedata fileref="Ref/Fig/Sda1/preceding.fig"/> + <imagedata fileref="Ref/Fig/preceding.fig"/> </imageobject> <caption> @@ -2242,7 +2242,7 @@ Jack Eve Jude <----Tolstoi----> <co <mediaobject> <imageobject> - <imagedata fileref="Ref/Fig/Sda1/booknavigate.fig"/> + <imagedata fileref="Ref/Fig/booknavigate.fig"/> </imageobject> </mediaobject> </figure>