svn commit: r952974 - in /websites/staging/sling/trunk/content: ./ documentation/bundles/mime-type-support-commons-mime.html

[bu...@apache.org]

Author: buildbot
Date: Thu May 28 09:51:49 2015
New Revision: 952974

Log:
Staging update by buildbot for sling

Modified:
    websites/staging/sling/trunk/content/   (props changed)
    websites/staging/sling/trunk/content/documentation/bundles/mime-type-support-commons-mime.html

Propchange: websites/staging/sling/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Thu May 28 09:51:49 2015
@@ -1 +1 @@
-1682192
+1682193

Modified: websites/staging/sling/trunk/content/documentation/bundles/mime-type-support-commons-mime.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/bundles/mime-type-support-commons-mime.html (original)
+++ websites/staging/sling/trunk/content/documentation/bundles/mime-type-support-commons-mime.html Thu May 28 09:51:49 2015
@@ -123,7 +123,10 @@
 <h2 id="the-sling-contentawaremimetypeservice">The Sling ContentAwareMimeTypeService</h2>
 <p>For content-based mime type detection (as opposed to filename-based detection), the <code>org.apache.sling.commons.contentdetection</code> bundle 
 provides the <code>ContentAwareMimeTypeService</code>, which takes an <code>InputStream</code> that's analyzed to detect its mime type, using Apache Tika
-by default.</p>
+by default:</p>
+<ul>
+<li><code>getMimeType(String filename, InputStream content)</code> -- given a filename and an <code>InputStream</code> that points to the file contents, this method first tries content-based detection using the stream, and falls back to filename-based detection if needed.</li>
+</ul>
 <h2 id="and-more">And More...</h2>
 <p>Besides the <code>MimeTypeService</code> provided by Apache Sling, there is actually more:</p>
 <ul>
@@ -162,7 +165,7 @@ by default.</p>
 <p>The Apache Sling MIME type mapping support bundle implements a plugin for the Apache Felix Web Console which may be consulted to investigate the current contents of the MIME type mapping tables.</p>
 <p><img alt="Mime Types Web Console Plugin" src="/documentation/bundles/mimetypes.png" /></p>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1682192 by bdelacretaz on Thu, 28 May 2015 09:49:03 +0000
+        Rev. 1682193 by bdelacretaz on Thu, 28 May 2015 09:51:42 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project