Finalizing the 1.23 release.v1.23

11 files changed, 76 insertions, 53 deletions

diff --git a/.hoerc b/.hoerc
index 6673a01cbb..9550ce2b77 100644
--- a/.hoerc
+++ b/.hoerc
@@ -1,2 +1,2 @@
 ---
-exclude: !ruby/regexp /(tmp|swp)$|CVS|TAGS|\.(svn|git|hg|DS_Store|idea)|Gemfile.lock|type-lists\//
+exclude: !ruby/regexp /(tmp|swp)$|CVS|TAGS|\.(svn|git|hg|DS_Store|idea)|Gemfile\.lock|type-lists\/|\.gemspec/
diff --git a/Gemfile b/Gemfile
index 53d55d3dd3..9ac891d22d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,7 +7,7 @@ source "https://rubygems.org/"
 
 gem "rubyforge", ">=2.0.4", :group => [:development, :test]
 gem "minitest", "~>4.7", :group => [:development, :test]
-gem "rdoc", "~>3.10", :group => [:development, :test]
+gem "rdoc", "~>4.0", :group => [:development, :test]
 gem "hoe-bundler", "~>1.2", :group => [:development, :test]
 gem "hoe-doofus", "~>1.0", :group => [:development, :test]
 gem "hoe-gemspec", "~>1.0", :group => [:development, :test]
@@ -16,6 +16,6 @@ gem "hoe-rubygems", "~>1.0", :group => [:development, :test]
 gem "hoe-travis", "~>1.2", :group => [:development, :test]
 gem "nokogiri", "~>1.5", :group => [:development, :test]
 gem "rake", "~>10.0", :group => [:development, :test]
-gem "hoe", "~>3.5", :group => [:development, :test]
+gem "hoe", "~>3.6", :group => [:development, :test]
 
 # vim: syntax=ruby
diff --git a/History.rdoc b/History.rdoc
index 9384cc26f3..9996d51e23 100644
--- a/History.rdoc
+++ b/History.rdoc
@@ -1,3 +1,22 @@
+== 1.23 / 2013-04-20
+
+* New Feature:
+  * Arnaud Meuret (ameuret) suggested that it could be useful if the MIME type
+    collection was enumerable, so he implemented it in #30. Thanks for the
+    contribution! https://github.com/halostatue/mime-types/pull/30
+* Updated MIME Types:
+  * RFC6910 was adopted (application/call-completion).
+  * RFC6902 was adopted (application/json-patch\+json).
+  * RFC6917 was adopted (application/mrb-consumer\+xml,
+    application/mrb-publish\+xml).
+  * RFC6922 was adopted (application/sql).
+  * RFC2560 is being
+    {updated}[http://tools.ietf.org/html/draft-ietf-pkix-rfc2560bis].
+* Administrivia:
+  * The gemspec now includes information about the licenses under which the
+    mime-types gem is available.
+  * Using hoe-gemspec2 instead of hoe-gemspec.
+
 == 1.22 / 2013-03-30
 
 * New MIME Types:
diff --git a/Manifest.txt b/Manifest.txt
index f7470fa604..93b32dc272 100644
--- a/Manifest.txt
+++ b/Manifest.txt
@@ -36,6 +36,5 @@ lib/mime/types/text.vms
 lib/mime/types/video
 lib/mime/types/video.nonstandard
 lib/mime/types/video.obsolete
-mime-types.gemspec
 test/test_mime_type.rb
 test/test_mime_types.rb
diff --git a/README.rdoc b/README.rdoc
index cad00d8364..d93b843cbd 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -8,17 +8,17 @@ rdoc :: http://mime-types.rubyforge.org/
 == Description
 
 This library allows for the identification of a file's likely MIME content
-type. This is release 1.22 with new MIME types. The identification of MIME
-content type is based on a file's filename extensions.
-
-MIME types are used in MIME-compliant communications, as in e-mail or
-HTTP traffic, to indicate the type of content which is transmitted.
-MIME::Types provides the ability for detailed information about MIME
-entities (provided as a set of MIME::Type objects) to be determined and
-used programmatically. There are many types defined by RFCs and vendors,
-so the list is long but not complete; don't hesitate to ask to add
-additional information. This library follows the IANA collection of MIME
-types (see below for reference).
+type. This is release 1.23 that adds the ability to enumerate over the
+collection of MIME types and updates the sources of a few MIME types. The
+identification of MIME content type is based on a file's filename extensions.
+
+MIME types are used in MIME-compliant communications, as in e-mail or HTTP
+traffic, to indicate the type of content which is transmitted. MIME::Types
+provides the ability for detailed information about MIME entities (provided as
+a set of MIME::Type objects) to be determined and used programmatically. There
+are many types defined by RFCs and vendors, so the list is long but not
+complete; don't hesitate to ask to add additional information. This library
+follows the IANA collection of MIME types (see below for reference).
 
 MIME::Types for Ruby was originally based on and synchronized with MIME::Types
 for Perl by Mark Overmeer, copyright 2001 - 2009. As of version 1.15, the data
@@ -52,6 +52,8 @@ files). A MIME::Type stores the known information about one MIME type.
     puts plaintext == 'text/plain'       # => true
     puts MIME::Type.simplified('x-appl/x-zip') # => 'appl/zip'
 
+    puts MIME::Types.any? { |type| type.content_type == 'text/plain' }
+
 == Continuous Integration Status
 
 {<img src="https://travis-ci.org/halostatue/mime-types.png" />}[https://travis-ci.org/halostatue/mime-types]
diff --git a/Rakefile b/Rakefile
index 84918a4599..5c73792df7 100644
--- a/Rakefile
+++ b/Rakefile
@@ -6,7 +6,7 @@ require 'hoe'
 Hoe.plugin :bundler
 Hoe.plugin :doofus
 Hoe.plugin :email
-Hoe.plugin :gemspec
+Hoe.plugin :gemspec2
 Hoe.plugin :git
 Hoe.plugin :rubyforge
 Hoe.plugin :minitest
@@ -21,10 +21,11 @@ spec = Hoe.spec 'mime-types' do
   self.history_file = 'History.rdoc'
   self.readme_file = 'README.rdoc'
   self.extra_rdoc_files = FileList["*.rdoc"].to_a
+  self.licenses = ["MIT", "Artistic 2.0", "GPL-2"]
 
   self.extra_dev_deps << ['hoe-bundler', '~> 1.2']
   self.extra_dev_deps << ['hoe-doofus', '~> 1.0']
-  self.extra_dev_deps << ['hoe-gemspec', '~> 1.0']
+  self.extra_dev_deps << ['hoe-gemspec2', '~> 1.1']
   self.extra_dev_deps << ['hoe-git', '~> 1.5']
   self.extra_dev_deps << ['hoe-rubygems', '~> 1.0']
   self.extra_dev_deps << ['hoe-travis', '~> 1.2']
@@ -195,7 +196,7 @@ namespace :mime do
 http://www.ltsw.se/knbase/internet/mime.htp
 http://www.webmaster-toolkit.com/mime-types.shtml
 http://plugindoc.mozdev.org/winmime.php
-http://standards.freedesktop.org/shared-mime-info-spec/shared-mime-info-spec-latest.html  
+http://standards.freedesktop.org/shared-mime-info-spec/shared-mime-info-spec-latest.html
 http://www.feedforall.com/mime-types.htm
 http://www.iana.org/assignments/media-types/
   EOS
diff --git a/lib/mime/types.rb b/lib/mime/types.rb
index ca7314b89f..d0d912b679 100644
--- a/lib/mime/types.rb
+++ b/lib/mime/types.rb
@@ -25,7 +25,7 @@ module MIME
   #
   class Type
     # The released version of Ruby MIME::Types
-    VERSION = '1.22'
+    VERSION = '1.23'
 
     include Comparable
 
diff --git a/lib/mime/types/application b/lib/mime/types/application
index 288c43e980..97dc69ea48 100644
--- a/lib/mime/types/application
+++ b/lib/mime/types/application
@@ -12,7 +12,7 @@ application/auth-policy+xml :8bit 'IANA,RFC4745
 application/batch-SMTP 'IANA,RFC2442
 application/beep+xml 'IANA,RFC3080
 application/calendar+xml 'IANA,RFC6321
-application/call-completion 'IANA,{RFC-ietf-bliss-call-completion-19=http://tools.ietf.org/html/draft-ietf-bliss-call-completion}
+application/call-completion 'IANA,RFC6910
 application/cals-1840 'IANA,RFC1895
 application/ccmp+xml 'IANA,RFC6503
 application/ccxml+xml 'IANA,RFC4267
@@ -81,7 +81,7 @@ application/ipp 'IANA,RFC2910
 application/isup 'IANA,RFC3204
 application/javascript @js :8bit 'IANA,RFC4329
 application/json @json :8bit 'IANA,RFC4627
-application/json-patch+json 'IANA,{RFC-ietf-appsawg-json-patch-10=http://tools.ietf.org/html/draft-ietf-appsawg-json-patch}
+application/json-patch+json 'IANA,RFC6902
 application/kpml-request+xml 'IANA,RFC4730
 application/kpml-response+xml 'IANA,RFC4730
 application/link-format 'IANA,RFC6690
@@ -123,8 +123,8 @@ application/mp4 @mp4,mpg4 'IANA,RFC4337,RFC6381
 application/mpeg4-generic 'IANA,RFC3640
 application/mpeg4-iod 'IANA,RFC4337
 application/mpeg4-iod-xmt 'IANA,RFC4337
-application/mrb-consumer+xml 'IANA,{RFC-ietf-mediactrl-mrb-19=http://tools.ietf.org/html/draft-ietf-mediactrl-mrb}
-application/mrb-publish+xml 'IANA,{RFC-ietf-mediactrl-mrb-19=http://tools.ietf.org/html/draft-ietf-mediactrl-mrb}
+application/mrb-consumer+xml 'IANA,RFC6917
+application/mrb-publish+xml 'IANA,RFC6917
 application/msc-ivr+xml 'IANA,RFC6231
 application/msc-mixer+xml 'IANA,RFC6505
 application/msword @doc,dot,wrd :base64 'IANA,[Lindner]
@@ -135,8 +135,8 @@ application/news-groupinfo 'IANA,RFC5537
 application/news-transmission 'IANA,RFC5537
 application/nlsml+xml 'IANA,RFC6787
 application/nss 'IANA,[Hammer]
-application/ocsp-request 'IANA,RFC2560
-application/ocsp-response 'IANA,RFC2560
+application/ocsp-request 'IANA,{RFC-ietf-pkix-rfc2560bis-20=http://tools.ietf.org/html/draft-ietf-pkix-rfc2560bis}
+application/ocsp-response 'IANA,{RFC-ietf-pkix-rfc2560bis-20=http://tools.ietf.org/html/draft-ietf-pkix-rfc2560bis}
 application/octet-stream @bin,dms,lha,lzh,exe,class,ani,pgp,so,dll,dylib :base64 'IANA,RFC2045,RFC2046
 application/oda @oda 'IANA,RFC2045,RFC2046
 application/oebps-package+xml 'IANA,RFC4839
@@ -217,7 +217,7 @@ application/soap+xml 'IANA,RFC3902
 application/sparql-query 'IANA,[W3C]
 application/sparql-results+xml 'IANA,[W3C]
 application/spirits-event+xml 'IANA,RFC3910
-application/sql 'IANA,{RFC-shafranovich-mime-sql-06=http://tools.ietf.org/html/draft-shafranovich-mime-sql}
+application/sql 'IANA,RFC6922
 application/srgs 'IANA,RFC4267
 application/srgs+xml 'IANA,RFC4267
 application/sru+xml 'IANA,RFC6207
diff --git a/mime-types.gemspec b/mime-types.gemspec
index ebd41a4713..b455084486 100644
--- a/mime-types.gemspec
+++ b/mime-types.gemspec
@@ -2,66 +2,68 @@
 
 Gem::Specification.new do |s|
   s.name = "mime-types"
-  s.version = "1.20.1"
+  s.version = "1.23"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Austin Ziegler"]
-  s.date = "2013-02-04"
-  s.description = "This library allows for the identification of a file's likely MIME content\ntype. This is release 1.20.1 with new MIME types. The identification of MIME\ncontent type is based on a file's filename extensions.\n\nMIME types are used in MIME-compliant communications, as in e-mail or\nHTTP traffic, to indicate the type of content which is transmitted.\nMIME::Types provides the ability for detailed information about MIME\nentities (provided as a set of MIME::Type objects) to be determined and\nused programmatically. There are many types defined by RFCs and vendors,\nso the list is long but not complete; don't hesitate to ask to add\nadditional information. This library follows the IANA collection of MIME\ntypes (see below for reference).\n\nMIME::Types for Ruby was originally based on and synchronized with MIME::Types\nfor Perl by Mark Overmeer, copyright 2001 - 2009. As of version 1.15, the data\nformat for the MIME::Type list has changed and the synchronization will no\nlonger happen.\n\nMIME::Types is built to conform to the MIME types of RFCs 2045 and 2231. It\nfollows the official {IANA registry}[http://www.iana.org/assignments/media-types/]\n({ftp}[ftp://ftp.iana.org/assignments/media-types]) with some unofficial types\nadded from the the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp]."
+  s.cert_chain = ["/Users/AZiegler/.gem/gem-public_cert.pem"]
+  s.date = "2013-04-21"
+  s.description = "This library allows for the identification of a file's likely MIME content\ntype. This is release 1.23 that adds the ability to enumerate over the\ncollection of MIME types and updates the sources of a few MIME types. The\nidentification of MIME content type is based on a file's filename extensions.\n\nMIME types are used in MIME-compliant communications, as in e-mail or HTTP\ntraffic, to indicate the type of content which is transmitted. MIME::Types\nprovides the ability for detailed information about MIME entities (provided as\na set of MIME::Type objects) to be determined and used programmatically. There\nare many types defined by RFCs and vendors, so the list is long but not\ncomplete; don't hesitate to ask to add additional information. This library\nfollows the IANA collection of MIME types (see below for reference).\n\nMIME::Types for Ruby was originally based on and synchronized with MIME::Types\nfor Perl by Mark Overmeer, copyright 2001 - 2009. As of version 1.15, the data\nformat for the MIME::Type list has changed and the synchronization will no\nlonger happen.\n\nMIME::Types is built to conform to the MIME types of RFCs 2045 and 2231. It\nfollows the official {IANA registry}[http://www.iana.org/assignments/media-types/]\n({ftp}[ftp://ftp.iana.org/assignments/media-types]) with some unofficial types\nadded from the the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp]."
   s.email = ["austin@rubyforge.org"]
   s.extra_rdoc_files = ["Contributing.rdoc", "History.rdoc", "Licence.rdoc", "Manifest.txt", "README.rdoc", "docs/COPYING.txt", "docs/artistic.txt", "Contributing.rdoc", "History.rdoc", "Licence.rdoc", "README.rdoc"]
-  s.files = [".travis.yml", "Contributing.rdoc", "Gemfile", "History.rdoc", "Licence.rdoc", "Manifest.txt", "README.rdoc", "Rakefile", "docs/COPYING.txt", "docs/artistic.txt", "lib/mime-types.rb", "lib/mime/types.rb", "lib/mime/types/application", "lib/mime/types/application.mac", "lib/mime/types/application.nonstandard", "lib/mime/types/application.obsolete", "lib/mime/types/audio", "lib/mime/types/audio.nonstandard", "lib/mime/types/audio.obsolete", "lib/mime/types/image", "lib/mime/types/image.nonstandard", "lib/mime/types/image.obsolete", "lib/mime/types/message", "lib/mime/types/message.obsolete", "lib/mime/types/model", "lib/mime/types/multipart", "lib/mime/types/multipart.nonstandard", "lib/mime/types/multipart.obsolete", "lib/mime/types/other.nonstandard", "lib/mime/types/text", "lib/mime/types/text.nonstandard", "lib/mime/types/text.obsolete", "lib/mime/types/text.vms", "lib/mime/types/video", "lib/mime/types/video.nonstandard", "lib/mime/types/video.obsolete", "mime-types.gemspec", "test/test_mime_type.rb", "test/test_mime_types.rb", ".gemtest"]
+  s.files = [".gemtest", ".hoerc", ".travis.yml", "Contributing.rdoc", "Gemfile", "History.rdoc", "Licence.rdoc", "Manifest.txt", "README.rdoc", "Rakefile", "docs/COPYING.txt", "docs/artistic.txt", "lib/mime-types.rb", "lib/mime/types.rb", "lib/mime/types/application", "lib/mime/types/application.mac", "lib/mime/types/application.nonstandard", "lib/mime/types/application.obsolete", "lib/mime/types/audio", "lib/mime/types/audio.nonstandard", "lib/mime/types/audio.obsolete", "lib/mime/types/image", "lib/mime/types/image.nonstandard", "lib/mime/types/image.obsolete", "lib/mime/types/message", "lib/mime/types/message.obsolete", "lib/mime/types/model", "lib/mime/types/multipart", "lib/mime/types/multipart.nonstandard", "lib/mime/types/multipart.obsolete", "lib/mime/types/other.nonstandard", "lib/mime/types/text", "lib/mime/types/text.nonstandard", "lib/mime/types/text.obsolete", "lib/mime/types/text.vms", "lib/mime/types/video", "lib/mime/types/video.nonstandard", "lib/mime/types/video.obsolete", "test/test_mime_type.rb", "test/test_mime_types.rb"]
   s.homepage = "http://mime-types.rubyforge.org/"
+  s.licenses = ["MIT", "Artistic 2.0", "GPL-2"]
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = "mime-types"
   s.rubygems_version = "1.8.25"
+  s.signing_key = "/Users/AZiegler/.gem/gem-private_key.pem"
   s.summary = "This library allows for the identification of a file's likely MIME content type"
   s.test_files = ["test/test_mime_type.rb", "test/test_mime_types.rb"]
-  s.licenses = ["MIT", "Artistic 2.0", "GPL-2"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rubyforge>, [">= 2.0.4"])
-      s.add_development_dependency(%q<minitest>, ["~> 4.5"])
-      s.add_development_dependency(%q<rdoc>, ["~> 3.10"])
+      s.add_development_dependency(%q<minitest>, ["~> 4.7"])
+      s.add_development_dependency(%q<rdoc>, ["~> 4.0"])
       s.add_development_dependency(%q<hoe-bundler>, ["~> 1.2"])
       s.add_development_dependency(%q<hoe-doofus>, ["~> 1.0"])
-      s.add_development_dependency(%q<hoe-gemspec>, ["~> 1.0"])
+      s.add_development_dependency(%q<hoe-gemspec2>, ["~> 1.1"])
       s.add_development_dependency(%q<hoe-git>, ["~> 1.5"])
       s.add_development_dependency(%q<hoe-rubygems>, ["~> 1.0"])
       s.add_development_dependency(%q<hoe-travis>, ["~> 1.2"])
       s.add_development_dependency(%q<nokogiri>, ["~> 1.5"])
       s.add_development_dependency(%q<rake>, ["~> 10.0"])
-      s.add_development_dependency(%q<hoe>, ["~> 3.5"])
+      s.add_development_dependency(%q<hoe>, ["~> 3.6"])
     else
       s.add_dependency(%q<rubyforge>, [">= 2.0.4"])
-      s.add_dependency(%q<minitest>, ["~> 4.5"])
-      s.add_dependency(%q<rdoc>, ["~> 3.10"])
+      s.add_dependency(%q<minitest>, ["~> 4.7"])
+      s.add_dependency(%q<rdoc>, ["~> 4.0"])
       s.add_dependency(%q<hoe-bundler>, ["~> 1.2"])
       s.add_dependency(%q<hoe-doofus>, ["~> 1.0"])
-      s.add_dependency(%q<hoe-gemspec>, ["~> 1.0"])
+      s.add_dependency(%q<hoe-gemspec2>, ["~> 1.1"])
       s.add_dependency(%q<hoe-git>, ["~> 1.5"])
       s.add_dependency(%q<hoe-rubygems>, ["~> 1.0"])
       s.add_dependency(%q<hoe-travis>, ["~> 1.2"])
       s.add_dependency(%q<nokogiri>, ["~> 1.5"])
       s.add_dependency(%q<rake>, ["~> 10.0"])
-      s.add_dependency(%q<hoe>, ["~> 3.5"])
+      s.add_dependency(%q<hoe>, ["~> 3.6"])
     end
   else
     s.add_dependency(%q<rubyforge>, [">= 2.0.4"])
-    s.add_dependency(%q<minitest>, ["~> 4.5"])
-    s.add_dependency(%q<rdoc>, ["~> 3.10"])
+    s.add_dependency(%q<minitest>, ["~> 4.7"])
+    s.add_dependency(%q<rdoc>, ["~> 4.0"])
     s.add_dependency(%q<hoe-bundler>, ["~> 1.2"])
     s.add_dependency(%q<hoe-doofus>, ["~> 1.0"])
-    s.add_dependency(%q<hoe-gemspec>, ["~> 1.0"])
+    s.add_dependency(%q<hoe-gemspec2>, ["~> 1.1"])
     s.add_dependency(%q<hoe-git>, ["~> 1.5"])
     s.add_dependency(%q<hoe-rubygems>, ["~> 1.0"])
     s.add_dependency(%q<hoe-travis>, ["~> 1.2"])
     s.add_dependency(%q<nokogiri>, ["~> 1.5"])
     s.add_dependency(%q<rake>, ["~> 10.0"])
-    s.add_dependency(%q<hoe>, ["~> 3.5"])
+    s.add_dependency(%q<hoe>, ["~> 3.6"])
   end
 end
diff --git a/test/test_mime_types.rb b/test/test_mime_types.rb
index f8bfd2f9ba..6827d9c5c5 100644
--- a/test/test_mime_types.rb
+++ b/test/test_mime_types.rb
@@ -70,11 +70,11 @@ class TestMIME_Types < MiniTest::Unit::TestCase #:nodoc:
     assert_equal(MIME::Types.of('gif', true), MIME::Types['image/gif'])
     assert(MIME::Types.of('zzz').empty?)
   end
-  
+
   def test_class_enumerable
     assert( MIME::Types.any? {|type| type.content_type == 'text/plain'} )
   end
-  
+
   def test_class_count
     assert(MIME::Types.count > 42, "A lot of types are expected to be known.")
   end
diff --git a/type-lists/application.txt b/type-lists/application.txt
index cbae4269cf..15af1b8c58 100644
--- a/type-lists/application.txt
+++ b/type-lists/application.txt
@@ -12,7 +12,7 @@ application/auth-policy+xml 'IANA,RFC4745
 application/batch-SMTP 'IANA,RFC2442
 application/beep+xml 'IANA,RFC3080
 application/calendar+xml 'IANA,RFC6321
-application/call-completion 'IANA,{RFC-ietf-bliss-call-completion-19=http://tools.ietf.org/html/draft-ietf-bliss-call-completion}
+application/call-completion 'IANA,RFC6910
 application/cals-1840 'IANA,RFC1895
 application/ccmp+xml 'IANA,RFC6503
 application/ccxml+xml 'IANA,RFC4267
@@ -82,7 +82,7 @@ application/ipp 'IANA,RFC2910
 application/isup 'IANA,RFC3204
 application/javascript 'IANA,RFC4329
 application/json 'IANA,RFC4627
-application/json-patch+json 'IANA,{RFC-ietf-appsawg-json-patch-10=http://tools.ietf.org/html/draft-ietf-appsawg-json-patch}
+application/json-patch+json 'IANA,RFC6902
 application/kpml-request+xml 'IANA,RFC4730
 application/kpml-response+xml 'IANA,RFC4730
 application/link-format 'IANA,RFC6690
@@ -124,8 +124,8 @@ application/mp4 'IANA,RFC4337,RFC6381
 application/mpeg4-generic 'IANA,RFC3640
 application/mpeg4-iod 'IANA,RFC4337
 application/mpeg4-iod-xmt 'IANA,RFC4337
-application/mrb-consumer+xml 'IANA,{RFC-ietf-mediactrl-mrb-19=http://tools.ietf.org/html/draft-ietf-mediactrl-mrb}
-application/mrb-publish+xml 'IANA,{RFC-ietf-mediactrl-mrb-19=http://tools.ietf.org/html/draft-ietf-mediactrl-mrb}
+application/mrb-consumer+xml 'IANA,RFC6917
+application/mrb-publish+xml 'IANA,RFC6917
 application/msc-ivr+xml 'IANA,RFC6231
 application/msc-mixer+xml 'IANA,RFC6505
 application/msword 'IANA,[Lindner]
@@ -136,8 +136,8 @@ application/news-groupinfo 'IANA,RFC5537
 application/news-transmission 'IANA,RFC5537
 application/nlsml+xml 'IANA,RFC6787
 application/nss 'IANA,[Hammer]
-application/ocsp-request 'IANA,RFC2560
-application/ocsp-response 'IANA,RFC2560
+application/ocsp-request 'IANA,{RFC-ietf-pkix-rfc2560bis-20=http://tools.ietf.org/html/draft-ietf-pkix-rfc2560bis}
+application/ocsp-response 'IANA,{RFC-ietf-pkix-rfc2560bis-20=http://tools.ietf.org/html/draft-ietf-pkix-rfc2560bis}
 application/octet-stream 'IANA,RFC2045,RFC2046
 application/oda 'IANA,RFC2045,RFC2046
 application/oebps-package+xml 'IANA,RFC4839
@@ -219,7 +219,7 @@ application/soap+xml 'IANA,RFC3902
 application/sparql-query 'IANA,[W3C]
 application/sparql-results+xml 'IANA,[W3C]
 application/spirits-event+xml 'IANA,RFC3910
-application/sql 'IANA,{RFC-shafranovich-mime-sql-06=http://tools.ietf.org/html/draft-shafranovich-mime-sql}
+application/sql 'IANA,RFC6922
 application/srgs 'IANA,RFC4267
 application/srgs+xml 'IANA,RFC4267
 application/sru+xml 'IANA,RFC6207
@@ -1005,4 +1005,4 @@ application/xv+xml 'IANA,RFC4374
 application/yang 'IANA,RFC6020
 application/yin+xml 'IANA,RFC6020
 application/zip 'IANA,[Lindner]
-application/zlib 'IANA,RFC6713
+application/zlib 'IANA,RFC6713
\ No newline at end of file