Commit cecbac02 authored by Astrid Kessler's avatar Astrid Kessler
Browse files

backport from 2.1: 

* add the two new elements <glossary> and <phonetic>
* add transformation for <glossary> and <phonetic>
* add style for pronounciations
* add title for glossary links


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@106820 13f79535-47bb-0310-9956-ffa450edef68
parent 788dd7a8

docs/manual/style/common.dtd

+12 −2
Changes for docs/manual/style/common.dtd: 12 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -35,8 +35,8 @@ 


<!-- Generic tag entities -->



<!ENTITY % inlinetags "em | strong | code | a | br | directive | module | img

| cite | q | dfn | var | transnote">

<!ENTITY % inlinetags "em | strong | code | a | br | directive | module |

img | cite | q | dfn | var | transnote | glossary | phonetic">



<!ENTITY % blocktags "p | example | note | table | ul | ol | dl | pre

| blockquote">
@@ -169,3 +169,13 @@ 
<!-- The path and title of the parent document -->

<!ELEMENT parentdocument (#PCDATA)>

<!ATTLIST parentdocument href CDATA #REQUIRED >



<!-- The glossary element defines a special case of link. The referenced

     target is the name of an anchor within the glossary -->

<!ELEMENT glossary %Inline;>

<!ATTLIST glossary ref CDATA #REQUIRED>



<!-- The phonetic element should be used only within the glossary. It

     describes a pronounciation -->

<!ELEMENT phonetic (#PCDATA)>

docs/manual/style/css/manual-print.css

+2 −1
Changes for docs/manual/style/css/manual-print.css: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -45,7 +45,8 @@ q, em, var { 
    font-style: italic;

}



span.transnote {

span.transnote, span.phonetic {

    font-weight: normal;

    background-color: inherit;

    color: #888;

}

docs/manual/style/css/manual.css

+2 −1
Changes for docs/manual/style/css/manual.css: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -45,7 +45,8 @@ q, em, var { 
    font-style: italic;

}



span.transnote {

span.transnote, span.phonetic {

    font-weight: normal;

    background-color: inherit;

    color: #888;

}

docs/manual/style/lang/de.xml

+4 −1
Changes for docs/manual/style/lang/de.xml: 4 added lines, 1 removed line.
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="ISO-8859-1"?>

<!DOCTYPE messages [ <!ENTITY nbsp "&#160;"> ]>

<!-- English revision: 1.6.2.4 -->

<!-- English revision: 106090 -->



<!--

 Copyright 2002-2004 The Apache Software Foundation
@@ -92,6 +92,9 @@ 
        <!-- Used for translation notes -->

        <message id="transnote">Anm.d.&#220;.:</message>

        

        <!-- Used for glossary link titles -->

        <message id="glossarylink">siehe Glossar</message>



        <!-- Used in headers and footers -->

        <message id="apachetitle">- Apache HTTP Server</message>

        <message id="apachehttpserver">Apache HTTP Server Version 2.0</message>

docs/manual/style/lang/en.xml

+3 −0
Changes for docs/manual/style/lang/en.xml: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -93,6 +93,9 @@ 
        <!-- Used in summaries -->

        <message id="summary">Summary</message>



        <!-- Used for glossary link titles -->

        <message id="glossarylink">see glossary</message>



        <!-- Used in headers and footers -->

        <message id="apachetitle">- Apache HTTP Server</message>

        <message id="apachehttpserver">Apache HTTP Server Version 2.0</message>