diff options
| -rw-r--r-- | htdocs/docs.css | 3 | ||||
| -rwxr-xr-x | htdocs/docs/errors.html | 10 | ||||
| -rwxr-xr-x | htdocs/docs/install.html | 8 | ||||
| -rwxr-xr-x | htdocs/feedback.html | 160 | ||||
| -rw-r--r-- | htdocs/images/.htaccess | 6 | ||||
| -rwxr-xr-x | htdocs/index.html | 21 | ||||
| -rwxr-xr-x | htdocs/source/index.html | 10 | ||||
| -rwxr-xr-x | htdocs/whatsnew.html | 27 | ||||
| -rw-r--r-- | misc/w3c-markup-validator.spec | 89 | ||||
| -rw-r--r-- | share/templates/en_US/error_messages.cfg | 6 |
10 files changed, 87 insertions, 253 deletions
diff --git a/htdocs/docs.css b/htdocs/docs.css index f0bdb37..20d88f0 100644 --- a/htdocs/docs.css +++ b/htdocs/docs.css @@ -4,7 +4,7 @@ Copyright 2003 W3C (MIT, INRIA, Keio). All Rights Reserved. See <http://www.w3.org/Consortium/Legal/ipr-notice.html#Copyright> - $Id: docs.css,v 1.6 2005-05-11 05:53:41 ot Exp $ + $Id: docs.css,v 1.7 2005-10-20 06:46:50 ot Exp $ */ /* @@ -66,7 +66,6 @@ dl#expl dt { .doc code { white-space: normal; font-weight: bold; - color: #006; display: inline; padding-left: .2em; padding-right: .2em; diff --git a/htdocs/docs/errors.html b/htdocs/docs/errors.html index a77dc20..0cbc646 100755 --- a/htdocs/docs/errors.html +++ b/htdocs/docs/errors.html @@ -1,5 +1,5 @@ -<!--#set var="revision" value="\$Id: errors.html,v 1.35 2005-07-26 23:15:04 ot Exp $" ---><!--#set var="date" value="\$Date: 2005-07-26 23:15:04 $" +<!--#set var="revision" value="\$Id: errors.html,v 1.36 2005-10-20 06:46:50 ot Exp $" +--><!--#set var="date" value="\$Date: 2005-10-20 06:46:50 $" --><!--#set var="title" value="Error Explanations for The W3C Markup Validation Service" --><!--#set var="relroot" value="../" --><!--#include virtual="../header.html" --> @@ -37,7 +37,7 @@ <dt id="ve-28">28: unterminated comment: found end of entity inside comment</dt> <dd><div class="ve mid-28"> <p> - Check that you are using a proper syntax for you comments, e.g: <!-- comment here -->. + Check that you are using a proper syntax for your comments, e.g: <!-- comment here -->. This error may appear if you forget the last "--" to close one comment, therefore including the rest of the content in your comment. </p> @@ -63,7 +63,7 @@ <dt id="ve-42">42: unknown declaration type X</dt> <dd><div class="ve mid-42"> <p> - This error may appear if you are using a bad syntax for you comments, such as "<!invalid comment>" + This error may appear if you are using a bad syntax for your comments, such as "<!invalid comment>" The proper syntax for comments is <!-- your comment here -->. </p> </div> @@ -515,7 +515,7 @@ <dt id="ve-137">137: invalid comment declaration: found character X outside comment but inside comment declaration</dt> <dd><div class="ve mid-137"> <p> - Check that you are using a proper syntax for you comments, e.g: <!-- comment here -->. + Check that you are using a proper syntax for your comments, e.g: <!-- comment here -->. This error may appear if you forget the last "--" to close one comment, and later open another. </p> </div> diff --git a/htdocs/docs/install.html b/htdocs/docs/install.html index be26da2..f7a662d 100755 --- a/htdocs/docs/install.html +++ b/htdocs/docs/install.html @@ -1,5 +1,5 @@ -<!--#set var="revision" value="\$Id: install.html,v 1.14 2005-08-08 15:11:37 ville Exp $" ---><!--#set var="date" value="\$Date: 2005-08-08 15:11:37 $" +<!--#set var="revision" value="\$Id: install.html,v 1.15 2005-10-20 06:46:50 ot Exp $" +--><!--#set var="date" value="\$Date: 2005-10-20 06:46:50 $" --><!--#set var="title" value="Installation Documentation for The W3C Markup Validation Service" --><!--#set var="relroot" value="../" --><!--#include virtual="../header.html" --> @@ -94,7 +94,7 @@ title="Comprehensive Perl Archive Network">CPAN</acronym></a> (minimum versions in parenthesis after the name). The following list was complete when CVS spit out: - <code>$Date: 2005-08-08 15:11:37 $</code>. <tt>:-)</tt> + <code>$Date: 2005-10-20 06:46:50 $</code>. <tt>:-)</tt> </p> <p> One easy - and strongly recommended - way to take care of all these @@ -350,7 +350,7 @@ <div id="credits" class="stb"> <h3>Credits and Acknowledgments</h3> <p>The Validator Team wishes to thank Nick Talbott and Stephen Yoch for their help -in creating the following installation instructions. Thanks also to all the people who +in creating these installation instructions. Thanks also to all the people who use and review the guide to make it better and better!</p> </div> diff --git a/htdocs/feedback.html b/htdocs/feedback.html deleted file mode 100755 index a78afe5..0000000 --- a/htdocs/feedback.html +++ /dev/null @@ -1,160 +0,0 @@ -<!--#set var="revision" value="\$Id: feedback.html,v 1.22 2005-06-21 05:55:37 ot Exp $" ---><!--#set var="date" value="\$Date: 2005-06-21 05:55:37 $" ---><!--#set var="title" value="How To Provide Feedback for The W3C Markup Validation Service" ---><!--#set var="relroot" value="./" ---><!--#include virtual="header.html" --> -<div class="doc"> -<h2>How to Provide Feedback For the W3C Markup Validator</h2> - -<div id="toc"> -<p>There are many ways to send feedback or discuss the Markup Validator:</p> -<ol> - <li>If you need <a href="#needhelp">help on validation or Web authoring</a></li> - - <li>If you would like to <a href="#errormsg">send a suggestion on a validation error message</a></li> - <li>If you want to <a href="#mailinglist">help, participate or discuss</a></li> - <li>If you want to <a href="#bugreport">search or report bugs</a>.</li> -</ol> -</div> - -<h3 id="needhelp"><a name="skip" id="skip"></a>Finding help on validation and Web Authoring</h3> - <p>Your page doesn't validate, and you don't know why, or - you have a question about <acronym title="HyperText Markup Language">HTML</acronym>, - stylesheets or validation?</p> - <p> - <strong>First, check our <a href="docs/help.html">Help and <acronym title="Frequently Asked Questions">FAQ</acronym> document</a>, as well as the - <a href="http://www.htmlhelp.com/faq/">Web authoring <acronym title="Frequently Asked Questions">FAQ</acronym></a> - to see if your question has been answered there.</strong> - </p> - <p> - The two most common problems are: - <a href="http://www.htmlhelp.com/tools/validator/problems.html#amp">Validating pages with - ampersands (&'s) in - <acronym title="Uniform Resource Locators">URLs</acronym></a> and - <a href="http://www.htmlhelp.com/tools/validator/problems.html#script">Validating pages with - JavaScript: <acronym title="HyperText Markup Language">HTML</acronym> - in a <code>SCRIPT</code> Element</a>. - </p> - <p> - If your problem isn't covered by one of the resources above, - you can send it to one of the following forums: - </p> - - <ul> - <li>Usenet newsgroup: <code><a href="news:comp.infosystems.www.authoring.html">comp.infosystems.www.authoring.html</a></code></li> - <li><a href="http://www.hwg.org/"><acronym - title="HyperText Markup Language">HTML</acronym> Writers Guild</a> - <a title="HTML Writers Guild Mailing Lists" - href="http://www.hwg.org/lists/">mailing lists</a></li> - </ul> - - <p> - Each of these forums have plenty of experienced <acronym - title="HyperText Markup Language">HTML</acronym> - authors who are willing to share their expertise. If you are - commenting on a specific page, be sure to provide a - <acronym title="Universal Resource Locator">URL</acronym> - when you ask your question! - </p> - - -<h3 id="errormsg">Error Message feedback</h3> - <p>If you think the error messages in the Markup Validator's result pages could be improved, or are not comprehensible, - you can send questions and suggestions to our mailing-list.</p> - - - - <p>Before you send any feedback on error messages, we encourage you to search the archives for existing messages on this error - in case your feedback has already been sent, or answers to - your query have already been given. </p> - - - - <form method="get" action="http://www.w3.org/Search/Mail/Public/search"> - <p>Search the archives of the www-validator mailing-list:<br /> - <input id="type-index" name="type-index" type="hidden" value="www-validator" /> - <input id="index-type" name="index-type" type="hidden" value="t" /> - - <input name="keywords" type="text" size="33" maxlength="100" value="" /> - - <input type="submit" name="search" value="Search Mail Archives" /> - </p> - </form> - - <p>Once you have checked that your suggestion has not been given yet, you can send your message. To write an efficient message:</p> - <ul> - <li><strong>Add a meaningful subject</strong>: summarize your feedback in a handful of words;</li> - <li>If our system added [VE][XX] at the beginning of the mail subject, keep it. - Otherwise, please precise which error message you are sending feedback about;</li> - <li><strong>Give a URL</strong> whenever possible: If your feedback comes from your experience validating a page, knowing what page it was will help us diagnose issues much quicker. - </li> - <li>Explain your suggestion, or question, in a clear and informative manner.</li> - </ul> - - <p>Once you have checked all the criteria above, - <a href="mailto:www-validator@w3.org?Subject=%20Error%20Message%20Feedback&body=Validating%20%0D%0A%0D%0A[%20Add%20your%20message/question%20here.%0D%0A%20%20Follow%20the%20instructions%20at%0D%0Ahttp%3A%2F%2Fvalidator.w3.org%2Ffeedback.html%23errormsg%20]">send your message to the www-validator public mailing-list</a>. - </p> - -<h3 id="mailinglist">Discuss and participate</h3> - -<p>If you are interested in helping to improve this - service, by writing code or just providing ideas, you should feel fee to join or send a message to our mailing-list.</p> - - <p> - The <strong>public</strong> mailing-list to discuss the Markup Validator, Link checker and other tools is - <a href="http://lists.w3.org/Archives/Public/www-validator/"><code>www-validator</code></a>. - </p> - - <p>You can <a title="Send a message to the www-validator-request subscription handler" - href="mailto:www-validator@w3.org?Subject=subscribe">subscribe</a> to the list - (and <a title="Send a message to the www-validator-request subscription handler" - href="mailto:www-validator@w3.org?Subject=unsubscribe">unsubscribe</a>), or if - you just have a small patch or idea and don't want to join the list, feel - free to <a title="Send a message to the www-validator mailing list" - href="mailto:www-validator@w3.org">send it directly to the list</a>. But whatever you do, - <strong>always use the <a href="http://www.w3.org/Search/Mail/Public/search?index-type=t;type-index=www-validator">mail - search engine</a></strong> first to check for existing messages on a given topic. - </p> - - <p> - If you just want to have an informal discussion with developers and users of the Validator, - you may also join the IRC channel #validator on the - <a href="http://freenode.net/using_the_network.shtml">freenode</a> network (irc.freenode.net). - However, please keep in mind that <em>this is not a support channel</em>. - </p> - -<h3 id="bugreport">Bug reports</h3> - <p> - The W3C maintains a public bug tracking database known as <a - href="http://www.w3.org/Bugs/Public/">Bugzilla</a> where developers - and other technical users can log bug reports and feature suggestions - directly. If you are not familiar with issue tracking systems in general - or the Bugzilla bug tracker, send your feedback to the <a href="#mailinglist">mailing list</a> - and someone on the W3C Validator Team will take care of logging your - issue as appropriate. - </p> - - <p>Before you enter a new bug in this database, we strongly encourage you to check that it is not yet in the list of opened issues. Here are a few links that you can use:</p> - - <ul> - <li><a href="http://www.w3.org/Bugs/">W3C issue tracking system homepage</a></li> - <li><a href="http://www.w3.org/Bugs/Public/buglist.cgi?product=Validator;bug_status=NEW;bug_status=ASSIGNED;bug_status=REOPENED;order=bugs.bug_id">All open Markup Validator issues</a></li> - <li><a href="http://www.w3.org/Bugs/Public/buglist.cgi?product=Validator;order=bugs.bug_id">All Markup Validator issues</a></li> - <li><a href="http://www.w3.org/Bugs/Public/query.cgi?product=Validator">Search Markup Validator issues</a></li> - <li><a href="http://www.w3.org/Bugs/Public/enter_bug.cgi?product=Validator">New Markup Validator issue</a></li> - </ul> - - <form method="get" action="http://www.w3.org/Bugs/Public/buglist.cgi"> - <p>You may also search the bug database directly:<br /> - <input name="short_desc_type" type="hidden" value="allwordssubstr" /> - <input name="product" type="hidden" value="Validator" /> - <input name="short_desc" type="text" size="40" maxlength="100" value="" /> - <input type="submit" name="search" value="Search Bug database" /> - </p> -</form> - -</div> -<!--#include virtual="footer.html" --> -</body> -</html> - diff --git a/htdocs/images/.htaccess b/htdocs/images/.htaccess deleted file mode 100644 index e283152..0000000 --- a/htdocs/images/.htaccess +++ /dev/null @@ -1,6 +0,0 @@ -# -# $Id: .htaccess,v 1.1 2001-02-18 01:06:28 gerald Exp $ -# - -Header set Cache-Control "max-age=604800" - diff --git a/htdocs/index.html b/htdocs/index.html index 89991b5..b4c44bd 100755 --- a/htdocs/index.html +++ b/htdocs/index.html @@ -1,5 +1,5 @@ -<!--#set var="revision" value="\$Id: index.html,v 1.74 2005-08-08 00:27:39 ot Exp $" ---><!--#set var="date" value="\$Date: 2005-08-08 00:27:39 $" +<!--#set var="revision" value="\$Id: index.html,v 1.75 2005-10-20 06:46:50 ot Exp $" +--><!--#set var="date" value="\$Date: 2005-10-20 06:46:50 $" --><!--#set var="title" value="The W3C Markup Validation Service" --><!--#set var="relroot" value="./" --><!--#include virtual="header.html" --> @@ -87,22 +87,23 @@ <div id="recent"> <h2>Recent Updates</h2> <dl id="news"> + <dt><a href="whatsnew.html#t2005-10-18">2005-10-18</a>: Markup Validator v0.7.1 Released</dt> + <dd> + Released version 0.7.1 of the Markup Validator, a maintenance release + introducing performance enhancements and including minor fixes + in the user interface and in the "Direct Input" validation results. + </dd> + <dt><a href="whatsnew.html#t2005-08-08">2005-08-08</a>: Markup Validator v0.7.0 Released</dt> <dd>Released version 0.7.0, including improvements in User Interface and feedback mechanisms, support for installation on Windows platform, better support for both W3C and non-W3C document types, usage of templates for validation results, and a number of bug fixes.</dd> - <dt><a href="whatsnew.html#t2004-07-23">2004-07-23</a>: - Markup Validator v0.6.7 Released</dt> - <dd> - Released version 0.6.7, a maintenance release that fixes a few minor - bugs, improves authentication proxying, and makes some slight - tweaks to the website style and markup. - </dd> </dl> <p class="intro"> These are the most recent major changes to this service. See - "<a href="whatsnew.html">What's New</a>" for more details. + "<a href="whatsnew.html">What's New</a>" for more details. + News for this service are also available as <a href="whatsnew.atom">an ATOM feed</a>. </p> </div> diff --git a/htdocs/source/index.html b/htdocs/source/index.html index 6a596db..7ec47af 100755 --- a/htdocs/source/index.html +++ b/htdocs/source/index.html @@ -1,5 +1,5 @@ -<!--#set var="revision" value="\$Id: index.html,v 1.38 2005-08-12 19:38:01 ville Exp $" ---><!--#set var="date" value="\$Date: 2005-08-12 19:38:01 $" +<!--#set var="revision" value="\$Id: index.html,v 1.39 2005-10-20 06:46:50 ot Exp $" +--><!--#set var="date" value="\$Date: 2005-10-20 06:46:50 $" --><!--#set var="title" value="Source Code Availability for The W3C Markup Validation Service" --><!--#set var="relroot" value="../" --><!--#include virtual="../header.html" --> @@ -124,9 +124,9 @@ <p> If you intend to actively mirror the code and/or contribute patches to the code, you should install and become familiar - with <a href="http://www.cvshome.org/">CVS</a>; + with <a href="http://www.nongnu.org/cvs/">CVS</a>; this is the tool we use for revision control and is generally - a good thing to <a href="http://www.cvshome.org/docs/">get to + a good thing to <a href="http://ximbiot.com/cvs/manual/">get to know</a>. </p> <p> @@ -138,7 +138,7 @@ bash$ <kbd>cvs login</kbd> (Logging in to anonymous@dev.w3.org) CVS password: <kbd>anonymous</kbd> - bash$ <kbd>cvs get -r validator-0_7_0-release validator</kbd> + bash$ <kbd>cvs get -r validator-0_7_1-release validator</kbd> cvs server: Updating validator cvs server: Updating validator/htdocs U validator/htdocs/about.html diff --git a/htdocs/whatsnew.html b/htdocs/whatsnew.html index 86aff4e..4d3c0ed 100755 --- a/htdocs/whatsnew.html +++ b/htdocs/whatsnew.html @@ -1,5 +1,5 @@ -<!--#set var="revision" value="\$Id: whatsnew.html,v 1.52 2005-10-07 03:55:31 ot Exp $" ---><!--#set var="date" value="\$Date: 2005-10-07 03:55:31 $" +<!--#set var="revision" value="\$Id: whatsnew.html,v 1.53 2005-10-20 06:46:50 ot Exp $" +--><!--#set var="date" value="\$Date: 2005-10-20 06:46:50 $" --><!--#set var="title" value="What's New at The W3C Markup Validation Service" --><!--#set var="relroot" value="./" --><!--#include virtual="header.html" --> @@ -13,12 +13,29 @@ page, see <a href="http://dev.w3.org/cvsweb/validator/">the <acronym title="Concurrent Versions System">CVS</acronym> log</a>. </p> + <p> + News for this service are also available as <a href="whatsnew.atom">an ATOM feed</a>. + </p> </div> <dl id="news"> + <dt id="t2005-10-18">2005-10-18 — 0.7.1 Release:</dt> + <dd> + <p> + Releasing version 0.7.1 of the Markup Validator, a maintenance release + introducing performance enhancements and including minor + <a href="http://www.w3.org/Bugs/Public/buglist.cgi?bug_id=1809%2C+1833%2C+1839%2C+1845">fixes</a> + in the user interface and in the "Direct Input" validation results. + </p> + </dd> + <dt id="t2005-08-08">2005-08-08 — 0.7.0 Release:</dt> - <dd>Stable release including all the fixes and improvements made in consecutive - beta versions <a href="#t2005-07-28">0.7.0 Beta #2</a> and - <a href="#t2005-07-12">0.7.0 Beta #1</a>.</dd> + <dd> + <p> + Stable release including all the fixes and improvements made in consecutive + beta versions <a href="#t2005-07-28">0.7.0 Beta #2</a> and + <a href="#t2005-07-12">0.7.0 Beta #1</a>. + </p> + </dd> <dt id="t2005-07-28">2005-07-28 — 0.7.0 Beta #2:</dt> <dd> <p> diff --git a/misc/w3c-markup-validator.spec b/misc/w3c-markup-validator.spec index 2c64034..0b3aef2 100644 --- a/misc/w3c-markup-validator.spec +++ b/misc/w3c-markup-validator.spec @@ -1,22 +1,25 @@ # RPM spec file for the W3C Markup Validator -# $Id: w3c-markup-validator.spec,v 1.5 2004-10-14 09:51:20 ville Exp $ +# $Id: w3c-markup-validator.spec,v 1.6 2005-10-20 06:48:53 ot Exp $ + +%{expand: %%define tbver %(echo %{version} | tr . _)} Name: w3c-markup-validator -Version: 0.7.0 -Release: 0.1.cvs -Epoch: 0 +Version: 0.7.1 +Release: 1 Summary: W3C Markup Validator Group: Applications/Internet License: W3C Software License URL: http://validator.w3.org/ -Source0: http://validator.w3.org/validator-0_7_0.tar.gz -Source1: http://validator.w3.org/sgml-lib-0_7_0.tar.gz +Source0: http://validator.w3.org/validator-%{tbver}.tar.gz +Source1: http://validator.w3.org/sgml-lib-%{tbver}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl -Requires: httpd, openjade >= 0:1.3.2, %{name}-libs = %{epoch}:%{version} +Requires: httpd +Requires: openjade >= 1.3.2 +Requires: %{name}-libs = %{version} Obsoletes: w3c-validator %description @@ -37,61 +40,40 @@ SGML and XML DTDs for the W3C Markup Validator. %setup -q -a 1 -n validator-%{version} mv validator-%{version}/htdocs/sgml-lib . -# Localize config files -perl -pi -e \ - 's|^(\s*)#Base\s*=.*|${1}Base = %{_datadir}/%{name}| ; - s|^(\s*Library\s*=\s*).*|${1}%{_datadir}/sgml/%{name}| ; +# Localize configs. +%{__perl} -pi -e \ + 's|/usr/local/validator\b|%{_datadir}/%{name}|' \ + htdocs/config/validator.conf httpd/conf/httpd.conf httpd/cgi-bin/* +%{__perl} -pi -e \ + 's|^(\s*Library\s*=\s*).*|${1}%{_datadir}/sgml/%{name}| ; s|\bwww-validator\@w3\.org\b|root\@localhost| ; s|/validator\.w3\.org/|/localhost/w3c-validator/|' \ htdocs/config/validator.conf -# TODO: conneg config for images -perl -pi -e \ - 's|^(\s*URI\s*=\s*).*validator\.w3\.org/images/(\S+) - |${1}images/${2}.gif|x ; - s|^(\s*URI\s*=\s*).*www\.w3\.org/Icons/valid-html(\d+).* - |${1}images/vh${2}.gif|x ; - s|^(\s*URI\s*=\s*).*www\.w3\.org/Icons/valid-xhtml(\d+).* - |${1}images/vxhtml${2}.gif|x' \ - htdocs/config/types.conf -perl -pi -e \ - 's|/usr/share/w3c-markup-validator|%{_datadir}/%{name}|g' \ - httpd/conf/httpd.conf # Move config out of the way mv htdocs/config __config -# Fixup permissions -find . -type d | xargs chmod 755 -find . -type f | xargs chmod 644 -chmod 755 httpd/cgi-bin/check - %build -# Not %install rm -rf $RPM_BUILD_ROOT -mkdir -pm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs - -# Script -cp -p httpd/cgi-bin/check $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs -# HTML and stuff -cp -pR htdocs/* $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs -# Templates -cp -pR share $RPM_BUILD_ROOT%{_datadir}/%{name} # Config files -mkdir -pm 755 $RPM_BUILD_ROOT%{_sysconfdir}/w3c -cp -p __config/* $RPM_BUILD_ROOT%{_sysconfdir}/w3c -mkdir -pm 755 $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d -cp -p httpd/conf/httpd.conf \ +install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/w3c +install -pm 644 __config/* $RPM_BUILD_ROOT%{_sysconfdir}/w3c +install -Dpm 644 httpd/conf/httpd.conf \ $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{name}.conf +# Scripts, HTML, etc. +install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name} +cp -pR httpd/cgi-bin htdocs share $RPM_BUILD_ROOT%{_datadir}/%{name} + # SGML library -mkdir -pm 755 $RPM_BUILD_ROOT%{_datadir}/sgml +install -dm 755 $RPM_BUILD_ROOT%{_datadir}/sgml cp -pR sgml-lib $RPM_BUILD_ROOT%{_datadir}/sgml/%{name} -mkdir -pm 755 $RPM_BUILD_ROOT%{_sysconfdir}/sgml +install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/sgml touch $RPM_BUILD_ROOT%{_sysconfdir}/sgml/%{name}-%{version}-%{release}.cat @@ -100,9 +82,7 @@ rm -rf $RPM_BUILD_ROOT %post -if [ $1 -eq 1 ] ; then - %{_initrddir}/httpd reload &>/dev/null || : -fi +[ $1 -eq 1 ] && %{_initrddir}/httpd reload &>/dev/null || : %postun %{_initrddir}/httpd reload &>/dev/null || : @@ -124,21 +104,24 @@ done %files %defattr(-,root,root,-) -# Install path has changed in 0.7.0 (htdocs/ added to "base" path) so we don't -# want (noreplace) here. Add it back in > 0.7.0. +# Configs not "noreplace", they're incompatible in 0.6.x and 0.7.x. %config %{_sysconfdir}/httpd/conf.d/%{name}.conf -# Config file format changed in 0.7.0 so we don't want (noreplace) here. -# Add it back in > 0.7.0. -%config %{_sysconfdir}/w3c -%{_datadir}/%{name} +%config %{_sysconfdir}/w3c/ +%{_datadir}/%{name}/ %files libs %defattr(-,root,root,-) %ghost %config %{_sysconfdir}/sgml/%{name}-%{version}-%{release}.cat -%{_datadir}/sgml/%{name} +%{_datadir}/sgml/%{name}/ %changelog +* Sat Oct 8 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.7.1-1 +- 0.7.1. + +* Fri Sep 23 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.7.0-1 +- Update to 0.7.0. + * Thu Oct 14 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7.0-0.1.cvs - Bring -libs post(un)install scriptlets up to date with sgml-lib/*.soc. diff --git a/share/templates/en_US/error_messages.cfg b/share/templates/en_US/error_messages.cfg index 427e9ca..5266c1d 100644 --- a/share/templates/en_US/error_messages.cfg +++ b/share/templates/en_US/error_messages.cfg @@ -109,7 +109,7 @@ verbose <<.EOF. <div class="ve mid-28"> <p> - Check that you are using a proper syntax for you comments, e.g: <!-- comment here -->. + Check that you are using a proper syntax for your comments, e.g: <!-- comment here -->. This error may appear if you forget the last "--" to close one comment, therefore including the rest of the content in your comment. </p> @@ -168,7 +168,7 @@ verbose <<.EOF. <div class="ve mid-42"> <p> - This error may appear if you are using a bad syntax for you comments, such as "<!invalid comment>" + This error may appear if you are using a bad syntax for your comments, such as "<!invalid comment>" The proper syntax for comments is <!-- your comment here -->. </p> </div> @@ -778,7 +778,7 @@ verbose <<.EOF. <div class="ve mid-137"> <p> - Check that you are using a proper syntax for you comments, e.g: <!-- comment here -->. + Check that you are using a proper syntax for your comments, e.g: <!-- comment here -->. This error may appear if you forget the last "--" to close one comment, and later open another. </p> </div> |