nokogiri 1.6.1 → 1.6.2.rc1

checksums.yaml

@@ -1,7 +1,7 @@
---- 
-SHA512: 
-  metadata.gz: f7e942be0168fae7e08fe35b78e1c73837e1e9b4f89de00759243fda87b26855432cdf8b7efbce9da8e9e22c0cc243d2442d65e110d6ea9c25d1552c416ca41f
-  data.tar.gz: b1c04a28170ff29c7382d4efe7513756076880fc2378f69d26512a7945dcc93f7d409f7846faa0a9d6989c1970c0bd18bc5ec913bacd68e03e341895e19d1b4c
-SHA1: 
-  metadata.gz: 07f6a8e0d9eb5904d81c062f66a8b0432ee9ee2f
-  data.tar.gz: 66b53546adc3fb06c3442638ed6fabe669421bee
+---
+SHA1:
+  metadata.gz: 5fd42fcf3e2ef0fe7d5b3762215247425d238ba8
+  data.tar.gz: 707702c005bcfb5a155e76845e45d706f8901463
+SHA512:
+  metadata.gz: 7fce29a5b4913dd4ac07d0f8a4b27adc4af130cc39decaa589df8223b313e64fd7677d0f8f96da61a4d6f1e1e390af91f93020ec1110d85dc594ada9e6c28c7b
+  data.tar.gz: 63c9d61766a9c5311d6eedad122e757e3e31d73df33ed30e6b7c0848237b7e825f2326e8b9811beb3e0511b8b07328d0f7e5e6231a5aa3794fa76db152340d71

data/.editorconfig

@@ -0,0 +1,17 @@
+root = true
+
+[**]
+end_of_line = lf
+insert_final_newline = true
+
+[**.rb]
+indent_style = space
+indent_size = 2
+
+[**.[ch]]
+indent_style = space
+indent_size = 2
+
+[**.java]
+indent_style = space
+indent_size = 4

data/.travis.yml

@@ -1,10 +1,10 @@
 language: ruby
 rvm:
-  - 1.9.2
   - 1.9.3
+  - 2.0.0
   - ruby-head
-  - ree
   - jruby-19mode
+  - jruby-20mode
   - rbx-19mode
 
 jdk:
@@ -15,13 +15,11 @@ matrix:
   allow_failures:
     - rvm: rbx-19mode
   exclude:
-    - rvm: 1.9.2
-      jdk: openjdk7
     - rvm: 1.9.3
       jdk: openjdk7
-    - rvm: ruby-head
+    - rvm: 2.0.0
       jdk: openjdk7
-    - rvm: ree
+    - rvm: ruby-head
       jdk: openjdk7
     - rvm: rbx-19mode
       jdk: openjdk7

data/CHANGELOG.ja.rdoc

@@ -1,3 +1,34 @@
+=== 1.6.2 / 未リリース
+
+* 機能
+
+  * (MRI) iconvが Windows-31J をサポートしていない場合は CP932 のエイリアスとして扱うようにした #836
+  * (MRI) 同梱ライブラリを静的にリンクするようになった (静的リンクをオフにするにはextconf.rbに --disable-static を渡す) #923
+  * (MRI) 同梱ライブラリのビルド後に不要になったディレクトリ群を自動的に削除するようになった (デバッグ等の目的で残すようにするにはextconf.rbに --disable-clean を渡す) #952
+  * (MRI) FreeBSDなど、libiconvがシステム標準ディレクトリ外にある環境でlibxml2がiconvサポート付きで正しくビルドされるようになった
+  * nthセレクタにおいてan-bを認識するようになった #886 (Magnus Bergmarkに感謝!)
+  * :not疑似クラスが、先行セレクタがない場合や複数重ねられた場合にも対応した #887 (Magnus Bergmarkに感謝!)
+  * (MRI) extconf.rb のオプション --use-system-libraries を追加
+    環境変数 NOKOGIRI_USE_SYSTEM_LIBRARIES を設定する代わりに使える
+  * (MRI) 同梱の libxslt を 1.1.28 に、 zlib を 1.2.8 に、 libiconv を 1.14 にそれぞれ更新した
+  * Nokogiri::HTML::Document#title= 及び #meta_encoding= は、head要素がない場合でも常に、最適な場所を探しつつ要素を追加するようになった
+  * Nokogiri::XML::DTD#html_dtd? と #html5_dtd? を追加
+  * Nokogiri::XML::Node#prepend_child を追加 #664
+  * Nokogiri::XML::SAX::ParserContext#recovery is added. #453
+
+* バグ修正
+
+  * :only-child疑似クラスが:not疑似クラスの中にある場合に正常な動作が行われるようになった #858 (Yamagishi Kazutoshiに感謝!)
+  * 同梱のライブラリを使う場合にはextconf.rbでpkg_configを呼ばなくなった #931 (Shota Fukumoriに感謝!)
+  * Nokogiri.parse()がRSS文書などをHTML文書として誤認する問題を修正 #932 (Yamagishi Kazutoshiに感謝!)
+  * (JRuby) XSD validation crashes in Java version. #373
+  * (JRuby) Document already has a root node error while using Builder. #646
+  * (JRuby) c14n tests are all passing on JRuby. #226
+  * Parsing empty documents raise SyntaxError in strict mode. #1005
+  * (JRuby) Make xpath faster by caching the xpath context. #741
+  * (JRuby) XML SAX push parser leaks memory on JRuby, but not on MRI. #998
+
+
 === 1.6.1 / 2013年12月14日
 
 * Bugfixes
@@ -8,18 +39,16 @@
 
 === 1.6.0 / 2013年6月8日
 
-This release was based on v1.5.10 and 1.6.0.rc1, and contains changes
-mentioned in both.
+本リリースは1.5.10および1.6.0.rc1を元にしているため、両リリースの改善点を含む
 
 * 廃止
 
-  * Remove pre 1.9 monitoring from Travis.
+  * TravisのCI対象からRuby 1.8を外した
 
 
 === 1.6.0.rc1 / 2013年4月14日
 
-This release was based on v1.5.9, and so does not contain any fixes
-mentioned in the notes for v1.5.10.
+本リリースは1.5.9を元にしているため、1.5.10の変更点は含まない
 
 * 註
 
@@ -31,7 +60,7 @@ mentioned in the notes for v1.5.10.
 
   * (MRI) libxml 2.8.0 と libxslt 1.2.26 を同梱。
     環境変数 NOKOGIRI_USE_SYSTEM_LIBRARIES を設定しない限り、 gem のインストール時にコンパイルして使われる。
-    VERSION_INFO (および `nokogiri -v`) には、同梱の libxml またはシステムの libxml のいずれが使われているかの情報が含まれる。
+    VERSION_INFO (および `nokogiri -v`) には、同梱の libxml またはシステムの libxml のいずれが使われているかの情報が含まれる
   * (Windows) libxml 2.8.0 に更新
 
 
@@ -40,12 +69,12 @@ mentioned in the notes for v1.5.10.
   * Ruby 1.8.7以下のサポートを終了
 
 
-=== 1.5.11 / 2013-11-09
+=== 1.5.11 / 2013年12月14日
 
 * Bugfixes
 
   * (JRuby) Fix out of memory bug when certain invalid documents are parsed.
-  * (JRuby) Fix regression of billion-laughs vulnerability. #568
+  * (JRuby) Fix regression of billion-laughs vulnerability. #586
 
 
 === 1.5.10 / 2013年6月7日

data/CHANGELOG.rdoc

@@ -1,3 +1,48 @@
+=== 1.6.2 / unreleased
+
+* Features
+
+  * (MRI) Alias CP932 to Windows-31J if iconv does not support Windows-31J.
+  * (MRI) Nokogiri now links packaged libraries statically.  To
+    disable static linking, pass --disable-static to extconf.rb. #923
+  * (MRI) Nokogiri automatically deletes directories of packaged
+    libraries only used during build.  To keep them for debugging
+    purposes, pass --disable-clean to extconf.rb. #952
+  * (MRI) Nokogiri now builds libxml2 properly with iconv support on
+    platforms where libiconv is installed outside the system default
+    directories, such as FreeBSD.
+  * Add support for an-b in nth selectors. #886 (Thanks, Magnus Bergmark!)
+  * Add support for bare and multiple :not() functions in selectors. #887
+    (Thanks, Magnus Bergmark!)
+  * (MRI) Add an extconf.rb option --use-system-libraries, alternative to
+    setting the environment variable NOKOGIRI_USE_SYSTEM_LIBRARIES.
+  * (MRI) Update packaged libraries: libxslt to 1.1.28, zlib to 1.2.8,
+    and libiconv to 1.14, respectively.
+  * Nokogiri::HTML::Document#title= and #meta_encoding= now always add
+    an element if not present, trying hard to find the best place to
+    put it.
+  * Nokogiri::XML::DTD#html_dtd? and #html5_dtd? are added.
+  * Nokogiri::XML::Node#prepend_child is added. #664
+  * Nokogiri::XML::SAX::ParserContext#recovery is added. #453
+  * Fix documentation for XML::Node#namespace. #803 #802 (Thanks, Hoylen Sue)
+  * Allow Nokogiri::XML::Node#parse from unparented non-element nodes. #407
+
+* Bugfixes
+
+  * Ensure :only-child pseudo class works within :not pseudo class. #858
+    (Thanks, Yamagishi Kazutoshi!)
+  * Don't call pkg_config when using bundled libraries in extconf.rb
+    #931 (Thanks, Shota Fukumori!)
+  * Nokogiri.parse() does not mistake a non-HTML document like a RSS
+    document as HTML document. #932 (Thanks, Yamagishi Kazutoshi!)
+  * (JRuby) XSD validation crashes in Java version. #373
+  * (JRuby) Document already has a root node error while using Builder. #646
+  * (JRuby) c14n tests are all passing on JRuby. #226
+  * Parsing empty documents raise SyntaxError in strict mode. #1005
+  * (JRuby) Make xpath faster by caching the xpath context. #741
+  * (JRuby) XML SAX push parser leaks memory on JRuby, but not on MRI. #998
+
+
 === 1.6.1 / 2013-12-14
 
 * Bugfixes
@@ -42,12 +87,12 @@ mentioned in the notes for v1.5.10.
   * Support for Ruby 1.8.7 and prior has been dropped
 
 
-=== 1.5.11 / 2013-11-09
+=== 1.5.11 / 2013-12-14
 
 * Bugfixes
 
   * (JRuby) Fix out of memory bug when certain invalid documents are parsed.
-  * (JRuby) Fix regression of billion-laughs vulnerability. #568
+  * (JRuby) Fix regression of billion-laughs vulnerability. #586
 
 
 === 1.5.10 / 2013-06-07
@@ -55,7 +100,7 @@ mentioned in the notes for v1.5.10.
 * Bugfixes
 
   * (JRuby) Fix "null document" error when parsing an empty IO in jruby 1.7.3. #883
-  * (JRuby) Fix schema validation when XSD has DOCTYPE set to DTD. #861 (Thanks, Patrick Cheng!)
+  * (JRuby) Fix schema validation when XSD has DOCTYPE set to DTD. #912 (Thanks, Patrick Cheng!)
   * (MRI) Fix segfault when there is no default subelement for an HTML node. #917
 
 

data/Gemfile

@@ -4,18 +4,18 @@
 
 source "https://rubygems.org/"
 
+gem "mini_portile", "~>0.5.2"
 
+gem "rdoc", "~>4.0", :group => [:development, :test]
 gem "hoe-bundler", ">=1.1", :group => [:development, :test]
 gem "hoe-debugging", ">=1.0.3", :group => [:development, :test]
 gem "hoe-gemspec", ">=1.0", :group => [:development, :test]
 gem "hoe-git", ">=1.4", :group => [:development, :test]
-gem "mini_portile", ">=0.2.2", :group => [:development, :test]
 gem "minitest", "~>2.2.2", :group => [:development, :test]
 gem "rake", ">=0.9", :group => [:development, :test]
-gem "rake-compiler", "~>0.8.0", :group => [:development, :test]
+gem "rake-compiler", "~>0.9.2", :group => [:development, :test]
 gem "racc", ">=1.4.6", :group => [:development, :test], :platform => :ruby
 gem "rexical", ">=1.0.5", :group => [:development, :test], :platform => :ruby
-gem "rdoc", "~>3.10", :group => [:development, :test]
 gem "hoe", "~>3.7", :group => [:development, :test]
 
 # vim: syntax=ruby

data/Manifest.txt

@@ -1,4 +1,5 @@
 .autotest
+.editorconfig
 .gemtest
 .travis.yml
 CHANGELOG.ja.rdoc
@@ -48,6 +49,7 @@ ext/java/nokogiri/XmlXpathContext.java
 ext/java/nokogiri/XsltStylesheet.java
 ext/java/nokogiri/internals/ClosedStreamException.java
 ext/java/nokogiri/internals/HtmlDomParserContext.java
+ext/java/nokogiri/internals/IgnoreSchemaErrorsErrorHandler.java
 ext/java/nokogiri/internals/NokogiriBlockingQueueInputStream.java
 ext/java/nokogiri/internals/NokogiriDocumentCache.java
 ext/java/nokogiri/internals/NokogiriDomParser.java
@@ -74,6 +76,33 @@ ext/java/nokogiri/internals/XmlDeclHandler.java
 ext/java/nokogiri/internals/XmlDomParserContext.java
 ext/java/nokogiri/internals/XmlSaxParser.java
 ext/java/nokogiri/internals/XsltExtensionFunction.java
+ext/java/nokogiri/internals/c14n/AttrCompare.java
+ext/java/nokogiri/internals/c14n/C14nHelper.java
+ext/java/nokogiri/internals/c14n/CanonicalFilter.java
+ext/java/nokogiri/internals/c14n/CanonicalizationException.java
+ext/java/nokogiri/internals/c14n/Canonicalizer.java
+ext/java/nokogiri/internals/c14n/Canonicalizer11.java
+ext/java/nokogiri/internals/c14n/Canonicalizer11_OmitComments.java
+ext/java/nokogiri/internals/c14n/Canonicalizer11_WithComments.java
+ext/java/nokogiri/internals/c14n/Canonicalizer20010315.java
+ext/java/nokogiri/internals/c14n/Canonicalizer20010315Excl.java
+ext/java/nokogiri/internals/c14n/Canonicalizer20010315ExclOmitComments.java
+ext/java/nokogiri/internals/c14n/Canonicalizer20010315ExclWithComments.java
+ext/java/nokogiri/internals/c14n/Canonicalizer20010315OmitComments.java
+ext/java/nokogiri/internals/c14n/Canonicalizer20010315WithComments.java
+ext/java/nokogiri/internals/c14n/CanonicalizerBase.java
+ext/java/nokogiri/internals/c14n/CanonicalizerPhysical.java
+ext/java/nokogiri/internals/c14n/CanonicalizerSpi.java
+ext/java/nokogiri/internals/c14n/Constants.java
+ext/java/nokogiri/internals/c14n/ElementProxy.java
+ext/java/nokogiri/internals/c14n/HelperNodeList.java
+ext/java/nokogiri/internals/c14n/IgnoreAllErrorHandler.java
+ext/java/nokogiri/internals/c14n/InclusiveNamespaces.java
+ext/java/nokogiri/internals/c14n/InvalidCanonicalizerException.java
+ext/java/nokogiri/internals/c14n/NameSpaceSymbTable.java
+ext/java/nokogiri/internals/c14n/NodeFilter.java
+ext/java/nokogiri/internals/c14n/UtfHelpper.java
+ext/java/nokogiri/internals/c14n/XMLUtils.java
 ext/nokogiri/depend
 ext/nokogiri/extconf.rb
 ext/nokogiri/html_document.c
@@ -210,7 +239,32 @@ lib/nokogiri/xslt.rb
 lib/nokogiri/xslt/stylesheet.rb
 lib/xercesImpl.jar
 lib/xsd/xmlparser/nokogiri.rb
-tasks/cross_compile.rb
+ports/patches/libxml2/0001-Fix-parser-local-buffers-size-problems.patch
+ports/patches/libxml2/0002-Fix-entities-local-buffers-size-problems.patch
+ports/patches/libxml2/0003-Fix-an-error-in-previous-commit.patch
+ports/patches/libxml2/0004-Fix-potential-out-of-bound-access.patch
+ports/patches/libxml2/0005-Detect-excessive-entities-expansion-upon-replacement.patch
+ports/patches/libxml2/0006-Do-not-fetch-external-parsed-entities.patch
+ports/patches/libxml2/0007-Enforce-XML_PARSER_EOF-state-handling-through-the-pa.patch
+ports/patches/libxml2/0008-Improve-handling-of-xmlStopParser.patch
+ports/patches/libxml2/0009-Fix-a-couple-of-return-without-value.patch
+ports/patches/libxslt/0001-Adding-doc-update-related-to-1.1.28.patch
+ports/patches/libxslt/0002-Fix-a-couple-of-places-where-f-printf-parameters-wer.patch
+ports/patches/libxslt/0003-Initialize-pseudo-random-number-generator-with-curre.patch
+ports/patches/libxslt/0004-EXSLT-function-str-replace-is-broken-as-is.patch
+ports/patches/libxslt/0006-Fix-str-padding-to-work-with-UTF-8-strings.patch
+ports/patches/libxslt/0007-Separate-function-for-predicate-matching-in-patterns.patch
+ports/patches/libxslt/0008-Fix-direct-pattern-matching.patch
+ports/patches/libxslt/0009-Fix-certain-patterns-with-predicates.patch
+ports/patches/libxslt/0010-Fix-handling-of-UTF-8-strings-in-EXSLT-crypto-module.patch
+ports/patches/libxslt/0013-Memory-leak-in-xsltCompileIdKeyPattern-error-path.patch
+ports/patches/libxslt/0014-Fix-for-bug-436589.patch
+ports/patches/libxslt/0015-Fix-mkdir-for-mingw.patch
+suppressions/README.txt
+suppressions/nokogiri_ree-1.8.7.358.supp
+suppressions/nokogiri_ruby-1.8.7.370.supp
+suppressions/nokogiri_ruby-1.9.2.320.supp
+suppressions/nokogiri_ruby-1.9.3.327.supp
 tasks/nokogiri.org.rb
 tasks/test.rb
 test/css/test_nthiness.rb
@@ -221,6 +275,7 @@ test/decorators/test_slop.rb
 test/files/2ch.html
 test/files/address_book.rlx
 test/files/address_book.xml
+test/files/atom.xml
 test/files/bar/bar.xsd
 test/files/bogus.xml
 test/files/dont_hurt_em_why.xml
@@ -239,6 +294,7 @@ test/files/saml/xenc_schema.xsd
 test/files/saml/xmldsig_schema.xsd
 test/files/shift_jis.html
 test/files/shift_jis.xml
+test/files/shift_jis_no_charset.html
 test/files/snuggles.xml
 test/files/staff.dtd
 test/files/staff.xml

data/README.ja.rdoc

@@ -1,10 +1,10 @@
 = Nokogiri (鋸) {<img src="https://secure.travis-ci.org/sparklemotion/nokogiri.png?rvm=1.9.3" />}[http://travis-ci.org/sparklemotion/nokogiri] {<img src="https://codeclimate.com/badge.png" />}[https://codeclimate.com/github/sparklemotion/nokogiri]
 
 * http://nokogiri.org/
-* http://github.com/sparklemotion/nokogiri/wikis
-* http://github.com/sparklemotion/nokogiri/tree/master
-* http://groups.google.com/group/nokogiri-list
-* http://github.com/sparklemotion/nokogiri/issues
+* https://github.com/sparklemotion/nokogiri/wikis
+* https://github.com/sparklemotion/nokogiri/tree/master
+* https://groups.google.com/group/nokogiri-list
+* https://github.com/sparklemotion/nokogiri/issues
 
 == DESCRIPTION:
 
@@ -16,22 +16,22 @@ XMLは暴力に似ている - XMLが君の問題を解決しないとしたら
 
 == FEATURES:
 
-* XPath による探索
+* XPath 1.0による探索
 * CSS3 のセレクターによる探索
 * XML/HTMLのビルダー
 
-XML/HTMLの高速な解析と探索検索、ならびにCSS3セレクタとXPathをサポートしています。
+XML/HTMLの高速な解析と探索検索、ならびにCSS3セレクタとXPath 1.0をサポートしています。
 
 == SUPPORT:
 
 日本語でNokogiriの
-{メーリングリスト}[http://groups.google.com/group/nokogiri-list]
+{メーリングリスト}[https://groups.google.com/group/nokogiri-list]
 
-  * http://groups.google.com/group/nokogiri-list
+  * https://groups.google.com/group/nokogiri-list
 
-{バグ報告}[http://github.com/sparklemotion/nokogiri/issues]
+{バグ報告}[https://github.com/sparklemotion/nokogiri/issues]
 
-  * http://github.com/sparklemotion/nokogiri/issues
+  * https://github.com/sparklemotion/nokogiri/issues
 
 IRCのチャンネルはfreenodeの #nokogiri です。
 
@@ -63,11 +63,16 @@ IRCのチャンネルはfreenodeの #nokogiri です。
 
 == REQUIREMENTS:
 
-* ruby 1.8 or 1.9
-* libxml2
-* libxml2-dev
-* libxslt
-* libxslt-dev
+* ruby 1.9.3以上
+
+* Nokogiri 1.6.0以降ではlibxml2とlibxsltは同梱されているが、
+  もしインストール済みのものを使いたい場合:
+
+  * libxml2 2.6.17以上2.9.0未満, iconvサポート付きのもの
+    (libxml2-dev/-develパッケージも必要)
+
+  * libxslt 上記のlibxml2でビルドされ、サポートされているもの
+    (libxslt-dev/-develパッケージも必要)
 
 == INSTALL:
 
@@ -77,7 +82,7 @@ IRCのチャンネルはfreenodeの #nokogiri です。
 
 (The MIT License)
 
-Copyright (c) 2008 - 2010:
+Copyright (c) 2008 - 2013:
 
 * {Aaron Patterson}[http://tenderlovemaking.com]
 * {Mike Dalessio}[http://mike.daless.io]
@@ -85,6 +90,7 @@ Copyright (c) 2008 - 2010:
 * {Sergio Arbeo}[http://www.serabe.com]
 * {Patrick Mahoney}[http://polycrystal.org]
 * {Yoko Harada}[http://yokolet.blogspot.com]
+* {Akinori MUSHA}[https://akinori.org]
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -1,10 +1,9 @@
-= Nokogiri {<img src="https://secure.travis-ci.org/sparklemotion/nokogiri.png?rvm=1.9.3" />}[http://travis-ci.org/sparklemotion/nokogiri] {<img src="https://codeclimate.com/badge.png" />}[https://codeclimate.com/github/sparklemotion/nokogiri]
-
+= Nokogiri {<img src="https://secure.travis-ci.org/sparklemotion/nokogiri.png?rvm=1.9.3" />}[http://travis-ci.org/sparklemotion/nokogiri] {<img src="https://codeclimate.com/github/sparklemotion/nokogiri.png" />}[https://codeclimate.com/github/sparklemotion/nokogiri] {<img src="https://www.versioneye.com/ruby/nokogiri/badge.png" alt="Dependency Status" />}[https://www.versioneye.com/ruby/nokogiri]
 * http://nokogiri.org
-* http://github.com/sparklemotion/nokogiri/wikis
-* http://github.com/sparklemotion/nokogiri/tree/master
-* http://groups.google.com/group/nokogiri-talk
-* http://github.com/sparklemotion/nokogiri/issues
+* https://github.com/sparklemotion/nokogiri/wikis
+* https://github.com/sparklemotion/nokogiri/tree/master
+* https://groups.google.com/group/nokogiri-talk
+* https://github.com/sparklemotion/nokogiri/issues
 
 == DESCRIPTION:
 
@@ -16,12 +15,12 @@ enough of it.
 
 == FEATURES:
 
-* XPath support for document searching
+* XPath 1.0 support for document searching
 * CSS3 selector support for document searching
 * XML/HTML builder
 
 Nokogiri parses and searches XML/HTML very quickly, and also has
-correctly implemented CSS3 selector support as well as XPath support.
+correctly implemented CSS3 selector support as well as XPath 1.0 support.
 
 == SUPPORT:
 
@@ -29,15 +28,15 @@ Before filing a bug report, please read our {submission guidelines}[http://nokog
 
   * http://nokogiri.org/tutorials/getting_help.html
 
-The Nokogiri {mailing list}[http://groups.google.com/group/nokogiri-talk]
+The Nokogiri {mailing list}[https://groups.google.com/group/nokogiri-talk]
 is available here:
 
-  * http://groups.google.com/group/nokogiri-talk
+  * https://groups.google.com/group/nokogiri-talk
 
-The {bug tracker}[http://github.com/sparklemotion/nokogiri/issues]
+The {bug tracker}[https://github.com/sparklemotion/nokogiri/issues]
 is available here:
 
-  * http://github.com/sparklemotion/nokogiri/issues
+  * https://github.com/sparklemotion/nokogiri/issues
 
 The IRC channel is #nokogiri on freenode.
 
@@ -73,11 +72,16 @@ The IRC channel is #nokogiri on freenode.
 
 == REQUIREMENTS:
 
-* ruby 1.8 or 1.9
-* libxml2
-* libxml2-dev
-* libxslt
-* libxslt-dev
+* ruby 1.9.3 or higher
+
+* in Nokogiri 1.6.0 and later libxml2 and libxslt are bundled with the
+  gem, but if you want to use them installed on the system:
+
+  * libxml2 >=2.6.17 and <2.9.0, with iconv support
+    (libxml2-dev/-devel is required too)
+
+  * libxslt, built with and supported by the given libxml2
+    (libxslt-dev/-devel is required too)
 
 == ENCODING:
 
@@ -111,7 +115,7 @@ explicitly setting the encoding to EUC-JP on the parser:
 
 Binary packages are available for:
 
-* SuSE[http://download.opensuse.org/repositories/devel:/languages:/ruby:/extensions/]
+* SuSE[https://download.opensuse.org/repositories/devel:/languages:/ruby:/extensions/]
 * Fedora[http://s390.koji.fedoraproject.org/koji/packageinfo?packageID=6756]
 
 == DEVELOPMENT:
@@ -146,7 +150,7 @@ Then run rake:
 
 (The MIT License)
 
-Copyright (c) 2008 - 2012:
+Copyright (c) 2008 - 2013:
 
 * {Aaron Patterson}[http://tenderlovemaking.com]
 * {Mike Dalessio}[http://mike.daless.io]
@@ -154,6 +158,7 @@ Copyright (c) 2008 - 2012:
 * {Sergio Arbeo}[http://www.serabe.com]
 * {Patrick Mahoney}[http://polycrystal.org]
 * {Yoko Harada}[http://yokolet.blogspot.com]
+* {Akinori MUSHA}[https://akinori.org]
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the