Upstream changes

Author: wencywww

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,10 +1,9 @@
 ---
 name: Bug report
 about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
-
+title: ""
+labels: "bug"
+assignees: ""
 ---
 
 <!-- Before filing a bug please check the following: -->

.github/ISSUE_TEMPLATE/config.yml

@@ -1,16 +1,17 @@
+blank_issues_enabled: false
 contact_links:
   - name: Translation bug
     url: https://github.com/progit/progit2/blob/master/TRANSLATING.md
     about: Refer to this table to find out where to report translation bugs.
 
   - name: Report bugs for git-scm.com site
     url: https://github.com/git/git-scm.com/issues/
-    about: Please report problems with the git-scm.com site here.
+    about: Please report problems with the git-scm.com site there.
 
   - name: Bug is about Git program itself
     url: https://git-scm.com/community
-    about: Please report problems with the Git program here.
+    about: Please report problems with the Git program there.
 
   - name: Bug is about Git for Windows
     url: https://github.com/git-for-windows/git/issues
-    about: Please report problems with Git for Windows here.
+    about: Please report problems with Git for Windows there.

.github/ISSUE_TEMPLATE/enhancement_idea.md

@@ -0,0 +1,15 @@
+---
+name: Enhancement idea
+about: Suggest an idea for the ProGit2 book or repository
+title: ""
+labels: "enhancement"
+assignees: ""
+---
+
+**Give a general overview of your idea.**
+
+**Explain what problem you're trying to solve.**
+
+**Have you thought about other solutions?**
+
+**Do you want to help with this enhancement idea?**

.github/dependabot.yml

@@ -6,6 +6,12 @@ updates:
     schedule:
       interval: "daily" # Checks on Monday trough Friday.
 
+  # Maintain GitHub Action runners
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily" # Checks on Monday trough Friday.
+
     # Set default reviewer and labels
     reviewers:
       - "ben"

Gemfile

@@ -6,11 +6,11 @@ gem 'asciidoctor', '2.0.15'
 gem 'json', '2.5.1'
 gem 'awesome_print', '1.9.2'
 
-gem 'asciidoctor-epub3', '1.5.0.alpha.19'
-gem 'asciidoctor-pdf', '1.5.4'
+gem 'asciidoctor-epub3', '1.5.1'
+gem 'asciidoctor-pdf', '1.6.0'
 
 gem 'coderay', '1.1.3'
 gem 'pygments.rb', '2.2.0'
 gem 'thread_safe', '0.3.6'
 gem 'epubcheck-ruby', '4.2.5.0'
-gem 'html-proofer', '3.19.0'
+gem 'html-proofer', '3.19.2'

README.asc

@@ -15,8 +15,7 @@
 == Генериране на книгата
 
 Можете да генерирате e-book файловете ръчно с Asciidoctor.
-Преди можехме да генерираме и .mobi файлове (за Kindle), но в момента това не е така, вижте #1496 за повече подробности.
-Посредством следните команди _можете_ да генерирате също HTML, Epub и PDF изходни файлове:
+Посредством следните команди _можете_ да генерирате също HTML, Epub, Mobi и PDF изходни файлове:
 
 ----
 $ bundle install
@@ -25,11 +24,13 @@ Converting to HTML...
  -- HTML output at progit.html
 Converting to EPub...
  -- Epub output at progit.epub
+Converting to Mobi (kf8)...
+ -- Mobi output at progit.mobi
 Converting to PDF...
  -- PDF output at progit.pdf
 ----
 
-Можете да генерирате и само един от поддържаните формати (HTML, EPUB, или PDF).
+Можете да генерирате и само един от поддържаните формати (HTML, EPUB, mobi или PDF).
 Използвайте някоя от следните команди:
 
 За да генерирате HTML варианта:
@@ -44,6 +45,12 @@ $ bundle exec rake book:build_html
 $ bundle exec rake book:build_epub
 ----
 
+За да генерирате mobi врианта:
+
+----
+$ bundle exec rake book:build_mobi
+----
+
 За да генерирате PDF варианта:
 
 ----

Rakefile

@@ -37,7 +37,7 @@ namespace :book do
   end
 
   desc 'build basic book formats'
-  task :build => [:build_html, :build_epub, :build_pdf] do
+  task :build => [:build_html, :build_epub, :build_mobi, :build_pdf] do
     begin
         # Run check
         Rake::Task['book:check'].invoke
@@ -50,7 +50,7 @@ namespace :book do
   end
 
   desc 'build basic book formats (for ci)'
-  task :ci => [:build_html, :build_epub, :build_pdf] do
+  task :ci => [:build_html, :build_epub, :build_mobi, :build_pdf] do
       # Run check, but don't ignore any errors
       Rake::Task['book:check'].invoke
   end
@@ -84,18 +84,11 @@ namespace :book do
 
   desc 'build Mobi format'
   task :build_mobi => 'book/contributors.txt' do
-      # Commented out the .mobi file creation because the kindlegen dependency is not available.
-      # For more information on this see: #1496.
-      # This is a (hopefully) temporary fix until upstream asciidoctor-epub3 is fixed and we can offer .mobi files again.
-
-      # puts "Converting to Mobi (kf8)..."
-      # `bundle exec asciidoctor-epub3 #{params} -a ebook-format=kf8 progit.asc`
-      # puts " -- Mobi output at progit.mobi"
-
-      # FIXME: If asciidoctor-epub3 supports Mobi again, uncomment these lines below
-      puts "Converting to Mobi isn't supported yet."
-      puts "For more information see issue #1496 at https://github.com/progit/progit2/issues/1496."
-      exit(127)
+      check_contrib()
+
+      puts "Converting to Mobi (kf8)..."
+      `bundle exec asciidoctor-epub3 #{params} -a ebook-format=kf8 progit.asc`
+      puts " -- Mobi output at progit.mobi"
   end
 
   desc 'build PDF format'
@@ -120,7 +113,7 @@ namespace :book do
     begin
         puts 'Removing generated files'
 
-        FileList['book/contributors.txt', 'progit.html', 'progit.epub', 'progit.pdf'].each do |file|
+        FileList['book/contributors.txt', 'progit.html', 'progit.epub', 'progit.mobi', 'progit.pdf'].each do |file|
             rm file
 
             # Rescue if file not found

book/01-introduction/sections/help.asc

@@ -28,20 +28,22 @@ $ git help config
 $ git add -h
 usage: git add [<options>] [--] <pathspec>...
 
-    -n, --dry-run         dry run
-    -v, --verbose         be verbose
-
-    -i, --interactive     interactive picking
-    -p, --patch           select hunks interactively
-    -e, --edit            edit current diff and apply
-    -f, --force           allow adding otherwise ignored files
-    -u, --update          update tracked files
-    --renormalize         renormalize EOL of tracked files (implies -u)
-    -N, --intent-to-add   record only the fact that the path will be added later
-    -A, --all             add changes from all tracked and untracked files
-    --ignore-removal      ignore paths removed in the working tree (same as --no-all)
-    --refresh             don't add, only refresh the index
-    --ignore-errors       just skip files which cannot be added because of errors
-    --ignore-missing      check if - even missing - files are ignored in dry run
-    --chmod (+|-)x        override the executable bit of the listed files
+    -n, --dry-run               dry run
+    -v, --verbose               be verbose
+
+    -i, --interactive           interactive picking
+    -p, --patch                 select hunks interactively
+    -e, --edit                  edit current diff and apply
+    -f, --force                 allow adding otherwise ignored files
+    -u, --update                update tracked files
+    --renormalize               renormalize EOL of tracked files (implies -u)
+    -N, --intent-to-add         record only the fact that the path will be added later
+    -A, --all                   add changes from all tracked and untracked files
+    --ignore-removal            ignore paths removed in the working tree (same as --no-all)
+    --refresh                   don't add, only refresh the index
+    --ignore-errors             just skip files which cannot be added because of errors
+    --ignore-missing            check if - even missing - files are ignored in dry run
+    --chmod (+|-)x              override the executable bit of the listed files
+    --pathspec-from-file <file> read pathspec from file
+    --pathspec-file-nul         with --pathspec-from-file, pathspec elements are separated with NUL character
 ----