httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From field...@apache.org
Subject svn commit: r774547 - /httpd/httpd/branches/2.2.x/docs/conf/mime.types
Date Wed, 13 May 2009 21:51:21 GMT
Author: fielding
Date: Wed May 13 21:51:21 2009
New Revision: 774547

URL: http://svn.apache.org/viewvc?rev=774547&view=rev
Log:
merge from trunk r774530

Modified:
    httpd/httpd/branches/2.2.x/docs/conf/mime.types   (contents, props changed)

Modified: httpd/httpd/branches/2.2.x/docs/conf/mime.types
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/conf/mime.types?rev=774547&r1=774546&r2=774547&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/conf/mime.types (original)
+++ httpd/httpd/branches/2.2.x/docs/conf/mime.types Wed May 13 21:51:21 2009
@@ -1,13 +1,16 @@
-# This is a comment. I love comments.
-
-# This file controls what Internet media types are sent to the client for
-# given file extension(s).  Sending the correct media type to the client
-# is important so they know how to handle the content of the file.
-# Extra types can either be added here or by using an AddType directive
-# in your config files. For more information about Internet media types,
-# please read RFC 2045, 2046, 2047, 2048, and 2077.  The Internet media type
-# registry is at <http://www.iana.org/assignments/media-types/>.
-
+# This file maps Internet media types to unique file extension(s).
+# Although created for httpd, this file is used by many software systems
+# and has been placed in the public domain for unlimited redisribution.
+#
+# The table below contains both registered and (common) unregistered types.
+# A type that has no unique extension can be ignored -- they are listed
+# here to guide configurations toward known types and to make it easier to
+# identify "new" types.  File extensions are also commonly used to indicate
+# content languages and encodings, so choose them carefully.
+#
+# Internet media types should be registered as described in RFC 4288.
+# The registry is at <http://www.iana.org/assignments/media-types/>.
+#
 # MIME type					Extensions
 application/activemessage
 application/andrew-inset			ez

Propchange: httpd/httpd/branches/2.2.x/docs/conf/mime.types
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 21:51:21 2009
@@ -1 +1 @@
-/httpd/httpd/trunk/docs/conf/mime.types:83749-774500
+/httpd/httpd/trunk/docs/conf/mime.types:83749-774546



Mime
View raw message