[icinga-checkins] icinga.org: icinga-doc/master: re-add section format macro in stylesheet

Lara Berdelsmann berdelsmann at arcor.de
Sat Oct 3 22:26:02 CEST 2009


Module: icinga-doc
Branch: master
Commit: a9223a65976432a58f4eb978d0afec4c3d77b20b
URL:    https://git.icinga.org/?p=icinga-doc.git;a=commit;h=a9223a65976432a58f4eb978d0afec4c3d77b20b

Author: Lara Berdelsmann <berdelsmann at arcor.de>
Date:   Sat Oct  3 22:20:08 2009 +0200

re-add section format macro in stylesheet

Conflicts:

	xsl/common/en.xml

---

 xsl/common/en.xml |   26 ++++++++++++++++++++++++++
 1 files changed, 26 insertions(+), 0 deletions(-)

diff --git a/xsl/common/en.xml b/xsl/common/en.xml
index 3553488..60f4e18 100644
--- a/xsl/common/en.xml
+++ b/xsl/common/en.xml
@@ -435,6 +435,7 @@
 <l:template name="docnamelong" text=" in the document titled %o"/>
 <l:template name="pageabbrev" text="(p. %p)"/>
 <l:template name="Page" text="Page %p"/>
+<<<<<<< HEAD:xsl/common/en.xml
 <l:template name="bridgehead" text="the section called “%t”"/>
 <l:template name="refsection" text="the section called “%t”"/>
 <l:template name="refsect1" text="the section called “%t”"/>
@@ -447,6 +448,20 @@
 <l:template name="sect5" text="the section called “%t”"/>
 <l:template name="section" text="the section called “%t”"/>
 <l:template name="simplesect" text="the section called “%t”"/>
+=======
+<l:template name="bridgehead" text="“%t”"/>
+<l:template name="refsection" text="“%t”"/>
+<l:template name="refsect1" text="“%t”"/>
+<l:template name="refsect2" text="“%t”"/>
+<l:template name="refsect3" text="“%t”"/>
+<l:template name="sect1" text="“%t”"/>
+<l:template name="sect2" text="“%t”"/>
+<l:template name="sect3" text="“%t”"/>
+<l:template name="sect4" text="“%t”"/>
+<l:template name="sect5" text="“%t”"/>
+<l:template name="section" text="“%t”"/>
+<l:template name="simplesect" text="“%t”"/>
+>>>>>>> 5a98431... re-add section format macro in stylesheet:xsl/common/en.xml
 </l:context>
 <l:context name="xref-number"><l:template name="answer" text="A: %n"/>
 <l:template name="appendix" text="Appendix %n"/>
@@ -479,17 +494,28 @@
 <l:template name="procedure" text="Procedure %n, “%t”"/>
 <l:template name="productionset" text="Production %n, “%t”"/>
 <l:template name="qandadiv" text="Q & A %n, “%t”"/>
+<<<<<<< HEAD:xsl/common/en.xml
 <l:template name="refsect1" text="the section called “%t”"/>
 <l:template name="refsect2" text="the section called “%t”"/>
 <l:template name="refsect3" text="the section called “%t”"/>
 <l:template name="refsection" text="the section called “%t”"/>
+=======
+<l:template name="refsect1" text="“%t”"/>
+<l:template name="refsect2" text="“%t”"/>
+<l:template name="refsect3" text="“%t”"/>
+<l:template name="refsection" text="“%t”"/>
+>>>>>>> 5a98431... re-add section format macro in stylesheet:xsl/common/en.xml
 <l:template name="sect1" text="Section %n, “%t”"/>
 <l:template name="sect2" text="Section %n, “%t”"/>
 <l:template name="sect3" text="Section %n, “%t”"/>
 <l:template name="sect4" text="Section %n, “%t”"/>
 <l:template name="sect5" text="Section %n, “%t”"/>
 <l:template name="section" text="Section %n, “%t”"/>
+<<<<<<< HEAD:xsl/common/en.xml
 <l:template name="simplesect" text="the section called “%t”"/>
+=======
+<l:template name="simplesect" text="“%t”"/>
+>>>>>>> 5a98431... re-add section format macro in stylesheet:xsl/common/en.xml
 <l:template name="table" text="Table %n, “%t”"/>
 </l:context>
 <l:context name="authorgroup"><l:template name="sep" text=", "/>





More information about the icinga-checkins mailing list