From: Hiroaki Kawai <kawai@apache.org>
Date: Mon, 9 Jan 2006 10:54:53 +0000 (+0000)
Subject: Sync.
X-Git-Tag: 2.2.1~161
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7bbf4f95a6c5be8ab9296c8e2adc6ff66b43f590;p=thirdparty%2Fapache%2Fhttpd.git

Sync.
English Revision: 290817

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@367269 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/content-negotiation.xml.ja b/docs/manual/content-negotiation.xml.ja
index b7ae4ce2947..6b26ae34224 100644
--- a/docs/manual/content-negotiation.xml.ja
+++ b/docs/manual/content-negotiation.xml.ja
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='iso-2022-jp' ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
-<!-- English Revision: 151408:290817 (outdated) -->
+<!-- English Revision: 290817 -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -121,7 +121,7 @@
 
     <p>タイプマップは <code>type-map</code> ハンドラ
     (もしくは、古い Apache
-    の設定と下位互換である MIME タイプ
+    の設定と下位互換である <glossary ref="mime-type">MIME タイプ</glossary>
     <code>application/x-type-map</code>)
     に関連付けられたドキュメントです。
     この機能を使うためには、あるファイルの拡張子を