svn commit: r1596587 - in /tika/site: publish/1.5/detection.html src/site/apt/1.5/detection.apt

[ni...@apache.org]

Author: nick
Date: Wed May 21 14:40:14 2014
New Revision: 1596587

URL: http://svn.apache.org/r1596587
Log:
Add a note that Tika supports more mime magic match types than the original Freedesktop format does

Modified:
    tika/site/publish/1.5/detection.html
    tika/site/src/site/apt/1.5/detection.apt

Modified: tika/site/publish/1.5/detection.html
URL: http://svn.apache.org/viewvc/tika/site/publish/1.5/detection.html?rev=1596587&r1=1596586&r2=1596587&view=diff
==============================================================================
--- tika/site/publish/1.5/detection.html (original)
+++ tika/site/publish/1.5/detection.html Wed May 21 14:40:14 2014
@@ -110,7 +110,7 @@
 <div class="section">
 <h3><a name="Mime_Magic_Detction">Mime Magic Detction</a></h3>
 <p>By looking for special (&quot;magic&quot;) patterns of bytes near the start of the file, it is often possible to detect the type of the file. For some file types, this is a simple process. For others, typically container based formats, the magic detection may not be enough. (More detail on detecting container formats below)</p>
-<p>Tika is able to make use of a a mime magic info file, in the <a class="externalLink" href="http://www.freedesktop.org/standards/shared-mime-info">Freedesktop MIME-info</a> format to peform mime magic detection.</p>
+<p>Tika is able to make use of a a mime magic info file, in the <a class="externalLink" href="http://www.freedesktop.org/standards/shared-mime-info">Freedesktop MIME-info</a> format to peform mime magic detection. (Note that Tika supports a few more match types than Freedesktop does)</p>
 <p>This is provided within Tika by <a href="./api/org/apache/tika/detect/MagicDetector.html">org.apache.tika.detect.MagicDetector</a>. It is most commonly access via <a href="./api/org/apache/tika/mime/MimeTypes.html">org.apache.tika.mime.MimeTypes</a>, normally sourced from the <tt>tika-mimetypes.xml</tt> and <tt>custom-mimetypes.xml</tt> files. For more information on defining your own custom mimetypes, see <a href="./parser_guide.html#Add_your_MIME-Type">the new parser guide</a>.</p></div>
 <div class="section">
 <h3><a name="Resource_Name_Based_Detection">Resource Name Based Detection</a></h3>

Modified: tika/site/src/site/apt/1.5/detection.apt
URL: http://svn.apache.org/viewvc/tika/site/src/site/apt/1.5/detection.apt?rev=1596587&r1=1596586&r2=1596587&view=diff
==============================================================================
--- tika/site/src/site/apt/1.5/detection.apt (original)
+++ tika/site/src/site/apt/1.5/detection.apt Wed May 21 14:40:14 2014
@@ -60,7 +60,8 @@ MediaType detect(java.io.InputStream inp
 
   Tika is able to make use of a a mime magic info file, in the 
   {{{http://www.freedesktop.org/standards/shared-mime-info}Freedesktop MIME-info}} 
-  format to peform mime magic detection.
+  format to peform mime magic detection. (Note that Tika supports a few
+  more match types than Freedesktop does)
 
   This is provided within Tika by
   {{{./api/org/apache/tika/detect/MagicDetector.html}org.apache.tika.detect.MagicDetector}}. It is most commonly access via