From e66eabc553f3004dade2c869756fbff8ddc7bc03 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 25 Mar 2004 15:17:48 +0000
Subject: fix documentation regarding _ vs. -

git-svn-id: file:///home/lennart/svn/public/mod_mime_xattr/trunk@8 f01872de-66d6-0310-9185-fc3b30f50adc
---
 configure.ac       |  2 +-
 doc/README.html.in | 26 +++++++++++++++-----------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/configure.ac b/configure.ac
index e770276..dd204f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@
 # permissions and limitations under the License.
 
 AC_PREREQ(2.59)
-AC_INIT([mod_mime_xattr],[0.1],[mzzvzrkngge (at) 0pointer (dot) de])
+AC_INIT([mod_mime_xattr],[0.2],[mzzvzrkngge (at) 0pointer (dot) de])
 AC_CONFIG_SRCDIR([src/mod_mime_xattr.c])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([foreign -Wall])
diff --git a/doc/README.html.in b/doc/README.html.in
index 2414133..ac179eb 100644
--- a/doc/README.html.in
+++ b/doc/README.html.in
@@ -42,6 +42,10 @@ permissions and limitations under the License.</p>
 
 <h2><a name="news">News</a></h2>
 
+<div class="news-date">Wed Mar 24 2004: </div> <p class="news-text"><a
+href="@PACKAGE_URL@mod_mime_xattr-0.1.tar.gz">Version
+0.2</a> released; changes include: look for both <tt>user.mime_type</tt> and <tt>user.mime-type</tt> for compliance with XDG</p>
+
 <div class="news-date">Wed Mar 24 2004: </div> <p class="news-text"><a
 href="@PACKAGE_URL@mod_mime_xattr-0.1.tar.gz">Version
 0.1</a> released</p>
@@ -58,13 +62,13 @@ href="http://acl.bestbits.at/">ACL/EA patches</a> applied and vanilla
 Linux 2.6. The following attributes may be used:</p>
 
 <ul>
-  <li><tt>user.mime-type</tt>: set the mime type of a file
+  <li><tt>user.mime_type</tt>: set the MIME type of a file
   explicitly. This attribute is compatible with the <a
 href="http://www.freedesktop.org/Standards/shared-mime-info-spec">shared
 MIME database specification</a> as published by <a href="http://www.freedesktop.org/">freedesktop.org</a></li>
   <li><tt>user.charset</tt>: set the charset used in a file</li>
-  <li><tt>user.encoding</tt>: set the mime encoding of a file (e.g. <tt>gzip</tt>)</li>
-  <li><tt>user.apache-handler</tt>: set the apache handler of a file explicitly</li>
+  <li><tt>user.mime_encoding</tt>: set the MIME encoding of a file (e.g. <tt>gzip</tt>)</li>
+  <li><tt>user.apache_handler</tt>: set the apache handler of a file explicitly</li>
 </ul>
   
   
@@ -87,7 +91,7 @@ LoadModule negotiation_module /usr/lib/apache/1.3/mod_negotiation.so
 
 <p>If you add the new line before <tt>mod_mime</tt>, the latter will
 overwrite the MIME type settings <tt>mod_mime_xattr</tt>
-detected. Thus the extension of a file is more important than the EA <tt>user.mime-type</tt>. If specified in the opposite
+detected. Thus the extension of a file is more important than the EA <tt>user.mime_type</tt>. If specified in the opposite
 order (which is recommended), the values set in the EAs take
 precedence.</p>
 
@@ -96,8 +100,8 @@ precedence.</p>
 configuration directives:</p>
 
 <ul>
-  <li><tt>XAttrMimeType [On/Off]</tt>; Enable or disable the use of the <tt>user.mime-type</tt>, <tt>user.charset</tt> and <tt>user.encoding</tt> EAs.</li>
-  <li><tt>XAttrHandler [On/Off]</tt>; Enable or disable the use of the <tt>user.apache-handler</tt> EA</li>
+  <li><tt>XAttrMimeType [On/Off]</tt>; Enable or disable the use of the <tt>user.mime_type</tt>, <tt>user.charset</tt> and <tt>user.mime_encoding</tt> EAs.</li>
+  <li><tt>XAttrHandler [On/Off]</tt>; Enable or disable the use of the <tt>user.apache_handler</tt> EA</li>
 </ul>
 
 <p>A simple usage example:</p>
@@ -114,20 +118,20 @@ configuration directives:</p>
 
 <p>You may get/set an extended attribute for a file with the Linux command line utilities <tt>getfattr</tt>/<tt>setfattr</tt>:</p>
 
-<pre>setfattr -n "user.mime-type" -v "text/html" foo.file</pre>
+<pre>setfattr -n "user.mime_type" -v "text/html" foo.file</pre>
 
 <p>The file <tt>foo.file</tt> will be served as HTML now. For more information consult the concerning man pages.</p>
 
 <p>If used with symbolic links, <tt>mod_mime_xattr</tt> will first
 check if an EA is set for the symlink itself, and second for the file
 the link points to. The <tt>user.charset</tt> EA is only used when the
-<tt>user.mime-type</tt> EA is set as well.</p>
+<tt>user.mime_type</tt> EA is set as well.</p>
 
 <h2>CGI and PHP scripts</h2>
 
-<p>You may use the <tt>user.apache-handler</tt> EA to mark a file as CGI script:</p>
+<p>You may use the <tt>user.apache_handler</tt> EA to mark a file as CGI script:</p>
 
-<pre>setfattr -n "user.apache-handler" -v "cgi-script" foo.html</pre>
+<pre>setfattr -n "user.apache_handler" -v "cgi-script" foo.html</pre>
 
 <p>This will force the execution of <tt>foo.html</tt> as CGI program,
 regardless of the name of the file which identifies it as an HTML
@@ -137,7 +141,7 @@ file.</p>
 your Apache web server you may mark a file as PHP script regardless of
 its name:</p>
 
-<pre>setfattr -n "user.mime-type" -v "application/x-httpd-php" bar.html</pre>
+<pre>setfattr -n "user.mime_type" -v "application/x-httpd-php" bar.html</pre>
 
 <p><b>Think twice</b> before enabling <tt>mod_mime_xattr</tt> for document
 trees you do not trust because a rogue user may mark his files as
-- 
cgit