docs-common/common/entities entities-en.xml, 1.4, 1.5 entities-it.ent, 1.3, 1.4 entities-it.xml, 1.3, 1.4 entities.dtd, 1.4, 1.5 entities.xsl, 1.3, 1.4 it.po, 1.3, 1.4
Tommy Reynolds (jtr)
fedora-docs-commits at redhat.com
Sat Feb 25 20:29:20 UTC 2006
- Previous message (by thread): release-notes/po ru.po,NONE,1.1
- Next message (by thread): docs-common/common/entities Makefile, 1.3, 1.4 entities-it.ent, 1.4, 1.5 entities-it.xml, 1.4, 1.5 it.po, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jtr
Update of /cvs/docs/docs-common/common/entities
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14952
Modified Files:
entities-en.xml entities-it.ent entities-it.xml entities.dtd
entities.xsl it.po
Log Message:
Added <ulink url="foo"/> construct to avoid all that hideous escaping
and ampersanding when entering a URL. Note that we only support the
EMPTY content model of the <ulink/> element because it renders
consistently with current practice.
Index: entities-en.xml
===================================================================
RCS file: /cvs/docs/docs-common/common/entities/entities-en.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- entities-en.xml 25 Feb 2006 04:51:56 -0000 1.4
+++ entities-en.xml 25 Feb 2006 20:29:12 -0000 1.5
@@ -52,11 +52,11 @@
</entity>
<entity name="FP-URL">
<comment>Fedora Docs Project URL</comment>
- <text><unlink url='http://fedora.redhat.com/projects/docs/'/></text>
+ <text><ulink url="http://fedora.redhat.com/projects/docs/"/></text>
</entity>
<entity name="FDPDOCS-UTL">
<comment>Fedora Documentation (repository) URL</comment>
- <text><ulink url='http://fedora.redhat.com/docs'></text>
+ <text><ulink url="http://fedora.redhat.com/docs/"/></text>
</entity>
<entity name="BZ">
<comment>Bugzilla</comment>
@@ -64,7 +64,7 @@
</entity>
<entity name="BZ-URL">
<comment>Bugzilla URL</comment>
- <text><ulink url='http://bugzilla.redhat.com/'></text>
+ <text><ulink url="http://bugzilla.redhat.com"/></text>
</entity>
<entity name="BZ-PROD">
<comment>Bugzilla product for Fedora Docs</comment>
@@ -164,11 +164,11 @@
<group name="Tutorial URL's">
<entity name="IG-URL">
<comment/>
- <text><ulink url='http://fedora.redhat.com/docs/fedora-install-guide-en/'></text>
+ <text><ulink url="http://fedora.redhat.com/docs/fedora-install-guide-en/"/></text>
</entity>
<entity name="DOCG-URL">
<comment/>
- <text><unlink url='http://fedora.redhat.com/participate/documentation-guide/'></text>
+ <text><ulink url="http://fedora.redhat.com/participate/documentation-guide/"/></text>
</entity>
</group>
<group name="Status notices">
Index: entities-it.ent
===================================================================
RCS file: /cvs/docs/docs-common/common/entities/entities-it.ent,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- entities-it.ent 25 Feb 2006 04:51:56 -0000 1.3
+++ entities-it.ent 25 Feb 2006 20:29:12 -0000 1.4
@@ -3,72 +3,72 @@
<!-- Group: Fedora common entries -->
- <!ENTITY FED "Fedora" > <!-- Generic root term -->
- <!ENTITY CORE "Core" > <!-- Generic root term -->
- <!ENTITY FC "&FED; &CORE;" > <!-- Generic main project name -->
- <!ENTITY DISTRO "&FC;" > <!-- Legacy Entity -->
- <!ENTITY FCX "FC" > <!-- Short project name -->
- <!ENTITY FP "&FED; Project" > <!-- Generic overall project name -->
- <!ENTITY FDP "&FED; Docs Project" > <!-- Generic docs project name -->
- <!ENTITY FDPX "&FED; Docs Project" > <!-- Italian short docs project name -->
- <!ENTITY EX "Extras" > <!-- cf. Core -->
- <!ENTITY FEX "&FED; &EX;" > <!-- cf. Fedora Core -->
- <!ENTITY FP-URL "<unlink url='http://fedora.redhat.com/projects/docs/'/>" > <!-- Fedora Docs Project URL -->
- <!ENTITY FDPDOCS-UTL "<ulink url='http://fedora.redhat.com/docs'>" > <!-- Fedora Documentation (repository) URL -->
- <!ENTITY BZ "Bugzilla" > <!-- Bugzilla -->
- <!ENTITY BZ-URL "<ulink url='http://bugzilla.redhat.com/'>" > <!-- Bugzilla URL -->
- <!ENTITY BZ-PROD "&FED; Documentation" > <!-- Bugzilla product for Fedora Docs -->
+ <!ENTITY FED "Fedora" > <!-- Generic root term -->
+ <!ENTITY CORE "Core" > <!-- Generic root term -->
+ <!ENTITY FC "&FED; &CORE;" > <!-- Generic main project name -->
+ <!ENTITY DISTRO "&FC;" > <!-- Legacy Entity -->
+ <!ENTITY FCX "FC" > <!-- Short project name -->
+ <!ENTITY FP "&FED; Project" > <!-- Generic overall project name -->
+ <!ENTITY FDP "&FED; Docs Project" > <!-- Generic docs project name -->
+ <!ENTITY FDPX "&FED; Docs Project" > <!-- Italian short docs project name -->
+ <!ENTITY EX "Extras" > <!-- cf. Core -->
+ <!ENTITY FEX "&FED; &EX;" > <!-- cf. Fedora Core -->
+ <!ENTITY FP-URL "<ulink url='http://fedora.redhat.com/projects/docs/'/>" > <!-- Fedora Docs Project URL -->
+ <!ENTITY FDPDOCS-UTL "<ulink url='http://fedora.redhat.com/docs/'/>" > <!-- Fedora Documentation (repository) URL -->
+ <!ENTITY BZ "Bugzilla" > <!-- Bugzilla -->
+ <!ENTITY BZ-URL "<ulink url='http://bugzilla.redhat.com'/>" > <!-- Bugzilla URL -->
+ <!ENTITY BZ-PROD "&FED; Documentation" > <!-- Bugzilla product for Fedora Docs -->
<!-- Group: Fedora Version Numbers -->
- <!ENTITY FCVER "4" > <!-- Current release version of main project -->
- <!ENTITY TESTVER "test3" > <!-- Current test number of main project -->
- <!ENTITY FCTESTVER "5 &TESTVER;" > <!-- Current test version of main project -->
+ <!ENTITY FCVER "4" > <!-- Current release version of main project -->
+ <!ENTITY TESTVER "test3" > <!-- Current test number of main project -->
+ <!ENTITY FCTESTVER "5 &TESTVER;" > <!-- Current test version of main project -->
<!-- Group: Other common names -->
- <!ENTITY RH "Red Hat" > <!-- The generic term "Red Hat" -->
- <!ENTITY FORMAL-RHI "&RH; Inc." > <!-- The generic term "Red Hat, Inc." -->
- <!ENTITY RHL "&RH; Linux" > <!-- The generic term "Red Hat Linux" -->
- <!ENTITY RHN "&RH; Network" > <!-- The generic term "Red Hat Network" -->
- <!ENTITY RHEL "&RH; Enterprise Linux" > <!-- The generic term "Red Hat Enterprise Linux" -->
+ <!ENTITY RH "Red Hat" > <!-- The generic term "Red Hat" -->
+ <!ENTITY FORMAL-RHI "&RH; Inc." > <!-- The generic term "Red Hat, Inc." -->
+ <!ENTITY RHL "&RH; Linux" > <!-- The generic term "Red Hat Linux" -->
+ <!ENTITY RHN "&RH; Network" > <!-- The generic term "Red Hat Network" -->
+ <!ENTITY RHEL "&RH; Enterprise Linux" > <!-- The generic term "Red Hat Enterprise Linux" -->
<!-- Group: Technology terms -->
- <!ENTITY SEL "SELinux" > <!-- Generic technology term -->
+ <!ENTITY SEL "SELinux" > <!-- Generic technology term -->
<!-- Group: Common doc files -->
- <!ENTITY LEGALNOTICE SYSTEM "legalnotice-en.xml" > <!-- WHO AM I? WHAT AM I? I CAN'T REMEMBER! -->
- <!ENTITY LEGALNOTICE-CONTENT SYSTEM "legalnotice-content-en.xml" > <!-- WHO AM I? WHAT AM I? I CAN'T REMEMBER! -->
- <!ENTITY LEGALNOTICE-OPL SYSTEM "legalnotice-opl-en.xml" > <!-- WHO AM I? WHAT AM I? I CAN'T REMEMBER! -->
- <!ENTITY LEGALNOTICE-OPL-CONTENT SYSTEM "opl.xml" > <!-- WHO AM I? WHAT AM I? I CAN'T REMEMBER! -->
- <!ENTITY LEGALNOTICE-RELNOTES SYSTEM "legalnotice-relnotes-en.xml" > <!-- WHO AM I? WHAT AM I? I CAN'T REMEMBER! -->
- <!ENTITY LEGALNOTICE-SECTION SYSTEM "legalnotice-section-en.xml" > <!-- WHO AM I? WHAT AM I? I CAN'T REMEMBER! -->
- <!ENTITY BUG-REPORTING SYSTEM "bugreporting-en.xml" > <!-- WHO AM I? WHAT AM I? I CAN'T REMEMBER! -->
+ <!ENTITY LEGALNOTICE SYSTEM "legalnotice-en.xml" > <!-- WHO AM I? WHAT AM I? I CAN'T REMEMBER! -->
+ <!ENTITY LEGALNOTICE-CONTENT SYSTEM "legalnotice-content-en.xml" > <!-- WHO AM I? WHAT AM I? I CAN'T REMEMBER! -->
+ <!ENTITY LEGALNOTICE-OPL SYSTEM "legalnotice-opl-en.xml" > <!-- WHO AM I? WHAT AM I? I CAN'T REMEMBER! -->
+ <!ENTITY LEGALNOTICE-OPL-CONTENT SYSTEM "opl.xml" > <!-- WHO AM I? WHAT AM I? I CAN'T REMEMBER! -->
+ <!ENTITY LEGALNOTICE-RELNOTES SYSTEM "legalnotice-relnotes-en.xml" > <!-- WHO AM I? WHAT AM I? I CAN'T REMEMBER! -->
+ <!ENTITY LEGALNOTICE-SECTION SYSTEM "legalnotice-section-en.xml" > <!-- WHO AM I? WHAT AM I? I CAN'T REMEMBER! -->
+ <!ENTITY BUG-REPORTING SYSTEM "bugreporting-en.xml" > <!-- WHO AM I? WHAT AM I? I CAN'T REMEMBER! -->
<!-- Group: Common applications -->
<!-- Group: Required by build scripts -->
- <!ENTITY PROJECT "&FP;" > <!-- WHO AM I? WHAT AM I? I CAN'T REMEMBER! -->
+ <!ENTITY PROJECT "&FP;" > <!-- WHO AM I? WHAT AM I? I CAN'T REMEMBER! -->
<!-- Group: Tutorial Titles -->
- <!ENTITY IG "Installation Guide" > <!-- WHO AM I? WHAT AM I? I CAN'T REMEMBER! -->
- <!ENTITY DOCG "Documentation Guide" > <!-- WHO AM I? WHAT AM I? I CAN'T REMEMBER! -->
+ <!ENTITY IG "Installation Guide" > <!-- WHO AM I? WHAT AM I? I CAN'T REMEMBER! -->
+ <!ENTITY DOCG "Documentation Guide" > <!-- WHO AM I? WHAT AM I? I CAN'T REMEMBER! -->
<!-- Group: Tutorial URL's -->
- <!ENTITY IG-URL "<ulink url='http://fedora.redhat.com/docs/fedora-install-guide-en/'>" > <!-- WHO AM I? WHAT AM I? I CAN'T REMEMBER! -->
- <!ENTITY DOCG-URL "<unlink url='http://fedora.redhat.com/participate/documentation-guide/'>" > <!-- WHO AM I? WHAT AM I? I CAN'T REMEMBER! -->
+ <!ENTITY IG-URL "<ulink url='http://fedora.redhat.com/docs/fedora-install-guide-en/'/>" > <!-- WHO AM I? WHAT AM I? I CAN'T REMEMBER! -->
+ <!ENTITY DOCG-URL "<ulink url='http://fedora.redhat.com/participate/documentation-guide/'/>" > <!-- WHO AM I? WHAT AM I? I CAN'T REMEMBER! -->
<!-- Group: Status notices -->
- <!ENTITY DRAFTNOTICE SYSTEM "draftnotice-en.xml" > <!-- WHO AM I? WHAT AM I? I CAN'T REMEMBER! -->
- <!ENTITY LEGACYNOTICE SYSTEM "legacynotice-en.xml" > <!-- WHO AM I? WHAT AM I? I CAN'T REMEMBER! -->
- <!ENTITY OBSOLETENOTICE SYSTEM "obsoletenotice-en.xml" > <!-- WHO AM I? WHAT AM I? I CAN'T REMEMBER! -->
- <!ENTITY DEPRECATEDNOTICE SYSTEM "deprecatednotice-en.xml" > <!-- WHO AM I? WHAT AM I? I CAN'T REMEMBER! -->
+ <!ENTITY DRAFTNOTICE SYSTEM "draftnotice-en.xml" > <!-- WHO AM I? WHAT AM I? I CAN'T REMEMBER! -->
+ <!ENTITY LEGACYNOTICE SYSTEM "legacynotice-en.xml" > <!-- WHO AM I? WHAT AM I? I CAN'T REMEMBER! -->
+ <!ENTITY OBSOLETENOTICE SYSTEM "obsoletenotice-en.xml" > <!-- WHO AM I? WHAT AM I? I CAN'T REMEMBER! -->
+ <!ENTITY DEPRECATEDNOTICE SYSTEM "deprecatednotice-en.xml" > <!-- WHO AM I? WHAT AM I? I CAN'T REMEMBER! -->
Index: entities-it.xml
===================================================================
RCS file: /cvs/docs/docs-common/common/entities/entities-it.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- entities-it.xml 25 Feb 2006 04:51:56 -0000 1.3
+++ entities-it.xml 25 Feb 2006 20:29:12 -0000 1.4
@@ -45,11 +45,11 @@
</entity>
<entity name="FP-URL">
<comment>Fedora Docs Project URL</comment>
- <text><unlink url='http://fedora.redhat.com/projects/docs/'/></text>
+ <text><ulink url="http://fedora.redhat.com/projects/docs/"/></text>
</entity>
<entity name="FDPDOCS-UTL">
<comment>Fedora Documentation (repository) URL</comment>
- <text><ulink url='http://fedora.redhat.com/docs'></text>
+ <text><ulink url="http://fedora.redhat.com/docs/"/></text>
</entity>
<entity name="BZ">
<comment>Bugzilla</comment>
@@ -57,7 +57,7 @@
</entity>
<entity name="BZ-URL">
<comment>Bugzilla URL</comment>
- <text><ulink url='http://bugzilla.redhat.com/'></text>
+ <text><ulink url="http://bugzilla.redhat.com"/></text>
</entity>
<entity name="BZ-PROD">
<comment>Bugzilla product for Fedora Docs</comment>
@@ -157,11 +157,11 @@
<group name="Tutorial URL's">
<entity name="IG-URL">
<comment/>
- <text><ulink url='http://fedora.redhat.com/docs/fedora-install-guide-en/'></text>
+ <text><ulink url="http://fedora.redhat.com/docs/fedora-install-guide-en/"/></text>
</entity>
<entity name="DOCG-URL">
<comment/>
- <text><unlink url='http://fedora.redhat.com/participate/documentation-guide/'></text>
+ <text><ulink url="http://fedora.redhat.com/participate/documentation-guide/"/></text>
</entity>
</group>
<group name="Status notices">
Index: entities.dtd
===================================================================
RCS file: /cvs/docs/docs-common/common/entities/entities.dtd,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- entities.dtd 25 Feb 2006 04:51:56 -0000 1.4
+++ entities.dtd 25 Feb 2006 20:29:12 -0000 1.5
@@ -7,10 +7,13 @@
<!ATTLIST entity kind (term|system) "term" >
<!ELEMENT comment (#PCDATA) >
-<!ELEMENT text (#PCDATA|use)* >
+<!ELEMENT text (#PCDATA|use|ulink)* >
<!ELEMENT group (entity*) >
<!ATTLIST group name CDATA #REQUIRED >
<!ELEMENT use EMPTY >
-<!ATTLIST use entity NMTOKEN #REQUIRED >
\ No newline at end of file
+<!ATTLIST use entity NMTOKEN #REQUIRED >
+
+<!ELEMENT ulink EMPTY >
+<!ATTLIST ulink url CDATA #REQUIRED >
\ No newline at end of file
Index: entities.xsl
===================================================================
RCS file: /cvs/docs/docs-common/common/entities/entities.xsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- entities.xsl 25 Feb 2006 04:51:56 -0000 1.3
+++ entities.xsl 25 Feb 2006 20:29:12 -0000 1.4
@@ -36,7 +36,7 @@
<xsl:variable name="body">
<xsl:apply-templates/>
</xsl:variable>
- <xsl:value-of select="concat( '<!ENTITY ', @name, ' ', normalize-space($extra), ' "', normalize-space($body), '" > <!-- ', normalize-space($desc), ' -->')" disable-output-escaping="yes"/>
+ <xsl:value-of select="concat( '<!ENTITY ', @name, ' ', normalize-space($extra), ' "', normalize-space($body), '" > <!-- ', normalize-space($desc), ' -->')" disable-output-escaping="yes"/>
</xsl:template>
<xsl:template match="use">
@@ -60,4 +60,11 @@
<xsl:text> </xsl:text>
</xsl:comment>
</xsl:template>
+
+ <xsl:template match="ulink">
+ <xsl:text disable-output-escaping="yes"><ulink url='</xsl:text>
+ <xsl:value-of select="normalize-space(@url)" disable-output-escaping="yes"/>
+ <xsl:text disable-output-escaping="yes">'/></xsl:text>
+ </xsl:template>
+
</xsl:stylesheet>
Index: it.po
===================================================================
RCS file: /cvs/docs/docs-common/common/entities/it.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- it.po 25 Feb 2006 04:51:56 -0000 1.3
+++ it.po 25 Feb 2006 20:29:12 -0000 1.4
@@ -3,7 +3,7 @@
msgid ""
msgstr ""
"Project-Id-Version: it\n"
-"POT-Creation-Date: 2006-02-24 22:50-0600\n"
+"POT-Creation-Date: 2006-02-25 13:56-0600\n"
"PO-Revision-Date: 2006-02-23 03:14-0600\n"
"Last-Translator: Tommy Reynolds <Tommy.Reynolds at MegaCoder.com>\n"
"Language-Team: US English <en at li.org>\n"
@@ -88,19 +88,11 @@
msgid "Fedora Docs Project URL"
msgstr "Projecto Fedora Document"
-#: entities-en.xml:55(text)
-msgid "<unlink url='http://fedora.redhat.com/projects/docs/'/>"
-msgstr ""
-
#: entities-en.xml:58(comment)
#, fuzzy
msgid "Fedora Documentation (repository) URL"
msgstr "Projecto Fedora Document"
-#: entities-en.xml:59(text)
-msgid "<ulink url='http://fedora.redhat.com/docs'>"
-msgstr ""
-
#: entities-en.xml:62(comment) entities-en.xml:63(text)
msgid "Bugzilla"
msgstr ""
@@ -109,10 +101,6 @@
msgid "Bugzilla URL"
msgstr ""
-#: entities-en.xml:67(text)
-msgid "<ulink url='http://bugzilla.redhat.com/'>"
-msgstr ""
-
#: entities-en.xml:70(comment)
msgid "Bugzilla product for Fedora Docs"
msgstr ""
@@ -229,17 +217,6 @@
msgid "Documentation Guide"
msgstr ""
-#: entities-en.xml:167(text)
-msgid ""
-"<ulink url='http://fedora.redhat.com/docs/fedora-install-guide-en/'>"
-msgstr ""
-
-#: entities-en.xml:171(text)
-msgid ""
-"<unlink url='http://fedora.redhat.com/participate/documentation-"
-"guide/'>"
-msgstr ""
-
#: entities-en.xml:177(text)
msgid "draftnotice-en.xml"
msgstr ""
- Previous message (by thread): release-notes/po ru.po,NONE,1.1
- Next message (by thread): docs-common/common/entities Makefile, 1.3, 1.4 entities-it.ent, 1.4, 1.5 entities-it.xml, 1.4, 1.5 it.po, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Fedora-docs-commits
mailing list