[DRE-commits] [asciidoctor] 01/01: Merge tag 'upstream/1.5.4'

[Guillaume Grossetie]

This is an automated email from the git hooks/post-receive script.

ggrossetie-guest pushed a commit to branch master
in repository asciidoctor.

commit c63c1db056af56a7745311e01400e22e47bf41e7
Merge: 4cce958 d42248c
Author: Guillaume Grossetie <ggrossetie at gmail.com>
Date:   Mon Feb 29 17:11:40 2016 +0100

    Merge tag 'upstream/1.5.4'
    
    Upstream version 1.5.4

 .travis.yml                           |  11 +-
 CHANGELOG.adoc                        |  72 ++++++-
 CONTRIBUTING.adoc                     |   5 +-
 LICENSE.adoc                          |   2 +-
 README-fr.adoc                        | 363 ++++++++++++++++++++++++++++++++++
 README.adoc                           |  92 ++++++---
 _settings-README.adoc                 |  46 +++++
 asciidoctor.gemspec                   |  23 +--
 bin/asciidoctor                       |   6 +-
 bin/asciidoctor-safe                  |  13 +-
 lib/asciidoctor.rb                    |  31 +--
 lib/asciidoctor/abstract_block.rb     |  40 ++--
 lib/asciidoctor/abstract_node.rb      |  17 +-
 lib/asciidoctor/callouts.rb           |  16 +-
 lib/asciidoctor/cli/options.rb        |   4 +-
 lib/asciidoctor/converter.rb          |   2 +-
 lib/asciidoctor/converter/docbook5.rb |  69 ++++---
 lib/asciidoctor/converter/factory.rb  |   6 +-
 lib/asciidoctor/converter/html5.rb    |  51 ++---
 lib/asciidoctor/converter/manpage.rb  | 133 +++++++------
 lib/asciidoctor/converter/template.rb |  14 +-
 lib/asciidoctor/document.rb           |  36 ++--
 lib/asciidoctor/extensions.rb         |  10 +-
 lib/asciidoctor/helpers.rb            |   4 +-
 lib/asciidoctor/inline.rb             |   4 +-
 lib/asciidoctor/parser.rb             | 118 +++++------
 lib/asciidoctor/path_resolver.rb      |  38 ++--
 lib/asciidoctor/reader.rb             |  63 +++---
 lib/asciidoctor/section.rb            |  14 +-
 lib/asciidoctor/substitutors.rb       |   4 +-
 lib/asciidoctor/table.rb              |  69 ++++---
 lib/asciidoctor/version.rb            |   2 +-
 man/asciidoctor.1                     |  22 +--
 man/asciidoctor.adoc                  |   4 +-
 test/attributes_test.rb               |  58 ++----
 test/blocks_test.rb                   |  55 ++++--
 test/converter_test.rb                |   8 +-
 test/document_test.rb                 |  69 ++++++-
 test/extensions_test.rb               |   4 +-
 test/invoker_test.rb                  |   6 +-
 test/links_test.rb                    |  16 +-
 test/lists_test.rb                    | 228 ++++++++++-----------
 test/manpage_test.rb                  | 203 +++++++++++++++++++
 test/paragraphs_test.rb               |   6 +-
 test/parser_test.rb                   |   8 +-
 test/preamble_test.rb                 |   2 +-
 test/reader_test.rb                   | 258 ++++++++++++++----------
 test/sections_test.rb                 | 164 ++++++++++++---
 test/substitutions_test.rb            |  40 ++--
 test/tables_test.rb                   | 214 +++++++++++++++++---
 test/test_helper.rb                   |  32 +--
 51 files changed, 1965 insertions(+), 810 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/asciidoctor.git