svn commit: r39209 - projects/sgml2xml/share/sgml
Gabor Kovesdan
gabor at FreeBSD.org
Sun Jul 15 10:40:08 UTC 2012
Author: gabor
Date: Sun Jul 15 10:40:08 2012
New Revision: 39209
URL: http://svn.freebsd.org/changeset/doc/39209
Log:
- Make entities well-nested
Approved by: doceng (implicit)
Modified:
projects/sgml2xml/share/sgml/header.ent
projects/sgml2xml/share/sgml/navibar.ent
Modified: projects/sgml2xml/share/sgml/header.ent
==============================================================================
--- projects/sgml2xml/share/sgml/header.ent Sun Jul 15 10:38:23 2012 (r39208)
+++ projects/sgml2xml/share/sgml/header.ent Sun Jul 15 10:40:08 2012 (r39209)
@@ -10,9 +10,9 @@
<!-- Components making up the standard headers and footers. -->
<!-- Override in the prolog <em>before</em> including this -->
<!-- file if necessary. -->
-<!ENTITY copyright '<a href="&base;/search/index-site.html">Site Map</a> |
+<!ENTITY copyright '<span xmlns="http://www.w3.org/1999/xhtml"><a href="&base;/search/index-site.html">Site Map</a> |
<a href="&base;/copyright/">Legal Notices</a> | © 1995-2012 The FreeBSD Project.
- All rights reserved.'>
+ All rights reserved.</span>'>
<!ENTITY email 'freebsd-questions'>
<!ENTITY author '<a href="&base;/index.html">home</a> | <a href="&base;/mailto.html">contact</a> | <a href="&base;/copyright/index.html">legal</a> | ©right;'>
<!ENTITY date ''>
@@ -24,9 +24,6 @@
<!-- Standard headers and footers -->
-<!ENTITY html.br.clearboth '<br class="clearboth" />'>
-<!ENTITY html.br '<br />'>
-
<!ENTITY header1.meta '
<meta http-equiv="Content-Type" content="text/html; charset=&xml.encoding;" />
<meta name="MSSmartTagsPreventParsing" content="TRUE" />
@@ -56,24 +53,15 @@
<!ENTITY header1.rsslink ''>
<![%html.header.script.google;[
-<!ENTITY header1.googlejs '<script type="text/javascript" src="&enbase;/layout/js/google.js"></script>'>
+<!ENTITY header1.googlejs '<script xmlns="http://www.w3.org/1999/xhtml" type="text/javascript" src="&enbase;/layout/js/google.js"></script>'>
]]>
<!ENTITY header1.googlejs ''>
-<!ENTITY header1 '
-<head>
- <title>&title;</title>
- &header1.meta;
- &header1.link;
- &header1.rsslink;
- <script type="text/javascript" src="&enbase;/layout/js/styleswitcher.js"></script>
- &header1.googlejs;
-</head>
-'>
+<!ENTITY header2.logo-red.label '<h2 xmlns="http://www.w3.org/1999/xhtml" class="blockhide">Header And Logo</h2>'>
<!ENTITY header2.logo-red '
-<a href="&base;" title="FreeBSD"><img src="&enbase;/layout/images/logo-red.png"
- width="457" height="75" alt="FreeBSD" /></a>
+<a xmlns="http://www.w3.org/1999/xhtml" href="&base;" title="FreeBSD"><img src="&enbase;/layout/images/logo-red.png"
+ width="457" height="75" alt="FreeBSD" /></a>
'>
<!ENTITY header2.word.search 'Search'>
@@ -86,7 +74,7 @@
<!ENTITY header2.word.contact 'Contact'>
<!ENTITY header2.searchinputs '
- <div xml:space="preserve">
+ <div xmlns="http://www.w3.org/1999/xhtml" xml:space="preserve">
<input type="hidden" name="max" value="25" />
<input type="hidden" name="source" value="www" />
<input id="WORDS" name="words" type="text" size="20"
@@ -97,10 +85,10 @@
</div>
'>
-<!ENTITY header2.topnav '
- <h2 class="blockhide">Site Navigation</h2>
+<!ENTITY header2.topnav.label '<h2 xmlns="http://www.w3.org/1999/xhtml" class="blockhide">Site Navigation</h2>'>
- <div id="MENU">
+<!ENTITY header2.topnav '
+ <div xmlns="http://www.w3.org/1999/xhtml" id="MENU">
<ul class="first">
<li><a href="&base;/">Home</a></li>
</ul>
@@ -174,25 +162,10 @@
</div> <!-- MENU -->
'>
-<!ENTITY header2 '
-<span class="txtoffscreen"
-><a href="#CONTENT" title="Skip site navigation" accesskey="1"
->Skip site navigation</a> (1)
-<a href="#CONTENTWRAP" title="Skip section navigation" accesskey="2"
->Skip section navigation</a> (2)</span>
-
-<div id="HEADERCONTAINER">
- <div id="HEADER">
- <h2 class="blockhide">Header And Logo</h2>
-
- <div id="HEADERLOGOLEFT">
- &header2.logo-red;
- </div> <!-- HEADERLOGOLEFT -->
-
- <div id="HEADERLOGORIGHT">
- <h2 class="blockhide">Peripheral Links</h2>
+<!ENTITY header2.searchnav.label '<h2 xmlns="http://www.w3.org/1999/xhtml" class="blockhide">Peripheral Links</h2>'>
- <div id="SEARCHNAV">
+<!ENTITY header2.searchnav '
+ <div xmlns="http://www.w3.org/1999/xhtml" id="SEARCHNAV">
<ul id="SEARCHNAVLIST">
<li>&header2.word.textsize;: <a href="#" onkeypress="return false;"
onclick="setActiveStyleSheet('Normal Text'); return false;"
@@ -207,6 +180,29 @@
<li class="last-child"><a href="&base;/mailto.html" title="&header2.word.contact;">&header2.word.contact;</a></li>
</ul>
</div> <!-- SEARCHNAV -->
+'>
+
+<!ENTITY header2.skipnav '
+<span xmlns="http://www.w3.org/1999/xhtml" class="txtoffscreen">
+ <a href="#CONTENT" title="Skip site navigation" accesskey="1">Skip site navigation</a> (1)
+ <a href="#CONTENTWRAP" title="Skip section navigation" accesskey="2">Skip section navigation</a> (2)
+</span>'>
+
+<!ENTITY header2 '
+&header2.skipnav;
+
+<div id="HEADERCONTAINER">
+ <div id="HEADER">
+ <h2 class="blockhide">Header And Logo</h2>
+
+ <div id="HEADERLOGOLEFT">
+ &header2.logo-red;
+ </div> <!-- HEADERLOGOLEFT -->
+
+ <div id="HEADERLOGORIGHT">
+ &header2.searchnav.label;
+
+ &header2.searchnav;
<div id="SEARCH">
<form action="&cgibase;/search.cgi" method="get">
@@ -241,22 +237,11 @@
<div id="CONTENTWRAP">
&header3;'>
-<!ENTITY footer '
- </div> <!-- CONTENTWRAP -->
-
- &html.br.clearboth;
- </div> <!-- CONTENT -->
-
- <div id="FOOTER">
- ©right;&html.br;
- &date;
- </div> <!-- FOOTER -->
- </div> <!-- CONTAINER -->
- </div> <!-- CONTAINERWRAP -->'>
+<!ENTITY lastmod 'Last modified: '>
<!-- macro for webbuild paper -->
<!ENTITY webbuild '
-<p>This document describes how to build and update
+<p xmlns="http://www.w3.org/1999/xhtml">This document describes how to build and update
the FreeBSD Web pages from the CVS repository by hand.</p>'>
<!--
Modified: projects/sgml2xml/share/sgml/navibar.ent
==============================================================================
--- projects/sgml2xml/share/sgml/navibar.ent Sun Jul 15 10:38:23 2012 (r39208)
+++ projects/sgml2xml/share/sgml/navibar.ent Sun Jul 15 10:40:08 2012 (r39209)
@@ -1,9 +1,7 @@
<!-- $FreeBSD$ -->
-<!ENTITY % navinclude.about "IGNORE">
-<![%navinclude.about;[
-<!ENTITY nav '
-<div id="SIDENAV">
+<!ENTITY nav.about '
+<div xmlns="http://www.w3.org/1999/xhtml" id="SIDENAV">
<h2 class="blockhide">Section Navigation</h2>
<ul>
@@ -25,12 +23,9 @@
<li><a href="&base;/privacy.html">Privacy Policy</a></li>
</ul>
</div> <!-- SIDENAV -->'>
-]]>
-<!ENTITY % navinclude.community "IGNORE">
-<![%navinclude.community;[
-<!ENTITY nav '
-<div id="SIDENAV">
+<!ENTITY nav.community '
+<div xmlns="http://www.w3.org/1999/xhtml" id="SIDENAV">
<h2 class="blockhide">Section Navigation</h2>
<ul>
@@ -45,12 +40,9 @@
<li><a href="&base;/community/social.html">Social Networks</a></li>
</ul>
</div> <!-- SIDENAV -->'>
-]]>
-<!ENTITY % navinclude.developers "IGNORE">
-<![%navinclude.developers;[
-<!ENTITY nav '
-<div id="SIDENAV">
+<!ENTITY nav.developers '
+<div xmlns="http://www.w3.org/1999/xhtml" id="SIDENAV">
<h2 class="blockhide">Section Navigation</h2>
<ul>
@@ -64,12 +56,9 @@
<li><a href="&base;/doc/en_US.ISO8859-1/articles/contributing/index.html">Contributing</a></li>
</ul>
</div> <!-- SIDENAV -->'>
-]]>
-<!ENTITY % navinclude.docs "IGNORE">
-<![%navinclude.docs;[
-<!ENTITY nav '
-<div id="SIDENAV">
+<!ENTITY nav.docs '
+<div xmlns="http://www.w3.org/1999/xhtml" id="SIDENAV">
<h2 class="blockhide">Section Navigation</h2>
<ul>
@@ -84,37 +73,25 @@
<li><a href="&base;/docproj/">Documentation Project</a></li>
</ul>
</div> <!-- SIDENAV -->'>
-]]>
-<!ENTITY % navinclude.download "IGNORE">
-<![%navinclude.download;[
-<!ENTITY nav '
-<div id="SIDENAV">
+<!ENTITY nav.download '
+<div xmlns="http://www.w3.org/1999/xhtml" id="SIDENAV">
<h2 class="blockhide">Section Navigation</h2>
<ul>
<li><a href="&base;/where.html">Get FreeBSD</a></li>
<li><a href="&base;/releases/">Release Information</a>
<ul>
<li>Production Release: <a href="&u.rel.announce;">&rel.current;</a> <a href="&u.rel2.announce;">&rel2.current;</a></li>
- <li>Production (Legacy) Release:<br>
+ <li>Production (Legacy) Release:<br />
<a href="&u.rel3.announce;">&rel3.current;</a></li>
<li><a href="&base;/snapshots/">Snapshot Releases</a></li>
-<![%beta.testing;[
- <li><a href="&u.betarel.schedule;">Upcoming Release: &betarel.current;</a></li>
-]]>
-<![%beta2.testing;[
- <li><a href="&u.betarel2.schedule;">Upcoming Release: &betarel2.current;</a></li>
-]]>
</ul></li>
<li><a href="&base;/ports/">Ported Applications</a></li>
</ul>
</div> <!-- SIDENAV -->'>
-]]>
-<!ENTITY % navinclude.gnome "IGNORE">
-<![%navinclude.gnome;[
-<!ENTITY nav '
-<div id="SIDENAV">
+<!ENTITY nav.gnome '
+<div xmlns="http://www.w3.org/1999/xhtml" id="SIDENAV">
<h2 class="blockhide">Section Navigation</h2>
<ul>
@@ -139,12 +116,9 @@
</ul></li>
</ul>
</div> <!-- SIDENAV -->'>
-]]>
-<!ENTITY % navinclude.ports "IGNORE">
-<![%navinclude.ports;[
-<!ENTITY nav '
-<div id="SIDENAV">
+<!ENTITY nav.ports '
+<div xmlns="http://www.w3.org/1999/xhtml" id="SIDENAV">
<h2 class="blockhide">Section Navigation</h2>
<ul>
<li><a href="&base;/ports/index.html">About ports</a></li>
@@ -160,12 +134,9 @@
<li><a href="&base;/ports/references.html">For More Information</a></li>
</ul>
</div> <!-- SIDENAV -->'>
-]]>
-<!ENTITY % navinclude.support "IGNORE">
-<![%navinclude.support;[
-<!ENTITY nav '
-<div id="SIDENAV">
+<!ENTITY nav.support '
+<div xmlns="http://www.w3.org/1999/xhtml" id="SIDENAV">
<h2 class="blockhide">Section Navigation</h2>
<ul>
@@ -190,4 +161,39 @@
<li><a href="&base;/support/webresources.html">Web Resources</a></li>
</ul>
</div> <!-- SIDENAV -->'>
+
+<!--
+<!ENTITY % navinclude.about "IGNORE">
+<![%navinclude.about;[
+<!ENTITY nav '&nav.about;'>
+]]>
+<!ENTITY % navinclude.community "IGNORE">
+<![%navinclude.community;[
+<!ENTITY nav '&nav.community;'>
+]]>
+<!ENTITY % navinclude.developers "IGNORE">
+<![%navinclude.developers;[
+<!ENTITY nav '&nav.developers;'>
+]]>
+<!ENTITY % navinclude.docs "IGNORE">
+<![%navinclude.docs;[
+<!ENTITY nav '&nav.docs;'>
+]]>
+<!ENTITY % navinclude.download "IGNORE">
+<![%navinclude.download;[
+<!ENTITY nav '&nav.download;'>
+]>
+<!ENTITY % navinclude.gnome "IGNORE">
+<![%navinclude.gnome;[
+<!ENTITY nav '&nav.gnome;'>
+]]>
+<!ENTITY % navinclude.ports "IGNORE">
+<![%navinclude.ports;[
+<!ENTITY nav '&nav.ports;'>
+]]>
+<!ENTITY % navinclude.support "IGNORE">
+<![%navinclude.support;[
+<!ENTITY nav '&nav.support;'>
]]>
+-->
+<!ENTITY nav ''>
More information about the svn-doc-projects
mailing list