Skip to content

Commit 25f5caa

Browse files
committed
Merge remote-tracking branch 'fork/build-task-refactor' into build-task-refactor
Signed-off-by: Bagas Sanjaya <[email protected]>
2 parents d39b86e + fa62984 commit 25f5caa

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

README.asc

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,21 +29,22 @@ Converting to PDF...
2929
-- PDF output at progit.pdf
3030
----
3131

32-
If you only want to generate only one of supported formats (HTML, Epub, or PDF), do one of the following:
32+
You can generate just one of the supported formats (HTML, EPUB, or PDF).
33+
Use one of the following commands:
3334

34-
To generate HTML book:
35+
To generate the HTML book:
3536

3637
----
3738
$ bundle exec rake book:build_html
3839
----
3940

40-
To generate Epub book:
41+
To generate the EPUB book:
4142

4243
----
4344
$ bundle exec rake book:build_epub
4445
----
4546

46-
To generate PDF book:
47+
To generate the PDF book:
4748

4849
----
4950
$ bundle exec rake book:build_pdf

Rakefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,10 @@ namespace :book do
9292
# `bundle exec asciidoctor-epub3 #{params} -a ebook-format=kf8 progit.asc`
9393
# puts " -- Mobi output at progit.mobi"
9494

95-
# FIXME: If asciidoctor-epub3 supports Mobi again, uncomment these
96-
# lines below
97-
puts 'Converting to Mobi is not supported yet.'
98-
puts 'For more information see issue #1496 at https://github.com/progit/progit2/issues/1496.'
95+
# FIXME: If asciidoctor-epub3 supports Mobi again, uncomment these lines below
96+
puts "Converting to Mobi isn't supported yet."
97+
puts "For more information see issue #1496 at https://github.com/progit/progit2/issues/1496."
98+
>>>>>>> fork/build-task-refactor
9999
exit(127)
100100
end
101101

0 commit comments

Comments
 (0)