Rework files for automatic build of PDF and epub #37
Conversation
There was a problem hiding this comment.
LGTM, I will modify progit.asc after this PR merged.
@YueLinHo Please take a look.
README.asc
Outdated
| @@ -1,3 +1,4 @@ | |||
| https://travis-ci.org/progit/progit2-zh-tw.svg?branch=master | |||
There was a problem hiding this comment.
This line doesn't render as a image.
There was a problem hiding this comment.
This is not formatted as asciidoc image.
There was a problem hiding this comment.
@taichunmin Reviewed all asc files, but the others. (我太淺了，其它檔案看不懂 :P )
| @@ -245,7 +245,7 @@ please contact us at email.support@github.com | |||
| </div> | |||
| ---- | |||
|
|
|||
| 這個解決方案分別採納了兩個分支中的各一部分內容，並且完整地移除了 `<<<<<<<`、`=======` 和 `>>>>>>>` 這些標記行。 | |||
| 這個解決方案分別採納了兩個分支中的各一部分內容，並且完整地移除了 `>>>>>` 這些標記行。 | |||
There was a problem hiding this comment.
mis-deleting few words about conflict marks?
There was a problem hiding this comment.
Good catch. My regexp for conversion was too greedy. Will revert.
| @@ -187,17 +187,17 @@ image::images/blink-06-final.png[結束 Pull Request] | |||
|
|
|||
| 這是個很重要的差異，因為通常變動會在程式碼完備之前就被提出，這點跟基於郵件清單的運作模式是天差地遠的。這讓維護者們可以更早做溝通，讓適合的解決方案可以在接受更多社群能量下誕生。當有人使用 Pull Request 提出程式碼，然後維護者或是社群建議了一個變更，雖然這補丁系列不會重來，但相對的會以一個新的提交的形式加入這個分支，並讓討論和背景可以齊頭並進。 | |||
|
|
|||
| 舉例來說，你可以回到 <<__pr_final>> 這邊看看，你會注意到那個貢獻者並沒有把他的提交重組之後另外開個新的 Pull Request，而是加入新的提交並推送到原本的分支。如果之後你回去看看 Pull Request，你可以看到之前我們為何做了這樣的變動的背景。當按下網站上的「Merge」鈕時，會建立一個參考那個 Pull Request 的合併提交，這樣當有需要時你可以很容易的就找到它並研究當初的交談內容。 | |||
| 舉例來說，你可以回到 這邊看看，你會注意到那個貢獻者並沒有把他的提交重組之後另外開個新的 Pull Request，而是加入新的提交並推送到原本的分支。如果之後你回去看看 Pull Request，你可以看到之前我們為何做了這樣的變動的背景。當按下網站上的「Merge」鈕時，會建立一個參考那個 Pull Request 的合併提交，這樣當有需要時你可以很容易的就找到它並研究當初的交談內容。 | |||
There was a problem hiding this comment.
should delete those 2 spaces after "你可以回到"?
There was a problem hiding this comment.
No, the marker was not found in the possible xrefs because it is malformed (two underscores).
| .不能乾淨的合併的 Pull Request | ||
| image::images/pr-01-fail.png[Pull Request 合併失敗] | ||
|
|
||
| 如果你看到類似 <<__pr_fail>> 的畫面，你就會希望去對你的分支做修正讓那個標示轉綠，之後維護者就不需要做額外的事。 | ||
| 如果你看到類似 的畫面，你就會希望去對你的分支做修正讓那個標示轉綠，之後維護者就不需要做額外的事。 |
There was a problem hiding this comment.
should delete those 2 spaces?
| [[_task_list_progress]] | ||
| 在 Pull Request 清單裡的工作清單統整。 | ||
| [[r_task_list_progress]] | ||
| .在 Pull Request 清單裡的工作清單統整。 |
There was a problem hiding this comment.
The title of the image was malformed. The dot is needed.
| @@ -364,17 +364,17 @@ image::images/markdown-04-fenced-code.png[渲染過的嵌入代碼] | |||
| How big are these slings and in particular, these arrows? | |||
| ---- | |||
|
|
|||
| 經過渲染之後評論就會變成 <<_md_note>> 這個樣子。 | |||
| 經過渲染之後評論就會變成 這個樣子。 | |||
There was a problem hiding this comment.
should delete those 2 spaces?
| This command is generally not used in day-to-day Git operations but it's useful to show us what references are present on the server. | ||
| 為了展示這個事實，我們要使用一個比較低階的指令（通常會被稱作「底層」指令，關於這點我們會在 <<_plumbing_procelain>> 再做詳細描述）—— `ls-remote`。 | ||
| 為了展示這個事實，我們要使用一個比較低階的指令（通常會被稱作「底層」指令，關於這點我們會在 再做詳細描述）—— `ls-remote`。 |
There was a problem hiding this comment.
should delete those 2 spaces?
There was a problem hiding this comment.
No there was a typo: procelain instead of porcelain.
| @@ -465,7 +465,7 @@ index 0399cd5,59727f0..0000000 | |||
| The format is called ``Combined Diff'' and gives you two columns of data next to each line. | |||
| The first column shows you if that line is different (added or removed) between the ``ours'' branch and the file in your working directory and the second column does the same between the ``theirs'' branch and your working directory copy. | |||
|
|
|||
| So in that example you can see that the `<<<<<<<` and `>>>>>>>` lines are in the working copy but were not in either side of the merge. | |||
| So in that example you can see that the `>>>>>` lines are in the working copy but were not in either side of the merge. | |||
There was a problem hiding this comment.
mis-deleting few words about conflict marks?
progit.asc
Outdated
| :front-cover-image: image:book/cover.png[width=1050,height=1600] | ||
| :toc-title: 目录 |
There was a problem hiding this comment.
should delete this line? see line 25.
book/license.asc
Outdated
| @@ -0,0 +1,4 @@ | |||
| [preface] | |||
| == 许可证 | |||
There was a problem hiding this comment.
他這是從簡體複製過來的啦，所以我原本想說等這個 PR Merge 以後再來修用詞。
I think this is copied form zh-cn. So I think we can modify the word after merged.
There was a problem hiding this comment.
Yes. To make it quicker, I copied some files from zh. Corrected.
|
Looks like the original |
|
cf. progit/progit2@2f6b50d for perface |
|
Thanks a lot for this review. I had overlooked some things with my conversion scripts. |
|
LGTM |
|
close #36 after merged |
|
LGTM :) |
With this file structure, the built epub and PDF are passing the checks.
Using the :lang: attribute does not work because the formatting does not follow what is accepted by xml.
jnavila
force-pushed
the
rework-files
branch
from
f4059ad to
0f19ead
Compare
No description provided.