diff --git a/01-basics.html b/01-basics.html
index 6bee312927..a2de10c8cc 100644
--- a/01-basics.html
+++ b/01-basics.html
@@ -381,7 +381,7 @@ <h2 class="accordion-header" id="flush-headingTwelve">
       </div>
       <hr></nav><main id="main-content" class="main-content"><div class="container lesson-content">
         <h1>自動的なバージョン管理</h1>
-        <p>最終更新日：2024-06-06 |
+        <p>最終更新日：2024-09-30 |
 
         <a href="https://github.com/swcarpentry-ja/git-novice/edit/main/episodes/01-basics.md" class="external-link">ページの編集 <i aria-hidden="true" data-feather="edit"></i></a></p>
 
@@ -431,12 +431,12 @@ <h3 class="card-title">目的</h3>
 加えられた全ての変更点を記録していきます。ドキュメントの
 進歩を記録していると考えてもらって構いません。変更点を最初の状況まで
 戻してから、最新版になるまでの変更を一つずつ再現していくことができます。</p>
-<figure><img src="fig/play-changes.svg" alt="変更は連続して保存されます" class="figure mx-auto d-block"></figure><p>「変更点」と「ドキュメント」を別々の物として考えてみると、基礎となるドキュメントに
+<figure><img src="fig/play-changes.svg" alt="A diagram demonstrating how a single document grows as the result of sequential changes" class="figure mx-auto d-block"></figure><p>「変更点」と「ドキュメント」を別々の物として考えてみると、基礎となるドキュメントに
 異なる変更点を「再現」する事によって、結果的に違ったバージョンのドキュメントを
 作る事が可能だという事が分かります。
 例えば、下の図のように二人のユーザーが同じドキュメントに違った編集を加えた場合です。</p>
-<figure><img src="fig/versions.svg" alt="異なるバージョンの保存ができます" class="figure mx-auto d-block"></figure><p>変更点の衝突（<a href="reference.html#conflict">コンフリクト</a>）が無ければ、二つ以上の違った変更点を基礎ドキュメントに加えることさえできます。</p>
-<figure><img src="fig/merge.svg" alt="複数のバージョンをマージできます" class="figure mx-auto d-block"></figure><p>バージョン管理システムは、ユーザーがドキュメントに加えた変更点を記録するツールであり、
+<figure><img src="fig/versions.svg" alt="A diagram with one source document that has been modified in two different ways to produce two different versions of the document" class="figure mx-auto d-block"></figure><p>変更点の衝突（<a href="reference.html#conflict">コンフリクト</a>）が無ければ、二つ以上の違った変更点を基礎ドキュメントに加えることさえできます。</p>
+<figure><img src="fig/merge.svg" alt="A diagram that shows the merging of two different document versions into one document that contains all of the changes from both versions" class="figure mx-auto d-block"></figure><p>バージョン管理システムは、ユーザーがドキュメントに加えた変更点を記録するツールであり、
 結果的にドキュメントの違ったバージョンを作成する事ができます。
 このツールを活用
 する事によって、次のバージョンに加える変更点（個々の変更点は 「<a href="reference.html#commit">commit（コミット）</a>」と呼びます）を決める事ができ、変更点に関するメタデータも一緒に保存する事ができます。
@@ -573,8 +573,8 @@ <h3 class="callout-title">まとめ</h3>
   "url": "https://swcarpentry-ja.github.io/git-novice/01-basics.html",
   "identifier": "https://swcarpentry-ja.github.io/git-novice/01-basics.html",
   "dateCreated": "2014-12-04",
-  "dateModified": "2024-06-06",
-  "datePublished": "2024-09-27"
+  "dateModified": "2024-09-30",
+  "datePublished": "2024-09-30"
 }
 
   </script><script>
diff --git a/02-setup.html b/02-setup.html
index 861a9ebce5..6b72fb2686 100644
--- a/02-setup.html
+++ b/02-setup.html
@@ -730,7 +730,7 @@ <h3 class="callout-title">まとめ</h3>
   "identifier": "https://swcarpentry-ja.github.io/git-novice/02-setup.html",
   "dateCreated": "2014-12-04",
   "dateModified": "2024-06-06",
-  "datePublished": "2024-09-27"
+  "datePublished": "2024-09-30"
 }
 
   </script><script>
diff --git a/03-create.html b/03-create.html
index 11ecf776c1..8d2205cf6a 100644
--- a/03-create.html
+++ b/03-create.html
@@ -381,7 +381,7 @@ <h2 class="accordion-header" id="flush-headingTwelve">
       </div>
       <hr></nav><main id="main-content" class="main-content"><div class="container lesson-content">
         <h1>リポジトリの作成</h1>
-        <p>最終更新日：2024-06-06 |
+        <p>最終更新日：2024-09-30 |
 
         <a href="https://github.com/swcarpentry-ja/git-novice/edit/main/episodes/03-create.md" class="external-link">ページの編集 <i aria-hidden="true" data-feather="edit"></i></a></p>
 
@@ -418,8 +418,9 @@ <h3 class="card-title">目的</h3>
 </div>
 <p>Gitの設定ができたら、 それを使い始めることができます。</p>
 <p>火星に惑星着陸船を送ることが可能かどうかを調査しているウルフマンとドラキュラの話に戻りましょう。</p>
-<p><img src="fig/motivatingexample.png" alt="motivatingexample" class="figure"><a href="https://www.deviantart.com/b-maze/art/Werewolf-vs-Dracula-124893530" class="external-link">ウルフマン対ドラキュラ</a>
-by <a href="https://www.deviantart.com/b-maze" class="external-link">b-maze</a> / <a href="https://www.deviantart.com/" class="external-link">Deviant Art</a>. <a href="https://en.wikipedia.org/wiki/File:OSIRIS_Mars_true_color.jpg" class="external-link">火星</a>
+<p><img src="fig/motivatingexample.png" alt="The main elements of the story: Dracula, Wolfman, the Mummy, Mars, Pluto and The Moon" class="figure"><a href="https://www.deviantart.com/b-maze/art/Werewolf-vs-Dracula-124893530" class="external-link">Werewolf
+vs dracula</a> by <a href="https://www.deviantart.com/b-maze" class="external-link">b-maze</a>
+/ <a href="https://www.deviantart.com/" class="external-link">Deviant Art</a>. <a href="https://en.wikipedia.org/wiki/File:OSIRIS_Mars_true_color.jpg" class="external-link">火星</a>
 by European Space Agency / <a href="https://creativecommons.org/licenses/by/3.0/deed.en" class="external-link">CC-BY-SA 3.0
 IGO</a>. <a href="https://commons.wikimedia.org/wiki/File:PIA19873-Pluto-NewHorizons-FlyingPastImage-20150714-transparent.png" class="external-link">冥王星</a>
 / Courtesy NASA/JPL-Caltech. <a href="https://commons.wikimedia.org/wiki/File:Mummy_icon_-_Noun_Project_4070.svg" class="external-link">ミイラ</a>
@@ -486,7 +487,11 @@ <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"><
 </h3>
 <pre class="output" tabindex="0"><code>Switched to a new branch 'main'</code></pre>
 </div>
-<p>プロジェクトのステータスをGitに問うことで、すべてが正しく設定されていることを確認できます:</p>
+<p>We can now start using one of the most important git commands, which
+is particularly helpful to beginners. <code>git status</code> tells us
+the status of our project, and better, a list of changes in the project
+and options on what to do with those changes. We can use it as often as
+we want, whenever we want to understand what is going on.</p>
 <div class="codewrapper sourceCode" id="cb8">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
@@ -577,7 +582,7 @@ <h3 class="callout-title">
 <code>git init</code> の間違いを修正する</h3>
 <div class="callout-content">
 <p>ウルフマンはドラキュラに、「入れ子」状態になっているリポジトリがいかに冗長で、混乱を引き起こす可能性があるかを説明しました。
-説明を聞いて、ドラキュラは「入れ子」状態のリポジトリを削除したいと思いました。
+Dracula would like to go back to a single git repository.
 <code>moons</code>サブディレクトリの最後の<code>git init</code>を、ドラキュラはどうやって、元に戻すことができるのでしょうか？</p>
 </div>
 </div>
@@ -601,14 +606,16 @@ <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i
 </h3>
 <pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb13-1"><a href="#cb13-1" tabindex="-1"></a><span class="ex">$</span> rm filename</span></code></pre>
 </div>
-<p>同様に、<code>rm -r dirname</code> または <code>rm -rf dirname</code>
-を使ってディレクトリを削除することができます。
+<p>Similarly a directory can be removed using
+<code>rm -r dirname</code>.
 この方法で削除されるファイルやフォルダがGitによって追跡されているなら、次のエピソードで見られるように、それらの削除が、追跡する必要がある別の変更になります。</p>
 </div>
 <div class="section level3">
 <h3 id="解答-1">解答<a class="anchor" aria-label="anchor" href="#%E8%A7%A3%E7%AD%94-1"></a></h3>
-<p>Gitはすべてのファイルを<code>.git</code>ディレクトリに保存します。
-この小さなミスから立ち直るには、ドラキュラは<code>planets</code>ディレクトリの中から次のコマンドを実行して、moonsサブディレクトリの中の<code>.git</code>フォルダを削除すれば良い：</p>
+<p>Gitはすべてのファイルを<code>.git</code>ディレクトリに保存します。 To
+recover from this little mistake, Dracula can remove the
+<code>.git</code> folder in the moons subdirectory by running the
+following command from inside the <code>planets</code> directory:</p>
 <div class="codewrapper sourceCode" id="cb14">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
@@ -616,7 +623,8 @@ <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i
 </div>
 <p>しかし、気をつけてください！
 間違ったディレクトリでこのコマンドを実行すると、残しておきたいプロジェクトのGit履歴がすべて削除されてしまいます。
-したがって、常に <code>pwd</code>
+In general, deleting files and directories using <code>rm</code> from
+the command line cannot be reversed. したがって、常に <code>pwd</code>
 コマンドを使用してカレントディレクトリを確認してください。</p>
 </div>
 </div>
@@ -698,8 +706,8 @@ <h3 class="callout-title">まとめ</h3>
   "url": "https://swcarpentry-ja.github.io/git-novice/03-create.html",
   "identifier": "https://swcarpentry-ja.github.io/git-novice/03-create.html",
   "dateCreated": "2014-12-04",
-  "dateModified": "2024-06-06",
-  "datePublished": "2024-09-27"
+  "dateModified": "2024-09-30",
+  "datePublished": "2024-09-30"
 }
 
   </script><script>
diff --git a/04-changes.html b/04-changes.html
index d925d9ae05..a47de59af3 100644
--- a/04-changes.html
+++ b/04-changes.html
@@ -381,7 +381,7 @@ <h2 class="accordion-header" id="flush-headingTwelve">
       </div>
       <hr></nav><main id="main-content" class="main-content"><div class="container lesson-content">
         <h1>変更内容の記録</h1>
-        <p>最終更新日：2024-06-06 |
+        <p>最終更新日：2024-09-30 |
 
         <a href="https://github.com/swcarpentry-ja/git-novice/edit/main/episodes/04-changes.md" class="external-link">ページの編集 <i aria-hidden="true" data-feather="edit"></i></a></p>
 
@@ -733,7 +733,7 @@ <h3 class="callout-title">ステージングエリア</h3>
 </div>
 </div>
 </div>
-<figure><img src="fig/git-staging-area.svg" alt="Gitのステージング・エリア" class="figure mx-auto d-block"></figure><p>それでは、ファイルの変更点がエディタからステージングエリア、そして長期保存に移る過程を見てみましょう。
+<figure><img src="fig/git-staging-area.svg" alt='A diagram showing how "git add" registers changes in the staging area, while "git commit" moves changes from the staging area to the repository' class="figure mx-auto d-block"></figure><p>それでは、ファイルの変更点がエディタからステージングエリア、そして長期保存に移る過程を見てみましょう。
 初めに、新しい文章をファイルに加えましょう：</p>
 <div class="codewrapper sourceCode" id="cb29">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
@@ -999,7 +999,7 @@ <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i
 <p>まとめると、変更内容をリポジトリに追加したい時は<code>git add</code>
 で変更点をステージングエリアに移してから、<code>git commit</code>
 でステージングエリアの変更点をリポジトリに保存します：</p>
-<figure><img src="fig/git-committing.svg" alt="git commitのワークフロー" class="figure mx-auto d-block"></figure><div id="コミットメッセージを決める" class="callout challenge">
+<figure><img src="fig/git-committing.svg" alt="A diagram showing two documents being separately staged using git add, before being combined into one commit using git commit" class="figure mx-auto d-block"></figure><div id="コミットメッセージを決める" class="callout challenge">
 <div class="callout-square">
 <i class="callout-icon" data-feather="zap"></i>
 </div>
@@ -1022,7 +1022,7 @@ <h4 class="accordion-header" id="headingSolution1">
   解答
   </h4>
 </button>
-<div id="collapseSolution1" class="accordion-collapse collapse" aria-labelledby="headingSolution1" data-bs-parent="#accordionSolution1">
+<div id="collapseSolution1" class="accordion-collapse collapse" data-bs-parent="#accordionSolution1" aria-labelledby="headingSolution1">
 <div class="accordion-body">
 <p>１つ目のメッセージは短すぎてコミットの内容が何なのかわかりにくいです。２つ目は<code>git diff</code>で何が変わったのかが分かるので、長い割にはあまり意味がありません。３つ目は、短く、簡潔で、分かりやすいメッセージです。</p>
 </div>
@@ -1070,7 +1070,7 @@ <h4 class="accordion-header" id="headingSolution2">
   解答
   </h4>
 </button>
-<div id="collapseSolution2" class="accordion-collapse collapse" aria-labelledby="headingSolution2" data-bs-parent="#accordionSolution2">
+<div id="collapseSolution2" class="accordion-collapse collapse" data-bs-parent="#accordionSolution2" aria-labelledby="headingSolution2">
 <div class="accordion-body">
 <ol style="list-style-type: decimal"><li><p>ファイルがステージングエリアにない限り、コミットできません。</p></li>
 <li><p>新しくリポジトリを作ろうとします。</p></li>
@@ -1105,7 +1105,7 @@ <h4 class="accordion-header" id="headingSolution3">
   解答
   </h4>
 </button>
-<div id="collapseSolution3" class="accordion-collapse collapse" aria-labelledby="headingSolution3" data-bs-parent="#accordionSolution3">
+<div id="collapseSolution3" class="accordion-collapse collapse" data-bs-parent="#accordionSolution3" aria-labelledby="headingSolution3">
 <div class="accordion-body">
 <p>以下の<code>cat mars.txt</code>の出力は、この課題で追加された内容のみを反映しています。
 出力は異なる場合があります。</p>
@@ -1191,7 +1191,7 @@ <h4 class="accordion-header" id="headingSolution4">
   解答
   </h4>
 </button>
-<div id="collapseSolution4" class="accordion-collapse collapse" aria-labelledby="headingSolution4" data-bs-parent="#accordionSolution4">
+<div id="collapseSolution4" class="accordion-collapse collapse" data-bs-parent="#accordionSolution4" aria-labelledby="headingSolution4">
 <div class="accordion-body">
 <p>必要であれば、<code>planets</code> から出ましょう：</p>
 <div class="codewrapper sourceCode" id="cb64">
@@ -1315,8 +1315,8 @@ <h3 class="callout-title">まとめ</h3>
   "url": "https://swcarpentry-ja.github.io/git-novice/04-changes.html",
   "identifier": "https://swcarpentry-ja.github.io/git-novice/04-changes.html",
   "dateCreated": "2014-12-04",
-  "dateModified": "2024-06-06",
-  "datePublished": "2024-09-27"
+  "dateModified": "2024-09-30",
+  "datePublished": "2024-09-30"
 }
 
   </script><script>
diff --git a/05-history.html b/05-history.html
index c35b096d04..47891feb8d 100644
--- a/05-history.html
+++ b/05-history.html
@@ -381,7 +381,7 @@ <h2 class="accordion-header" id="flush-headingTwelve">
       </div>
       <hr></nav><main id="main-content" class="main-content"><div class="container lesson-content">
         <h1>履歴の探索</h1>
-        <p>最終更新日：2024-06-06 |
+        <p>最終更新日：2024-09-30 |
 
         <a href="https://github.com/swcarpentry-ja/git-novice/edit/main/episodes/05-history.md" class="external-link">ページの編集 <i aria-hidden="true" data-feather="edit"></i></a></p>
 
@@ -476,7 +476,7 @@ <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i
 <div class="codewrapper sourceCode" id="cb6">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
-<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb6-1"><a href="#cb6-1" tabindex="-1"></a><span class="ex">$</span> git diff HEAD~3 mars.txt</span></code></pre>
+<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb6-1"><a href="#cb6-1" tabindex="-1"></a><span class="ex">$</span> git diff HEAD~2 mars.txt</span></code></pre>
 </div>
 <div class="codewrapper">
 <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
@@ -498,7 +498,7 @@ <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"><
 <div class="codewrapper sourceCode" id="cb8">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
-<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb8-1"><a href="#cb8-1" tabindex="-1"></a><span class="ex">$</span> git show HEAD~3 mars.txt</span></code></pre>
+<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb8-1"><a href="#cb8-1" tabindex="-1"></a><span class="ex">$</span> git show HEAD~2 mars.txt</span></code></pre>
 </div>
 <div class="codewrapper">
 <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
@@ -522,7 +522,7 @@ <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"><
 表記を使用して以前のコミットを参照できるため、<code>HEAD~1</code>
 は「以前のコミット」を意味し、<code>HEAD~123</code>
 は現在の場所から123個前のコミットに戻ります。</p>
-<p><code>git log</code>
+<p><code>git log</code> および <code>git show</code>
 が表示する、数字と文字の長い文字列を使用してコミットを参照することもできます。
 これらは一個一個の変更に対するユニークなIDであり、「ユニーク」は本当に唯一であることを意味します:
 どのコンピューターのどのファイルの変更の組み合わせに対しても、ユニークな40文字の
@@ -583,17 +583,17 @@ <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"><
 <pre class="output" tabindex="0"><code>On branch main
 Changes not staged for commit:
   (use "git add &lt;file&gt;..." to update what will be committed)
-  (use "git checkout -- &lt;file&gt;..." to discard changes in working directory)
+  (use "git restore &lt;file&gt;..." to discard changes in working directory)
 
     modified:   mars.txt
 
 no changes added to commit (use "git add" and/or "git commit -a")</code></pre>
 </div>
-<p><code>git checkout</code>を使うと、元の状態に戻すことができます:</p>
+<p><code>git restore</code>を使うと、元の状態に戻すことができます:</p>
 <div class="codewrapper sourceCode" id="cb16">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
-<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb16-1"><a href="#cb16-1" tabindex="-1"></a><span class="ex">$</span> git checkout HEAD mars.txt</span>
+<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb16-1"><a href="#cb16-1" tabindex="-1"></a><span class="ex">$</span> git restore mars.txt</span>
 <span id="cb16-2"><a href="#cb16-2" tabindex="-1"></a><span class="ex">$</span> cat mars.txt</span></code></pre>
 </div>
 <div class="codewrapper">
@@ -603,15 +603,16 @@ <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"><
 The two moons may be a problem for Wolfman
 But the Mummy will appreciate the lack of humidity</code></pre>
 </div>
-<p>その名前から推測できるように、<code>git checkout</code>
-はファイルの古いバージョンをチェックアウト (つまり、復元) します。
+<p>その名前から推測できるように、<code>git restore</code>
+はファイルの古いバージョンを復元します。
 この場合、最後に保存されたコミットである <code>HEAD</code>
-に記録されたファイルのバージョン を復元することをGitに伝えています。
-さらに戻りたい場合は、代わりにコミット Id を使うことができます:</p>
+に記録されたファイルのバージョンを復元することをGitに伝えています。
+さらに遡りたい場合は、<code>-s</code>オプションとコミット Id
+を使うことができます:</p>
 <div class="codewrapper sourceCode" id="cb18">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
-<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb18-1"><a href="#cb18-1" tabindex="-1"></a><span class="ex">$</span> git checkout f22b25e mars.txt</span></code></pre>
+<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb18-1"><a href="#cb18-1" tabindex="-1"></a><span class="ex">$</span> git restore <span class="at">-s</span> f22b25e mars.txt</span></code></pre>
 </div>
 <div class="codewrapper sourceCode" id="cb19">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
@@ -632,95 +633,39 @@ <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i
 <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
 <pre class="output" tabindex="0"><code>On branch main
-Changes to be committed:
-  (use "git reset HEAD &lt;file&gt;..." to unstage)
+Changes not staged for commit:
+  (use "git add &lt;file&gt;..." to update what will be committed)
+  (use "git restore &lt;file&gt;..." to discard changes in working directory)
+        modified:   mars.txt
 
-    modified:   mars.txt
+no changes added to commit (use "git add" and/or "git commit -a")
 </code></pre>
 </div>
 <p>変更はステージング領域にあることに注意してください。
-繰り返しますが、<code>git checkout</code>
+繰り返しますが、<code>git restore</code>
 を使うと、元の状態に戻すことができます:</p>
 <div class="codewrapper sourceCode" id="cb23">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
-<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb23-1"><a href="#cb23-1" tabindex="-1"></a><span class="ex">$</span> git checkout HEAD mars.txt</span></code></pre>
-</div>
-<div id="head-を見失わないようにしましょう" class="callout">
-<div class="callout-square">
-<i class="callout-icon" data-feather="bell"></i>
-</div>
-<div id="head-を見失わないようにしましょう" class="callout-inner">
-<h3 class="callout-title">HEAD を見失わないようにしましょう</h3>
-<div class="callout-content">
-<p>上記では下記を使いました</p>
-<div class="codewrapper sourceCode" id="cb24">
-<h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
-</h3>
-<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb24-1"><a href="#cb24-1" tabindex="-1"></a><span class="ex">$</span> git checkout f22b25e mars.txt</span></code></pre>
-</div>
-<p><code>mars.txt</code> をコミット <code>f22b25e</code>
-後の状態に戻すためにです。 しかし、気をつけてください！ コマンド
-<code>checkout</code>
-には他の重要な機能があり、入力が正確でない場合、Gitはあなたの意図を誤解する可能性があります。
-たとえば、前のコマンドで <code>mars.txt</code> を忘れた場合です。</p>
-<div class="codewrapper sourceCode" id="cb25">
-<h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
-</h3>
-<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb25-1"><a href="#cb25-1" tabindex="-1"></a><span class="ex">$</span> git checkout f22b25e</span></code></pre>
+<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb23-1"><a href="#cb23-1" tabindex="-1"></a><span class="ex">$</span> git restore mars.txt</span>
+<span id="cb23-2"><a href="#cb23-2" tabindex="-1"></a><span class="ex">$</span> cat mars.txt</span></code></pre>
 </div>
 <div class="codewrapper">
-<h3 class="code-label">エラー<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
+<h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
-<pre class="error" tabindex="0"><code>Note: checking out 'f22b25e'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
- git checkout -b &lt;new-branch-name&gt;
-
-HEAD is now at f22b25e Start notes on Mars as a base</code></pre>
-</div>
-<p>ここでの「HEADが切り離された」状態は「見れるが触ってはいけない」ようなものなので、この状態で変更を加えないでください。
-リポジトリの過去の状態を調査した後、<code>git checkout main</code> で
-<code>HEAD</code>を再接続してください。</p>
-</div>
-</div>
+<pre class="output" tabindex="0"><code>Cold and dry, but everything is my favorite color
+The two moons may be a problem for Wolfman
+But the Mummy will appreciate the lack of humidity</code></pre>
 </div>
 <p>取り消したい変更の一個<strong>前</strong>のコミット番号を使う必要があることを覚えておくことが重要です。
 よくある間違いは、破棄しようとしている変更を行ったコミットの番号を使用することです。
 以下の例では、最新のコミットの前 (<code>HEAD~1</code>)
-、すなわち<code>f22b25e</code>から状態を取得したいと考えています:</p>
-<figure><img src="fig/git-checkout.svg" alt="Git Checkout" class="figure mx-auto d-block"></figure><p>つまり、すべてをまとめると、Gitがどのように機能するかは次の漫画のようになります:</p>
-<figure><img src="fig/git_staging.svg" alt="https://figshare.com/articles/How\_Git\_works\_a\_cartoon/1328266" class="figure mx-auto d-block"><div class="figcaption"><a href="https://figshare.com/articles/How%5C_Git%5C_works%5C_a%5C_cartoon/1328266" class="external-link uri">https://figshare.com/articles/How\_Git\_works\_a\_cartoon/1328266</a></div>
-</figure><div id="よくあるケースの簡単化" class="callout">
-<div class="callout-square">
-<i class="callout-icon" data-feather="bell"></i>
-</div>
-<div id="よくあるケースの簡単化" class="callout-inner">
-<h3 class="callout-title">よくあるケースの簡単化</h3>
-<div class="callout-content">
-<p><code>git status</code>
-の出力を注意深く読むと、次のヒントを含んでいることが分かります:</p>
-<div class="codewrapper">
-<h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
-</h3>
-<pre class="output" tabindex="0"><code>(use "git checkout -- &lt;file&gt;..." to discard changes in working directory)</code></pre>
-</div>
-<p>それが言っているように、バージョン識別子のない
-<code>git checkout</code>
-はファイルを<code>HEAD</code>に保存された状態に復元します。
-二重のダッシュ
-<code>--</code>はコマンドから復元されるファイルの名前を区別するために必要です：それがないと、Git
-はファイルの名前をコミット Id として使用しようとします。</p>
-</div>
-</div>
-</div>
-<p>ファイルを1つずつ元に戻すことができるという事実は
+、すなわち<code>f22b25e</code>から状態を取得したいと考えています:
+このとき、<code>.</code>
+を使用することで、全てのファイルを対象にします。</p>
+<figure><img src="fig/git-restore.svg" alt="以下の図は、git restoreを使って2つのファイルの前のバージョンを復元する方法を示しています" class="figure mx-auto d-block"></figure><p>つまり、すべてをまとめると、Gitがどのように機能するかは次の漫画のようになります:</p>
+<figure><img src="fig/git_staging.svg" alt="以下の図は、Gitの全体的なワークフローを示しています。ローカルでの変更は、git addを使ってステージングされ、git commitでローカルリポジトリに反映されます。また、git checkoutを使用することで、リポジトリから変更を元に戻すことができます。" class="figure mx-auto d-block"><div class="figcaption"><a href="https://figshare.com/articles/How%5C_Git%5C_works%5C_a%5C_cartoon/1328266" class="external-link uri">https://figshare.com/articles/How\_Git\_works\_a\_cartoon/1328266</a></div>
+</figure><p>ファイルを1つずつ元に戻すことができるという事実は
 人々が研究を整理する方法を変えることがあります。
 すべての変更が1つの大きなドキュメントに含まれている場合、
 後で結論に加えられた変更を元に戻さずに、
@@ -739,11 +684,11 @@ <h3 class="callout-title">ファイルの古いバージョンの復元</h3>
 <p>幸い、彼女はGitを使用してプロジェクトのバージョンを追跡していました!
 以下のどのコマンドで、<code>data_cruncher.py</code>
 と呼ばれるPythonスクリプトの最後にコミットされたバージョンを復元できるでしょうか？</p>
-<ol style="list-style-type: decimal"><li><p><code>$ git checkout HEAD</code></p></li>
-<li><p><code>$ git checkout HEAD data_cruncher.py</code></p></li>
-<li><p><code>$ git checkout HEAD~1 data_cruncher.py</code></p></li>
-<li><p><code>$ git checkout &lt;unique ID of last commit&gt; data_cruncher.py</code></p></li>
-<li><p>Both 2 and 4</p></li>
+<ol style="list-style-type: decimal"><li><p><code>$ git restore</code></p></li>
+<li><p><code>$ git restore data_cruncher.py</code></p></li>
+<li><p><code>$ git restore -s HEAD~1 data_cruncher.py</code></p></li>
+<li><p><code>$ git restore -s &lt;unique ID of last commit&gt; data_cruncher.py</code></p></li>
+<li><p>2番と4番の両方</p></li>
 </ol></div>
 </div>
 </div>
@@ -757,24 +702,17 @@ <h4 class="accordion-header" id="headingSolution1">
 <div id="collapseSolution1" class="accordion-collapse collapse" data-bs-parent="#accordionSolution1" aria-labelledby="headingSolution1">
 <div class="accordion-body">
 <p>答えは (5) - 2 と 4 の両方です。</p>
-<p>The <code>checkout</code> command restores files from the repository,
-overwriting the files in your working directory. Answers 2 and 4 both
-restore the <em>latest</em> version <em>in the repository</em> of the
-file <code>data_cruncher.py</code>. Answer 2 uses <code>HEAD</code> to
-indicate the <em>latest</em>, whereas answer 4 uses the unique ID of the
-last commit, which is what <code>HEAD</code> means.</p>
-<p>Answer 3 gets the version of <code>data_cruncher.py</code> from the
-commit <em>before</em> <code>HEAD</code>, which is NOT what we
-wanted.</p>
-<p>Answer 1 can be dangerous! Without a filename,
-<code>git checkout</code> will restore <strong>all files</strong> in the
-current directory (and all directories below it) to their state at the
-commit specified. This command will restore
-<code>data_cruncher.py</code> to the latest commit version, but it will
-also restore <em>any other files that are changed</em> to that version,
-erasing any changes you may have made to those files! As discussed
-above, you are left in a <em>detached</em> <code>HEAD</code> state, and
-you don’t want to be there.</p>
+<p><code>restore</code>
+コマンドはリポジトリからファイルを復元し、作業ディレクトリのファイルを上書きします。
+2番と4番のコマンドはどちらもリ_ポジトリにある_
+<code>data_cruncher.py</code> の_最新バージョン_を復元します。 2番は
+<code>HEAD</code> を使って_最新バージョン_を指定し、4番は
+<code>HEAD</code> と同じ意味の最後のコミットIDを使います。</p>
+<p>3番のコマンドは、<code>data_cruncher.py</code> の <code>HEAD</code>
+_より前_のコミットから復元するため、今回の目的とは異なります。</p>
+<p>1番はエラーになります。 復元するファイルを指定する必要があります。
+すべてのファイルを復元したい場合は、<code>git restore .</code>
+を使用するべきです。</p>
 </div>
 </div>
 </div>
@@ -791,9 +729,10 @@ <h3 class="callout-title">コミットを戻すことについて</h3>
 ジェニファーは、グループリポジトリのみんなが正しい変更を取得できるように、正しく元に戻す必要があります。
 <code>git revert [wrong commit ID]</code>
 は、ジェニファーの誤ったコミットを元に戻す新しいコミットを作ります。</p>
-<p>従って<code>git revert</code>は<code>git checkout [commit ID]</code>とは異なります。なぜなら
-<code>checkout</code>
-はグループのリポジトリにはコミットされていないローカルの変更用のコマンドだからです。</p>
+<p><code>git revert</code> は <code>git restore -s [commit ID] .</code>
+とは異なります。<code>git restore</code>
+は、ローカルリポジトリ内でまだコミットされていないファイルを以前の状態に戻すために使用されるのに対して、<code>git revert</code>
+はローカルリポジトリおよびプロジェクトリポジトリにコミットされた変更を取り消すために使用されます。</p>
 <p>以下は、ジェニファーが<code>git revert</code>を使用するための正しい手順と説明ですが、不足しているコマンドは何でしょうか？</p>
 <ol style="list-style-type: decimal"><li><p><code>________ # コミットIDを見つけるために、プロジェクトのgitの 履歴を見ます</code></p></li>
 <li><p>そのIDをコピーします (IDの最初の数文字は例えば
@@ -813,12 +752,10 @@ <h4 class="accordion-header" id="headingSolution2">
 </button>
 <div id="collapseSolution2" class="accordion-collapse collapse" data-bs-parent="#accordionSolution2" aria-labelledby="headingSolution2">
 <div class="accordion-body">
-<p>The command <code>git log</code> lists project history with commit
-IDs.</p>
-<p>The command <code>git show HEAD</code> shows changes made at the
-latest commit, and lists the commit ID; however, Jennifer should
-double-check it is the correct commit, and no one else has committed
-changes to the repository.</p>
+<p><code>git log</code>
+コマンドは、コミットIDを含むプロジェクトの履歴を一覧表示します。</p>
+<p><code>git show HEAD</code>
+は、最新のコミットで行われた変更を表示し、コミットIDも確認できます。ただし、ジェニファーはこれが正しいコミットであることを再確認し、他の人がリポジトリに変更をコミットしていないか確認する必要があります。</p>
 </div>
 </div>
 </div>
@@ -831,16 +768,16 @@ <h4 class="accordion-header" id="headingSolution2">
 <h3 class="callout-title">ワークフローと履歴の理解</h3>
 <div class="callout-content">
 <p>最後のコマンドの出力は何でしょうか？</p>
-<div class="codewrapper sourceCode" id="cb28">
+<div class="codewrapper sourceCode" id="cb25">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
-<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb28-1"><a href="#cb28-1" tabindex="-1"></a><span class="ex">$</span> cd planets</span>
-<span id="cb28-2"><a href="#cb28-2" tabindex="-1"></a><span class="ex">$</span> echo <span class="st">"Venus is beautiful and full of love"</span> <span class="op">&gt;</span> venus.txt</span>
-<span id="cb28-3"><a href="#cb28-3" tabindex="-1"></a><span class="ex">$</span> git add venus.txt</span>
-<span id="cb28-4"><a href="#cb28-4" tabindex="-1"></a><span class="ex">$</span> echo <span class="st">"Venus is too hot to be suitable as a base"</span> <span class="op">&gt;&gt;</span> venus.txt</span>
-<span id="cb28-5"><a href="#cb28-5" tabindex="-1"></a><span class="ex">$</span> git commit <span class="at">-m</span> <span class="st">"Comment on Venus as an unsuitable base"</span></span>
-<span id="cb28-6"><a href="#cb28-6" tabindex="-1"></a><span class="ex">$</span> git checkout HEAD venus.txt</span>
-<span id="cb28-7"><a href="#cb28-7" tabindex="-1"></a><span class="ex">$</span> cat venus.txt <span class="co">#this will print the contents of venus.txt to the screen</span></span></code></pre>
+<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb25-1"><a href="#cb25-1" tabindex="-1"></a><span class="ex">$</span> cd planets</span>
+<span id="cb25-2"><a href="#cb25-2" tabindex="-1"></a><span class="ex">$</span> echo <span class="st">"Venus is beautiful and full of love"</span> <span class="op">&gt;</span> venus.txt</span>
+<span id="cb25-3"><a href="#cb25-3" tabindex="-1"></a><span class="ex">$</span> git add venus.txt</span>
+<span id="cb25-4"><a href="#cb25-4" tabindex="-1"></a><span class="ex">$</span> echo <span class="st">"Venus is too hot to be suitable as a base"</span> <span class="op">&gt;&gt;</span> venus.txt</span>
+<span id="cb25-5"><a href="#cb25-5" tabindex="-1"></a><span class="ex">$</span> git commit <span class="at">-m</span> <span class="st">"Comment on Venus as an unsuitable base"</span></span>
+<span id="cb25-6"><a href="#cb25-6" tabindex="-1"></a><span class="ex">$</span> git restore venus.txt</span>
+<span id="cb25-7"><a href="#cb25-7" tabindex="-1"></a><span class="ex">$</span> cat venus.txt <span class="co">#this will print the contents of venus.txt to the screen</span></span></code></pre>
 </div>
 <ol style="list-style-type: decimal"><li><div class="codewrapper">
 <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
@@ -882,8 +819,8 @@ <h4 class="accordion-header" id="headingSolution3">
 repository is the one from the staging area and has only one line.</p>
 <p>At this time, the working copy still has the second line (and
 <code>git status</code> will show that the file is modified). However,
-<code>git checkout HEAD venus.txt</code> replaces the working copy with
-the most recently committed version of <code>venus.txt</code>.</p>
+<code>git restore venus.txt</code> replaces the working copy with the
+most recently committed version of <code>venus.txt</code>.</p>
 <p>So, <code>cat venus.txt</code> will output</p>
 <div class="codewrapper">
 <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
@@ -919,10 +856,10 @@ <h3 class="callout-title">
 <div id="ステージされた変更の除去" class="callout-inner">
 <h3 class="callout-title">ステージされた変更の除去</h3>
 <div class="callout-content">
-<p><code>git checkout</code> は、ステージされていない変更があったときに
+<p><code>git restore</code> は、ステージされていない変更があったときに
 以前のコミットを復元するために使用できます。しかしそれはステージされているがコミットされていない変更に対しても機能するでしょうか?
 <code>mars.txt</code>
-に変更を用意し、その変更を加え（<code>git add</code>を使い）、<code>git checkout</code>
+に変更を用意し、その変更を加え（<code>git add</code>を使い）、<code>git restore</code>
 を使い変更を取り除くことができるかどうか確かめましょう。</p>
 </div>
 </div>
@@ -936,41 +873,32 @@ <h4 class="accordion-header" id="headingSolution4">
 </button>
 <div id="collapseSolution4" class="accordion-collapse collapse" data-bs-parent="#accordionSolution4" aria-labelledby="headingSolution4">
 <div class="accordion-body">
-<p>After adding a change, <code>git checkout</code> can not be used
-directly. Let’s look at the output of <code>git status</code>:</p>
+<p>変更を追加した後、<code>git restore</code> は直接使用できません。
+次に、<code>git status</code> の出力を確認してみましょう。</p>
 <div class="codewrapper">
 <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
 <pre class="output" tabindex="0"><code>On branch main
 Changes to be committed:
-  (use "git reset HEAD &lt;file&gt;..." to unstage)
-
+  (use "git restore --staged &lt;file&gt;..." to unstage)
         modified:   mars.txt
 </code></pre>
 </div>
-<p>Note that if you don’t have the same output you may either have
-forgotten to change the file, or you have added it <em>and</em>
-committed it.</p>
-<p>Using the command <code>git checkout -- mars.txt</code> now does not
-give an error, but it does not restore the file either. Git helpfully
-tells us that we need to use <code>git reset</code> first to unstage the
-file:</p>
-<div class="codewrapper sourceCode" id="cb35">
+<p>この出力が表示されない場合、ファイルの変更を忘れているか、すでにファイルを追加してコミットした可能性があります。</p>
+<p>この時点で、<code>git restore mars.txt</code>
+コマンドを実行してもエラーは発生しませんが、ファイルは元に戻りません。
+Gitは、まず <code>git restore --staged</code>
+を使用してステージングエリアからファイルを戻す必要があることを教えてくれます。</p>
+<div class="codewrapper sourceCode" id="cb32">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
-<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb35-1"><a href="#cb35-1" tabindex="-1"></a><span class="ex">$</span> git reset HEAD mars.txt</span></code></pre>
+<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb32-1"><a href="#cb32-1" tabindex="-1"></a><span class="ex">$</span> git restore <span class="at">--staged</span> mars.txt</span></code></pre>
 </div>
-<div class="codewrapper">
-<h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
-</h3>
-<pre class="output" tabindex="0"><code>Unstaged changes after reset:
-M	mars.txt</code></pre>
-</div>
-<p>Now, <code>git status</code> gives us:</p>
-<div class="codewrapper sourceCode" id="cb37">
+<p>次に、<code>git status</code> の出力を確認します。</p>
+<div class="codewrapper sourceCode" id="cb33">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
-<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb37-1"><a href="#cb37-1" tabindex="-1"></a><span class="ex">$</span> git status</span></code></pre>
+<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb33-1"><a href="#cb33-1" tabindex="-1"></a><span class="ex">$</span> git status</span></code></pre>
 </div>
 <div class="codewrapper">
 <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
@@ -978,19 +906,19 @@ <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"><
 <pre class="output" tabindex="0"><code>On branch main
 Changes not staged for commit:
   (use "git add &lt;file&gt;..." to update what will be committed)
-  (use "git checkout -- &lt;file&gt;..." to discard changes in working directory)
+  (use "git git restore &lt;file&gt;..." to discard changes in working directory)
 
         modified:   mars.txt
 
 no changes added to commit (use "git add" and/or "git commit -a")</code></pre>
 </div>
-<p>This means we can now use <code>git checkout</code> to restore the
-file to the previous commit:</p>
-<div class="codewrapper sourceCode" id="cb39">
+<p>ここで、<code>git restore</code>
+コマンドを使ってファイルを前のコミットの状態に戻すことができます。</p>
+<div class="codewrapper sourceCode" id="cb35">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
-<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb39-1"><a href="#cb39-1" tabindex="-1"></a><span class="ex">$</span> git checkout <span class="at">--</span> mars.txt</span>
-<span id="cb39-2"><a href="#cb39-2" tabindex="-1"></a><span class="ex">$</span> git status</span></code></pre>
+<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb35-1"><a href="#cb35-1" tabindex="-1"></a><span class="ex">$</span> git restore mars.txt</span>
+<span id="cb35-2"><a href="#cb35-2" tabindex="-1"></a><span class="ex">$</span> git status</span></code></pre>
 </div>
 <div class="codewrapper">
 <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
@@ -1020,28 +948,29 @@ <h3 class="callout-title">履歴を探索し、要約する</h3>
 コマンドを使用すると、1つの特定のファイルを探索できることを思い出してください、
 例えば、<code>git diff mars.txt</code> 。
 ここでも同様のアイデアを適用できます。</p>
-<div class="codewrapper sourceCode" id="cb41">
+<div class="codewrapper sourceCode" id="cb37">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
-<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb41-1"><a href="#cb41-1" tabindex="-1"></a><span class="ex">$</span> git log mars.txt</span></code></pre>
-</div>
-<p>Unfortunately some of these commit messages are very ambiguous, e.g.,
-<code>update files</code>. How can you search through these files?</p>
-<p>Both <code>git diff</code> and <code>git log</code> are very useful
-and they summarize a different part of the history for you. Is it
-possible to combine both? Let’s try the following:</p>
-<div class="codewrapper sourceCode" id="cb42">
+<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb37-1"><a href="#cb37-1" tabindex="-1"></a><span class="ex">$</span> git log mars.txt</span></code></pre>
+</div>
+<p>残念ながら、一部のコミットメッセージは
+<code>update files</code>（「ファイルを更新する」）などのように非常に曖昧です。
+これらのファイルをどうやって調べたら良いでしょうか？</p>
+<p><code>git diff</code> と <code>git log</code>
+はどちらも非常に便利で、それぞれリポジトリの異なる部分の履歴を要約してくれます。
+これらを組み合わせることは可能でしょうか？
+次のコマンドを試してみましょう：</p>
+<div class="codewrapper sourceCode" id="cb38">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
-<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb42-1"><a href="#cb42-1" tabindex="-1"></a><span class="ex">$</span> git log <span class="at">--patch</span> mars.txt</span></code></pre>
+<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb38-1"><a href="#cb38-1" tabindex="-1"></a><span class="ex">$</span> git log <span class="at">--patch</span> mars.txt</span></code></pre>
 </div>
-<p>You should get a long list of output, and you should be able to see
-both commit messages and the difference between each commit.</p>
-<p>Question: What does the following command do?</p>
-<div class="codewrapper sourceCode" id="cb43">
+<p>長い出力が表示され、各コミットメッセージと、そのコミット間での違い（差分）が確認できるはずです。</p>
+<p>質問: 次のコマンドは何をしますか？</p>
+<div class="codewrapper sourceCode" id="cb39">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
-<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb43-1"><a href="#cb43-1" tabindex="-1"></a><span class="ex">$</span> git log <span class="at">--patch</span> HEAD~9 <span class="pp">*</span>.txt</span></code></pre>
+<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb39-1"><a href="#cb39-1" tabindex="-1"></a><span class="ex">$</span> git log <span class="at">--patch</span> HEAD~9 <span class="pp">*</span>.txt</span></code></pre>
 </div>
 </div>
 </div>
@@ -1123,8 +1052,8 @@ <h3 class="callout-title">まとめ</h3>
   "url": "https://swcarpentry-ja.github.io/git-novice/05-history.html",
   "identifier": "https://swcarpentry-ja.github.io/git-novice/05-history.html",
   "dateCreated": "2014-12-04",
-  "dateModified": "2024-06-06",
-  "datePublished": "2024-09-27"
+  "dateModified": "2024-09-30",
+  "datePublished": "2024-09-30"
 }
 
   </script><script>
diff --git a/06-ignore.html b/06-ignore.html
index 924786e897..27295ba0a5 100644
--- a/06-ignore.html
+++ b/06-ignore.html
@@ -906,7 +906,7 @@ <h3 class="callout-title">まとめ</h3>
   "identifier": "https://swcarpentry-ja.github.io/git-novice/06-ignore.html",
   "dateCreated": "2014-12-04",
   "dateModified": "2024-06-06",
-  "datePublished": "2024-09-27"
+  "datePublished": "2024-09-30"
 }
 
   </script><script>
diff --git a/07-github.html b/07-github.html
index a53560946a..7562e3d666 100644
--- a/07-github.html
+++ b/07-github.html
@@ -391,7 +391,7 @@ <h2 class="accordion-header" id="flush-headingTwelve">
       </div>
       <hr></nav><main id="main-content" class="main-content"><div class="container lesson-content">
         <h1>GitHub におけるリモート</h1>
-        <p>最終更新日：2024-06-06 |
+        <p>最終更新日：2024-09-30 |
 
         <a href="https://github.com/swcarpentry-ja/git-novice/edit/main/episodes/07-github.md" class="external-link">ページの編集 <i aria-hidden="true" data-feather="edit"></i></a></p>
 
@@ -440,7 +440,7 @@ <h3 class="card-title">目的</h3>
 <hr class="half-width"><p><a href="https://github.com" class="external-link">GitHub</a>
 にログインし、右上隅のアイコンをクリックして <code>planets</code>
 という名前の新しいリポジトリを作成してみましょう：</p>
-<figure><img src="fig/github-create-repo-01.png" alt="Creating a Repository on GitHub (Step 1)" class="figure mx-auto d-block"></figure><p>リポジトリに「planets」という名前を付けて、「Create
+<figure><img src="fig/github-create-repo-01.png" alt='The first step in creating a repository on GitHub: clicking the "create new" button' class="figure mx-auto d-block"></figure><p>リポジトリに「planets」という名前を付けて、「Create
 Repository」をクリックします。</p>
 <p>注:
 このリポジトリはローカルのリポジトリに接続されるため、空にしておく必要があります。
@@ -449,9 +449,9 @@ <h3 class="card-title">目的</h3>
 license.」の両方のオプションを「None」のままにします。
 リポジトリを空にしておく必要がある理由の完全な説明については、以下の「GitHub
 ライセンスと README ファイル」の演習を参照してください。</p>
-<figure><img src="fig/github-create-repo-02.png" alt="Creating a Repository on GitHub (Step 2)" class="figure mx-auto d-block"></figure><p>リポジトリが作成されるとすぐに、GitHub には ある URL
+<figure><img src="fig/github-create-repo-02.png" alt="The second step in creating a repository on GitHub: filling out the new repository form to provide the repository name, and specify that neither a readme nor a license should be created" class="figure mx-auto d-block"></figure><p>リポジトリが作成されるとすぐに、GitHub には ある URL
 と、ローカルのリポジトリの構成方法に関する情報が記載されたページが表示されます。</p>
-<figure><img src="fig/github-create-repo-03.png" alt="Creating a Repository on GitHub (Step 3)" class="figure mx-auto d-block"></figure><p>これにより、GitHub のサーバー上で次のことが効果的に行われます。</p>
+<figure><img src="fig/github-create-repo-03.png" alt="The summary page displayed by GitHub after a new repository has been created. It contains instructions for configuring the new GitHub repository as a git remote" class="figure mx-auto d-block"></figure><p>これにより、GitHub のサーバー上で次のことが効果的に行われます。</p>
 <div class="codewrapper sourceCode" id="cb1">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
@@ -463,8 +463,8 @@ <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i
 を覚えていれば、私達は <code>mars.txt</code>
 に以前の作業を追加してコミットしました。
 ローカルリポジトリのダイアグラムは次のようになります：</p>
-<figure><img src="fig/git-staging-area.svg" alt="The Local Repository with Git Staging Area" class="figure mx-auto d-block"></figure><p>Now that we have two repositories, we need a diagram like this:</p>
-<figure><img src="fig/git-freshly-made-github-repo.svg" alt="Freshly-Made GitHub Repository" class="figure mx-auto d-block"></figure><p>Note that our local repository still contains our earlier work on
+<figure><img src="fig/git-staging-area.svg" alt='A diagram showing how "git add" registers changes in the staging area, while "git commit" moves changes from the staging area to the repository' class="figure mx-auto d-block"></figure><p>Now that we have two repositories, we need a diagram like this:</p>
+<figure><img src="fig/git-freshly-made-github-repo.svg" alt='A diagram illustrating how the GitHub "planets" repository is also a git repository like our local repository, but that it is currently empty' class="figure mx-auto d-block"></figure><p>Note that our local repository still contains our earlier work on
 <code>mars.txt</code>, but the remote repository on GitHub appears empty
 as it doesn’t contain any files yet.</p>
 </section><section><h2 class="section-heading" id="connect-local-to-remote-repository">2. Connect local to remote repository<a class="anchor" aria-label="anchor" href="#connect-local-to-remote-repository"></a></h2>
@@ -472,7 +472,7 @@ <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i
 repository a <a href="reference.html#remote">remote</a> for the local
 repository. The home page of the repository on GitHub includes the URL
 string we need to identify it:</p>
-<figure><img src="fig/github-find-repo-string.png" alt="Where to Find Repository URL on GitHub" class="figure mx-auto d-block"></figure><p>Click on the ‘SSH’ link to change the <a href="reference.html#protocol">protocol</a> from HTTPS to SSH.</p>
+<figure><img src="fig/github-find-repo-string.png" alt="Clicking the &quot;Copy to Clipboard&quot; button on GitHub to obtain the repository's URL" class="figure mx-auto d-block"></figure><p>Click on the ‘SSH’ link to change the <a href="reference.html#protocol">protocol</a> from HTTPS to SSH.</p>
 <div id="https-vs.-ssh" class="callout">
 <div class="callout-square">
 <i class="callout-icon" data-feather="bell"></i>
@@ -487,7 +487,7 @@ <h3 class="callout-title">HTTPS vs. SSH</h3>
 </div>
 </div>
 </div>
-<figure><img src="fig/github-change-repo-string.png" alt="Changing the Repository URL on GitHub" class="figure mx-auto d-block"></figure><p>Copy that URL from the browser, go into the local
+<figure><img src="fig/github-change-repo-string.png" alt='A screenshot showing that clicking on "SSH" will make GitHub provide the SSH URL for a repository instead of the HTTPS URL' class="figure mx-auto d-block"></figure><p>Copy that URL from the browser, go into the local
 <code>planets</code> repository, and run this command:</p>
 <div class="codewrapper sourceCode" id="cb2">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
@@ -618,7 +618,10 @@ <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"><
 <p>Now, it is prompting Dracula for a passphrase. Since he is using his
 lab’s laptop that other people sometimes have access to, he wants to
 create a passphrase. Be sure to use something memorable or save your
-passphrase somewhere, as there is no “reset my password” option.</p>
+passphrase somewhere, as there is no “reset my password” option. Note
+that, when typing a passphrase on a terminal, there won’t be any visual
+feedback of your typing. This is normal: your passphrase will be
+recorded even if you see nothing changing on your screen.</p>
 <div class="codewrapper">
 <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
@@ -801,7 +804,7 @@ <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i
 </div>
 </div>
 <p>Our local and remote repositories are now in this state:</p>
-<figure><img src="fig/github-repo-after-first-push.svg" alt="GitHub Repository After First Push" class="figure mx-auto d-block"></figure><div id="the--u-flag" class="callout">
+<figure><img src="fig/github-repo-after-first-push.svg" alt='A diagram showing how "git push origin" will push changes from the local repository to the remote, making the remote repository an exact copy of the local repository.' class="figure mx-auto d-block"></figure><div id="the--u-flag" class="callout">
 <div class="callout-square">
 <i class="callout-icon" data-feather="bell"></i>
 </div>
@@ -1106,8 +1109,8 @@ <h3 class="callout-title">まとめ</h3>
   "url": "https://swcarpentry-ja.github.io/git-novice/07-github.html",
   "identifier": "https://swcarpentry-ja.github.io/git-novice/07-github.html",
   "dateCreated": "2014-12-04",
-  "dateModified": "2024-06-06",
-  "datePublished": "2024-09-27"
+  "dateModified": "2024-09-30",
+  "datePublished": "2024-09-30"
 }
 
   </script><script>
diff --git a/08-collab.html b/08-collab.html
index d46e9c79cf..008fcce284 100644
--- a/08-collab.html
+++ b/08-collab.html
@@ -381,7 +381,7 @@ <h2 class="accordion-header" id="flush-headingTwelve">
       </div>
       <hr></nav><main id="main-content" class="main-content"><div class="container lesson-content">
         <h1>Collaborating</h1>
-        <p>最終更新日：2024-06-06 |
+        <p>最終更新日：2024-09-30 |
 
         <a href="https://github.com/swcarpentry-ja/git-novice/edit/main/episodes/08-collab.md" class="external-link">ページの編集 <i aria-hidden="true" data-feather="edit"></i></a></p>
 
@@ -438,7 +438,7 @@ <h3 class="callout-title">Practicing By Yourself</h3>
 page on GitHub, click the “Settings” button on the right, select
 “Collaborators”, click “Add people”, and then enter your partner’s
 username.</p>
-<figure><img src="fig/github-add-collaborators.png" alt="screenshot of repository page with Settings then Collaborators selected, showing how to add Collaborators in a GitHub repository" class="figure mx-auto d-block"></figure><p>To accept access to the Owner’s repo, the Collaborator needs to go to
+<figure><img src="fig/github-add-collaborators.png" alt='A screenshot of the GitHub Collaborators settings page, which is accessed by clicking "Settings" then "Collaborators"' class="figure mx-auto d-block"></figure><p>To accept access to the Owner’s repo, the Collaborator needs to go to
 <a href="https://github.com/notifications" class="external-link">https://github.com/notifications</a>
 or check for email notification. Once there she can accept access to the
 Owner’s repo.</p>
@@ -459,7 +459,7 @@ <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i
 (<code>~/Desktop/vlad-planets</code>) specified at the end, you will
 clone inside your own planets folder! Make sure to navigate to the
 <code>Desktop</code> folder first.</p>
-<figure><img src="fig/github-collaboration.svg" alt="After Creating Clone of Repository" class="figure mx-auto d-block"></figure><p>The Collaborator can now make a change in her clone of the Owner’s
+<figure><img src="fig/github-collaboration.svg" alt='A diagram showing that "git clone" can create a copy of a remote GitHub repository, allowing a second person to create their own local repository that they can make changes to.' class="figure mx-auto d-block"></figure><p>The Collaborator can now make a change in her clone of the Owner’s
 repository, exactly the same way as we’ve been doing before:</p>
 <div class="codewrapper sourceCode" id="cb2">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
@@ -635,7 +635,7 @@ <h3 class="callout-title">Review Changes</h3>
 <button class="accordion-button solution-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseSolution1" aria-expanded="false" aria-controls="collapseSolution1">
   <h4 class="accordion-header" id="headingSolution1"> 回答を表示する </h4>
 </button>
-<div id="collapseSolution1" class="accordion-collapse collapse" data-bs-parent="#accordionSolution1" aria-labelledby="headingSolution1">
+<div id="collapseSolution1" class="accordion-collapse collapse" aria-labelledby="headingSolution1" data-bs-parent="#accordionSolution1">
 <div class="accordion-body">
 <p>On the command line, the Collaborator can use
 <code>git fetch origin main</code> to get the remote changes into the
@@ -755,8 +755,8 @@ <h3 class="callout-title">まとめ</h3>
   "url": "https://swcarpentry-ja.github.io/git-novice/08-collab.html",
   "identifier": "https://swcarpentry-ja.github.io/git-novice/08-collab.html",
   "dateCreated": "2014-12-04",
-  "dateModified": "2024-06-06",
-  "datePublished": "2024-09-27"
+  "dateModified": "2024-09-30",
+  "datePublished": "2024-09-30"
 }
 
   </script><script>
diff --git a/09-conflict.html b/09-conflict.html
index 0246369ffd..dc8fffdd02 100644
--- a/09-conflict.html
+++ b/09-conflict.html
@@ -381,7 +381,7 @@ <h2 class="accordion-header" id="flush-headingTwelve">
       </div>
       <hr></nav><main id="main-content" class="main-content"><div class="container lesson-content">
         <h1>Conflicts</h1>
-        <p>最終更新日：2024-06-06 |
+        <p>最終更新日：2024-09-30 |
 
         <a href="https://github.com/swcarpentry-ja/git-novice/edit/main/episodes/09-conflict.md" class="external-link">ページの編集 <i aria-hidden="true" data-feather="edit"></i></a></p>
 
@@ -530,7 +530,7 @@ <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"><
 hint: (e.g., 'git pull ...') before pushing again.
 hint: See the 'Note about fast-forwards' in 'git push --help' for details.</code></pre>
 </div>
-<figure><img src="fig/conflict.svg" alt="The Conflicting Changes" class="figure mx-auto d-block"></figure><p>Git rejects the push because it detects that the remote repository
+<figure><img src="fig/conflict.svg" alt="A diagram showing a conflict that might occur when two sets of independent changes are merged" class="figure mx-auto d-block"></figure><p>Git rejects the push because it detects that the remote repository
 has new updates that have not been incorporated into the local branch.
 What we have to do is pull the changes from GitHub, <a href="reference.html#merge">merge</a> them into the copy we’re currently
 working in, and then push that. Let’s start by pulling:</p>
@@ -750,7 +750,7 @@ <h3 class="callout-title">Conflicts on Non-textual files</h3>
 <button class="accordion-button solution-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseSolution1" aria-expanded="false" aria-controls="collapseSolution1">
   <h4 class="accordion-header" id="headingSolution1"> 回答を表示する </h4>
 </button>
-<div id="collapseSolution1" class="accordion-collapse collapse" data-bs-parent="#accordionSolution1" aria-labelledby="headingSolution1">
+<div id="collapseSolution1" class="accordion-collapse collapse" aria-labelledby="headingSolution1" data-bs-parent="#accordionSolution1">
 <div class="accordion-body">
 <p>Let’s try it. Suppose Dracula takes a picture of Martian surface and
 calls it <code>mars.jpg</code>.</p>
@@ -958,7 +958,7 @@ <h3 class="callout-title">A Typical Work Session</h3>
 <td></td>
 </tr><tr class="even"><td>6</td>
 <td>Celebrate!</td>
-<td><code>AFK</code></td>
+<td></td>
 </tr></tbody></table></div>
 </div>
 </div>
@@ -967,7 +967,7 @@ <h3 class="callout-title">A Typical Work Session</h3>
 <button class="accordion-button solution-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseSolution2" aria-expanded="false" aria-controls="collapseSolution2">
   <h4 class="accordion-header" id="headingSolution2"> 回答を表示する </h4>
 </button>
-<div id="collapseSolution2" class="accordion-collapse collapse" data-bs-parent="#accordionSolution2" aria-labelledby="headingSolution2">
+<div id="collapseSolution2" class="accordion-collapse collapse" aria-labelledby="headingSolution2" data-bs-parent="#accordionSolution2">
 <div class="accordion-body">
 <table class="table"><colgroup><col width="1%"><col width="24%"><col width="74%"></colgroup><thead><tr class="header"><th>order</th>
 <th>action . . . . . .</th>
@@ -989,7 +989,7 @@ <h4 class="accordion-header" id="headingSolution2"> 回答を表示する </h4>
 <td><code>git push origin main</code></td>
 </tr><tr class="even"><td>6</td>
 <td>Celebrate!</td>
-<td><code>AFK</code></td>
+<td></td>
 </tr></tbody></table></div>
 </div>
 </div>
@@ -1071,8 +1071,8 @@ <h3 class="callout-title">まとめ</h3>
   "url": "https://swcarpentry-ja.github.io/git-novice/09-conflict.html",
   "identifier": "https://swcarpentry-ja.github.io/git-novice/09-conflict.html",
   "dateCreated": "2014-12-04",
-  "dateModified": "2024-06-06",
-  "datePublished": "2024-09-27"
+  "dateModified": "2024-09-30",
+  "datePublished": "2024-09-30"
 }
 
   </script><script>
diff --git a/10-open.html b/10-open.html
index 3db3adc309..bc6a9c2e4c 100644
--- a/10-open.html
+++ b/10-open.html
@@ -593,7 +593,7 @@ <h3 class="callout-title">まとめ</h3>
   "identifier": "https://swcarpentry-ja.github.io/git-novice/10-open.html",
   "dateCreated": "2014-12-04",
   "dateModified": "2024-06-06",
-  "datePublished": "2024-09-27"
+  "datePublished": "2024-09-30"
 }
 
   </script><script>
diff --git a/11-licensing.html b/11-licensing.html
index aad90b2d5a..79a8b4f3b9 100644
--- a/11-licensing.html
+++ b/11-licensing.html
@@ -577,7 +577,7 @@ <h3 class="callout-title">まとめ</h3>
   "identifier": "https://swcarpentry-ja.github.io/git-novice/11-licensing.html",
   "dateCreated": "2014-12-04",
   "dateModified": "2024-06-06",
-  "datePublished": "2024-09-27"
+  "datePublished": "2024-09-30"
 }
 
   </script><script>
diff --git a/12-citation.html b/12-citation.html
index 33e963f4a5..6a4f647085 100644
--- a/12-citation.html
+++ b/12-citation.html
@@ -381,7 +381,7 @@ <h2 class="accordion-header" id="flush-headingTwelve">
       </div>
       <hr></nav><main id="main-content" class="main-content"><div class="container lesson-content">
         <h1>Citation</h1>
-        <p>最終更新日：2024-06-06 |
+        <p>最終更新日：2024-09-30 |
 
         <a href="https://github.com/swcarpentry-ja/git-novice/edit/main/episodes/12-citation.md" class="external-link">ページの編集 <i aria-hidden="true" data-feather="edit"></i></a></p>
 
@@ -417,30 +417,18 @@ <h3 class="card-title">目的</h3>
 <p>You may want to include a file called <code>CITATION</code> or
 <code>CITATION.txt</code> that describes how to reference your project;
 the one for Software Carpentry states:</p>
-<pre class="source"><code>To reference Software Carpentry in publications, please cite both of the following:
+<pre class="source"><code>To reference Software Carpentry in publications, please cite:
 
-Greg Wilson: "Software Carpentry: Getting Scientists to Write Better
-Code by Making Them More Productive".  Computing in Science &amp;
-Engineering, Nov-Dec 2006.
+Greg Wilson: "Software Carpentry: Lessons Learned". F1000Research,
+2016, 3:62 (doi: 10.12688/f1000research.3-62.v2).
 
-Greg Wilson: "Software Carpentry: Lessons Learned". arXiv:1307.5448,
-July 2013.
-
-@article{wilson-software-carpentry-2006,
-    author =  {Greg Wilson},
-    title =   {Software Carpentry: Getting Scientists to Write Better Code by Making Them More Productive},
-    journal = {Computing in Science \&amp; Engineering},
-    month =   {November--December},
-    year =    {2006},
-}
-
-@online{wilson-software-carpentry-2013,
+@online{wilson-software-carpentry-2016,
   author      = {Greg Wilson},
   title       = {Software Carpentry: Lessons Learned},
-  version     = {1},
-  date        = {2013-07-20},
-  eprinttype  = {arxiv},
-  eprint      = {1307.5448}
+  version     = {2},
+  date        = {2016-01-28},
+  url         = {http://f1000research.com/articles/3-62/v2},
+  doi         = {10.12688/f1000research.3-62.v2}
 }</code></pre>
 <p>More detailed advice, and other ways to make your code citable can be
 found <a href="https://www.software.ac.uk/publication/how-cite-and-describe-software" class="external-link">at
@@ -526,8 +514,8 @@ <h3 class="callout-title">まとめ</h3>
   "url": "https://swcarpentry-ja.github.io/git-novice/12-citation.html",
   "identifier": "https://swcarpentry-ja.github.io/git-novice/12-citation.html",
   "dateCreated": "2014-12-04",
-  "dateModified": "2024-06-06",
-  "datePublished": "2024-09-27"
+  "dateModified": "2024-09-30",
+  "datePublished": "2024-09-30"
 }
 
   </script><script>
diff --git a/13-hosting.html b/13-hosting.html
index f5e4491bb0..2fe85f6a12 100644
--- a/13-hosting.html
+++ b/13-hosting.html
@@ -381,7 +381,7 @@ <h2 class="accordion-header" id="flush-headingTwelve">
       </div>
       <hr></nav><main id="main-content" class="main-content"><div class="container lesson-content">
         <h1>Hosting</h1>
-        <p>最終更新日：2024-06-06 |
+        <p>最終更新日：2024-09-30 |
 
         <a href="https://github.com/swcarpentry-ja/git-novice/edit/main/episodes/13-hosting.md" class="external-link">ページの編集 <i aria-hidden="true" data-feather="edit"></i></a></p>
 
@@ -414,8 +414,9 @@ <h3 class="card-title">目的</h3>
 </div>
 </div>
 </div>
-<p>自分たちの仕事をオープンにしたいグループにとって次に大きな問題は、コードとデータをどこにホストするかです。
-1
+<p>After <a href="11-licensing.html">choosing a license</a>, another big
+question for groups that want to open up their work is where to host
+their code and data. 1
 つのオプションは、研究室、学部、または大学がサーバーを提供し、アカウントやバックアップなどを管理することです。
 これの主な利点は、誰が何を所有しているかを明確にすることです。
 それは、題材が機密性の高いもの
@@ -574,8 +575,8 @@ <h3 class="callout-title">まとめ</h3>
   "url": "https://swcarpentry-ja.github.io/git-novice/13-hosting.html",
   "identifier": "https://swcarpentry-ja.github.io/git-novice/13-hosting.html",
   "dateCreated": "2014-12-04",
-  "dateModified": "2024-06-06",
-  "datePublished": "2024-09-27"
+  "dateModified": "2024-09-30",
+  "datePublished": "2024-09-30"
 }
 
   </script><script>
diff --git a/14-supplemental-rstudio.html b/14-supplemental-rstudio.html
index c1139173b1..c68b5f6a81 100644
--- a/14-supplemental-rstudio.html
+++ b/14-supplemental-rstudio.html
@@ -381,7 +381,7 @@ <h2 class="accordion-header" id="flush-headingTwelve">
       </div>
       <hr></nav><main id="main-content" class="main-content"><div class="container lesson-content">
         <h1>Supplemental: Using Git from RStudio</h1>
-        <p>最終更新日：2024-06-06 |
+        <p>最終更新日：2024-09-30 |
 
         <a href="https://github.com/swcarpentry-ja/git-novice/edit/main/episodes/14-supplemental-rstudio.md" class="external-link">ページの編集 <i aria-hidden="true" data-feather="edit"></i></a></p>
 
@@ -476,26 +476,26 @@ <h3 id="tell-rstudio-where-to-find-github">Tell RStudio where to find GitHub<a c
 <p>Next, RStudio will ask which existing directory we want to use. Click
 “Browse…” and navigate to the correct directory, then click “Create
 Project”:</p>
-<figure><img src="fig/RStudio_screenshot_navigateexisting.png" class="figure mx-auto d-block"></figure><p>Ta-da! We have created a new project in RStudio within the existing
+<figure><img src="fig/RStudio_screenshot_navigateexisting.png" alt='RStudio window showing the "Create Project From Existing Directory" dialog. In the dialog, the project working directory has been set to "~/Desktop/planets"' class="figure mx-auto d-block"></figure><p>Ta-da! We have created a new project in RStudio within the existing
 planets repository. Notice the vertical “Git” menu in the menu bar.
 RStudio has recognized that the current directory is a Git repository,
 and gives us a number of tools to use Git:</p>
 <figure><img src="fig/RStudio_screenshot_afterclone.png" alt="RStudio window after new project is created with large arrow pointing to vertical Git menu bar." class="figure mx-auto d-block"></figure><p>To edit the existing files in the repository, we can click on them in
 the “Files” panel on the lower right. Now let’s add some additional
 information about Pluto:</p>
-<figure><img src="fig/RStudio_screenshot_editfiles.png" class="figure mx-auto d-block"></figure><p>Once we have saved our edited files, we can use RStudio to commit the
+<figure><img src="fig/RStudio_screenshot_editfiles.png" alt='RStudio window demonstrating the use of the editor panel to modify the "pluto.txt" file' class="figure mx-auto d-block"></figure><p>Once we have saved our edited files, we can use RStudio to commit the
 changes by clicking on “Commit…” in the Git menu:</p>
-<figure><img src="fig/RStudio_screenshot_commit.png" alt='RStudio screenshot showing the Git menu dropdown with "Commit..." selected' class="figure mx-auto d-block"></figure><p>This will open a dialogue where we can select which files to commit
+<figure><img src="fig/RStudio_screenshot_commit.png" alt='RStudio screenshot showing the Git menu dropdown with the "Commit..." option selected' class="figure mx-auto d-block"></figure><p>This will open a dialogue where we can select which files to commit
 (by checking the appropriate boxes in the “Staged” column), and enter a
 commit message (in the upper right panel). The icons in the “Status”
 column indicate the current status of each file. Clicking on a file
 shows information about changes in the lower panel (using output of
 <code>git diff</code>). Once everything is the way we want it, we click
 “Commit”:</p>
-<figure><img src="fig/RStudio_screenshot_review.png" class="figure mx-auto d-block"></figure><p>The changes can be pushed by selecting “Push Branch” from the Git
+<figure><img src="fig/RStudio_screenshot_review.png" alt='RStudio screenshow showing the "Review Changes" dialog. The top left panel shows the list of files that can be included or excluded from the commit. The top right panel is for writing a commit message. The bottom panel shows information about the currently selected file in the top left panel.' class="figure mx-auto d-block"></figure><p>The changes can be pushed by selecting “Push Branch” from the Git
 menu. There are also options to pull from the remote repository, and to
 view the commit history:</p>
-<figure><img src="fig/RStudio_screenshot_history.png" alt='RStudio screenshot showing the git menu dropdown with "History" selected' class="figure mx-auto d-block"></figure><div id="are-the-pushpull-commands-grayed-out" class="callout">
+<figure><img src="fig/RStudio_screenshot_history.png" alt='RStudio screenshot showing the git menu dropdown with the "History" option selected' class="figure mx-auto d-block"></figure><div id="are-the-pushpull-commands-grayed-out" class="callout">
 <div class="callout-square">
 <i class="callout-icon" data-feather="bell"></i>
 </div>
@@ -511,7 +511,7 @@ <h3 class="callout-title">Are the Push/Pull Commands Grayed Out?</h3>
 </div>
 <p>If we click on “History”, we can see a graphical version of what
 <code>git log</code> would tell us:</p>
-<figure><img src="fig/RStudio_screenshot_viewhistory.png" class="figure mx-auto d-block"></figure><p>RStudio creates a number of files that it uses to keep track of a
+<figure><img src="fig/RStudio_screenshot_viewhistory.png" alt='RStudio screenshot showing the "Review Changes" dialog after pressing the "History" button. The top panel lists the commits in the repository, similar to git log. The bottom panel shows the changes included in the commit that has been selected in the top panel.' class="figure mx-auto d-block"></figure><p>RStudio creates a number of files that it uses to keep track of a
 project. We often don’t want to track these, in which case we add them
 to our <code>.gitignore</code> file:</p>
 <figure><img src="fig/RStudio_screenshot_gitignore.png" alt="RStudio screenshot showing .gitignore open in the editor pane with the files .Rproj.user, .Rhistory, .RData, and *.Rproj added to the end" class="figure mx-auto d-block"></figure><div id="tip-versioning-disposable-output" class="callout">
@@ -640,8 +640,8 @@ <h3 class="callout-title">まとめ</h3>
   "url": "https://swcarpentry-ja.github.io/git-novice/14-supplemental-rstudio.html",
   "identifier": "https://swcarpentry-ja.github.io/git-novice/14-supplemental-rstudio.html",
   "dateCreated": "2014-12-04",
-  "dateModified": "2024-06-06",
-  "datePublished": "2024-09-27"
+  "dateModified": "2024-09-30",
+  "datePublished": "2024-09-30"
 }
 
   </script><script>
diff --git a/404.html b/404.html
index be704c96a0..4bf4060ab2 100644
--- a/404.html
+++ b/404.html
@@ -453,8 +453,8 @@ <h1>ページが見つかりません</h1>
   "url": "https://swcarpentry-ja.github.io/git-novice/404.html",
   "identifier": "https://swcarpentry-ja.github.io/git-novice/404.html",
   "dateCreated": "2014-12-04",
-  "dateModified": "2024-09-27",
-  "datePublished": "2024-09-27"
+  "dateModified": "2024-09-30",
+  "datePublished": "2024-09-30"
 }
 
   </script><script>
diff --git a/CODE_OF_CONDUCT.html b/CODE_OF_CONDUCT.html
index 2c0d06165e..0661ae8541 100644
--- a/CODE_OF_CONDUCT.html
+++ b/CODE_OF_CONDUCT.html
@@ -458,7 +458,7 @@ <h1>Contributor Code of Conduct</h1>
   "identifier": "https://swcarpentry-ja.github.io/git-novice/CODE_OF_CONDUCT.html",
   "dateCreated": "2014-12-04",
   "dateModified": "2024-06-06",
-  "datePublished": "2024-09-27"
+  "datePublished": "2024-09-30"
 }
 
   </script><script>
diff --git a/LICENSE.html b/LICENSE.html
index 16b8ae69ff..b5c9086282 100644
--- a/LICENSE.html
+++ b/LICENSE.html
@@ -377,7 +377,7 @@ <h2 class="accordion-header" id="flush-headingTwelve">
       </div>
       <hr></nav><main id="main-content" class="main-content"><div class="container lesson-content">
         <h1>Licenses</h1>
-        <p>最終更新日：2024-06-06 |
+        <p>最終更新日：2024-09-30 |
 
         <a href="https://github.com/swcarpentry-ja/git-novice/edit/main/LICENSE.md" class="external-link">ページの編集 <i aria-hidden="true" data-feather="edit"></i></a></p>
 
@@ -407,7 +407,7 @@ <h1>Licenses</h1>
 <ul><li><p><strong>Attribution</strong>—You must give appropriate credit
 (mentioning that your work is derived from work that is Copyright (c)
 The Carpentries and, where practical, linking to
-https://carpentries.org/), provide a <a href="https://creativecommons.org/licenses/by/4.0/" class="external-link">link to the
+&lt;https://carpentries.org/&gt;), provide a <a href="https://creativecommons.org/licenses/by/4.0/" class="external-link">link to the
 license</a>, and indicate if changes were made. You may do so in any
 reasonable manner, but not in any way that suggests the licensor
 endorses you or your use.</p></li>
@@ -506,8 +506,8 @@ <h1>Licenses</h1>
   "url": "https://swcarpentry-ja.github.io/git-novice/LICENSE.html",
   "identifier": "https://swcarpentry-ja.github.io/git-novice/LICENSE.html",
   "dateCreated": "2014-12-04",
-  "dateModified": "2024-06-06",
-  "datePublished": "2024-09-27"
+  "dateModified": "2024-09-30",
+  "datePublished": "2024-09-30"
 }
 
   </script><script>
diff --git a/aio.html b/aio.html
index d3f2fbf60e..257f9db939 100644
--- a/aio.html
+++ b/aio.html
@@ -457,7 +457,7 @@ <h2 class="accordion-header" id="flush-headingTwelve">
         
 <section id="aio-01-basics"><p>Content from <a href="01-basics.html">自動的なバージョン管理</a></p>
 <hr>
-<p>最終更新日：2024-06-06 |
+<p>最終更新日：2024-09-30 |
 
         <a href="https://github.com/swcarpentry-ja/git-novice/edit/main/episodes/01-basics.md" class="external-link">ページの編集 <i aria-hidden="true" data-feather="edit"></i></a></p>
 <div class="text-end">
@@ -505,12 +505,12 @@ <h3 class="card-title">目的</h3>
 加えられた全ての変更点を記録していきます。ドキュメントの
 進歩を記録していると考えてもらって構いません。変更点を最初の状況まで
 戻してから、最新版になるまでの変更を一つずつ再現していくことができます。</p>
-<figure><img src="fig/play-changes.svg" alt="変更は連続して保存されます" class="figure mx-auto d-block"></figure><p>「変更点」と「ドキュメント」を別々の物として考えてみると、基礎となるドキュメントに
+<figure><img src="fig/play-changes.svg" alt="A diagram demonstrating how a single document grows as the result of sequential changes" class="figure mx-auto d-block"></figure><p>「変更点」と「ドキュメント」を別々の物として考えてみると、基礎となるドキュメントに
 異なる変更点を「再現」する事によって、結果的に違ったバージョンのドキュメントを
 作る事が可能だという事が分かります。
 例えば、下の図のように二人のユーザーが同じドキュメントに違った編集を加えた場合です。</p>
-<figure><img src="fig/versions.svg" alt="異なるバージョンの保存ができます" class="figure mx-auto d-block"></figure><p>変更点の衝突（<a href="reference.html#conflict">コンフリクト</a>）が無ければ、二つ以上の違った変更点を基礎ドキュメントに加えることさえできます。</p>
-<figure><img src="fig/merge.svg" alt="複数のバージョンをマージできます" class="figure mx-auto d-block"></figure><p>バージョン管理システムは、ユーザーがドキュメントに加えた変更点を記録するツールであり、
+<figure><img src="fig/versions.svg" alt="A diagram with one source document that has been modified in two different ways to produce two different versions of the document" class="figure mx-auto d-block"></figure><p>変更点の衝突（<a href="reference.html#conflict">コンフリクト</a>）が無ければ、二つ以上の違った変更点を基礎ドキュメントに加えることさえできます。</p>
+<figure><img src="fig/merge.svg" alt="A diagram that shows the merging of two different document versions into one document that contains all of the changes from both versions" class="figure mx-auto d-block"></figure><p>バージョン管理システムは、ユーザーがドキュメントに加えた変更点を記録するツールであり、
 結果的にドキュメントの違ったバージョンを作成する事ができます。
 このツールを活用
 する事によって、次のバージョンに加える変更点（個々の変更点は 「<a href="reference.html#commit">commit（コミット）</a>」と呼びます）を決める事ができ、変更点に関するメタデータも一緒に保存する事ができます。
@@ -921,7 +921,7 @@ <h3 class="callout-title">まとめ</h3>
 </div>
 </div></section><section id="aio-03-create"><p>Content from <a href="03-create.html">リポジトリの作成</a></p>
 <hr>
-<p>最終更新日：2024-06-06 |
+<p>最終更新日：2024-09-30 |
 
         <a href="https://github.com/swcarpentry-ja/git-novice/edit/main/episodes/03-create.md" class="external-link">ページの編集 <i aria-hidden="true" data-feather="edit"></i></a></p>
 <div class="text-end">
@@ -956,8 +956,9 @@ <h3 class="card-title">目的</h3>
 </div>
 <p>Gitの設定ができたら、 それを使い始めることができます。</p>
 <p>火星に惑星着陸船を送ることが可能かどうかを調査しているウルフマンとドラキュラの話に戻りましょう。</p>
-<p><img src="fig/motivatingexample.png" alt="motivatingexample" class="figure"><a href="https://www.deviantart.com/b-maze/art/Werewolf-vs-Dracula-124893530" class="external-link">ウルフマン対ドラキュラ</a>
-by <a href="https://www.deviantart.com/b-maze" class="external-link">b-maze</a> / <a href="https://www.deviantart.com/" class="external-link">Deviant Art</a>. <a href="https://en.wikipedia.org/wiki/File:OSIRIS_Mars_true_color.jpg" class="external-link">火星</a>
+<p><img src="fig/motivatingexample.png" alt="The main elements of the story: Dracula, Wolfman, the Mummy, Mars, Pluto and The Moon" class="figure"><a href="https://www.deviantart.com/b-maze/art/Werewolf-vs-Dracula-124893530" class="external-link">Werewolf
+vs dracula</a> by <a href="https://www.deviantart.com/b-maze" class="external-link">b-maze</a>
+/ <a href="https://www.deviantart.com/" class="external-link">Deviant Art</a>. <a href="https://en.wikipedia.org/wiki/File:OSIRIS_Mars_true_color.jpg" class="external-link">火星</a>
 by European Space Agency / <a href="https://creativecommons.org/licenses/by/3.0/deed.en" class="external-link">CC-BY-SA 3.0
 IGO</a>. <a href="https://commons.wikimedia.org/wiki/File:PIA19873-Pluto-NewHorizons-FlyingPastImage-20150714-transparent.png" class="external-link">冥王星</a>
 / Courtesy NASA/JPL-Caltech. <a href="https://commons.wikimedia.org/wiki/File:Mummy_icon_-_Noun_Project_4070.svg" class="external-link">ミイラ</a>
@@ -1024,7 +1025,11 @@ <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"><
 </h3>
 <pre class="output" tabindex="0"><code>Switched to a new branch 'main'</code></pre>
 </div>
-<p>プロジェクトのステータスをGitに問うことで、すべてが正しく設定されていることを確認できます:</p>
+<p>We can now start using one of the most important git commands, which
+is particularly helpful to beginners. <code>git status</code> tells us
+the status of our project, and better, a list of changes in the project
+and options on what to do with those changes. We can use it as often as
+we want, whenever we want to understand what is going on.</p>
 <div class="codewrapper sourceCode" id="cb8">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
@@ -1115,7 +1120,7 @@ <h3 class="callout-title">
 <code>git init</code> の間違いを修正する</h3>
 <div class="callout-content">
 <p>ウルフマンはドラキュラに、「入れ子」状態になっているリポジトリがいかに冗長で、混乱を引き起こす可能性があるかを説明しました。
-説明を聞いて、ドラキュラは「入れ子」状態のリポジトリを削除したいと思いました。
+Dracula would like to go back to a single git repository.
 <code>moons</code>サブディレクトリの最後の<code>git init</code>を、ドラキュラはどうやって、元に戻すことができるのでしょうか？</p>
 </div>
 </div>
@@ -1140,15 +1145,17 @@ <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i
 </h3>
 <pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb13-1"><a href="#cb13-1" tabindex="-1"></a><span class="ex">$</span> rm filename</span></code></pre>
 </div>
-<p>同様に、<code>rm -r dirname</code> または <code>rm -rf dirname</code>
-を使ってディレクトリを削除することができます。
+<p>Similarly a directory can be removed using
+<code>rm -r dirname</code>.
 この方法で削除されるファイルやフォルダがGitによって追跡されているなら、次のエピソードで見られるように、それらの削除が、追跡する必要がある別の変更になります。</p>
 </div>
 <div class="section level3">
 <h3 id="解答-1">解答<a class="anchor" aria-label="anchor" href="#%E8%A7%A3%E7%AD%94-1"></a>
 </h3>
-<p>Gitはすべてのファイルを<code>.git</code>ディレクトリに保存します。
-この小さなミスから立ち直るには、ドラキュラは<code>planets</code>ディレクトリの中から次のコマンドを実行して、moonsサブディレクトリの中の<code>.git</code>フォルダを削除すれば良い：</p>
+<p>Gitはすべてのファイルを<code>.git</code>ディレクトリに保存します。 To
+recover from this little mistake, Dracula can remove the
+<code>.git</code> folder in the moons subdirectory by running the
+following command from inside the <code>planets</code> directory:</p>
 <div class="codewrapper sourceCode" id="cb14">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
@@ -1156,7 +1163,8 @@ <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i
 </div>
 <p>しかし、気をつけてください！
 間違ったディレクトリでこのコマンドを実行すると、残しておきたいプロジェクトのGit履歴がすべて削除されてしまいます。
-したがって、常に <code>pwd</code>
+In general, deleting files and directories using <code>rm</code> from
+the command line cannot be reversed. したがって、常に <code>pwd</code>
 コマンドを使用してカレントディレクトリを確認してください。</p>
 </div>
 </div>
@@ -1179,7 +1187,7 @@ <h3 class="callout-title">まとめ</h3>
 </div>
 </div></section><section id="aio-04-changes"><p>Content from <a href="04-changes.html">変更内容の記録</a></p>
 <hr>
-<p>最終更新日：2024-06-06 |
+<p>最終更新日：2024-09-30 |
 
         <a href="https://github.com/swcarpentry-ja/git-novice/edit/main/episodes/04-changes.md" class="external-link">ページの編集 <i aria-hidden="true" data-feather="edit"></i></a></p>
 <div class="text-end">
@@ -1531,7 +1539,7 @@ <h3 class="callout-title">ステージングエリア</h3>
 </div>
 </div>
 </div>
-<figure><img src="fig/git-staging-area.svg" alt="Gitのステージング・エリア" class="figure mx-auto d-block"></figure><p>それでは、ファイルの変更点がエディタからステージングエリア、そして長期保存に移る過程を見てみましょう。
+<figure><img src="fig/git-staging-area.svg" alt='A diagram showing how "git add" registers changes in the staging area, while "git commit" moves changes from the staging area to the repository' class="figure mx-auto d-block"></figure><p>それでは、ファイルの変更点がエディタからステージングエリア、そして長期保存に移る過程を見てみましょう。
 初めに、新しい文章をファイルに加えましょう：</p>
 <div class="codewrapper sourceCode" id="cb29">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
@@ -1803,7 +1811,7 @@ <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i
 <p>まとめると、変更内容をリポジトリに追加したい時は<code>git add</code>
 で変更点をステージングエリアに移してから、<code>git commit</code>
 でステージングエリアの変更点をリポジトリに保存します：</p>
-<figure><img src="fig/git-committing.svg" alt="git commitのワークフロー" class="figure mx-auto d-block"></figure><div id="コミットメッセージを決める" class="callout challenge">
+<figure><img src="fig/git-committing.svg" alt="A diagram showing two documents being separately staged using git add, before being combined into one commit using git commit" class="figure mx-auto d-block"></figure><div id="コミットメッセージを決める" class="callout challenge">
 <div class="callout-square">
 <i class="callout-icon" data-feather="zap"></i>
 </div>
@@ -1828,7 +1836,7 @@ <h4 class="accordion-header" id="headingSolution1">
   解答
   </h4>
 </button>
-<div id="collapseSolution1" class="accordion-collapse collapse" aria-labelledby="headingSolution1" data-bs-parent="#accordionSolution1">
+<div id="collapseSolution1" class="accordion-collapse collapse" data-bs-parent="#accordionSolution1" aria-labelledby="headingSolution1">
 <div class="accordion-body">
 <p>１つ目のメッセージは短すぎてコミットの内容が何なのかわかりにくいです。２つ目は<code>git diff</code>で何が変わったのかが分かるので、長い割にはあまり意味がありません。３つ目は、短く、簡潔で、分かりやすいメッセージです。</p>
 </div>
@@ -1878,7 +1886,7 @@ <h4 class="accordion-header" id="headingSolution2">
   解答
   </h4>
 </button>
-<div id="collapseSolution2" class="accordion-collapse collapse" aria-labelledby="headingSolution2" data-bs-parent="#accordionSolution2">
+<div id="collapseSolution2" class="accordion-collapse collapse" data-bs-parent="#accordionSolution2" aria-labelledby="headingSolution2">
 <div class="accordion-body">
 <ol style="list-style-type: decimal">
 <li><p>ファイルがステージングエリアにない限り、コミットできません。</p></li>
@@ -1917,7 +1925,7 @@ <h4 class="accordion-header" id="headingSolution3">
   解答
   </h4>
 </button>
-<div id="collapseSolution3" class="accordion-collapse collapse" aria-labelledby="headingSolution3" data-bs-parent="#accordionSolution3">
+<div id="collapseSolution3" class="accordion-collapse collapse" data-bs-parent="#accordionSolution3" aria-labelledby="headingSolution3">
 <div class="accordion-body">
 <p>以下の<code>cat mars.txt</code>の出力は、この課題で追加された内容のみを反映しています。
 出力は異なる場合があります。</p>
@@ -2005,7 +2013,7 @@ <h4 class="accordion-header" id="headingSolution4">
   解答
   </h4>
 </button>
-<div id="collapseSolution4" class="accordion-collapse collapse" aria-labelledby="headingSolution4" data-bs-parent="#accordionSolution4">
+<div id="collapseSolution4" class="accordion-collapse collapse" data-bs-parent="#accordionSolution4" aria-labelledby="headingSolution4">
 <div class="accordion-body">
 <p>必要であれば、<code>planets</code> から出ましょう：</p>
 <div class="codewrapper sourceCode" id="cb64">
@@ -2070,7 +2078,7 @@ <h3 class="callout-title">まとめ</h3>
 </div>
 </div></section><section id="aio-05-history"><p>Content from <a href="05-history.html">履歴の探索</a></p>
 <hr>
-<p>最終更新日：2024-06-06 |
+<p>最終更新日：2024-09-30 |
 
         <a href="https://github.com/swcarpentry-ja/git-novice/edit/main/episodes/05-history.md" class="external-link">ページの編集 <i aria-hidden="true" data-feather="edit"></i></a></p>
 <div class="text-end">
@@ -2163,7 +2171,7 @@ <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i
 <div class="codewrapper sourceCode" id="cb6">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
-<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb6-1"><a href="#cb6-1" tabindex="-1"></a><span class="ex">$</span> git diff HEAD~3 mars.txt</span></code></pre>
+<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb6-1"><a href="#cb6-1" tabindex="-1"></a><span class="ex">$</span> git diff HEAD~2 mars.txt</span></code></pre>
 </div>
 <div class="codewrapper">
 <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
@@ -2185,7 +2193,7 @@ <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"><
 <div class="codewrapper sourceCode" id="cb8">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
-<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb8-1"><a href="#cb8-1" tabindex="-1"></a><span class="ex">$</span> git show HEAD~3 mars.txt</span></code></pre>
+<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb8-1"><a href="#cb8-1" tabindex="-1"></a><span class="ex">$</span> git show HEAD~2 mars.txt</span></code></pre>
 </div>
 <div class="codewrapper">
 <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
@@ -2209,7 +2217,7 @@ <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"><
 表記を使用して以前のコミットを参照できるため、<code>HEAD~1</code>
 は「以前のコミット」を意味し、<code>HEAD~123</code>
 は現在の場所から123個前のコミットに戻ります。</p>
-<p><code>git log</code>
+<p><code>git log</code> および <code>git show</code>
 が表示する、数字と文字の長い文字列を使用してコミットを参照することもできます。
 これらは一個一個の変更に対するユニークなIDであり、「ユニーク」は本当に唯一であることを意味します:
 どのコンピューターのどのファイルの変更の組み合わせに対しても、ユニークな40文字の
@@ -2270,17 +2278,17 @@ <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"><
 <pre class="output" tabindex="0"><code>On branch main
 Changes not staged for commit:
   (use "git add &lt;file&gt;..." to update what will be committed)
-  (use "git checkout -- &lt;file&gt;..." to discard changes in working directory)
+  (use "git restore &lt;file&gt;..." to discard changes in working directory)
 
     modified:   mars.txt
 
 no changes added to commit (use "git add" and/or "git commit -a")</code></pre>
 </div>
-<p><code>git checkout</code>を使うと、元の状態に戻すことができます:</p>
+<p><code>git restore</code>を使うと、元の状態に戻すことができます:</p>
 <div class="codewrapper sourceCode" id="cb16">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
-<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb16-1"><a href="#cb16-1" tabindex="-1"></a><span class="ex">$</span> git checkout HEAD mars.txt</span>
+<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb16-1"><a href="#cb16-1" tabindex="-1"></a><span class="ex">$</span> git restore mars.txt</span>
 <span id="cb16-2"><a href="#cb16-2" tabindex="-1"></a><span class="ex">$</span> cat mars.txt</span></code></pre>
 </div>
 <div class="codewrapper">
@@ -2290,15 +2298,16 @@ <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"><
 The two moons may be a problem for Wolfman
 But the Mummy will appreciate the lack of humidity</code></pre>
 </div>
-<p>その名前から推測できるように、<code>git checkout</code>
-はファイルの古いバージョンをチェックアウト (つまり、復元) します。
+<p>その名前から推測できるように、<code>git restore</code>
+はファイルの古いバージョンを復元します。
 この場合、最後に保存されたコミットである <code>HEAD</code>
-に記録されたファイルのバージョン を復元することをGitに伝えています。
-さらに戻りたい場合は、代わりにコミット Id を使うことができます:</p>
+に記録されたファイルのバージョンを復元することをGitに伝えています。
+さらに遡りたい場合は、<code>-s</code>オプションとコミット Id
+を使うことができます:</p>
 <div class="codewrapper sourceCode" id="cb18">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
-<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb18-1"><a href="#cb18-1" tabindex="-1"></a><span class="ex">$</span> git checkout f22b25e mars.txt</span></code></pre>
+<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb18-1"><a href="#cb18-1" tabindex="-1"></a><span class="ex">$</span> git restore <span class="at">-s</span> f22b25e mars.txt</span></code></pre>
 </div>
 <div class="codewrapper sourceCode" id="cb19">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
@@ -2319,95 +2328,39 @@ <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i
 <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
 <pre class="output" tabindex="0"><code>On branch main
-Changes to be committed:
-  (use "git reset HEAD &lt;file&gt;..." to unstage)
+Changes not staged for commit:
+  (use "git add &lt;file&gt;..." to update what will be committed)
+  (use "git restore &lt;file&gt;..." to discard changes in working directory)
+        modified:   mars.txt
 
-    modified:   mars.txt
+no changes added to commit (use "git add" and/or "git commit -a")
 </code></pre>
 </div>
 <p>変更はステージング領域にあることに注意してください。
-繰り返しますが、<code>git checkout</code>
+繰り返しますが、<code>git restore</code>
 を使うと、元の状態に戻すことができます:</p>
 <div class="codewrapper sourceCode" id="cb23">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
-<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb23-1"><a href="#cb23-1" tabindex="-1"></a><span class="ex">$</span> git checkout HEAD mars.txt</span></code></pre>
-</div>
-<div id="head-を見失わないようにしましょう" class="callout">
-<div class="callout-square">
-<i class="callout-icon" data-feather="bell"></i>
-</div>
-<div id="head-を見失わないようにしましょう" class="callout-inner">
-<h3 class="callout-title">HEAD を見失わないようにしましょう</h3>
-<div class="callout-content">
-<p>上記では下記を使いました</p>
-<div class="codewrapper sourceCode" id="cb24">
-<h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
-</h3>
-<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb24-1"><a href="#cb24-1" tabindex="-1"></a><span class="ex">$</span> git checkout f22b25e mars.txt</span></code></pre>
-</div>
-<p><code>mars.txt</code> をコミット <code>f22b25e</code>
-後の状態に戻すためにです。 しかし、気をつけてください！ コマンド
-<code>checkout</code>
-には他の重要な機能があり、入力が正確でない場合、Gitはあなたの意図を誤解する可能性があります。
-たとえば、前のコマンドで <code>mars.txt</code> を忘れた場合です。</p>
-<div class="codewrapper sourceCode" id="cb25">
-<h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
-</h3>
-<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb25-1"><a href="#cb25-1" tabindex="-1"></a><span class="ex">$</span> git checkout f22b25e</span></code></pre>
+<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb23-1"><a href="#cb23-1" tabindex="-1"></a><span class="ex">$</span> git restore mars.txt</span>
+<span id="cb23-2"><a href="#cb23-2" tabindex="-1"></a><span class="ex">$</span> cat mars.txt</span></code></pre>
 </div>
 <div class="codewrapper">
-<h3 class="code-label">エラー<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
+<h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
-<pre class="error" tabindex="0"><code>Note: checking out 'f22b25e'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
- git checkout -b &lt;new-branch-name&gt;
-
-HEAD is now at f22b25e Start notes on Mars as a base</code></pre>
-</div>
-<p>ここでの「HEADが切り離された」状態は「見れるが触ってはいけない」ようなものなので、この状態で変更を加えないでください。
-リポジトリの過去の状態を調査した後、<code>git checkout main</code> で
-<code>HEAD</code>を再接続してください。</p>
-</div>
-</div>
+<pre class="output" tabindex="0"><code>Cold and dry, but everything is my favorite color
+The two moons may be a problem for Wolfman
+But the Mummy will appreciate the lack of humidity</code></pre>
 </div>
 <p>取り消したい変更の一個<strong>前</strong>のコミット番号を使う必要があることを覚えておくことが重要です。
 よくある間違いは、破棄しようとしている変更を行ったコミットの番号を使用することです。
 以下の例では、最新のコミットの前 (<code>HEAD~1</code>)
-、すなわち<code>f22b25e</code>から状態を取得したいと考えています:</p>
-<figure><img src="fig/git-checkout.svg" alt="Git Checkout" class="figure mx-auto d-block"></figure><p>つまり、すべてをまとめると、Gitがどのように機能するかは次の漫画のようになります:</p>
-<figure><img src="fig/git_staging.svg" alt="https://figshare.com/articles/How\_Git\_works\_a\_cartoon/1328266" class="figure mx-auto d-block"><div class="figcaption"><a href="https://figshare.com/articles/How%5C_Git%5C_works%5C_a%5C_cartoon/1328266" class="external-link uri">https://figshare.com/articles/How\_Git\_works\_a\_cartoon/1328266</a></div>
-</figure><div id="よくあるケースの簡単化" class="callout">
-<div class="callout-square">
-<i class="callout-icon" data-feather="bell"></i>
-</div>
-<div id="よくあるケースの簡単化" class="callout-inner">
-<h3 class="callout-title">よくあるケースの簡単化</h3>
-<div class="callout-content">
-<p><code>git status</code>
-の出力を注意深く読むと、次のヒントを含んでいることが分かります:</p>
-<div class="codewrapper">
-<h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
-</h3>
-<pre class="output" tabindex="0"><code>(use "git checkout -- &lt;file&gt;..." to discard changes in working directory)</code></pre>
-</div>
-<p>それが言っているように、バージョン識別子のない
-<code>git checkout</code>
-はファイルを<code>HEAD</code>に保存された状態に復元します。
-二重のダッシュ
-<code>--</code>はコマンドから復元されるファイルの名前を区別するために必要です：それがないと、Git
-はファイルの名前をコミット Id として使用しようとします。</p>
-</div>
-</div>
-</div>
-<p>ファイルを1つずつ元に戻すことができるという事実は
+、すなわち<code>f22b25e</code>から状態を取得したいと考えています:
+このとき、<code>.</code>
+を使用することで、全てのファイルを対象にします。</p>
+<figure><img src="fig/git-restore.svg" alt="以下の図は、git restoreを使って2つのファイルの前のバージョンを復元する方法を示しています" class="figure mx-auto d-block"></figure><p>つまり、すべてをまとめると、Gitがどのように機能するかは次の漫画のようになります:</p>
+<figure><img src="fig/git_staging.svg" alt="以下の図は、Gitの全体的なワークフローを示しています。ローカルでの変更は、git addを使ってステージングされ、git commitでローカルリポジトリに反映されます。また、git checkoutを使用することで、リポジトリから変更を元に戻すことができます。" class="figure mx-auto d-block"><div class="figcaption"><a href="https://figshare.com/articles/How%5C_Git%5C_works%5C_a%5C_cartoon/1328266" class="external-link uri">https://figshare.com/articles/How\_Git\_works\_a\_cartoon/1328266</a></div>
+</figure><p>ファイルを1つずつ元に戻すことができるという事実は
 人々が研究を整理する方法を変えることがあります。
 すべての変更が1つの大きなドキュメントに含まれている場合、
 後で結論に加えられた変更を元に戻さずに、
@@ -2427,11 +2380,11 @@ <h3 class="callout-title">ファイルの古いバージョンの復元</h3>
 以下のどのコマンドで、<code>data_cruncher.py</code>
 と呼ばれるPythonスクリプトの最後にコミットされたバージョンを復元できるでしょうか？</p>
 <ol style="list-style-type: decimal">
-<li><p><code>$ git checkout HEAD</code></p></li>
-<li><p><code>$ git checkout HEAD data_cruncher.py</code></p></li>
-<li><p><code>$ git checkout HEAD~1 data_cruncher.py</code></p></li>
-<li><p><code>$ git checkout &lt;unique ID of last commit&gt; data_cruncher.py</code></p></li>
-<li><p>Both 2 and 4</p></li>
+<li><p><code>$ git restore</code></p></li>
+<li><p><code>$ git restore data_cruncher.py</code></p></li>
+<li><p><code>$ git restore -s HEAD~1 data_cruncher.py</code></p></li>
+<li><p><code>$ git restore -s &lt;unique ID of last commit&gt; data_cruncher.py</code></p></li>
+<li><p>2番と4番の両方</p></li>
 </ol>
 </div>
 </div>
@@ -2446,24 +2399,17 @@ <h4 class="accordion-header" id="headingSolution1">
 <div id="collapseSolution1" class="accordion-collapse collapse" data-bs-parent="#accordionSolution1" aria-labelledby="headingSolution1">
 <div class="accordion-body">
 <p>答えは (5) - 2 と 4 の両方です。</p>
-<p>The <code>checkout</code> command restores files from the repository,
-overwriting the files in your working directory. Answers 2 and 4 both
-restore the <em>latest</em> version <em>in the repository</em> of the
-file <code>data_cruncher.py</code>. Answer 2 uses <code>HEAD</code> to
-indicate the <em>latest</em>, whereas answer 4 uses the unique ID of the
-last commit, which is what <code>HEAD</code> means.</p>
-<p>Answer 3 gets the version of <code>data_cruncher.py</code> from the
-commit <em>before</em> <code>HEAD</code>, which is NOT what we
-wanted.</p>
-<p>Answer 1 can be dangerous! Without a filename,
-<code>git checkout</code> will restore <strong>all files</strong> in the
-current directory (and all directories below it) to their state at the
-commit specified. This command will restore
-<code>data_cruncher.py</code> to the latest commit version, but it will
-also restore <em>any other files that are changed</em> to that version,
-erasing any changes you may have made to those files! As discussed
-above, you are left in a <em>detached</em> <code>HEAD</code> state, and
-you don’t want to be there.</p>
+<p><code>restore</code>
+コマンドはリポジトリからファイルを復元し、作業ディレクトリのファイルを上書きします。
+2番と4番のコマンドはどちらもリ_ポジトリにある_
+<code>data_cruncher.py</code> の_最新バージョン_を復元します。 2番は
+<code>HEAD</code> を使って_最新バージョン_を指定し、4番は
+<code>HEAD</code> と同じ意味の最後のコミットIDを使います。</p>
+<p>3番のコマンドは、<code>data_cruncher.py</code> の <code>HEAD</code>
+_より前_のコミットから復元するため、今回の目的とは異なります。</p>
+<p>1番はエラーになります。 復元するファイルを指定する必要があります。
+すべてのファイルを復元したい場合は、<code>git restore .</code>
+を使用するべきです。</p>
 </div>
 </div>
 </div>
@@ -2480,9 +2426,10 @@ <h3 class="callout-title">コミットを戻すことについて</h3>
 ジェニファーは、グループリポジトリのみんなが正しい変更を取得できるように、正しく元に戻す必要があります。
 <code>git revert [wrong commit ID]</code>
 は、ジェニファーの誤ったコミットを元に戻す新しいコミットを作ります。</p>
-<p>従って<code>git revert</code>は<code>git checkout [commit ID]</code>とは異なります。なぜなら
-<code>checkout</code>
-はグループのリポジトリにはコミットされていないローカルの変更用のコマンドだからです。</p>
+<p><code>git revert</code> は <code>git restore -s [commit ID] .</code>
+とは異なります。<code>git restore</code>
+は、ローカルリポジトリ内でまだコミットされていないファイルを以前の状態に戻すために使用されるのに対して、<code>git revert</code>
+はローカルリポジトリおよびプロジェクトリポジトリにコミットされた変更を取り消すために使用されます。</p>
 <p>以下は、ジェニファーが<code>git revert</code>を使用するための正しい手順と説明ですが、不足しているコマンドは何でしょうか？</p>
 <ol style="list-style-type: decimal">
 <li><p><code>________ # コミットIDを見つけるために、プロジェクトのgitの 履歴を見ます</code></p></li>
@@ -2504,12 +2451,10 @@ <h4 class="accordion-header" id="headingSolution2">
 </button>
 <div id="collapseSolution2" class="accordion-collapse collapse" data-bs-parent="#accordionSolution2" aria-labelledby="headingSolution2">
 <div class="accordion-body">
-<p>The command <code>git log</code> lists project history with commit
-IDs.</p>
-<p>The command <code>git show HEAD</code> shows changes made at the
-latest commit, and lists the commit ID; however, Jennifer should
-double-check it is the correct commit, and no one else has committed
-changes to the repository.</p>
+<p><code>git log</code>
+コマンドは、コミットIDを含むプロジェクトの履歴を一覧表示します。</p>
+<p><code>git show HEAD</code>
+は、最新のコミットで行われた変更を表示し、コミットIDも確認できます。ただし、ジェニファーはこれが正しいコミットであることを再確認し、他の人がリポジトリに変更をコミットしていないか確認する必要があります。</p>
 </div>
 </div>
 </div>
@@ -2522,16 +2467,16 @@ <h4 class="accordion-header" id="headingSolution2">
 <h3 class="callout-title">ワークフローと履歴の理解</h3>
 <div class="callout-content">
 <p>最後のコマンドの出力は何でしょうか？</p>
-<div class="codewrapper sourceCode" id="cb28">
+<div class="codewrapper sourceCode" id="cb25">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
-<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb28-1"><a href="#cb28-1" tabindex="-1"></a><span class="ex">$</span> cd planets</span>
-<span id="cb28-2"><a href="#cb28-2" tabindex="-1"></a><span class="ex">$</span> echo <span class="st">"Venus is beautiful and full of love"</span> <span class="op">&gt;</span> venus.txt</span>
-<span id="cb28-3"><a href="#cb28-3" tabindex="-1"></a><span class="ex">$</span> git add venus.txt</span>
-<span id="cb28-4"><a href="#cb28-4" tabindex="-1"></a><span class="ex">$</span> echo <span class="st">"Venus is too hot to be suitable as a base"</span> <span class="op">&gt;&gt;</span> venus.txt</span>
-<span id="cb28-5"><a href="#cb28-5" tabindex="-1"></a><span class="ex">$</span> git commit <span class="at">-m</span> <span class="st">"Comment on Venus as an unsuitable base"</span></span>
-<span id="cb28-6"><a href="#cb28-6" tabindex="-1"></a><span class="ex">$</span> git checkout HEAD venus.txt</span>
-<span id="cb28-7"><a href="#cb28-7" tabindex="-1"></a><span class="ex">$</span> cat venus.txt <span class="co">#this will print the contents of venus.txt to the screen</span></span></code></pre>
+<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb25-1"><a href="#cb25-1" tabindex="-1"></a><span class="ex">$</span> cd planets</span>
+<span id="cb25-2"><a href="#cb25-2" tabindex="-1"></a><span class="ex">$</span> echo <span class="st">"Venus is beautiful and full of love"</span> <span class="op">&gt;</span> venus.txt</span>
+<span id="cb25-3"><a href="#cb25-3" tabindex="-1"></a><span class="ex">$</span> git add venus.txt</span>
+<span id="cb25-4"><a href="#cb25-4" tabindex="-1"></a><span class="ex">$</span> echo <span class="st">"Venus is too hot to be suitable as a base"</span> <span class="op">&gt;&gt;</span> venus.txt</span>
+<span id="cb25-5"><a href="#cb25-5" tabindex="-1"></a><span class="ex">$</span> git commit <span class="at">-m</span> <span class="st">"Comment on Venus as an unsuitable base"</span></span>
+<span id="cb25-6"><a href="#cb25-6" tabindex="-1"></a><span class="ex">$</span> git restore venus.txt</span>
+<span id="cb25-7"><a href="#cb25-7" tabindex="-1"></a><span class="ex">$</span> cat venus.txt <span class="co">#this will print the contents of venus.txt to the screen</span></span></code></pre>
 </div>
 <ol style="list-style-type: decimal">
 <li><div class="codewrapper">
@@ -2577,8 +2522,8 @@ <h4 class="accordion-header" id="headingSolution3">
 repository is the one from the staging area and has only one line.</p>
 <p>At this time, the working copy still has the second line (and
 <code>git status</code> will show that the file is modified). However,
-<code>git checkout HEAD venus.txt</code> replaces the working copy with
-the most recently committed version of <code>venus.txt</code>.</p>
+<code>git restore venus.txt</code> replaces the working copy with the
+most recently committed version of <code>venus.txt</code>.</p>
 <p>So, <code>cat venus.txt</code> will output</p>
 <div class="codewrapper">
 <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
@@ -2614,10 +2559,10 @@ <h3 class="callout-title">
 <div id="ステージされた変更の除去" class="callout-inner">
 <h3 class="callout-title">ステージされた変更の除去</h3>
 <div class="callout-content">
-<p><code>git checkout</code> は、ステージされていない変更があったときに
+<p><code>git restore</code> は、ステージされていない変更があったときに
 以前のコミットを復元するために使用できます。しかしそれはステージされているがコミットされていない変更に対しても機能するでしょうか?
 <code>mars.txt</code>
-に変更を用意し、その変更を加え（<code>git add</code>を使い）、<code>git checkout</code>
+に変更を用意し、その変更を加え（<code>git add</code>を使い）、<code>git restore</code>
 を使い変更を取り除くことができるかどうか確かめましょう。</p>
 </div>
 </div>
@@ -2631,41 +2576,32 @@ <h4 class="accordion-header" id="headingSolution4">
 </button>
 <div id="collapseSolution4" class="accordion-collapse collapse" data-bs-parent="#accordionSolution4" aria-labelledby="headingSolution4">
 <div class="accordion-body">
-<p>After adding a change, <code>git checkout</code> can not be used
-directly. Let’s look at the output of <code>git status</code>:</p>
+<p>変更を追加した後、<code>git restore</code> は直接使用できません。
+次に、<code>git status</code> の出力を確認してみましょう。</p>
 <div class="codewrapper">
 <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
 <pre class="output" tabindex="0"><code>On branch main
 Changes to be committed:
-  (use "git reset HEAD &lt;file&gt;..." to unstage)
-
+  (use "git restore --staged &lt;file&gt;..." to unstage)
         modified:   mars.txt
 </code></pre>
 </div>
-<p>Note that if you don’t have the same output you may either have
-forgotten to change the file, or you have added it <em>and</em>
-committed it.</p>
-<p>Using the command <code>git checkout -- mars.txt</code> now does not
-give an error, but it does not restore the file either. Git helpfully
-tells us that we need to use <code>git reset</code> first to unstage the
-file:</p>
-<div class="codewrapper sourceCode" id="cb35">
+<p>この出力が表示されない場合、ファイルの変更を忘れているか、すでにファイルを追加してコミットした可能性があります。</p>
+<p>この時点で、<code>git restore mars.txt</code>
+コマンドを実行してもエラーは発生しませんが、ファイルは元に戻りません。
+Gitは、まず <code>git restore --staged</code>
+を使用してステージングエリアからファイルを戻す必要があることを教えてくれます。</p>
+<div class="codewrapper sourceCode" id="cb32">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
-<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb35-1"><a href="#cb35-1" tabindex="-1"></a><span class="ex">$</span> git reset HEAD mars.txt</span></code></pre>
+<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb32-1"><a href="#cb32-1" tabindex="-1"></a><span class="ex">$</span> git restore <span class="at">--staged</span> mars.txt</span></code></pre>
 </div>
-<div class="codewrapper">
-<h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
-</h3>
-<pre class="output" tabindex="0"><code>Unstaged changes after reset:
-M	mars.txt</code></pre>
-</div>
-<p>Now, <code>git status</code> gives us:</p>
-<div class="codewrapper sourceCode" id="cb37">
+<p>次に、<code>git status</code> の出力を確認します。</p>
+<div class="codewrapper sourceCode" id="cb33">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
-<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb37-1"><a href="#cb37-1" tabindex="-1"></a><span class="ex">$</span> git status</span></code></pre>
+<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb33-1"><a href="#cb33-1" tabindex="-1"></a><span class="ex">$</span> git status</span></code></pre>
 </div>
 <div class="codewrapper">
 <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
@@ -2673,19 +2609,19 @@ <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"><
 <pre class="output" tabindex="0"><code>On branch main
 Changes not staged for commit:
   (use "git add &lt;file&gt;..." to update what will be committed)
-  (use "git checkout -- &lt;file&gt;..." to discard changes in working directory)
+  (use "git git restore &lt;file&gt;..." to discard changes in working directory)
 
         modified:   mars.txt
 
 no changes added to commit (use "git add" and/or "git commit -a")</code></pre>
 </div>
-<p>This means we can now use <code>git checkout</code> to restore the
-file to the previous commit:</p>
-<div class="codewrapper sourceCode" id="cb39">
+<p>ここで、<code>git restore</code>
+コマンドを使ってファイルを前のコミットの状態に戻すことができます。</p>
+<div class="codewrapper sourceCode" id="cb35">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
-<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb39-1"><a href="#cb39-1" tabindex="-1"></a><span class="ex">$</span> git checkout <span class="at">--</span> mars.txt</span>
-<span id="cb39-2"><a href="#cb39-2" tabindex="-1"></a><span class="ex">$</span> git status</span></code></pre>
+<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb35-1"><a href="#cb35-1" tabindex="-1"></a><span class="ex">$</span> git restore mars.txt</span>
+<span id="cb35-2"><a href="#cb35-2" tabindex="-1"></a><span class="ex">$</span> git status</span></code></pre>
 </div>
 <div class="codewrapper">
 <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
@@ -2715,28 +2651,29 @@ <h3 class="callout-title">履歴を探索し、要約する</h3>
 コマンドを使用すると、1つの特定のファイルを探索できることを思い出してください、
 例えば、<code>git diff mars.txt</code> 。
 ここでも同様のアイデアを適用できます。</p>
-<div class="codewrapper sourceCode" id="cb41">
+<div class="codewrapper sourceCode" id="cb37">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
-<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb41-1"><a href="#cb41-1" tabindex="-1"></a><span class="ex">$</span> git log mars.txt</span></code></pre>
+<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb37-1"><a href="#cb37-1" tabindex="-1"></a><span class="ex">$</span> git log mars.txt</span></code></pre>
 </div>
-<p>Unfortunately some of these commit messages are very ambiguous, e.g.,
-<code>update files</code>. How can you search through these files?</p>
-<p>Both <code>git diff</code> and <code>git log</code> are very useful
-and they summarize a different part of the history for you. Is it
-possible to combine both? Let’s try the following:</p>
-<div class="codewrapper sourceCode" id="cb42">
+<p>残念ながら、一部のコミットメッセージは
+<code>update files</code>（「ファイルを更新する」）などのように非常に曖昧です。
+これらのファイルをどうやって調べたら良いでしょうか？</p>
+<p><code>git diff</code> と <code>git log</code>
+はどちらも非常に便利で、それぞれリポジトリの異なる部分の履歴を要約してくれます。
+これらを組み合わせることは可能でしょうか？
+次のコマンドを試してみましょう：</p>
+<div class="codewrapper sourceCode" id="cb38">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
-<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb42-1"><a href="#cb42-1" tabindex="-1"></a><span class="ex">$</span> git log <span class="at">--patch</span> mars.txt</span></code></pre>
+<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb38-1"><a href="#cb38-1" tabindex="-1"></a><span class="ex">$</span> git log <span class="at">--patch</span> mars.txt</span></code></pre>
 </div>
-<p>You should get a long list of output, and you should be able to see
-both commit messages and the difference between each commit.</p>
-<p>Question: What does the following command do?</p>
-<div class="codewrapper sourceCode" id="cb43">
+<p>長い出力が表示され、各コミットメッセージと、そのコミット間での違い（差分）が確認できるはずです。</p>
+<p>質問: 次のコマンドは何をしますか？</p>
+<div class="codewrapper sourceCode" id="cb39">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
-<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb43-1"><a href="#cb43-1" tabindex="-1"></a><span class="ex">$</span> git log <span class="at">--patch</span> HEAD~9 <span class="pp">*</span>.txt</span></code></pre>
+<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb39-1"><a href="#cb39-1" tabindex="-1"></a><span class="ex">$</span> git log <span class="at">--patch</span> HEAD~9 <span class="pp">*</span>.txt</span></code></pre>
 </div>
 </div>
 </div>
@@ -3226,7 +3163,7 @@ <h3 class="callout-title">まとめ</h3>
 </div>
 </div></section><section id="aio-07-github"><p>Content from <a href="07-github.html">GitHub におけるリモート</a></p>
 <hr>
-<p>最終更新日：2024-06-06 |
+<p>最終更新日：2024-09-30 |
 
         <a href="https://github.com/swcarpentry-ja/git-novice/edit/main/episodes/07-github.md" class="external-link">ページの編集 <i aria-hidden="true" data-feather="edit"></i></a></p>
 <div class="text-end">
@@ -3275,7 +3212,7 @@ <h3 class="card-title">目的</h3>
 <p><a href="https://github.com" class="external-link">GitHub</a>
 にログインし、右上隅のアイコンをクリックして <code>planets</code>
 という名前の新しいリポジトリを作成してみましょう：</p>
-<figure><img src="fig/github-create-repo-01.png" alt="Creating a Repository on GitHub (Step 1)" class="figure mx-auto d-block"></figure><p>リポジトリに「planets」という名前を付けて、「Create
+<figure><img src="fig/github-create-repo-01.png" alt='The first step in creating a repository on GitHub: clicking the "create new" button' class="figure mx-auto d-block"></figure><p>リポジトリに「planets」という名前を付けて、「Create
 Repository」をクリックします。</p>
 <p>注:
 このリポジトリはローカルのリポジトリに接続されるため、空にしておく必要があります。
@@ -3284,9 +3221,9 @@ <h3 class="card-title">目的</h3>
 license.」の両方のオプションを「None」のままにします。
 リポジトリを空にしておく必要がある理由の完全な説明については、以下の「GitHub
 ライセンスと README ファイル」の演習を参照してください。</p>
-<figure><img src="fig/github-create-repo-02.png" alt="Creating a Repository on GitHub (Step 2)" class="figure mx-auto d-block"></figure><p>リポジトリが作成されるとすぐに、GitHub には ある URL
+<figure><img src="fig/github-create-repo-02.png" alt="The second step in creating a repository on GitHub: filling out the new repository form to provide the repository name, and specify that neither a readme nor a license should be created" class="figure mx-auto d-block"></figure><p>リポジトリが作成されるとすぐに、GitHub には ある URL
 と、ローカルのリポジトリの構成方法に関する情報が記載されたページが表示されます。</p>
-<figure><img src="fig/github-create-repo-03.png" alt="Creating a Repository on GitHub (Step 3)" class="figure mx-auto d-block"></figure><p>これにより、GitHub のサーバー上で次のことが効果的に行われます。</p>
+<figure><img src="fig/github-create-repo-03.png" alt="The summary page displayed by GitHub after a new repository has been created. It contains instructions for configuring the new GitHub repository as a git remote" class="figure mx-auto d-block"></figure><p>これにより、GitHub のサーバー上で次のことが効果的に行われます。</p>
 <div class="codewrapper sourceCode" id="cb1">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
@@ -3298,8 +3235,8 @@ <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i
 を覚えていれば、私達は <code>mars.txt</code>
 に以前の作業を追加してコミットしました。
 ローカルリポジトリのダイアグラムは次のようになります：</p>
-<figure><img src="fig/git-staging-area.svg" alt="The Local Repository with Git Staging Area" class="figure mx-auto d-block"></figure><p>Now that we have two repositories, we need a diagram like this:</p>
-<figure><img src="fig/git-freshly-made-github-repo.svg" alt="Freshly-Made GitHub Repository" class="figure mx-auto d-block"></figure><p>Note that our local repository still contains our earlier work on
+<figure><img src="fig/git-staging-area.svg" alt='A diagram showing how "git add" registers changes in the staging area, while "git commit" moves changes from the staging area to the repository' class="figure mx-auto d-block"></figure><p>Now that we have two repositories, we need a diagram like this:</p>
+<figure><img src="fig/git-freshly-made-github-repo.svg" alt='A diagram illustrating how the GitHub "planets" repository is also a git repository like our local repository, but that it is currently empty' class="figure mx-auto d-block"></figure><p>Note that our local repository still contains our earlier work on
 <code>mars.txt</code>, but the remote repository on GitHub appears empty
 as it doesn’t contain any files yet.</p>
 </section><section><h2 class="section-heading" id="connect-local-to-remote-repository">2. Connect local to remote repository<a class="anchor" aria-label="anchor" href="#connect-local-to-remote-repository"></a>
@@ -3309,7 +3246,7 @@ <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i
 repository a <a href="reference.html#remote">remote</a> for the local
 repository. The home page of the repository on GitHub includes the URL
 string we need to identify it:</p>
-<figure><img src="fig/github-find-repo-string.png" alt="Where to Find Repository URL on GitHub" class="figure mx-auto d-block"></figure><p>Click on the ‘SSH’ link to change the <a href="reference.html#protocol">protocol</a> from HTTPS to SSH.</p>
+<figure><img src="fig/github-find-repo-string.png" alt="Clicking the &quot;Copy to Clipboard&quot; button on GitHub to obtain the repository's URL" class="figure mx-auto d-block"></figure><p>Click on the ‘SSH’ link to change the <a href="reference.html#protocol">protocol</a> from HTTPS to SSH.</p>
 <div id="https-vs.-ssh" class="callout">
 <div class="callout-square">
 <i class="callout-icon" data-feather="bell"></i>
@@ -3324,7 +3261,7 @@ <h3 class="callout-title">HTTPS vs. SSH</h3>
 </div>
 </div>
 </div>
-<figure><img src="fig/github-change-repo-string.png" alt="Changing the Repository URL on GitHub" class="figure mx-auto d-block"></figure><p>Copy that URL from the browser, go into the local
+<figure><img src="fig/github-change-repo-string.png" alt='A screenshot showing that clicking on "SSH" will make GitHub provide the SSH URL for a repository instead of the HTTPS URL' class="figure mx-auto d-block"></figure><p>Copy that URL from the browser, go into the local
 <code>planets</code> repository, and run this command:</p>
 <div class="codewrapper sourceCode" id="cb2">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
@@ -3458,7 +3395,10 @@ <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"><
 <p>Now, it is prompting Dracula for a passphrase. Since he is using his
 lab’s laptop that other people sometimes have access to, he wants to
 create a passphrase. Be sure to use something memorable or save your
-passphrase somewhere, as there is no “reset my password” option.</p>
+passphrase somewhere, as there is no “reset my password” option. Note
+that, when typing a passphrase on a terminal, there won’t be any visual
+feedback of your typing. This is normal: your passphrase will be
+recorded even if you see nothing changing on your screen.</p>
 <div class="codewrapper">
 <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
@@ -3644,7 +3584,7 @@ <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i
 </div>
 </div>
 <p>Our local and remote repositories are now in this state:</p>
-<figure><img src="fig/github-repo-after-first-push.svg" alt="GitHub Repository After First Push" class="figure mx-auto d-block"></figure><div id="the--u-flag" class="callout">
+<figure><img src="fig/github-repo-after-first-push.svg" alt='A diagram showing how "git push origin" will push changes from the local repository to the remote, making the remote repository an exact copy of the local repository.' class="figure mx-auto d-block"></figure><div id="the--u-flag" class="callout">
 <div class="callout-square">
 <i class="callout-icon" data-feather="bell"></i>
 </div>
@@ -3894,7 +3834,7 @@ <h3 class="callout-title">まとめ</h3>
 </div>
 </section></section><section id="aio-08-collab"><p>Content from <a href="08-collab.html">Collaborating</a></p>
 <hr>
-<p>最終更新日：2024-06-06 |
+<p>最終更新日：2024-09-30 |
 
         <a href="https://github.com/swcarpentry-ja/git-novice/edit/main/episodes/08-collab.md" class="external-link">ページの編集 <i aria-hidden="true" data-feather="edit"></i></a></p>
 <div class="text-end">
@@ -3949,7 +3889,7 @@ <h3 class="callout-title">Practicing By Yourself</h3>
 page on GitHub, click the “Settings” button on the right, select
 “Collaborators”, click “Add people”, and then enter your partner’s
 username.</p>
-<figure><img src="fig/github-add-collaborators.png" alt="screenshot of repository page with Settings then Collaborators selected, showing how to add Collaborators in a GitHub repository" class="figure mx-auto d-block"></figure><p>To accept access to the Owner’s repo, the Collaborator needs to go to
+<figure><img src="fig/github-add-collaborators.png" alt='A screenshot of the GitHub Collaborators settings page, which is accessed by clicking "Settings" then "Collaborators"' class="figure mx-auto d-block"></figure><p>To accept access to the Owner’s repo, the Collaborator needs to go to
 <a href="https://github.com/notifications" class="external-link">https://github.com/notifications</a>
 or check for email notification. Once there she can accept access to the
 Owner’s repo.</p>
@@ -3970,7 +3910,7 @@ <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i
 (<code>~/Desktop/vlad-planets</code>) specified at the end, you will
 clone inside your own planets folder! Make sure to navigate to the
 <code>Desktop</code> folder first.</p>
-<figure><img src="fig/github-collaboration.svg" alt="After Creating Clone of Repository" class="figure mx-auto d-block"></figure><p>The Collaborator can now make a change in her clone of the Owner’s
+<figure><img src="fig/github-collaboration.svg" alt='A diagram showing that "git clone" can create a copy of a remote GitHub repository, allowing a second person to create their own local repository that they can make changes to.' class="figure mx-auto d-block"></figure><p>The Collaborator can now make a change in her clone of the Owner’s
 repository, exactly the same way as we’ve been doing before:</p>
 <div class="codewrapper sourceCode" id="cb2">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
@@ -4150,7 +4090,7 @@ <h3 class="callout-title">Review Changes</h3>
 <button class="accordion-button solution-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseSolution1" aria-expanded="false" aria-controls="collapseSolution1">
   <h4 class="accordion-header" id="headingSolution1"> 回答を表示する </h4>
 </button>
-<div id="collapseSolution1" class="accordion-collapse collapse" data-bs-parent="#accordionSolution1" aria-labelledby="headingSolution1">
+<div id="collapseSolution1" class="accordion-collapse collapse" aria-labelledby="headingSolution1" data-bs-parent="#accordionSolution1">
 <div class="accordion-body">
 <p>On the command line, the Collaborator can use
 <code>git fetch origin main</code> to get the remote changes into the
@@ -4211,7 +4151,7 @@ <h3 class="callout-title">まとめ</h3>
 </div>
 </div></section><section id="aio-09-conflict"><p>Content from <a href="09-conflict.html">Conflicts</a></p>
 <hr>
-<p>最終更新日：2024-06-06 |
+<p>最終更新日：2024-09-30 |
 
         <a href="https://github.com/swcarpentry-ja/git-novice/edit/main/episodes/09-conflict.md" class="external-link">ページの編集 <i aria-hidden="true" data-feather="edit"></i></a></p>
 <div class="text-end">
@@ -4358,7 +4298,7 @@ <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"><
 hint: (e.g., 'git pull ...') before pushing again.
 hint: See the 'Note about fast-forwards' in 'git push --help' for details.</code></pre>
 </div>
-<figure><img src="fig/conflict.svg" alt="The Conflicting Changes" class="figure mx-auto d-block"></figure><p>Git rejects the push because it detects that the remote repository
+<figure><img src="fig/conflict.svg" alt="A diagram showing a conflict that might occur when two sets of independent changes are merged" class="figure mx-auto d-block"></figure><p>Git rejects the push because it detects that the remote repository
 has new updates that have not been incorporated into the local branch.
 What we have to do is pull the changes from GitHub, <a href="reference.html#merge">merge</a> them into the copy we’re currently
 working in, and then push that. Let’s start by pulling:</p>
@@ -4582,7 +4522,7 @@ <h3 class="callout-title">Conflicts on Non-textual files</h3>
 <button class="accordion-button solution-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseSolution1" aria-expanded="false" aria-controls="collapseSolution1">
   <h4 class="accordion-header" id="headingSolution1"> 回答を表示する </h4>
 </button>
-<div id="collapseSolution1" class="accordion-collapse collapse" data-bs-parent="#accordionSolution1" aria-labelledby="headingSolution1">
+<div id="collapseSolution1" class="accordion-collapse collapse" aria-labelledby="headingSolution1" data-bs-parent="#accordionSolution1">
 <div class="accordion-body">
 <p>Let’s try it. Suppose Dracula takes a picture of Martian surface and
 calls it <code>mars.jpg</code>.</p>
@@ -4812,7 +4752,7 @@ <h3 class="callout-title">A Typical Work Session</h3>
 <tr class="even">
 <td>6</td>
 <td>Celebrate!</td>
-<td><code>AFK</code></td>
+<td></td>
 </tr>
 </tbody>
 </table>
@@ -4824,7 +4764,7 @@ <h3 class="callout-title">A Typical Work Session</h3>
 <button class="accordion-button solution-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseSolution2" aria-expanded="false" aria-controls="collapseSolution2">
   <h4 class="accordion-header" id="headingSolution2"> 回答を表示する </h4>
 </button>
-<div id="collapseSolution2" class="accordion-collapse collapse" data-bs-parent="#accordionSolution2" aria-labelledby="headingSolution2">
+<div id="collapseSolution2" class="accordion-collapse collapse" aria-labelledby="headingSolution2" data-bs-parent="#accordionSolution2">
 <div class="accordion-body">
 <table class="table">
 <colgroup>
@@ -4866,7 +4806,7 @@ <h4 class="accordion-header" id="headingSolution2"> 回答を表示する </h4>
 <tr class="even">
 <td>6</td>
 <td>Celebrate!</td>
-<td><code>AFK</code></td>
+<td></td>
 </tr>
 </tbody>
 </table>
@@ -5186,7 +5126,7 @@ <h3 class="callout-title">まとめ</h3>
 </div>
 </div></section><section id="aio-12-citation"><p>Content from <a href="12-citation.html">Citation</a></p>
 <hr>
-<p>最終更新日：2024-06-06 |
+<p>最終更新日：2024-09-30 |
 
         <a href="https://github.com/swcarpentry-ja/git-novice/edit/main/episodes/12-citation.md" class="external-link">ページの編集 <i aria-hidden="true" data-feather="edit"></i></a></p>
 <div class="text-end">
@@ -5220,30 +5160,18 @@ <h3 class="card-title">目的</h3>
 <p>You may want to include a file called <code>CITATION</code> or
 <code>CITATION.txt</code> that describes how to reference your project;
 the one for Software Carpentry states:</p>
-<pre class="source"><code>To reference Software Carpentry in publications, please cite both of the following:
+<pre class="source"><code>To reference Software Carpentry in publications, please cite:
 
-Greg Wilson: "Software Carpentry: Getting Scientists to Write Better
-Code by Making Them More Productive".  Computing in Science &amp;
-Engineering, Nov-Dec 2006.
+Greg Wilson: "Software Carpentry: Lessons Learned". F1000Research,
+2016, 3:62 (doi: 10.12688/f1000research.3-62.v2).
 
-Greg Wilson: "Software Carpentry: Lessons Learned". arXiv:1307.5448,
-July 2013.
-
-@article{wilson-software-carpentry-2006,
-    author =  {Greg Wilson},
-    title =   {Software Carpentry: Getting Scientists to Write Better Code by Making Them More Productive},
-    journal = {Computing in Science \&amp; Engineering},
-    month =   {November--December},
-    year =    {2006},
-}
-
-@online{wilson-software-carpentry-2013,
+@online{wilson-software-carpentry-2016,
   author      = {Greg Wilson},
   title       = {Software Carpentry: Lessons Learned},
-  version     = {1},
-  date        = {2013-07-20},
-  eprinttype  = {arxiv},
-  eprint      = {1307.5448}
+  version     = {2},
+  date        = {2016-01-28},
+  url         = {http://f1000research.com/articles/3-62/v2},
+  doi         = {10.12688/f1000research.3-62.v2}
 }</code></pre>
 <p>More detailed advice, and other ways to make your code citable can be
 found <a href="https://www.software.ac.uk/publication/how-cite-and-describe-software" class="external-link">at
@@ -5270,7 +5198,7 @@ <h3 class="callout-title">まとめ</h3>
 </div>
 </div></section><section id="aio-13-hosting"><p>Content from <a href="13-hosting.html">Hosting</a></p>
 <hr>
-<p>最終更新日：2024-06-06 |
+<p>最終更新日：2024-09-30 |
 
         <a href="https://github.com/swcarpentry-ja/git-novice/edit/main/episodes/13-hosting.md" class="external-link">ページの編集 <i aria-hidden="true" data-feather="edit"></i></a></p>
 <div class="text-end">
@@ -5301,8 +5229,9 @@ <h3 class="card-title">目的</h3>
 </div>
 </div>
 </div>
-<p>自分たちの仕事をオープンにしたいグループにとって次に大きな問題は、コードとデータをどこにホストするかです。
-1
+<p>After <a href="11-licensing.html">choosing a license</a>, another big
+question for groups that want to open up their work is where to host
+their code and data. 1
 つのオプションは、研究室、学部、または大学がサーバーを提供し、アカウントやバックアップなどを管理することです。
 これの主な利点は、誰が何を所有しているかを明確にすることです。
 それは、題材が機密性の高いもの
@@ -5402,7 +5331,7 @@ <h3 class="callout-title">まとめ</h3>
 </div>
 </div></section><section id="aio-14-supplemental-rstudio"><p>Content from <a href="14-supplemental-rstudio.html">Supplemental: Using Git from RStudio</a></p>
 <hr>
-<p>最終更新日：2024-06-06 |
+<p>最終更新日：2024-09-30 |
 
         <a href="https://github.com/swcarpentry-ja/git-novice/edit/main/episodes/14-supplemental-rstudio.md" class="external-link">ページの編集 <i aria-hidden="true" data-feather="edit"></i></a></p>
 <div class="text-end">
@@ -5499,26 +5428,26 @@ <h3 id="tell-rstudio-where-to-find-github">Tell RStudio where to find GitHub<a c
 <p>Next, RStudio will ask which existing directory we want to use. Click
 “Browse…” and navigate to the correct directory, then click “Create
 Project”:</p>
-<figure><img src="fig/RStudio_screenshot_navigateexisting.png" class="figure mx-auto d-block"></figure><p>Ta-da! We have created a new project in RStudio within the existing
+<figure><img src="fig/RStudio_screenshot_navigateexisting.png" alt='RStudio window showing the "Create Project From Existing Directory" dialog. In the dialog, the project working directory has been set to "~/Desktop/planets"' class="figure mx-auto d-block"></figure><p>Ta-da! We have created a new project in RStudio within the existing
 planets repository. Notice the vertical “Git” menu in the menu bar.
 RStudio has recognized that the current directory is a Git repository,
 and gives us a number of tools to use Git:</p>
 <figure><img src="fig/RStudio_screenshot_afterclone.png" alt="RStudio window after new project is created with large arrow pointing to vertical Git menu bar." class="figure mx-auto d-block"></figure><p>To edit the existing files in the repository, we can click on them in
 the “Files” panel on the lower right. Now let’s add some additional
 information about Pluto:</p>
-<figure><img src="fig/RStudio_screenshot_editfiles.png" class="figure mx-auto d-block"></figure><p>Once we have saved our edited files, we can use RStudio to commit the
+<figure><img src="fig/RStudio_screenshot_editfiles.png" alt='RStudio window demonstrating the use of the editor panel to modify the "pluto.txt" file' class="figure mx-auto d-block"></figure><p>Once we have saved our edited files, we can use RStudio to commit the
 changes by clicking on “Commit…” in the Git menu:</p>
-<figure><img src="fig/RStudio_screenshot_commit.png" alt='RStudio screenshot showing the Git menu dropdown with "Commit..." selected' class="figure mx-auto d-block"></figure><p>This will open a dialogue where we can select which files to commit
+<figure><img src="fig/RStudio_screenshot_commit.png" alt='RStudio screenshot showing the Git menu dropdown with the "Commit..." option selected' class="figure mx-auto d-block"></figure><p>This will open a dialogue where we can select which files to commit
 (by checking the appropriate boxes in the “Staged” column), and enter a
 commit message (in the upper right panel). The icons in the “Status”
 column indicate the current status of each file. Clicking on a file
 shows information about changes in the lower panel (using output of
 <code>git diff</code>). Once everything is the way we want it, we click
 “Commit”:</p>
-<figure><img src="fig/RStudio_screenshot_review.png" class="figure mx-auto d-block"></figure><p>The changes can be pushed by selecting “Push Branch” from the Git
+<figure><img src="fig/RStudio_screenshot_review.png" alt='RStudio screenshow showing the "Review Changes" dialog. The top left panel shows the list of files that can be included or excluded from the commit. The top right panel is for writing a commit message. The bottom panel shows information about the currently selected file in the top left panel.' class="figure mx-auto d-block"></figure><p>The changes can be pushed by selecting “Push Branch” from the Git
 menu. There are also options to pull from the remote repository, and to
 view the commit history:</p>
-<figure><img src="fig/RStudio_screenshot_history.png" alt='RStudio screenshot showing the git menu dropdown with "History" selected' class="figure mx-auto d-block"></figure><div id="are-the-pushpull-commands-grayed-out" class="callout">
+<figure><img src="fig/RStudio_screenshot_history.png" alt='RStudio screenshot showing the git menu dropdown with the "History" option selected' class="figure mx-auto d-block"></figure><div id="are-the-pushpull-commands-grayed-out" class="callout">
 <div class="callout-square">
 <i class="callout-icon" data-feather="bell"></i>
 </div>
@@ -5534,7 +5463,7 @@ <h3 class="callout-title">Are the Push/Pull Commands Grayed Out?</h3>
 </div>
 <p>If we click on “History”, we can see a graphical version of what
 <code>git log</code> would tell us:</p>
-<figure><img src="fig/RStudio_screenshot_viewhistory.png" class="figure mx-auto d-block"></figure><p>RStudio creates a number of files that it uses to keep track of a
+<figure><img src="fig/RStudio_screenshot_viewhistory.png" alt='RStudio screenshot showing the "Review Changes" dialog after pressing the "History" button. The top panel lists the commits in the repository, similar to git log. The bottom panel shows the changes included in the commit that has been selected in the top panel.' class="figure mx-auto d-block"></figure><p>RStudio creates a number of files that it uses to keep track of a
 project. We often don’t want to track these, in which case we add them
 to our <code>.gitignore</code> file:</p>
 <figure><img src="fig/RStudio_screenshot_gitignore.png" alt="RStudio screenshot showing .gitignore open in the editor pane with the files .Rproj.user, .Rhistory, .RData, and *.Rproj added to the end" class="figure mx-auto d-block"></figure><div id="tip-versioning-disposable-output" class="callout">
@@ -5653,8 +5582,8 @@ <h3 class="callout-title">まとめ</h3>
   "url": "https://swcarpentry-ja.github.io/git-novice/aio.html",
   "identifier": "https://swcarpentry-ja.github.io/git-novice/aio.html",
   "dateCreated": "2014-12-04",
-  "dateModified": "2024-09-27",
-  "datePublished": "2024-09-27"
+  "dateModified": "2024-09-30",
+  "datePublished": "2024-09-30"
 }
 
   </script><script>
diff --git a/discuss.html b/discuss.html
index 2cd6a4122e..9515117e92 100644
--- a/discuss.html
+++ b/discuss.html
@@ -849,7 +849,7 @@ <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"><
 <button class="accordion-button solution-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseSolution1" aria-expanded="false" aria-controls="collapseSolution1">
   <h4 class="accordion-header" id="headingSolution1"> 回答を表示する </h4>
 </button>
-<div id="collapseSolution1" class="accordion-collapse collapse" aria-labelledby="headingSolution1" data-bs-parent="#accordionSolution1">
+<div id="collapseSolution1" class="accordion-collapse collapse" data-bs-parent="#accordionSolution1" aria-labelledby="headingSolution1">
 <div class="accordion-body">
 <p>To do this, your .gitignore would look like this:</p>
 <div class="codewrapper">
@@ -924,7 +924,7 @@ <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"><
   "identifier": "https://swcarpentry-ja.github.io/git-novice/discuss.html",
   "dateCreated": "2014-12-04",
   "dateModified": "2024-06-06",
-  "datePublished": "2024-09-27"
+  "datePublished": "2024-09-30"
 }
 
   </script><script>
diff --git a/images.html b/images.html
index 4fe16f5112..55f6ab326e 100644
--- a/images.html
+++ b/images.html
@@ -463,20 +463,21 @@ <h3 id="01-basics-figure-1">図の1</h3>
 </div>
 </figure><hr>
 <h3 id="01-basics-figure-2">図の2</h3>
-<p aria-hidden="true">画像1/1: ‘変更は連続して保存されます’</p>
-<figure><img src="fig/play-changes.svg" alt="変更は連続して保存されます" class="figure mx-auto d-block"></figure><hr>
+<p aria-hidden="true">画像1/1: ‘A diagram demonstrating how a single document grows as the result of sequential changes’</p>
+<figure><img src="fig/play-changes.svg" alt="A diagram demonstrating how a single document grows as the result of sequential changes" class="figure mx-auto d-block"></figure><hr>
 <h3 id="01-basics-figure-3">図の3</h3>
-<p aria-hidden="true">画像1/1: ‘異なるバージョンの保存ができます’</p>
-<figure><img src="fig/versions.svg" alt="異なるバージョンの保存ができます" class="figure mx-auto d-block"></figure><hr>
+<p aria-hidden="true">画像1/1: ‘A diagram with one source document that has been modified in two different ways to produce two different versions of the document’</p>
+<figure><img src="fig/versions.svg" alt="A diagram with one source document that has been modified in two different ways to produce two different versions of the document" class="figure mx-auto d-block"></figure><hr>
 <h3 id="01-basics-figure-4">図の4</h3>
-<p aria-hidden="true">画像1/1: ‘複数のバージョンをマージできます’</p>
-<figure><img src="fig/merge.svg" alt="複数のバージョンをマージできます" class="figure mx-auto d-block"></figure><hr></section><section id="02-setup"><h2 class="section-heading"><a href="02-setup.html">Gitの設定</a></h2>
+<p aria-hidden="true">画像1/1: ‘A diagram that shows the merging of two different document versions into one document that contains all of the changes from both versions’</p>
+<figure><img src="fig/merge.svg" alt="A diagram that shows the merging of two different document versions into one document that contains all of the changes from both versions" class="figure mx-auto d-block"></figure><hr></section><section id="02-setup"><h2 class="section-heading"><a href="02-setup.html">Gitの設定</a></h2>
 <hr class="half-width"></section><section id="03-create"><h2 class="section-heading"><a href="03-create.html">リポジトリの作成</a></h2>
 <hr class="half-width">
 <h3 id="03-create-figure-1">図の1</h3>
-<p aria-hidden="true">画像1/1: ‘motivatingexample’</p>
-<p><img src="fig/motivatingexample.png" alt="motivatingexample" class="figure"><a href="https://www.deviantart.com/b-maze/art/Werewolf-vs-Dracula-124893530" class="external-link">ウルフマン対ドラキュラ</a>
-by <a href="https://www.deviantart.com/b-maze" class="external-link">b-maze</a> / <a href="https://www.deviantart.com/" class="external-link">Deviant Art</a>. <a href="https://en.wikipedia.org/wiki/File:OSIRIS_Mars_true_color.jpg" class="external-link">火星</a>
+<p aria-hidden="true">画像1/1: ‘The main elements of the story: Dracula, Wolfman, the Mummy, Mars, Pluto and The Moon’</p>
+<p><img src="fig/motivatingexample.png" alt="The main elements of the story: Dracula, Wolfman, the Mummy, Mars, Pluto and The Moon" class="figure"><a href="https://www.deviantart.com/b-maze/art/Werewolf-vs-Dracula-124893530" class="external-link">Werewolf
+vs dracula</a> by <a href="https://www.deviantart.com/b-maze" class="external-link">b-maze</a>
+/ <a href="https://www.deviantart.com/" class="external-link">Deviant Art</a>. <a href="https://en.wikipedia.org/wiki/File:OSIRIS_Mars_true_color.jpg" class="external-link">火星</a>
 by European Space Agency / <a href="https://creativecommons.org/licenses/by/3.0/deed.en" class="external-link">CC-BY-SA 3.0
 IGO</a>. <a href="https://commons.wikimedia.org/wiki/File:PIA19873-Pluto-NewHorizons-FlyingPastImage-20150714-transparent.png" class="external-link">冥王星</a>
 / Courtesy NASA/JPL-Caltech. <a href="https://commons.wikimedia.org/wiki/File:Mummy_icon_-_Noun_Project_4070.svg" class="external-link">ミイラ</a>
@@ -488,56 +489,56 @@ <h3 id="03-create-figure-1">図の1</h3>
 <hr></section><section id="04-changes"><h2 class="section-heading"><a href="04-changes.html">変更内容の記録</a></h2>
 <hr class="half-width">
 <h3 id="04-changes-figure-1">図の1</h3>
-<p aria-hidden="true">画像1/1: ‘Gitのステージング・エリア’</p>
-<figure><img src="fig/git-staging-area.svg" alt="Gitのステージング・エリア" class="figure mx-auto d-block"></figure><hr>
+<p aria-hidden="true">画像1/1: ‘A diagram showing how "git add" registers changes in the staging area, while "git commit" moves changes from the staging area to the repository’</p>
+<figure><img src="fig/git-staging-area.svg" alt='A diagram showing how "git add" registers changes in the staging area, while "git commit" moves changes from the staging area to the repository' class="figure mx-auto d-block"></figure><hr>
 <h3 id="04-changes-figure-2">図の2</h3>
-<p aria-hidden="true">画像1/1: ‘git commitのワークフロー’</p>
-<figure><img src="fig/git-committing.svg" alt="git commitのワークフロー" class="figure mx-auto d-block"></figure><hr></section><section id="05-history"><h2 class="section-heading"><a href="05-history.html">履歴の探索</a></h2>
+<p aria-hidden="true">画像1/1: ‘A diagram showing two documents being separately staged using git add, before being combined into one commit using git commit’</p>
+<figure><img src="fig/git-committing.svg" alt="A diagram showing two documents being separately staged using git add, before being combined into one commit using git commit" class="figure mx-auto d-block"></figure><hr></section><section id="05-history"><h2 class="section-heading"><a href="05-history.html">履歴の探索</a></h2>
 <hr class="half-width">
 <h3 id="05-history-figure-1">図の1</h3>
-<p aria-hidden="true">画像1/1: ‘Git Checkout’</p>
-<figure><img src="fig/git-checkout.svg" alt="Git Checkout" class="figure mx-auto d-block"></figure><hr>
+<p aria-hidden="true">画像1/1: ‘以下の図は、git restoreを使って2つのファイルの前のバージョンを復元する方法を示しています’</p>
+<figure><img src="fig/git-restore.svg" alt="以下の図は、git restoreを使って2つのファイルの前のバージョンを復元する方法を示しています" class="figure mx-auto d-block"></figure><hr>
 <h3 id="05-history-figure-2">図の2</h3>
-<p aria-hidden="true">画像1/1: ‘https://figshare.com/articles/How\_Git\_works\_a\_cartoon/1328266’</p>
-<figure><img src="fig/git_staging.svg" alt="https://figshare.com/articles/How\_Git\_works\_a\_cartoon/1328266" class="figure mx-auto d-block"><div class="figcaption"><a href="https://figshare.com/articles/How%5C_Git%5C_works%5C_a%5C_cartoon/1328266" class="external-link uri">https://figshare.com/articles/How\_Git\_works\_a\_cartoon/1328266</a></div>
+<p aria-hidden="true">画像1/1: ‘以下の図は、Gitの全体的なワークフローを示しています。ローカルでの変更は、git addを使ってステージングされ、git commitでローカルリポジトリに反映されます。また、git checkoutを使用することで、リポジトリから変更を元に戻すことができます。’</p>
+<figure><img src="fig/git_staging.svg" alt="以下の図は、Gitの全体的なワークフローを示しています。ローカルでの変更は、git addを使ってステージングされ、git commitでローカルリポジトリに反映されます。また、git checkoutを使用することで、リポジトリから変更を元に戻すことができます。" class="figure mx-auto d-block"><div class="figcaption"><a href="https://figshare.com/articles/How%5C_Git%5C_works%5C_a%5C_cartoon/1328266" class="external-link uri">https://figshare.com/articles/How\_Git\_works\_a\_cartoon/1328266</a></div>
 </figure><hr></section><section id="06-ignore"><h2 class="section-heading"><a href="06-ignore.html">ファイルを無視する</a></h2>
 <hr class="half-width"></section><section id="07-github"><h2 class="section-heading"><a href="07-github.html">GitHub におけるリモート</a></h2>
 <hr class="half-width">
 <h3 id="07-github-figure-1">図の1</h3>
-<p aria-hidden="true">画像1/1: ‘Creating a Repository on GitHub (Step 1)’</p>
-<figure><img src="fig/github-create-repo-01.png" alt="Creating a Repository on GitHub (Step 1)" class="figure mx-auto d-block"></figure><hr>
+<p aria-hidden="true">画像1/1: ‘The first step in creating a repository on GitHub: clicking the "create new" button’</p>
+<figure><img src="fig/github-create-repo-01.png" alt='The first step in creating a repository on GitHub: clicking the "create new" button' class="figure mx-auto d-block"></figure><hr>
 <h3 id="07-github-figure-2">図の2</h3>
-<p aria-hidden="true">画像1/1: ‘Creating a Repository on GitHub (Step 2)’</p>
-<figure><img src="fig/github-create-repo-02.png" alt="Creating a Repository on GitHub (Step 2)" class="figure mx-auto d-block"></figure><hr>
+<p aria-hidden="true">画像1/1: ‘The second step in creating a repository on GitHub: filling out the new repository form to provide the repository name, and specify that neither a readme nor a license should be created’</p>
+<figure><img src="fig/github-create-repo-02.png" alt="The second step in creating a repository on GitHub: filling out the new repository form to provide the repository name, and specify that neither a readme nor a license should be created" class="figure mx-auto d-block"></figure><hr>
 <h3 id="07-github-figure-3">図の3</h3>
-<p aria-hidden="true">画像1/1: ‘Creating a Repository on GitHub (Step 3)’</p>
-<figure><img src="fig/github-create-repo-03.png" alt="Creating a Repository on GitHub (Step 3)" class="figure mx-auto d-block"></figure><hr>
+<p aria-hidden="true">画像1/1: ‘The summary page displayed by GitHub after a new repository has been created. It contains instructions for configuring the new GitHub repository as a git remote’</p>
+<figure><img src="fig/github-create-repo-03.png" alt="The summary page displayed by GitHub after a new repository has been created. It contains instructions for configuring the new GitHub repository as a git remote" class="figure mx-auto d-block"></figure><hr>
 <h3 id="07-github-figure-4">図の4</h3>
-<p aria-hidden="true">画像1/1: ‘The Local Repository with Git Staging Area’</p>
-<figure><img src="fig/git-staging-area.svg" alt="The Local Repository with Git Staging Area" class="figure mx-auto d-block"></figure><hr>
+<p aria-hidden="true">画像1/1: ‘A diagram showing how "git add" registers changes in the staging area, while "git commit" moves changes from the staging area to the repository’</p>
+<figure><img src="fig/git-staging-area.svg" alt='A diagram showing how "git add" registers changes in the staging area, while "git commit" moves changes from the staging area to the repository' class="figure mx-auto d-block"></figure><hr>
 <h3 id="07-github-figure-5">図の5</h3>
-<p aria-hidden="true">画像1/1: ‘Freshly-Made GitHub Repository’</p>
-<figure><img src="fig/git-freshly-made-github-repo.svg" alt="Freshly-Made GitHub Repository" class="figure mx-auto d-block"></figure><hr>
+<p aria-hidden="true">画像1/1: ‘A diagram illustrating how the GitHub "planets" repository is also a git repository like our local repository, but that it is currently empty’</p>
+<figure><img src="fig/git-freshly-made-github-repo.svg" alt='A diagram illustrating how the GitHub "planets" repository is also a git repository like our local repository, but that it is currently empty' class="figure mx-auto d-block"></figure><hr>
 <h3 id="07-github-figure-6">図の6</h3>
-<p aria-hidden="true">画像1/1: ‘Where to Find Repository URL on GitHub’</p>
-<figure><img src="fig/github-find-repo-string.png" alt="Where to Find Repository URL on GitHub" class="figure mx-auto d-block"></figure><hr>
+<p aria-hidden="true">画像1/1: ‘Clicking the "Copy to Clipboard" button on GitHub to obtain the repository's URL’</p>
+<figure><img src="fig/github-find-repo-string.png" alt="Clicking the &quot;Copy to Clipboard&quot; button on GitHub to obtain the repository's URL" class="figure mx-auto d-block"></figure><hr>
 <h3 id="07-github-figure-7">図の7</h3>
-<p aria-hidden="true">画像1/1: ‘Changing the Repository URL on GitHub’</p>
-<figure><img src="fig/github-change-repo-string.png" alt="Changing the Repository URL on GitHub" class="figure mx-auto d-block"></figure><hr>
+<p aria-hidden="true">画像1/1: ‘A screenshot showing that clicking on "SSH" will make GitHub provide the SSH URL for a repository instead of the HTTPS URL’</p>
+<figure><img src="fig/github-change-repo-string.png" alt='A screenshot showing that clicking on "SSH" will make GitHub provide the SSH URL for a repository instead of the HTTPS URL' class="figure mx-auto d-block"></figure><hr>
 <h3 id="07-github-figure-8">図の8</h3>
-<p aria-hidden="true">画像1/1: ‘GitHub Repository After First Push’</p>
-<figure><img src="fig/github-repo-after-first-push.svg" alt="GitHub Repository After First Push" class="figure mx-auto d-block"></figure><hr></section><section id="08-collab"><h2 class="section-heading"><a href="08-collab.html">Collaborating</a></h2>
+<p aria-hidden="true">画像1/1: ‘A diagram showing how "git push origin" will push changes from the local repository to the remote, making the remote repository an exact copy of the local repository.’</p>
+<figure><img src="fig/github-repo-after-first-push.svg" alt='A diagram showing how "git push origin" will push changes from the local repository to the remote, making the remote repository an exact copy of the local repository.' class="figure mx-auto d-block"></figure><hr></section><section id="08-collab"><h2 class="section-heading"><a href="08-collab.html">Collaborating</a></h2>
 <hr class="half-width">
 <h3 id="08-collab-figure-1">図の1</h3>
-<p aria-hidden="true">画像1/1: ‘screenshot of repository page with Settings then Collaborators selected, showing how to add Collaborators in a GitHub repository’</p>
-<figure><img src="fig/github-add-collaborators.png" alt="screenshot of repository page with Settings then Collaborators selected, showing how to add Collaborators in a GitHub repository" class="figure mx-auto d-block"></figure><hr>
+<p aria-hidden="true">画像1/1: ‘A screenshot of the GitHub Collaborators settings page, which is accessed by clicking "Settings" then "Collaborators"’</p>
+<figure><img src="fig/github-add-collaborators.png" alt='A screenshot of the GitHub Collaborators settings page, which is accessed by clicking "Settings" then "Collaborators"' class="figure mx-auto d-block"></figure><hr>
 <h3 id="08-collab-figure-2">図の2</h3>
-<p aria-hidden="true">画像1/1: ‘After Creating Clone of Repository’</p>
-<figure><img src="fig/github-collaboration.svg" alt="After Creating Clone of Repository" class="figure mx-auto d-block"></figure><hr></section><section id="09-conflict"><h2 class="section-heading"><a href="09-conflict.html">Conflicts</a></h2>
+<p aria-hidden="true">画像1/1: ‘A diagram showing that "git clone" can create a copy of a remote GitHub repository, allowing a second person to create their own local repository that they can make changes to.’</p>
+<figure><img src="fig/github-collaboration.svg" alt='A diagram showing that "git clone" can create a copy of a remote GitHub repository, allowing a second person to create their own local repository that they can make changes to.' class="figure mx-auto d-block"></figure><hr></section><section id="09-conflict"><h2 class="section-heading"><a href="09-conflict.html">Conflicts</a></h2>
 <hr class="half-width">
 <h3 id="09-conflict-figure-1">図の1</h3>
-<p aria-hidden="true">画像1/1: ‘The Conflicting Changes’</p>
-<figure><img src="fig/conflict.svg" alt="The Conflicting Changes" class="figure mx-auto d-block"></figure><hr></section><section id="10-open"><h2 class="section-heading"><a href="10-open.html">オープン サイエンス</a></h2>
+<p aria-hidden="true">画像1/1: ‘A diagram showing a conflict that might occur when two sets of independent changes are merged’</p>
+<figure><img src="fig/conflict.svg" alt="A diagram showing a conflict that might occur when two sets of independent changes are merged" class="figure mx-auto d-block"></figure><hr></section><section id="10-open"><h2 class="section-heading"><a href="10-open.html">オープン サイエンス</a></h2>
 <hr class="half-width"></section><section id="11-licensing"><h2 class="section-heading"><a href="11-licensing.html">Licensing</a></h2>
 <hr class="half-width"></section><section id="12-citation"><h2 class="section-heading"><a href="12-citation.html">Citation</a></h2>
 <hr class="half-width"></section><section id="13-hosting"><h2 class="section-heading"><a href="13-hosting.html">Hosting</a></h2>
@@ -550,22 +551,26 @@ <h3 id="14-supplemental-rstudio-figure-2">図の2</h3>
 <p aria-hidden="true">画像1/1: ‘RStudio screenshot showing New Project dialog window with "Create project from existing directory" selected’</p>
 <figure><img src="fig/RStudio_screenshot_existingdirectory.png" alt='RStudio screenshot showing New Project dialog window with "Create project from existing directory" selected' class="figure mx-auto d-block"></figure><hr>
 <h3 id="14-supplemental-rstudio-figure-3">図の3</h3>
-<figure><img src="fig/RStudio_screenshot_navigateexisting.png" class="figure mx-auto d-block"></figure><hr>
+<p aria-hidden="true">画像1/1: ‘RStudio window showing the "Create Project From Existing Directory" dialog. In the dialog, the project working directory has been set to "~/Desktop/planets"’</p>
+<figure><img src="fig/RStudio_screenshot_navigateexisting.png" alt='RStudio window showing the "Create Project From Existing Directory" dialog. In the dialog, the project working directory has been set to "~/Desktop/planets"' class="figure mx-auto d-block"></figure><hr>
 <h3 id="14-supplemental-rstudio-figure-4">図の4</h3>
 <p aria-hidden="true">画像1/1: ‘RStudio window after new project is created with large arrow pointing to vertical Git menu bar.’</p>
 <figure><img src="fig/RStudio_screenshot_afterclone.png" alt="RStudio window after new project is created with large arrow pointing to vertical Git menu bar." class="figure mx-auto d-block"></figure><hr>
 <h3 id="14-supplemental-rstudio-figure-5">図の5</h3>
-<figure><img src="fig/RStudio_screenshot_editfiles.png" class="figure mx-auto d-block"></figure><hr>
+<p aria-hidden="true">画像1/1: ‘RStudio window demonstrating the use of the editor panel to modify the "pluto.txt" file’</p>
+<figure><img src="fig/RStudio_screenshot_editfiles.png" alt='RStudio window demonstrating the use of the editor panel to modify the "pluto.txt" file' class="figure mx-auto d-block"></figure><hr>
 <h3 id="14-supplemental-rstudio-figure-6">図の6</h3>
-<p aria-hidden="true">画像1/1: ‘RStudio screenshot showing the Git menu dropdown with "Commit..." selected’</p>
-<figure><img src="fig/RStudio_screenshot_commit.png" alt='RStudio screenshot showing the Git menu dropdown with "Commit..." selected' class="figure mx-auto d-block"></figure><hr>
+<p aria-hidden="true">画像1/1: ‘RStudio screenshot showing the Git menu dropdown with the "Commit..." option selected’</p>
+<figure><img src="fig/RStudio_screenshot_commit.png" alt='RStudio screenshot showing the Git menu dropdown with the "Commit..." option selected' class="figure mx-auto d-block"></figure><hr>
 <h3 id="14-supplemental-rstudio-figure-7">図の7</h3>
-<figure><img src="fig/RStudio_screenshot_review.png" class="figure mx-auto d-block"></figure><hr>
+<p aria-hidden="true">画像1/1: ‘RStudio screenshow showing the "Review Changes" dialog. The top left panel shows the list of files that can be included or excluded from the commit. The top right panel is for writing a commit message. The bottom panel shows information about the currently selected file in the top left panel.’</p>
+<figure><img src="fig/RStudio_screenshot_review.png" alt='RStudio screenshow showing the "Review Changes" dialog. The top left panel shows the list of files that can be included or excluded from the commit. The top right panel is for writing a commit message. The bottom panel shows information about the currently selected file in the top left panel.' class="figure mx-auto d-block"></figure><hr>
 <h3 id="14-supplemental-rstudio-figure-8">図の8</h3>
-<p aria-hidden="true">画像1/1: ‘RStudio screenshot showing the git menu dropdown with "History" selected’</p>
-<figure><img src="fig/RStudio_screenshot_history.png" alt='RStudio screenshot showing the git menu dropdown with "History" selected' class="figure mx-auto d-block"></figure><hr>
+<p aria-hidden="true">画像1/1: ‘RStudio screenshot showing the git menu dropdown with the "History" option selected’</p>
+<figure><img src="fig/RStudio_screenshot_history.png" alt='RStudio screenshot showing the git menu dropdown with the "History" option selected' class="figure mx-auto d-block"></figure><hr>
 <h3 id="14-supplemental-rstudio-figure-9">図の9</h3>
-<figure><img src="fig/RStudio_screenshot_viewhistory.png" class="figure mx-auto d-block"></figure><hr>
+<p aria-hidden="true">画像1/1: ‘RStudio screenshot showing the "Review Changes" dialog after pressing the "History" button. The top panel lists the commits in the repository, similar to git log. The bottom panel shows the changes included in the commit that has been selected in the top panel.’</p>
+<figure><img src="fig/RStudio_screenshot_viewhistory.png" alt='RStudio screenshot showing the "Review Changes" dialog after pressing the "History" button. The top panel lists the commits in the repository, similar to git log. The bottom panel shows the changes included in the commit that has been selected in the top panel.' class="figure mx-auto d-block"></figure><hr>
 <h3 id="14-supplemental-rstudio-figure-10">図の10</h3>
 <p aria-hidden="true">画像1/1: ‘RStudio screenshot showing .gitignore open in the editor pane with the files .Rproj.user, .Rhistory, .RData, and *.Rproj added to the end’</p>
 <figure><img src="fig/RStudio_screenshot_gitignore.png" alt="RStudio screenshot showing .gitignore open in the editor pane with the files .Rproj.user, .Rhistory, .RData, and *.Rproj added to the end" class="figure mx-auto d-block"></figure><hr></section>
@@ -617,8 +622,8 @@ <h3 id="14-supplemental-rstudio-figure-10">図の10</h3>
   "url": "https://swcarpentry-ja.github.io/git-novice/images.html",
   "identifier": "https://swcarpentry-ja.github.io/git-novice/images.html",
   "dateCreated": "2014-12-04",
-  "dateModified": "2024-09-27",
-  "datePublished": "2024-09-27"
+  "dateModified": "2024-09-30",
+  "datePublished": "2024-09-30"
 }
 
   </script><script>
diff --git a/index.html b/index.html
index 63ecd820bc..42e91e39b1 100644
--- a/index.html
+++ b/index.html
@@ -517,8 +517,8 @@ <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i
   "url": "https://swcarpentry-ja.github.io/git-novice/index.html",
   "identifier": "https://swcarpentry-ja.github.io/git-novice/index.html",
   "dateCreated": "2014-12-04",
-  "dateModified": "2024-09-27",
-  "datePublished": "2024-09-27"
+  "dateModified": "2024-09-30",
+  "datePublished": "2024-09-30"
 }
 
   </script><script>
diff --git a/instructor-notes.html b/instructor-notes.html
index 935d89493a..5b2aec1d1e 100644
--- a/instructor-notes.html
+++ b/instructor-notes.html
@@ -872,8 +872,8 @@ <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i
   "url": "https://swcarpentry-ja.github.io/git-novice/instructor-notes.html",
   "identifier": "https://swcarpentry-ja.github.io/git-novice/instructor-notes.html",
   "dateCreated": "2014-12-04",
-  "dateModified": "2024-09-27",
-  "datePublished": "2024-09-27"
+  "dateModified": "2024-09-30",
+  "datePublished": "2024-09-30"
 }
 
   </script><script>
diff --git a/instructor/01-basics.html b/instructor/01-basics.html
index 63869abd00..1a237900f8 100644
--- a/instructor/01-basics.html
+++ b/instructor/01-basics.html
@@ -381,7 +381,7 @@ <h2 class="accordion-header" id="flush-headingTwelve">
       </div>
       <hr></nav><main id="main-content" class="main-content"><div class="container lesson-content">
         <h1>自動的なバージョン管理</h1>
-        <p>最終更新日：2024-06-06 |
+        <p>最終更新日：2024-09-30 |
 
         <a href="https://github.com/swcarpentry-ja/git-novice/edit/main/episodes/01-basics.md" class="external-link">ページの編集 <i aria-hidden="true" data-feather="edit"></i></a></p>
 
@@ -433,12 +433,12 @@ <h3 class="card-title">目的</h3>
 加えられた全ての変更点を記録していきます。ドキュメントの
 進歩を記録していると考えてもらって構いません。変更点を最初の状況まで
 戻してから、最新版になるまでの変更を一つずつ再現していくことができます。</p>
-<figure><img src="../fig/play-changes.svg" alt="変更は連続して保存されます" class="figure mx-auto d-block"></figure><p>「変更点」と「ドキュメント」を別々の物として考えてみると、基礎となるドキュメントに
+<figure><img src="../fig/play-changes.svg" alt="A diagram demonstrating how a single document grows as the result of sequential changes" class="figure mx-auto d-block"></figure><p>「変更点」と「ドキュメント」を別々の物として考えてみると、基礎となるドキュメントに
 異なる変更点を「再現」する事によって、結果的に違ったバージョンのドキュメントを
 作る事が可能だという事が分かります。
 例えば、下の図のように二人のユーザーが同じドキュメントに違った編集を加えた場合です。</p>
-<figure><img src="../fig/versions.svg" alt="異なるバージョンの保存ができます" class="figure mx-auto d-block"></figure><p>変更点の衝突（<a href="reference.html#conflict">コンフリクト</a>）が無ければ、二つ以上の違った変更点を基礎ドキュメントに加えることさえできます。</p>
-<figure><img src="../fig/merge.svg" alt="複数のバージョンをマージできます" class="figure mx-auto d-block"></figure><p>バージョン管理システムは、ユーザーがドキュメントに加えた変更点を記録するツールであり、
+<figure><img src="../fig/versions.svg" alt="A diagram with one source document that has been modified in two different ways to produce two different versions of the document" class="figure mx-auto d-block"></figure><p>変更点の衝突（<a href="reference.html#conflict">コンフリクト</a>）が無ければ、二つ以上の違った変更点を基礎ドキュメントに加えることさえできます。</p>
+<figure><img src="../fig/merge.svg" alt="A diagram that shows the merging of two different document versions into one document that contains all of the changes from both versions" class="figure mx-auto d-block"></figure><p>バージョン管理システムは、ユーザーがドキュメントに加えた変更点を記録するツールであり、
 結果的にドキュメントの違ったバージョンを作成する事ができます。
 このツールを活用
 する事によって、次のバージョンに加える変更点（個々の変更点は 「<a href="reference.html#commit">commit（コミット）</a>」と呼びます）を決める事ができ、変更点に関するメタデータも一緒に保存する事ができます。
@@ -575,8 +575,8 @@ <h3 class="callout-title">まとめ</h3>
   "url": "https://swcarpentry-ja.github.io/git-novice/instructor/01-basics.html",
   "identifier": "https://swcarpentry-ja.github.io/git-novice/instructor/01-basics.html",
   "dateCreated": "2014-12-04",
-  "dateModified": "2024-06-06",
-  "datePublished": "2024-09-27"
+  "dateModified": "2024-09-30",
+  "datePublished": "2024-09-30"
 }
 
   </script><script>
diff --git a/instructor/02-setup.html b/instructor/02-setup.html
index 1225d620ca..62b7e9bf34 100644
--- a/instructor/02-setup.html
+++ b/instructor/02-setup.html
@@ -732,7 +732,7 @@ <h3 class="callout-title">まとめ</h3>
   "identifier": "https://swcarpentry-ja.github.io/git-novice/instructor/02-setup.html",
   "dateCreated": "2014-12-04",
   "dateModified": "2024-06-06",
-  "datePublished": "2024-09-27"
+  "datePublished": "2024-09-30"
 }
 
   </script><script>
diff --git a/instructor/03-create.html b/instructor/03-create.html
index 749897d0ee..5c6046f870 100644
--- a/instructor/03-create.html
+++ b/instructor/03-create.html
@@ -381,7 +381,7 @@ <h2 class="accordion-header" id="flush-headingTwelve">
       </div>
       <hr></nav><main id="main-content" class="main-content"><div class="container lesson-content">
         <h1>リポジトリの作成</h1>
-        <p>最終更新日：2024-06-06 |
+        <p>最終更新日：2024-09-30 |
 
         <a href="https://github.com/swcarpentry-ja/git-novice/edit/main/episodes/03-create.md" class="external-link">ページの編集 <i aria-hidden="true" data-feather="edit"></i></a></p>
 
@@ -420,8 +420,9 @@ <h3 class="card-title">目的</h3>
 </div>
 <p>Gitの設定ができたら、 それを使い始めることができます。</p>
 <p>火星に惑星着陸船を送ることが可能かどうかを調査しているウルフマンとドラキュラの話に戻りましょう。</p>
-<p><img src="../fig/motivatingexample.png" alt="motivatingexample" class="figure"><a href="https://www.deviantart.com/b-maze/art/Werewolf-vs-Dracula-124893530" class="external-link">ウルフマン対ドラキュラ</a>
-by <a href="https://www.deviantart.com/b-maze" class="external-link">b-maze</a> / <a href="https://www.deviantart.com/" class="external-link">Deviant Art</a>. <a href="https://en.wikipedia.org/wiki/File:OSIRIS_Mars_true_color.jpg" class="external-link">火星</a>
+<p><img src="../fig/motivatingexample.png" alt="The main elements of the story: Dracula, Wolfman, the Mummy, Mars, Pluto and The Moon" class="figure"><a href="https://www.deviantart.com/b-maze/art/Werewolf-vs-Dracula-124893530" class="external-link">Werewolf
+vs dracula</a> by <a href="https://www.deviantart.com/b-maze" class="external-link">b-maze</a>
+/ <a href="https://www.deviantart.com/" class="external-link">Deviant Art</a>. <a href="https://en.wikipedia.org/wiki/File:OSIRIS_Mars_true_color.jpg" class="external-link">火星</a>
 by European Space Agency / <a href="https://creativecommons.org/licenses/by/3.0/deed.en" class="external-link">CC-BY-SA 3.0
 IGO</a>. <a href="https://commons.wikimedia.org/wiki/File:PIA19873-Pluto-NewHorizons-FlyingPastImage-20150714-transparent.png" class="external-link">冥王星</a>
 / Courtesy NASA/JPL-Caltech. <a href="https://commons.wikimedia.org/wiki/File:Mummy_icon_-_Noun_Project_4070.svg" class="external-link">ミイラ</a>
@@ -488,7 +489,11 @@ <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"><
 </h3>
 <pre class="output" tabindex="0"><code>Switched to a new branch 'main'</code></pre>
 </div>
-<p>プロジェクトのステータスをGitに問うことで、すべてが正しく設定されていることを確認できます:</p>
+<p>We can now start using one of the most important git commands, which
+is particularly helpful to beginners. <code>git status</code> tells us
+the status of our project, and better, a list of changes in the project
+and options on what to do with those changes. We can use it as often as
+we want, whenever we want to understand what is going on.</p>
 <div class="codewrapper sourceCode" id="cb8">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
@@ -579,7 +584,7 @@ <h3 class="callout-title">
 <code>git init</code> の間違いを修正する</h3>
 <div class="callout-content">
 <p>ウルフマンはドラキュラに、「入れ子」状態になっているリポジトリがいかに冗長で、混乱を引き起こす可能性があるかを説明しました。
-説明を聞いて、ドラキュラは「入れ子」状態のリポジトリを削除したいと思いました。
+Dracula would like to go back to a single git repository.
 <code>moons</code>サブディレクトリの最後の<code>git init</code>を、ドラキュラはどうやって、元に戻すことができるのでしょうか？</p>
 </div>
 </div>
@@ -603,14 +608,16 @@ <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i
 </h3>
 <pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb13-1"><a href="#cb13-1" tabindex="-1"></a><span class="ex">$</span> rm filename</span></code></pre>
 </div>
-<p>同様に、<code>rm -r dirname</code> または <code>rm -rf dirname</code>
-を使ってディレクトリを削除することができます。
+<p>Similarly a directory can be removed using
+<code>rm -r dirname</code>.
 この方法で削除されるファイルやフォルダがGitによって追跡されているなら、次のエピソードで見られるように、それらの削除が、追跡する必要がある別の変更になります。</p>
 </div>
 <div class="section level3">
 <h3 id="解答-1">解答<a class="anchor" aria-label="anchor" href="#%E8%A7%A3%E7%AD%94-1"></a></h3>
-<p>Gitはすべてのファイルを<code>.git</code>ディレクトリに保存します。
-この小さなミスから立ち直るには、ドラキュラは<code>planets</code>ディレクトリの中から次のコマンドを実行して、moonsサブディレクトリの中の<code>.git</code>フォルダを削除すれば良い：</p>
+<p>Gitはすべてのファイルを<code>.git</code>ディレクトリに保存します。 To
+recover from this little mistake, Dracula can remove the
+<code>.git</code> folder in the moons subdirectory by running the
+following command from inside the <code>planets</code> directory:</p>
 <div class="codewrapper sourceCode" id="cb14">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
@@ -618,7 +625,8 @@ <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i
 </div>
 <p>しかし、気をつけてください！
 間違ったディレクトリでこのコマンドを実行すると、残しておきたいプロジェクトのGit履歴がすべて削除されてしまいます。
-したがって、常に <code>pwd</code>
+In general, deleting files and directories using <code>rm</code> from
+the command line cannot be reversed. したがって、常に <code>pwd</code>
 コマンドを使用してカレントディレクトリを確認してください。</p>
 </div>
 </div>
@@ -700,8 +708,8 @@ <h3 class="callout-title">まとめ</h3>
   "url": "https://swcarpentry-ja.github.io/git-novice/instructor/03-create.html",
   "identifier": "https://swcarpentry-ja.github.io/git-novice/instructor/03-create.html",
   "dateCreated": "2014-12-04",
-  "dateModified": "2024-06-06",
-  "datePublished": "2024-09-27"
+  "dateModified": "2024-09-30",
+  "datePublished": "2024-09-30"
 }
 
   </script><script>
diff --git a/instructor/04-changes.html b/instructor/04-changes.html
index c1b425ab15..a5c80ed93d 100644
--- a/instructor/04-changes.html
+++ b/instructor/04-changes.html
@@ -381,7 +381,7 @@ <h2 class="accordion-header" id="flush-headingTwelve">
       </div>
       <hr></nav><main id="main-content" class="main-content"><div class="container lesson-content">
         <h1>変更内容の記録</h1>
-        <p>最終更新日：2024-06-06 |
+        <p>最終更新日：2024-09-30 |
 
         <a href="https://github.com/swcarpentry-ja/git-novice/edit/main/episodes/04-changes.md" class="external-link">ページの編集 <i aria-hidden="true" data-feather="edit"></i></a></p>
 
@@ -735,7 +735,7 @@ <h3 class="callout-title">ステージングエリア</h3>
 </div>
 </div>
 </div>
-<figure><img src="../fig/git-staging-area.svg" alt="Gitのステージング・エリア" class="figure mx-auto d-block"></figure><p>それでは、ファイルの変更点がエディタからステージングエリア、そして長期保存に移る過程を見てみましょう。
+<figure><img src="../fig/git-staging-area.svg" alt='A diagram showing how "git add" registers changes in the staging area, while "git commit" moves changes from the staging area to the repository' class="figure mx-auto d-block"></figure><p>それでは、ファイルの変更点がエディタからステージングエリア、そして長期保存に移る過程を見てみましょう。
 初めに、新しい文章をファイルに加えましょう：</p>
 <div class="codewrapper sourceCode" id="cb29">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
@@ -1001,7 +1001,7 @@ <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i
 <p>まとめると、変更内容をリポジトリに追加したい時は<code>git add</code>
 で変更点をステージングエリアに移してから、<code>git commit</code>
 でステージングエリアの変更点をリポジトリに保存します：</p>
-<figure><img src="../fig/git-committing.svg" alt="git commitのワークフロー" class="figure mx-auto d-block"></figure><div id="コミットメッセージを決める" class="callout challenge">
+<figure><img src="../fig/git-committing.svg" alt="A diagram showing two documents being separately staged using git add, before being combined into one commit using git commit" class="figure mx-auto d-block"></figure><div id="コミットメッセージを決める" class="callout challenge">
 <div class="callout-square">
 <i class="callout-icon" data-feather="zap"></i>
 </div>
@@ -1024,7 +1024,7 @@ <h4 class="accordion-header" id="headingSolution1">
   解答
   </h4>
 </button>
-<div id="collapseSolution1" class="accordion-collapse collapse" aria-labelledby="headingSolution1" data-bs-parent="#accordionSolution1">
+<div id="collapseSolution1" class="accordion-collapse collapse" data-bs-parent="#accordionSolution1" aria-labelledby="headingSolution1">
 <div class="accordion-body">
 <p>１つ目のメッセージは短すぎてコミットの内容が何なのかわかりにくいです。２つ目は<code>git diff</code>で何が変わったのかが分かるので、長い割にはあまり意味がありません。３つ目は、短く、簡潔で、分かりやすいメッセージです。</p>
 </div>
@@ -1072,7 +1072,7 @@ <h4 class="accordion-header" id="headingSolution2">
   解答
   </h4>
 </button>
-<div id="collapseSolution2" class="accordion-collapse collapse" aria-labelledby="headingSolution2" data-bs-parent="#accordionSolution2">
+<div id="collapseSolution2" class="accordion-collapse collapse" data-bs-parent="#accordionSolution2" aria-labelledby="headingSolution2">
 <div class="accordion-body">
 <ol style="list-style-type: decimal"><li><p>ファイルがステージングエリアにない限り、コミットできません。</p></li>
 <li><p>新しくリポジトリを作ろうとします。</p></li>
@@ -1107,7 +1107,7 @@ <h4 class="accordion-header" id="headingSolution3">
   解答
   </h4>
 </button>
-<div id="collapseSolution3" class="accordion-collapse collapse" aria-labelledby="headingSolution3" data-bs-parent="#accordionSolution3">
+<div id="collapseSolution3" class="accordion-collapse collapse" data-bs-parent="#accordionSolution3" aria-labelledby="headingSolution3">
 <div class="accordion-body">
 <p>以下の<code>cat mars.txt</code>の出力は、この課題で追加された内容のみを反映しています。
 出力は異なる場合があります。</p>
@@ -1193,7 +1193,7 @@ <h4 class="accordion-header" id="headingSolution4">
   解答
   </h4>
 </button>
-<div id="collapseSolution4" class="accordion-collapse collapse" aria-labelledby="headingSolution4" data-bs-parent="#accordionSolution4">
+<div id="collapseSolution4" class="accordion-collapse collapse" data-bs-parent="#accordionSolution4" aria-labelledby="headingSolution4">
 <div class="accordion-body">
 <p>必要であれば、<code>planets</code> から出ましょう：</p>
 <div class="codewrapper sourceCode" id="cb64">
@@ -1317,8 +1317,8 @@ <h3 class="callout-title">まとめ</h3>
   "url": "https://swcarpentry-ja.github.io/git-novice/instructor/04-changes.html",
   "identifier": "https://swcarpentry-ja.github.io/git-novice/instructor/04-changes.html",
   "dateCreated": "2014-12-04",
-  "dateModified": "2024-06-06",
-  "datePublished": "2024-09-27"
+  "dateModified": "2024-09-30",
+  "datePublished": "2024-09-30"
 }
 
   </script><script>
diff --git a/instructor/05-history.html b/instructor/05-history.html
index 4111b67c3b..ffae3aacbc 100644
--- a/instructor/05-history.html
+++ b/instructor/05-history.html
@@ -381,7 +381,7 @@ <h2 class="accordion-header" id="flush-headingTwelve">
       </div>
       <hr></nav><main id="main-content" class="main-content"><div class="container lesson-content">
         <h1>履歴の探索</h1>
-        <p>最終更新日：2024-06-06 |
+        <p>最終更新日：2024-09-30 |
 
         <a href="https://github.com/swcarpentry-ja/git-novice/edit/main/episodes/05-history.md" class="external-link">ページの編集 <i aria-hidden="true" data-feather="edit"></i></a></p>
 
@@ -478,7 +478,7 @@ <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i
 <div class="codewrapper sourceCode" id="cb6">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
-<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb6-1"><a href="#cb6-1" tabindex="-1"></a><span class="ex">$</span> git diff HEAD~3 mars.txt</span></code></pre>
+<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb6-1"><a href="#cb6-1" tabindex="-1"></a><span class="ex">$</span> git diff HEAD~2 mars.txt</span></code></pre>
 </div>
 <div class="codewrapper">
 <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
@@ -500,7 +500,7 @@ <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"><
 <div class="codewrapper sourceCode" id="cb8">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
-<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb8-1"><a href="#cb8-1" tabindex="-1"></a><span class="ex">$</span> git show HEAD~3 mars.txt</span></code></pre>
+<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb8-1"><a href="#cb8-1" tabindex="-1"></a><span class="ex">$</span> git show HEAD~2 mars.txt</span></code></pre>
 </div>
 <div class="codewrapper">
 <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
@@ -524,7 +524,7 @@ <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"><
 表記を使用して以前のコミットを参照できるため、<code>HEAD~1</code>
 は「以前のコミット」を意味し、<code>HEAD~123</code>
 は現在の場所から123個前のコミットに戻ります。</p>
-<p><code>git log</code>
+<p><code>git log</code> および <code>git show</code>
 が表示する、数字と文字の長い文字列を使用してコミットを参照することもできます。
 これらは一個一個の変更に対するユニークなIDであり、「ユニーク」は本当に唯一であることを意味します:
 どのコンピューターのどのファイルの変更の組み合わせに対しても、ユニークな40文字の
@@ -585,17 +585,17 @@ <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"><
 <pre class="output" tabindex="0"><code>On branch main
 Changes not staged for commit:
   (use "git add &lt;file&gt;..." to update what will be committed)
-  (use "git checkout -- &lt;file&gt;..." to discard changes in working directory)
+  (use "git restore &lt;file&gt;..." to discard changes in working directory)
 
     modified:   mars.txt
 
 no changes added to commit (use "git add" and/or "git commit -a")</code></pre>
 </div>
-<p><code>git checkout</code>を使うと、元の状態に戻すことができます:</p>
+<p><code>git restore</code>を使うと、元の状態に戻すことができます:</p>
 <div class="codewrapper sourceCode" id="cb16">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
-<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb16-1"><a href="#cb16-1" tabindex="-1"></a><span class="ex">$</span> git checkout HEAD mars.txt</span>
+<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb16-1"><a href="#cb16-1" tabindex="-1"></a><span class="ex">$</span> git restore mars.txt</span>
 <span id="cb16-2"><a href="#cb16-2" tabindex="-1"></a><span class="ex">$</span> cat mars.txt</span></code></pre>
 </div>
 <div class="codewrapper">
@@ -605,15 +605,16 @@ <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"><
 The two moons may be a problem for Wolfman
 But the Mummy will appreciate the lack of humidity</code></pre>
 </div>
-<p>その名前から推測できるように、<code>git checkout</code>
-はファイルの古いバージョンをチェックアウト (つまり、復元) します。
+<p>その名前から推測できるように、<code>git restore</code>
+はファイルの古いバージョンを復元します。
 この場合、最後に保存されたコミットである <code>HEAD</code>
-に記録されたファイルのバージョン を復元することをGitに伝えています。
-さらに戻りたい場合は、代わりにコミット Id を使うことができます:</p>
+に記録されたファイルのバージョンを復元することをGitに伝えています。
+さらに遡りたい場合は、<code>-s</code>オプションとコミット Id
+を使うことができます:</p>
 <div class="codewrapper sourceCode" id="cb18">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
-<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb18-1"><a href="#cb18-1" tabindex="-1"></a><span class="ex">$</span> git checkout f22b25e mars.txt</span></code></pre>
+<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb18-1"><a href="#cb18-1" tabindex="-1"></a><span class="ex">$</span> git restore <span class="at">-s</span> f22b25e mars.txt</span></code></pre>
 </div>
 <div class="codewrapper sourceCode" id="cb19">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
@@ -634,95 +635,39 @@ <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i
 <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
 <pre class="output" tabindex="0"><code>On branch main
-Changes to be committed:
-  (use "git reset HEAD &lt;file&gt;..." to unstage)
+Changes not staged for commit:
+  (use "git add &lt;file&gt;..." to update what will be committed)
+  (use "git restore &lt;file&gt;..." to discard changes in working directory)
+        modified:   mars.txt
 
-    modified:   mars.txt
+no changes added to commit (use "git add" and/or "git commit -a")
 </code></pre>
 </div>
 <p>変更はステージング領域にあることに注意してください。
-繰り返しますが、<code>git checkout</code>
+繰り返しますが、<code>git restore</code>
 を使うと、元の状態に戻すことができます:</p>
 <div class="codewrapper sourceCode" id="cb23">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
-<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb23-1"><a href="#cb23-1" tabindex="-1"></a><span class="ex">$</span> git checkout HEAD mars.txt</span></code></pre>
-</div>
-<div id="head-を見失わないようにしましょう" class="callout">
-<div class="callout-square">
-<i class="callout-icon" data-feather="bell"></i>
-</div>
-<div id="head-を見失わないようにしましょう" class="callout-inner">
-<h3 class="callout-title">HEAD を見失わないようにしましょう</h3>
-<div class="callout-content">
-<p>上記では下記を使いました</p>
-<div class="codewrapper sourceCode" id="cb24">
-<h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
-</h3>
-<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb24-1"><a href="#cb24-1" tabindex="-1"></a><span class="ex">$</span> git checkout f22b25e mars.txt</span></code></pre>
-</div>
-<p><code>mars.txt</code> をコミット <code>f22b25e</code>
-後の状態に戻すためにです。 しかし、気をつけてください！ コマンド
-<code>checkout</code>
-には他の重要な機能があり、入力が正確でない場合、Gitはあなたの意図を誤解する可能性があります。
-たとえば、前のコマンドで <code>mars.txt</code> を忘れた場合です。</p>
-<div class="codewrapper sourceCode" id="cb25">
-<h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
-</h3>
-<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb25-1"><a href="#cb25-1" tabindex="-1"></a><span class="ex">$</span> git checkout f22b25e</span></code></pre>
+<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb23-1"><a href="#cb23-1" tabindex="-1"></a><span class="ex">$</span> git restore mars.txt</span>
+<span id="cb23-2"><a href="#cb23-2" tabindex="-1"></a><span class="ex">$</span> cat mars.txt</span></code></pre>
 </div>
 <div class="codewrapper">
-<h3 class="code-label">エラー<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
+<h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
-<pre class="error" tabindex="0"><code>Note: checking out 'f22b25e'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
- git checkout -b &lt;new-branch-name&gt;
-
-HEAD is now at f22b25e Start notes on Mars as a base</code></pre>
-</div>
-<p>ここでの「HEADが切り離された」状態は「見れるが触ってはいけない」ようなものなので、この状態で変更を加えないでください。
-リポジトリの過去の状態を調査した後、<code>git checkout main</code> で
-<code>HEAD</code>を再接続してください。</p>
-</div>
-</div>
+<pre class="output" tabindex="0"><code>Cold and dry, but everything is my favorite color
+The two moons may be a problem for Wolfman
+But the Mummy will appreciate the lack of humidity</code></pre>
 </div>
 <p>取り消したい変更の一個<strong>前</strong>のコミット番号を使う必要があることを覚えておくことが重要です。
 よくある間違いは、破棄しようとしている変更を行ったコミットの番号を使用することです。
 以下の例では、最新のコミットの前 (<code>HEAD~1</code>)
-、すなわち<code>f22b25e</code>から状態を取得したいと考えています:</p>
-<figure><img src="../fig/git-checkout.svg" alt="Git Checkout" class="figure mx-auto d-block"></figure><p>つまり、すべてをまとめると、Gitがどのように機能するかは次の漫画のようになります:</p>
-<figure><img src="../fig/git_staging.svg" alt="https://figshare.com/articles/How\_Git\_works\_a\_cartoon/1328266" class="figure mx-auto d-block"><div class="figcaption"><a href="https://figshare.com/articles/How%5C_Git%5C_works%5C_a%5C_cartoon/1328266" class="external-link uri">https://figshare.com/articles/How\_Git\_works\_a\_cartoon/1328266</a></div>
-</figure><div id="よくあるケースの簡単化" class="callout">
-<div class="callout-square">
-<i class="callout-icon" data-feather="bell"></i>
-</div>
-<div id="よくあるケースの簡単化" class="callout-inner">
-<h3 class="callout-title">よくあるケースの簡単化</h3>
-<div class="callout-content">
-<p><code>git status</code>
-の出力を注意深く読むと、次のヒントを含んでいることが分かります:</p>
-<div class="codewrapper">
-<h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
-</h3>
-<pre class="output" tabindex="0"><code>(use "git checkout -- &lt;file&gt;..." to discard changes in working directory)</code></pre>
-</div>
-<p>それが言っているように、バージョン識別子のない
-<code>git checkout</code>
-はファイルを<code>HEAD</code>に保存された状態に復元します。
-二重のダッシュ
-<code>--</code>はコマンドから復元されるファイルの名前を区別するために必要です：それがないと、Git
-はファイルの名前をコミット Id として使用しようとします。</p>
-</div>
-</div>
-</div>
-<p>ファイルを1つずつ元に戻すことができるという事実は
+、すなわち<code>f22b25e</code>から状態を取得したいと考えています:
+このとき、<code>.</code>
+を使用することで、全てのファイルを対象にします。</p>
+<figure><img src="../fig/git-restore.svg" alt="以下の図は、git restoreを使って2つのファイルの前のバージョンを復元する方法を示しています" class="figure mx-auto d-block"></figure><p>つまり、すべてをまとめると、Gitがどのように機能するかは次の漫画のようになります:</p>
+<figure><img src="../fig/git_staging.svg" alt="以下の図は、Gitの全体的なワークフローを示しています。ローカルでの変更は、git addを使ってステージングされ、git commitでローカルリポジトリに反映されます。また、git checkoutを使用することで、リポジトリから変更を元に戻すことができます。" class="figure mx-auto d-block"><div class="figcaption"><a href="https://figshare.com/articles/How%5C_Git%5C_works%5C_a%5C_cartoon/1328266" class="external-link uri">https://figshare.com/articles/How\_Git\_works\_a\_cartoon/1328266</a></div>
+</figure><p>ファイルを1つずつ元に戻すことができるという事実は
 人々が研究を整理する方法を変えることがあります。
 すべての変更が1つの大きなドキュメントに含まれている場合、
 後で結論に加えられた変更を元に戻さずに、
@@ -741,11 +686,11 @@ <h3 class="callout-title">ファイルの古いバージョンの復元</h3>
 <p>幸い、彼女はGitを使用してプロジェクトのバージョンを追跡していました!
 以下のどのコマンドで、<code>data_cruncher.py</code>
 と呼ばれるPythonスクリプトの最後にコミットされたバージョンを復元できるでしょうか？</p>
-<ol style="list-style-type: decimal"><li><p><code>$ git checkout HEAD</code></p></li>
-<li><p><code>$ git checkout HEAD data_cruncher.py</code></p></li>
-<li><p><code>$ git checkout HEAD~1 data_cruncher.py</code></p></li>
-<li><p><code>$ git checkout &lt;unique ID of last commit&gt; data_cruncher.py</code></p></li>
-<li><p>Both 2 and 4</p></li>
+<ol style="list-style-type: decimal"><li><p><code>$ git restore</code></p></li>
+<li><p><code>$ git restore data_cruncher.py</code></p></li>
+<li><p><code>$ git restore -s HEAD~1 data_cruncher.py</code></p></li>
+<li><p><code>$ git restore -s &lt;unique ID of last commit&gt; data_cruncher.py</code></p></li>
+<li><p>2番と4番の両方</p></li>
 </ol></div>
 </div>
 </div>
@@ -759,24 +704,17 @@ <h4 class="accordion-header" id="headingSolution1">
 <div id="collapseSolution1" class="accordion-collapse collapse" data-bs-parent="#accordionSolution1" aria-labelledby="headingSolution1">
 <div class="accordion-body">
 <p>答えは (5) - 2 と 4 の両方です。</p>
-<p>The <code>checkout</code> command restores files from the repository,
-overwriting the files in your working directory. Answers 2 and 4 both
-restore the <em>latest</em> version <em>in the repository</em> of the
-file <code>data_cruncher.py</code>. Answer 2 uses <code>HEAD</code> to
-indicate the <em>latest</em>, whereas answer 4 uses the unique ID of the
-last commit, which is what <code>HEAD</code> means.</p>
-<p>Answer 3 gets the version of <code>data_cruncher.py</code> from the
-commit <em>before</em> <code>HEAD</code>, which is NOT what we
-wanted.</p>
-<p>Answer 1 can be dangerous! Without a filename,
-<code>git checkout</code> will restore <strong>all files</strong> in the
-current directory (and all directories below it) to their state at the
-commit specified. This command will restore
-<code>data_cruncher.py</code> to the latest commit version, but it will
-also restore <em>any other files that are changed</em> to that version,
-erasing any changes you may have made to those files! As discussed
-above, you are left in a <em>detached</em> <code>HEAD</code> state, and
-you don’t want to be there.</p>
+<p><code>restore</code>
+コマンドはリポジトリからファイルを復元し、作業ディレクトリのファイルを上書きします。
+2番と4番のコマンドはどちらもリ_ポジトリにある_
+<code>data_cruncher.py</code> の_最新バージョン_を復元します。 2番は
+<code>HEAD</code> を使って_最新バージョン_を指定し、4番は
+<code>HEAD</code> と同じ意味の最後のコミットIDを使います。</p>
+<p>3番のコマンドは、<code>data_cruncher.py</code> の <code>HEAD</code>
+_より前_のコミットから復元するため、今回の目的とは異なります。</p>
+<p>1番はエラーになります。 復元するファイルを指定する必要があります。
+すべてのファイルを復元したい場合は、<code>git restore .</code>
+を使用するべきです。</p>
 </div>
 </div>
 </div>
@@ -793,9 +731,10 @@ <h3 class="callout-title">コミットを戻すことについて</h3>
 ジェニファーは、グループリポジトリのみんなが正しい変更を取得できるように、正しく元に戻す必要があります。
 <code>git revert [wrong commit ID]</code>
 は、ジェニファーの誤ったコミットを元に戻す新しいコミットを作ります。</p>
-<p>従って<code>git revert</code>は<code>git checkout [commit ID]</code>とは異なります。なぜなら
-<code>checkout</code>
-はグループのリポジトリにはコミットされていないローカルの変更用のコマンドだからです。</p>
+<p><code>git revert</code> は <code>git restore -s [commit ID] .</code>
+とは異なります。<code>git restore</code>
+は、ローカルリポジトリ内でまだコミットされていないファイルを以前の状態に戻すために使用されるのに対して、<code>git revert</code>
+はローカルリポジトリおよびプロジェクトリポジトリにコミットされた変更を取り消すために使用されます。</p>
 <p>以下は、ジェニファーが<code>git revert</code>を使用するための正しい手順と説明ですが、不足しているコマンドは何でしょうか？</p>
 <ol style="list-style-type: decimal"><li><p><code>________ # コミットIDを見つけるために、プロジェクトのgitの 履歴を見ます</code></p></li>
 <li><p>そのIDをコピーします (IDの最初の数文字は例えば
@@ -815,12 +754,10 @@ <h4 class="accordion-header" id="headingSolution2">
 </button>
 <div id="collapseSolution2" class="accordion-collapse collapse" data-bs-parent="#accordionSolution2" aria-labelledby="headingSolution2">
 <div class="accordion-body">
-<p>The command <code>git log</code> lists project history with commit
-IDs.</p>
-<p>The command <code>git show HEAD</code> shows changes made at the
-latest commit, and lists the commit ID; however, Jennifer should
-double-check it is the correct commit, and no one else has committed
-changes to the repository.</p>
+<p><code>git log</code>
+コマンドは、コミットIDを含むプロジェクトの履歴を一覧表示します。</p>
+<p><code>git show HEAD</code>
+は、最新のコミットで行われた変更を表示し、コミットIDも確認できます。ただし、ジェニファーはこれが正しいコミットであることを再確認し、他の人がリポジトリに変更をコミットしていないか確認する必要があります。</p>
 </div>
 </div>
 </div>
@@ -833,16 +770,16 @@ <h4 class="accordion-header" id="headingSolution2">
 <h3 class="callout-title">ワークフローと履歴の理解</h3>
 <div class="callout-content">
 <p>最後のコマンドの出力は何でしょうか？</p>
-<div class="codewrapper sourceCode" id="cb28">
+<div class="codewrapper sourceCode" id="cb25">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
-<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb28-1"><a href="#cb28-1" tabindex="-1"></a><span class="ex">$</span> cd planets</span>
-<span id="cb28-2"><a href="#cb28-2" tabindex="-1"></a><span class="ex">$</span> echo <span class="st">"Venus is beautiful and full of love"</span> <span class="op">&gt;</span> venus.txt</span>
-<span id="cb28-3"><a href="#cb28-3" tabindex="-1"></a><span class="ex">$</span> git add venus.txt</span>
-<span id="cb28-4"><a href="#cb28-4" tabindex="-1"></a><span class="ex">$</span> echo <span class="st">"Venus is too hot to be suitable as a base"</span> <span class="op">&gt;&gt;</span> venus.txt</span>
-<span id="cb28-5"><a href="#cb28-5" tabindex="-1"></a><span class="ex">$</span> git commit <span class="at">-m</span> <span class="st">"Comment on Venus as an unsuitable base"</span></span>
-<span id="cb28-6"><a href="#cb28-6" tabindex="-1"></a><span class="ex">$</span> git checkout HEAD venus.txt</span>
-<span id="cb28-7"><a href="#cb28-7" tabindex="-1"></a><span class="ex">$</span> cat venus.txt <span class="co">#this will print the contents of venus.txt to the screen</span></span></code></pre>
+<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb25-1"><a href="#cb25-1" tabindex="-1"></a><span class="ex">$</span> cd planets</span>
+<span id="cb25-2"><a href="#cb25-2" tabindex="-1"></a><span class="ex">$</span> echo <span class="st">"Venus is beautiful and full of love"</span> <span class="op">&gt;</span> venus.txt</span>
+<span id="cb25-3"><a href="#cb25-3" tabindex="-1"></a><span class="ex">$</span> git add venus.txt</span>
+<span id="cb25-4"><a href="#cb25-4" tabindex="-1"></a><span class="ex">$</span> echo <span class="st">"Venus is too hot to be suitable as a base"</span> <span class="op">&gt;&gt;</span> venus.txt</span>
+<span id="cb25-5"><a href="#cb25-5" tabindex="-1"></a><span class="ex">$</span> git commit <span class="at">-m</span> <span class="st">"Comment on Venus as an unsuitable base"</span></span>
+<span id="cb25-6"><a href="#cb25-6" tabindex="-1"></a><span class="ex">$</span> git restore venus.txt</span>
+<span id="cb25-7"><a href="#cb25-7" tabindex="-1"></a><span class="ex">$</span> cat venus.txt <span class="co">#this will print the contents of venus.txt to the screen</span></span></code></pre>
 </div>
 <ol style="list-style-type: decimal"><li><div class="codewrapper">
 <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
@@ -884,8 +821,8 @@ <h4 class="accordion-header" id="headingSolution3">
 repository is the one from the staging area and has only one line.</p>
 <p>At this time, the working copy still has the second line (and
 <code>git status</code> will show that the file is modified). However,
-<code>git checkout HEAD venus.txt</code> replaces the working copy with
-the most recently committed version of <code>venus.txt</code>.</p>
+<code>git restore venus.txt</code> replaces the working copy with the
+most recently committed version of <code>venus.txt</code>.</p>
 <p>So, <code>cat venus.txt</code> will output</p>
 <div class="codewrapper">
 <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
@@ -921,10 +858,10 @@ <h3 class="callout-title">
 <div id="ステージされた変更の除去" class="callout-inner">
 <h3 class="callout-title">ステージされた変更の除去</h3>
 <div class="callout-content">
-<p><code>git checkout</code> は、ステージされていない変更があったときに
+<p><code>git restore</code> は、ステージされていない変更があったときに
 以前のコミットを復元するために使用できます。しかしそれはステージされているがコミットされていない変更に対しても機能するでしょうか?
 <code>mars.txt</code>
-に変更を用意し、その変更を加え（<code>git add</code>を使い）、<code>git checkout</code>
+に変更を用意し、その変更を加え（<code>git add</code>を使い）、<code>git restore</code>
 を使い変更を取り除くことができるかどうか確かめましょう。</p>
 </div>
 </div>
@@ -938,41 +875,32 @@ <h4 class="accordion-header" id="headingSolution4">
 </button>
 <div id="collapseSolution4" class="accordion-collapse collapse" data-bs-parent="#accordionSolution4" aria-labelledby="headingSolution4">
 <div class="accordion-body">
-<p>After adding a change, <code>git checkout</code> can not be used
-directly. Let’s look at the output of <code>git status</code>:</p>
+<p>変更を追加した後、<code>git restore</code> は直接使用できません。
+次に、<code>git status</code> の出力を確認してみましょう。</p>
 <div class="codewrapper">
 <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
 <pre class="output" tabindex="0"><code>On branch main
 Changes to be committed:
-  (use "git reset HEAD &lt;file&gt;..." to unstage)
-
+  (use "git restore --staged &lt;file&gt;..." to unstage)
         modified:   mars.txt
 </code></pre>
 </div>
-<p>Note that if you don’t have the same output you may either have
-forgotten to change the file, or you have added it <em>and</em>
-committed it.</p>
-<p>Using the command <code>git checkout -- mars.txt</code> now does not
-give an error, but it does not restore the file either. Git helpfully
-tells us that we need to use <code>git reset</code> first to unstage the
-file:</p>
-<div class="codewrapper sourceCode" id="cb35">
+<p>この出力が表示されない場合、ファイルの変更を忘れているか、すでにファイルを追加してコミットした可能性があります。</p>
+<p>この時点で、<code>git restore mars.txt</code>
+コマンドを実行してもエラーは発生しませんが、ファイルは元に戻りません。
+Gitは、まず <code>git restore --staged</code>
+を使用してステージングエリアからファイルを戻す必要があることを教えてくれます。</p>
+<div class="codewrapper sourceCode" id="cb32">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
-<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb35-1"><a href="#cb35-1" tabindex="-1"></a><span class="ex">$</span> git reset HEAD mars.txt</span></code></pre>
+<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb32-1"><a href="#cb32-1" tabindex="-1"></a><span class="ex">$</span> git restore <span class="at">--staged</span> mars.txt</span></code></pre>
 </div>
-<div class="codewrapper">
-<h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
-</h3>
-<pre class="output" tabindex="0"><code>Unstaged changes after reset:
-M	mars.txt</code></pre>
-</div>
-<p>Now, <code>git status</code> gives us:</p>
-<div class="codewrapper sourceCode" id="cb37">
+<p>次に、<code>git status</code> の出力を確認します。</p>
+<div class="codewrapper sourceCode" id="cb33">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
-<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb37-1"><a href="#cb37-1" tabindex="-1"></a><span class="ex">$</span> git status</span></code></pre>
+<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb33-1"><a href="#cb33-1" tabindex="-1"></a><span class="ex">$</span> git status</span></code></pre>
 </div>
 <div class="codewrapper">
 <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
@@ -980,19 +908,19 @@ <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"><
 <pre class="output" tabindex="0"><code>On branch main
 Changes not staged for commit:
   (use "git add &lt;file&gt;..." to update what will be committed)
-  (use "git checkout -- &lt;file&gt;..." to discard changes in working directory)
+  (use "git git restore &lt;file&gt;..." to discard changes in working directory)
 
         modified:   mars.txt
 
 no changes added to commit (use "git add" and/or "git commit -a")</code></pre>
 </div>
-<p>This means we can now use <code>git checkout</code> to restore the
-file to the previous commit:</p>
-<div class="codewrapper sourceCode" id="cb39">
+<p>ここで、<code>git restore</code>
+コマンドを使ってファイルを前のコミットの状態に戻すことができます。</p>
+<div class="codewrapper sourceCode" id="cb35">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
-<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb39-1"><a href="#cb39-1" tabindex="-1"></a><span class="ex">$</span> git checkout <span class="at">--</span> mars.txt</span>
-<span id="cb39-2"><a href="#cb39-2" tabindex="-1"></a><span class="ex">$</span> git status</span></code></pre>
+<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb35-1"><a href="#cb35-1" tabindex="-1"></a><span class="ex">$</span> git restore mars.txt</span>
+<span id="cb35-2"><a href="#cb35-2" tabindex="-1"></a><span class="ex">$</span> git status</span></code></pre>
 </div>
 <div class="codewrapper">
 <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
@@ -1022,28 +950,29 @@ <h3 class="callout-title">履歴を探索し、要約する</h3>
 コマンドを使用すると、1つの特定のファイルを探索できることを思い出してください、
 例えば、<code>git diff mars.txt</code> 。
 ここでも同様のアイデアを適用できます。</p>
-<div class="codewrapper sourceCode" id="cb41">
+<div class="codewrapper sourceCode" id="cb37">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
-<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb41-1"><a href="#cb41-1" tabindex="-1"></a><span class="ex">$</span> git log mars.txt</span></code></pre>
-</div>
-<p>Unfortunately some of these commit messages are very ambiguous, e.g.,
-<code>update files</code>. How can you search through these files?</p>
-<p>Both <code>git diff</code> and <code>git log</code> are very useful
-and they summarize a different part of the history for you. Is it
-possible to combine both? Let’s try the following:</p>
-<div class="codewrapper sourceCode" id="cb42">
+<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb37-1"><a href="#cb37-1" tabindex="-1"></a><span class="ex">$</span> git log mars.txt</span></code></pre>
+</div>
+<p>残念ながら、一部のコミットメッセージは
+<code>update files</code>（「ファイルを更新する」）などのように非常に曖昧です。
+これらのファイルをどうやって調べたら良いでしょうか？</p>
+<p><code>git diff</code> と <code>git log</code>
+はどちらも非常に便利で、それぞれリポジトリの異なる部分の履歴を要約してくれます。
+これらを組み合わせることは可能でしょうか？
+次のコマンドを試してみましょう：</p>
+<div class="codewrapper sourceCode" id="cb38">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
-<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb42-1"><a href="#cb42-1" tabindex="-1"></a><span class="ex">$</span> git log <span class="at">--patch</span> mars.txt</span></code></pre>
+<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb38-1"><a href="#cb38-1" tabindex="-1"></a><span class="ex">$</span> git log <span class="at">--patch</span> mars.txt</span></code></pre>
 </div>
-<p>You should get a long list of output, and you should be able to see
-both commit messages and the difference between each commit.</p>
-<p>Question: What does the following command do?</p>
-<div class="codewrapper sourceCode" id="cb43">
+<p>長い出力が表示され、各コミットメッセージと、そのコミット間での違い（差分）が確認できるはずです。</p>
+<p>質問: 次のコマンドは何をしますか？</p>
+<div class="codewrapper sourceCode" id="cb39">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
-<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb43-1"><a href="#cb43-1" tabindex="-1"></a><span class="ex">$</span> git log <span class="at">--patch</span> HEAD~9 <span class="pp">*</span>.txt</span></code></pre>
+<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb39-1"><a href="#cb39-1" tabindex="-1"></a><span class="ex">$</span> git log <span class="at">--patch</span> HEAD~9 <span class="pp">*</span>.txt</span></code></pre>
 </div>
 </div>
 </div>
@@ -1125,8 +1054,8 @@ <h3 class="callout-title">まとめ</h3>
   "url": "https://swcarpentry-ja.github.io/git-novice/instructor/05-history.html",
   "identifier": "https://swcarpentry-ja.github.io/git-novice/instructor/05-history.html",
   "dateCreated": "2014-12-04",
-  "dateModified": "2024-06-06",
-  "datePublished": "2024-09-27"
+  "dateModified": "2024-09-30",
+  "datePublished": "2024-09-30"
 }
 
   </script><script>
diff --git a/instructor/06-ignore.html b/instructor/06-ignore.html
index 8963c5ade1..99f1786204 100644
--- a/instructor/06-ignore.html
+++ b/instructor/06-ignore.html
@@ -908,7 +908,7 @@ <h3 class="callout-title">まとめ</h3>
   "identifier": "https://swcarpentry-ja.github.io/git-novice/instructor/06-ignore.html",
   "dateCreated": "2014-12-04",
   "dateModified": "2024-06-06",
-  "datePublished": "2024-09-27"
+  "datePublished": "2024-09-30"
 }
 
   </script><script>
diff --git a/instructor/07-github.html b/instructor/07-github.html
index 304e02e410..b6dee7fdd0 100644
--- a/instructor/07-github.html
+++ b/instructor/07-github.html
@@ -391,7 +391,7 @@ <h2 class="accordion-header" id="flush-headingTwelve">
       </div>
       <hr></nav><main id="main-content" class="main-content"><div class="container lesson-content">
         <h1>GitHub におけるリモート</h1>
-        <p>最終更新日：2024-06-06 |
+        <p>最終更新日：2024-09-30 |
 
         <a href="https://github.com/swcarpentry-ja/git-novice/edit/main/episodes/07-github.md" class="external-link">ページの編集 <i aria-hidden="true" data-feather="edit"></i></a></p>
 
@@ -442,7 +442,7 @@ <h3 class="card-title">目的</h3>
 <hr class="half-width"><p><a href="https://github.com" class="external-link">GitHub</a>
 にログインし、右上隅のアイコンをクリックして <code>planets</code>
 という名前の新しいリポジトリを作成してみましょう：</p>
-<figure><img src="../fig/github-create-repo-01.png" alt="Creating a Repository on GitHub (Step 1)" class="figure mx-auto d-block"></figure><p>リポジトリに「planets」という名前を付けて、「Create
+<figure><img src="../fig/github-create-repo-01.png" alt='The first step in creating a repository on GitHub: clicking the "create new" button' class="figure mx-auto d-block"></figure><p>リポジトリに「planets」という名前を付けて、「Create
 Repository」をクリックします。</p>
 <p>注:
 このリポジトリはローカルのリポジトリに接続されるため、空にしておく必要があります。
@@ -451,9 +451,9 @@ <h3 class="card-title">目的</h3>
 license.」の両方のオプションを「None」のままにします。
 リポジトリを空にしておく必要がある理由の完全な説明については、以下の「GitHub
 ライセンスと README ファイル」の演習を参照してください。</p>
-<figure><img src="../fig/github-create-repo-02.png" alt="Creating a Repository on GitHub (Step 2)" class="figure mx-auto d-block"></figure><p>リポジトリが作成されるとすぐに、GitHub には ある URL
+<figure><img src="../fig/github-create-repo-02.png" alt="The second step in creating a repository on GitHub: filling out the new repository form to provide the repository name, and specify that neither a readme nor a license should be created" class="figure mx-auto d-block"></figure><p>リポジトリが作成されるとすぐに、GitHub には ある URL
 と、ローカルのリポジトリの構成方法に関する情報が記載されたページが表示されます。</p>
-<figure><img src="../fig/github-create-repo-03.png" alt="Creating a Repository on GitHub (Step 3)" class="figure mx-auto d-block"></figure><p>これにより、GitHub のサーバー上で次のことが効果的に行われます。</p>
+<figure><img src="../fig/github-create-repo-03.png" alt="The summary page displayed by GitHub after a new repository has been created. It contains instructions for configuring the new GitHub repository as a git remote" class="figure mx-auto d-block"></figure><p>これにより、GitHub のサーバー上で次のことが効果的に行われます。</p>
 <div class="codewrapper sourceCode" id="cb1">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
@@ -465,8 +465,8 @@ <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i
 を覚えていれば、私達は <code>mars.txt</code>
 に以前の作業を追加してコミットしました。
 ローカルリポジトリのダイアグラムは次のようになります：</p>
-<figure><img src="../fig/git-staging-area.svg" alt="The Local Repository with Git Staging Area" class="figure mx-auto d-block"></figure><p>Now that we have two repositories, we need a diagram like this:</p>
-<figure><img src="../fig/git-freshly-made-github-repo.svg" alt="Freshly-Made GitHub Repository" class="figure mx-auto d-block"></figure><p>Note that our local repository still contains our earlier work on
+<figure><img src="../fig/git-staging-area.svg" alt='A diagram showing how "git add" registers changes in the staging area, while "git commit" moves changes from the staging area to the repository' class="figure mx-auto d-block"></figure><p>Now that we have two repositories, we need a diagram like this:</p>
+<figure><img src="../fig/git-freshly-made-github-repo.svg" alt='A diagram illustrating how the GitHub "planets" repository is also a git repository like our local repository, but that it is currently empty' class="figure mx-auto d-block"></figure><p>Note that our local repository still contains our earlier work on
 <code>mars.txt</code>, but the remote repository on GitHub appears empty
 as it doesn’t contain any files yet.</p>
 </section><section><h2 class="section-heading" id="connect-local-to-remote-repository">2. Connect local to remote repository<a class="anchor" aria-label="anchor" href="#connect-local-to-remote-repository"></a></h2>
@@ -474,7 +474,7 @@ <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i
 repository a <a href="reference.html#remote">remote</a> for the local
 repository. The home page of the repository on GitHub includes the URL
 string we need to identify it:</p>
-<figure><img src="../fig/github-find-repo-string.png" alt="Where to Find Repository URL on GitHub" class="figure mx-auto d-block"></figure><p>Click on the ‘SSH’ link to change the <a href="reference.html#protocol">protocol</a> from HTTPS to SSH.</p>
+<figure><img src="../fig/github-find-repo-string.png" alt="Clicking the &quot;Copy to Clipboard&quot; button on GitHub to obtain the repository's URL" class="figure mx-auto d-block"></figure><p>Click on the ‘SSH’ link to change the <a href="reference.html#protocol">protocol</a> from HTTPS to SSH.</p>
 <div id="https-vs.-ssh" class="callout">
 <div class="callout-square">
 <i class="callout-icon" data-feather="bell"></i>
@@ -489,7 +489,7 @@ <h3 class="callout-title">HTTPS vs. SSH</h3>
 </div>
 </div>
 </div>
-<figure><img src="../fig/github-change-repo-string.png" alt="Changing the Repository URL on GitHub" class="figure mx-auto d-block"></figure><p>Copy that URL from the browser, go into the local
+<figure><img src="../fig/github-change-repo-string.png" alt='A screenshot showing that clicking on "SSH" will make GitHub provide the SSH URL for a repository instead of the HTTPS URL' class="figure mx-auto d-block"></figure><p>Copy that URL from the browser, go into the local
 <code>planets</code> repository, and run this command:</p>
 <div class="codewrapper sourceCode" id="cb2">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
@@ -620,7 +620,10 @@ <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"><
 <p>Now, it is prompting Dracula for a passphrase. Since he is using his
 lab’s laptop that other people sometimes have access to, he wants to
 create a passphrase. Be sure to use something memorable or save your
-passphrase somewhere, as there is no “reset my password” option.</p>
+passphrase somewhere, as there is no “reset my password” option. Note
+that, when typing a passphrase on a terminal, there won’t be any visual
+feedback of your typing. This is normal: your passphrase will be
+recorded even if you see nothing changing on your screen.</p>
 <div class="codewrapper">
 <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
@@ -803,7 +806,7 @@ <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i
 </div>
 </div>
 <p>Our local and remote repositories are now in this state:</p>
-<figure><img src="../fig/github-repo-after-first-push.svg" alt="GitHub Repository After First Push" class="figure mx-auto d-block"></figure><div id="the--u-flag" class="callout">
+<figure><img src="../fig/github-repo-after-first-push.svg" alt='A diagram showing how "git push origin" will push changes from the local repository to the remote, making the remote repository an exact copy of the local repository.' class="figure mx-auto d-block"></figure><div id="the--u-flag" class="callout">
 <div class="callout-square">
 <i class="callout-icon" data-feather="bell"></i>
 </div>
@@ -1108,8 +1111,8 @@ <h3 class="callout-title">まとめ</h3>
   "url": "https://swcarpentry-ja.github.io/git-novice/instructor/07-github.html",
   "identifier": "https://swcarpentry-ja.github.io/git-novice/instructor/07-github.html",
   "dateCreated": "2014-12-04",
-  "dateModified": "2024-06-06",
-  "datePublished": "2024-09-27"
+  "dateModified": "2024-09-30",
+  "datePublished": "2024-09-30"
 }
 
   </script><script>
diff --git a/instructor/08-collab.html b/instructor/08-collab.html
index e418fd992b..3721a49cb8 100644
--- a/instructor/08-collab.html
+++ b/instructor/08-collab.html
@@ -381,7 +381,7 @@ <h2 class="accordion-header" id="flush-headingTwelve">
       </div>
       <hr></nav><main id="main-content" class="main-content"><div class="container lesson-content">
         <h1>Collaborating</h1>
-        <p>最終更新日：2024-06-06 |
+        <p>最終更新日：2024-09-30 |
 
         <a href="https://github.com/swcarpentry-ja/git-novice/edit/main/episodes/08-collab.md" class="external-link">ページの編集 <i aria-hidden="true" data-feather="edit"></i></a></p>
 
@@ -440,7 +440,7 @@ <h3 class="callout-title">Practicing By Yourself</h3>
 page on GitHub, click the “Settings” button on the right, select
 “Collaborators”, click “Add people”, and then enter your partner’s
 username.</p>
-<figure><img src="../fig/github-add-collaborators.png" alt="screenshot of repository page with Settings then Collaborators selected, showing how to add Collaborators in a GitHub repository" class="figure mx-auto d-block"></figure><p>To accept access to the Owner’s repo, the Collaborator needs to go to
+<figure><img src="../fig/github-add-collaborators.png" alt='A screenshot of the GitHub Collaborators settings page, which is accessed by clicking "Settings" then "Collaborators"' class="figure mx-auto d-block"></figure><p>To accept access to the Owner’s repo, the Collaborator needs to go to
 <a href="https://github.com/notifications" class="external-link">https://github.com/notifications</a>
 or check for email notification. Once there she can accept access to the
 Owner’s repo.</p>
@@ -461,7 +461,7 @@ <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i
 (<code>~/Desktop/vlad-planets</code>) specified at the end, you will
 clone inside your own planets folder! Make sure to navigate to the
 <code>Desktop</code> folder first.</p>
-<figure><img src="../fig/github-collaboration.svg" alt="After Creating Clone of Repository" class="figure mx-auto d-block"></figure><p>The Collaborator can now make a change in her clone of the Owner’s
+<figure><img src="../fig/github-collaboration.svg" alt='A diagram showing that "git clone" can create a copy of a remote GitHub repository, allowing a second person to create their own local repository that they can make changes to.' class="figure mx-auto d-block"></figure><p>The Collaborator can now make a change in her clone of the Owner’s
 repository, exactly the same way as we’ve been doing before:</p>
 <div class="codewrapper sourceCode" id="cb2">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
@@ -637,7 +637,7 @@ <h3 class="callout-title">Review Changes</h3>
 <button class="accordion-button solution-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseSolution1" aria-expanded="false" aria-controls="collapseSolution1">
   <h4 class="accordion-header" id="headingSolution1"> 回答を表示する </h4>
 </button>
-<div id="collapseSolution1" class="accordion-collapse collapse" data-bs-parent="#accordionSolution1" aria-labelledby="headingSolution1">
+<div id="collapseSolution1" class="accordion-collapse collapse" aria-labelledby="headingSolution1" data-bs-parent="#accordionSolution1">
 <div class="accordion-body">
 <p>On the command line, the Collaborator can use
 <code>git fetch origin main</code> to get the remote changes into the
@@ -757,8 +757,8 @@ <h3 class="callout-title">まとめ</h3>
   "url": "https://swcarpentry-ja.github.io/git-novice/instructor/08-collab.html",
   "identifier": "https://swcarpentry-ja.github.io/git-novice/instructor/08-collab.html",
   "dateCreated": "2014-12-04",
-  "dateModified": "2024-06-06",
-  "datePublished": "2024-09-27"
+  "dateModified": "2024-09-30",
+  "datePublished": "2024-09-30"
 }
 
   </script><script>
diff --git a/instructor/09-conflict.html b/instructor/09-conflict.html
index abb1240e62..c9f5bcecf4 100644
--- a/instructor/09-conflict.html
+++ b/instructor/09-conflict.html
@@ -381,7 +381,7 @@ <h2 class="accordion-header" id="flush-headingTwelve">
       </div>
       <hr></nav><main id="main-content" class="main-content"><div class="container lesson-content">
         <h1>Conflicts</h1>
-        <p>最終更新日：2024-06-06 |
+        <p>最終更新日：2024-09-30 |
 
         <a href="https://github.com/swcarpentry-ja/git-novice/edit/main/episodes/09-conflict.md" class="external-link">ページの編集 <i aria-hidden="true" data-feather="edit"></i></a></p>
 
@@ -532,7 +532,7 @@ <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"><
 hint: (e.g., 'git pull ...') before pushing again.
 hint: See the 'Note about fast-forwards' in 'git push --help' for details.</code></pre>
 </div>
-<figure><img src="../fig/conflict.svg" alt="The Conflicting Changes" class="figure mx-auto d-block"></figure><p>Git rejects the push because it detects that the remote repository
+<figure><img src="../fig/conflict.svg" alt="A diagram showing a conflict that might occur when two sets of independent changes are merged" class="figure mx-auto d-block"></figure><p>Git rejects the push because it detects that the remote repository
 has new updates that have not been incorporated into the local branch.
 What we have to do is pull the changes from GitHub, <a href="reference.html#merge">merge</a> them into the copy we’re currently
 working in, and then push that. Let’s start by pulling:</p>
@@ -752,7 +752,7 @@ <h3 class="callout-title">Conflicts on Non-textual files</h3>
 <button class="accordion-button solution-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseSolution1" aria-expanded="false" aria-controls="collapseSolution1">
   <h4 class="accordion-header" id="headingSolution1"> 回答を表示する </h4>
 </button>
-<div id="collapseSolution1" class="accordion-collapse collapse" data-bs-parent="#accordionSolution1" aria-labelledby="headingSolution1">
+<div id="collapseSolution1" class="accordion-collapse collapse" aria-labelledby="headingSolution1" data-bs-parent="#accordionSolution1">
 <div class="accordion-body">
 <p>Let’s try it. Suppose Dracula takes a picture of Martian surface and
 calls it <code>mars.jpg</code>.</p>
@@ -960,7 +960,7 @@ <h3 class="callout-title">A Typical Work Session</h3>
 <td></td>
 </tr><tr class="even"><td>6</td>
 <td>Celebrate!</td>
-<td><code>AFK</code></td>
+<td></td>
 </tr></tbody></table></div>
 </div>
 </div>
@@ -969,7 +969,7 @@ <h3 class="callout-title">A Typical Work Session</h3>
 <button class="accordion-button solution-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseSolution2" aria-expanded="false" aria-controls="collapseSolution2">
   <h4 class="accordion-header" id="headingSolution2"> 回答を表示する </h4>
 </button>
-<div id="collapseSolution2" class="accordion-collapse collapse" data-bs-parent="#accordionSolution2" aria-labelledby="headingSolution2">
+<div id="collapseSolution2" class="accordion-collapse collapse" aria-labelledby="headingSolution2" data-bs-parent="#accordionSolution2">
 <div class="accordion-body">
 <table class="table"><colgroup><col width="1%"><col width="24%"><col width="74%"></colgroup><thead><tr class="header"><th>order</th>
 <th>action . . . . . .</th>
@@ -991,7 +991,7 @@ <h4 class="accordion-header" id="headingSolution2"> 回答を表示する </h4>
 <td><code>git push origin main</code></td>
 </tr><tr class="even"><td>6</td>
 <td>Celebrate!</td>
-<td><code>AFK</code></td>
+<td></td>
 </tr></tbody></table></div>
 </div>
 </div>
@@ -1073,8 +1073,8 @@ <h3 class="callout-title">まとめ</h3>
   "url": "https://swcarpentry-ja.github.io/git-novice/instructor/09-conflict.html",
   "identifier": "https://swcarpentry-ja.github.io/git-novice/instructor/09-conflict.html",
   "dateCreated": "2014-12-04",
-  "dateModified": "2024-06-06",
-  "datePublished": "2024-09-27"
+  "dateModified": "2024-09-30",
+  "datePublished": "2024-09-30"
 }
 
   </script><script>
diff --git a/instructor/10-open.html b/instructor/10-open.html
index a3bccac33d..99f0b77f22 100644
--- a/instructor/10-open.html
+++ b/instructor/10-open.html
@@ -595,7 +595,7 @@ <h3 class="callout-title">まとめ</h3>
   "identifier": "https://swcarpentry-ja.github.io/git-novice/instructor/10-open.html",
   "dateCreated": "2014-12-04",
   "dateModified": "2024-06-06",
-  "datePublished": "2024-09-27"
+  "datePublished": "2024-09-30"
 }
 
   </script><script>
diff --git a/instructor/11-licensing.html b/instructor/11-licensing.html
index 5d194006e0..13292ccc06 100644
--- a/instructor/11-licensing.html
+++ b/instructor/11-licensing.html
@@ -579,7 +579,7 @@ <h3 class="callout-title">まとめ</h3>
   "identifier": "https://swcarpentry-ja.github.io/git-novice/instructor/11-licensing.html",
   "dateCreated": "2014-12-04",
   "dateModified": "2024-06-06",
-  "datePublished": "2024-09-27"
+  "datePublished": "2024-09-30"
 }
 
   </script><script>
diff --git a/instructor/12-citation.html b/instructor/12-citation.html
index 8bf002d3d8..1901b7496d 100644
--- a/instructor/12-citation.html
+++ b/instructor/12-citation.html
@@ -381,7 +381,7 @@ <h2 class="accordion-header" id="flush-headingTwelve">
       </div>
       <hr></nav><main id="main-content" class="main-content"><div class="container lesson-content">
         <h1>Citation</h1>
-        <p>最終更新日：2024-06-06 |
+        <p>最終更新日：2024-09-30 |
 
         <a href="https://github.com/swcarpentry-ja/git-novice/edit/main/episodes/12-citation.md" class="external-link">ページの編集 <i aria-hidden="true" data-feather="edit"></i></a></p>
 
@@ -419,30 +419,18 @@ <h3 class="card-title">目的</h3>
 <p>You may want to include a file called <code>CITATION</code> or
 <code>CITATION.txt</code> that describes how to reference your project;
 the one for Software Carpentry states:</p>
-<pre class="source"><code>To reference Software Carpentry in publications, please cite both of the following:
+<pre class="source"><code>To reference Software Carpentry in publications, please cite:
 
-Greg Wilson: "Software Carpentry: Getting Scientists to Write Better
-Code by Making Them More Productive".  Computing in Science &amp;
-Engineering, Nov-Dec 2006.
+Greg Wilson: "Software Carpentry: Lessons Learned". F1000Research,
+2016, 3:62 (doi: 10.12688/f1000research.3-62.v2).
 
-Greg Wilson: "Software Carpentry: Lessons Learned". arXiv:1307.5448,
-July 2013.
-
-@article{wilson-software-carpentry-2006,
-    author =  {Greg Wilson},
-    title =   {Software Carpentry: Getting Scientists to Write Better Code by Making Them More Productive},
-    journal = {Computing in Science \&amp; Engineering},
-    month =   {November--December},
-    year =    {2006},
-}
-
-@online{wilson-software-carpentry-2013,
+@online{wilson-software-carpentry-2016,
   author      = {Greg Wilson},
   title       = {Software Carpentry: Lessons Learned},
-  version     = {1},
-  date        = {2013-07-20},
-  eprinttype  = {arxiv},
-  eprint      = {1307.5448}
+  version     = {2},
+  date        = {2016-01-28},
+  url         = {http://f1000research.com/articles/3-62/v2},
+  doi         = {10.12688/f1000research.3-62.v2}
 }</code></pre>
 <p>More detailed advice, and other ways to make your code citable can be
 found <a href="https://www.software.ac.uk/publication/how-cite-and-describe-software" class="external-link">at
@@ -528,8 +516,8 @@ <h3 class="callout-title">まとめ</h3>
   "url": "https://swcarpentry-ja.github.io/git-novice/instructor/12-citation.html",
   "identifier": "https://swcarpentry-ja.github.io/git-novice/instructor/12-citation.html",
   "dateCreated": "2014-12-04",
-  "dateModified": "2024-06-06",
-  "datePublished": "2024-09-27"
+  "dateModified": "2024-09-30",
+  "datePublished": "2024-09-30"
 }
 
   </script><script>
diff --git a/instructor/13-hosting.html b/instructor/13-hosting.html
index 1f0d820c5b..1dfd498f8a 100644
--- a/instructor/13-hosting.html
+++ b/instructor/13-hosting.html
@@ -381,7 +381,7 @@ <h2 class="accordion-header" id="flush-headingTwelve">
       </div>
       <hr></nav><main id="main-content" class="main-content"><div class="container lesson-content">
         <h1>Hosting</h1>
-        <p>最終更新日：2024-06-06 |
+        <p>最終更新日：2024-09-30 |
 
         <a href="https://github.com/swcarpentry-ja/git-novice/edit/main/episodes/13-hosting.md" class="external-link">ページの編集 <i aria-hidden="true" data-feather="edit"></i></a></p>
 
@@ -416,8 +416,9 @@ <h3 class="card-title">目的</h3>
 </div>
 </div>
 </div>
-<p>自分たちの仕事をオープンにしたいグループにとって次に大きな問題は、コードとデータをどこにホストするかです。
-1
+<p>After <a href="11-licensing.html">choosing a license</a>, another big
+question for groups that want to open up their work is where to host
+their code and data. 1
 つのオプションは、研究室、学部、または大学がサーバーを提供し、アカウントやバックアップなどを管理することです。
 これの主な利点は、誰が何を所有しているかを明確にすることです。
 それは、題材が機密性の高いもの
@@ -576,8 +577,8 @@ <h3 class="callout-title">まとめ</h3>
   "url": "https://swcarpentry-ja.github.io/git-novice/instructor/13-hosting.html",
   "identifier": "https://swcarpentry-ja.github.io/git-novice/instructor/13-hosting.html",
   "dateCreated": "2014-12-04",
-  "dateModified": "2024-06-06",
-  "datePublished": "2024-09-27"
+  "dateModified": "2024-09-30",
+  "datePublished": "2024-09-30"
 }
 
   </script><script>
diff --git a/instructor/14-supplemental-rstudio.html b/instructor/14-supplemental-rstudio.html
index f296c0df21..896300edf7 100644
--- a/instructor/14-supplemental-rstudio.html
+++ b/instructor/14-supplemental-rstudio.html
@@ -381,7 +381,7 @@ <h2 class="accordion-header" id="flush-headingTwelve">
       </div>
       <hr></nav><main id="main-content" class="main-content"><div class="container lesson-content">
         <h1>Supplemental: Using Git from RStudio</h1>
-        <p>最終更新日：2024-06-06 |
+        <p>最終更新日：2024-09-30 |
 
         <a href="https://github.com/swcarpentry-ja/git-novice/edit/main/episodes/14-supplemental-rstudio.md" class="external-link">ページの編集 <i aria-hidden="true" data-feather="edit"></i></a></p>
 
@@ -478,26 +478,26 @@ <h3 id="tell-rstudio-where-to-find-github">Tell RStudio where to find GitHub<a c
 <p>Next, RStudio will ask which existing directory we want to use. Click
 “Browse…” and navigate to the correct directory, then click “Create
 Project”:</p>
-<figure><img src="../fig/RStudio_screenshot_navigateexisting.png" class="figure mx-auto d-block"></figure><p>Ta-da! We have created a new project in RStudio within the existing
+<figure><img src="../fig/RStudio_screenshot_navigateexisting.png" alt='RStudio window showing the "Create Project From Existing Directory" dialog. In the dialog, the project working directory has been set to "~/Desktop/planets"' class="figure mx-auto d-block"></figure><p>Ta-da! We have created a new project in RStudio within the existing
 planets repository. Notice the vertical “Git” menu in the menu bar.
 RStudio has recognized that the current directory is a Git repository,
 and gives us a number of tools to use Git:</p>
 <figure><img src="../fig/RStudio_screenshot_afterclone.png" alt="RStudio window after new project is created with large arrow pointing to vertical Git menu bar." class="figure mx-auto d-block"></figure><p>To edit the existing files in the repository, we can click on them in
 the “Files” panel on the lower right. Now let’s add some additional
 information about Pluto:</p>
-<figure><img src="../fig/RStudio_screenshot_editfiles.png" class="figure mx-auto d-block"></figure><p>Once we have saved our edited files, we can use RStudio to commit the
+<figure><img src="../fig/RStudio_screenshot_editfiles.png" alt='RStudio window demonstrating the use of the editor panel to modify the "pluto.txt" file' class="figure mx-auto d-block"></figure><p>Once we have saved our edited files, we can use RStudio to commit the
 changes by clicking on “Commit…” in the Git menu:</p>
-<figure><img src="../fig/RStudio_screenshot_commit.png" alt='RStudio screenshot showing the Git menu dropdown with "Commit..." selected' class="figure mx-auto d-block"></figure><p>This will open a dialogue where we can select which files to commit
+<figure><img src="../fig/RStudio_screenshot_commit.png" alt='RStudio screenshot showing the Git menu dropdown with the "Commit..." option selected' class="figure mx-auto d-block"></figure><p>This will open a dialogue where we can select which files to commit
 (by checking the appropriate boxes in the “Staged” column), and enter a
 commit message (in the upper right panel). The icons in the “Status”
 column indicate the current status of each file. Clicking on a file
 shows information about changes in the lower panel (using output of
 <code>git diff</code>). Once everything is the way we want it, we click
 “Commit”:</p>
-<figure><img src="../fig/RStudio_screenshot_review.png" class="figure mx-auto d-block"></figure><p>The changes can be pushed by selecting “Push Branch” from the Git
+<figure><img src="../fig/RStudio_screenshot_review.png" alt='RStudio screenshow showing the "Review Changes" dialog. The top left panel shows the list of files that can be included or excluded from the commit. The top right panel is for writing a commit message. The bottom panel shows information about the currently selected file in the top left panel.' class="figure mx-auto d-block"></figure><p>The changes can be pushed by selecting “Push Branch” from the Git
 menu. There are also options to pull from the remote repository, and to
 view the commit history:</p>
-<figure><img src="../fig/RStudio_screenshot_history.png" alt='RStudio screenshot showing the git menu dropdown with "History" selected' class="figure mx-auto d-block"></figure><div id="are-the-pushpull-commands-grayed-out" class="callout">
+<figure><img src="../fig/RStudio_screenshot_history.png" alt='RStudio screenshot showing the git menu dropdown with the "History" option selected' class="figure mx-auto d-block"></figure><div id="are-the-pushpull-commands-grayed-out" class="callout">
 <div class="callout-square">
 <i class="callout-icon" data-feather="bell"></i>
 </div>
@@ -513,7 +513,7 @@ <h3 class="callout-title">Are the Push/Pull Commands Grayed Out?</h3>
 </div>
 <p>If we click on “History”, we can see a graphical version of what
 <code>git log</code> would tell us:</p>
-<figure><img src="../fig/RStudio_screenshot_viewhistory.png" class="figure mx-auto d-block"></figure><p>RStudio creates a number of files that it uses to keep track of a
+<figure><img src="../fig/RStudio_screenshot_viewhistory.png" alt='RStudio screenshot showing the "Review Changes" dialog after pressing the "History" button. The top panel lists the commits in the repository, similar to git log. The bottom panel shows the changes included in the commit that has been selected in the top panel.' class="figure mx-auto d-block"></figure><p>RStudio creates a number of files that it uses to keep track of a
 project. We often don’t want to track these, in which case we add them
 to our <code>.gitignore</code> file:</p>
 <figure><img src="../fig/RStudio_screenshot_gitignore.png" alt="RStudio screenshot showing .gitignore open in the editor pane with the files .Rproj.user, .Rhistory, .RData, and *.Rproj added to the end" class="figure mx-auto d-block"></figure><div id="tip-versioning-disposable-output" class="callout">
@@ -642,8 +642,8 @@ <h3 class="callout-title">まとめ</h3>
   "url": "https://swcarpentry-ja.github.io/git-novice/instructor/14-supplemental-rstudio.html",
   "identifier": "https://swcarpentry-ja.github.io/git-novice/instructor/14-supplemental-rstudio.html",
   "dateCreated": "2014-12-04",
-  "dateModified": "2024-06-06",
-  "datePublished": "2024-09-27"
+  "dateModified": "2024-09-30",
+  "datePublished": "2024-09-30"
 }
 
   </script><script>
diff --git a/instructor/404.html b/instructor/404.html
index 8f6496030b..e80e4106ac 100644
--- a/instructor/404.html
+++ b/instructor/404.html
@@ -453,8 +453,8 @@ <h1>ページが見つかりません</h1>
   "url": "https://swcarpentry-ja.github.io/git-novice/instructor/404.html",
   "identifier": "https://swcarpentry-ja.github.io/git-novice/instructor/404.html",
   "dateCreated": "2014-12-04",
-  "dateModified": "2024-09-27",
-  "datePublished": "2024-09-27"
+  "dateModified": "2024-09-30",
+  "datePublished": "2024-09-30"
 }
 
   </script><script>
diff --git a/instructor/CODE_OF_CONDUCT.html b/instructor/CODE_OF_CONDUCT.html
index fe64f208d8..ff15287212 100644
--- a/instructor/CODE_OF_CONDUCT.html
+++ b/instructor/CODE_OF_CONDUCT.html
@@ -460,7 +460,7 @@ <h1>Contributor Code of Conduct</h1>
   "identifier": "https://swcarpentry-ja.github.io/git-novice/instructor/CODE_OF_CONDUCT.html",
   "dateCreated": "2014-12-04",
   "dateModified": "2024-06-06",
-  "datePublished": "2024-09-27"
+  "datePublished": "2024-09-30"
 }
 
   </script><script>
diff --git a/instructor/LICENSE.html b/instructor/LICENSE.html
index 732843f7c7..d106ff7978 100644
--- a/instructor/LICENSE.html
+++ b/instructor/LICENSE.html
@@ -377,7 +377,7 @@ <h2 class="accordion-header" id="flush-headingTwelve">
       </div>
       <hr></nav><main id="main-content" class="main-content"><div class="container lesson-content">
         <h1>Licenses</h1>
-        <p>最終更新日：2024-06-06 |
+        <p>最終更新日：2024-09-30 |
 
         <a href="https://github.com/swcarpentry-ja/git-novice/edit/main/LICENSE.md" class="external-link">ページの編集 <i aria-hidden="true" data-feather="edit"></i></a></p>
 
@@ -409,7 +409,7 @@ <h1>Licenses</h1>
 <ul><li><p><strong>Attribution</strong>—You must give appropriate credit
 (mentioning that your work is derived from work that is Copyright (c)
 The Carpentries and, where practical, linking to
-https://carpentries.org/), provide a <a href="https://creativecommons.org/licenses/by/4.0/" class="external-link">link to the
+&lt;https://carpentries.org/&gt;), provide a <a href="https://creativecommons.org/licenses/by/4.0/" class="external-link">link to the
 license</a>, and indicate if changes were made. You may do so in any
 reasonable manner, but not in any way that suggests the licensor
 endorses you or your use.</p></li>
@@ -508,8 +508,8 @@ <h1>Licenses</h1>
   "url": "https://swcarpentry-ja.github.io/git-novice/instructor/LICENSE.html",
   "identifier": "https://swcarpentry-ja.github.io/git-novice/instructor/LICENSE.html",
   "dateCreated": "2014-12-04",
-  "dateModified": "2024-06-06",
-  "datePublished": "2024-09-27"
+  "dateModified": "2024-09-30",
+  "datePublished": "2024-09-30"
 }
 
   </script><script>
diff --git a/instructor/aio.html b/instructor/aio.html
index 94a777bb69..27676d4449 100644
--- a/instructor/aio.html
+++ b/instructor/aio.html
@@ -459,7 +459,7 @@ <h2 class="accordion-header" id="flush-headingTwelve">
         
 <section id="aio-01-basics"><p>Content from <a href="01-basics.html">自動的なバージョン管理</a></p>
 <hr>
-<p>最終更新日：2024-06-06 |
+<p>最終更新日：2024-09-30 |
 
         <a href="https://github.com/swcarpentry-ja/git-novice/edit/main/episodes/01-basics.md" class="external-link">ページの編集 <i aria-hidden="true" data-feather="edit"></i></a></p>
 <p>所要時間：<i aria-hidden="true" data-feather="clock"></i> 5分</p>
@@ -508,12 +508,12 @@ <h3 class="card-title">目的</h3>
 加えられた全ての変更点を記録していきます。ドキュメントの
 進歩を記録していると考えてもらって構いません。変更点を最初の状況まで
 戻してから、最新版になるまでの変更を一つずつ再現していくことができます。</p>
-<figure><img src="../fig/play-changes.svg" alt="変更は連続して保存されます" class="figure mx-auto d-block"></figure><p>「変更点」と「ドキュメント」を別々の物として考えてみると、基礎となるドキュメントに
+<figure><img src="../fig/play-changes.svg" alt="A diagram demonstrating how a single document grows as the result of sequential changes" class="figure mx-auto d-block"></figure><p>「変更点」と「ドキュメント」を別々の物として考えてみると、基礎となるドキュメントに
 異なる変更点を「再現」する事によって、結果的に違ったバージョンのドキュメントを
 作る事が可能だという事が分かります。
 例えば、下の図のように二人のユーザーが同じドキュメントに違った編集を加えた場合です。</p>
-<figure><img src="../fig/versions.svg" alt="異なるバージョンの保存ができます" class="figure mx-auto d-block"></figure><p>変更点の衝突（<a href="reference.html#conflict">コンフリクト</a>）が無ければ、二つ以上の違った変更点を基礎ドキュメントに加えることさえできます。</p>
-<figure><img src="../fig/merge.svg" alt="複数のバージョンをマージできます" class="figure mx-auto d-block"></figure><p>バージョン管理システムは、ユーザーがドキュメントに加えた変更点を記録するツールであり、
+<figure><img src="../fig/versions.svg" alt="A diagram with one source document that has been modified in two different ways to produce two different versions of the document" class="figure mx-auto d-block"></figure><p>変更点の衝突（<a href="reference.html#conflict">コンフリクト</a>）が無ければ、二つ以上の違った変更点を基礎ドキュメントに加えることさえできます。</p>
+<figure><img src="../fig/merge.svg" alt="A diagram that shows the merging of two different document versions into one document that contains all of the changes from both versions" class="figure mx-auto d-block"></figure><p>バージョン管理システムは、ユーザーがドキュメントに加えた変更点を記録するツールであり、
 結果的にドキュメントの違ったバージョンを作成する事ができます。
 このツールを活用
 する事によって、次のバージョンに加える変更点（個々の変更点は 「<a href="reference.html#commit">commit（コミット）</a>」と呼びます）を決める事ができ、変更点に関するメタデータも一緒に保存する事ができます。
@@ -925,7 +925,7 @@ <h3 class="callout-title">まとめ</h3>
 </div>
 </div></section><section id="aio-03-create"><p>Content from <a href="03-create.html">リポジトリの作成</a></p>
 <hr>
-<p>最終更新日：2024-06-06 |
+<p>最終更新日：2024-09-30 |
 
         <a href="https://github.com/swcarpentry-ja/git-novice/edit/main/episodes/03-create.md" class="external-link">ページの編集 <i aria-hidden="true" data-feather="edit"></i></a></p>
 <p>所要時間：<i aria-hidden="true" data-feather="clock"></i> 10分</p>
@@ -961,8 +961,9 @@ <h3 class="card-title">目的</h3>
 </div>
 <p>Gitの設定ができたら、 それを使い始めることができます。</p>
 <p>火星に惑星着陸船を送ることが可能かどうかを調査しているウルフマンとドラキュラの話に戻りましょう。</p>
-<p><img src="../fig/motivatingexample.png" alt="motivatingexample" class="figure"><a href="https://www.deviantart.com/b-maze/art/Werewolf-vs-Dracula-124893530" class="external-link">ウルフマン対ドラキュラ</a>
-by <a href="https://www.deviantart.com/b-maze" class="external-link">b-maze</a> / <a href="https://www.deviantart.com/" class="external-link">Deviant Art</a>. <a href="https://en.wikipedia.org/wiki/File:OSIRIS_Mars_true_color.jpg" class="external-link">火星</a>
+<p><img src="../fig/motivatingexample.png" alt="The main elements of the story: Dracula, Wolfman, the Mummy, Mars, Pluto and The Moon" class="figure"><a href="https://www.deviantart.com/b-maze/art/Werewolf-vs-Dracula-124893530" class="external-link">Werewolf
+vs dracula</a> by <a href="https://www.deviantart.com/b-maze" class="external-link">b-maze</a>
+/ <a href="https://www.deviantart.com/" class="external-link">Deviant Art</a>. <a href="https://en.wikipedia.org/wiki/File:OSIRIS_Mars_true_color.jpg" class="external-link">火星</a>
 by European Space Agency / <a href="https://creativecommons.org/licenses/by/3.0/deed.en" class="external-link">CC-BY-SA 3.0
 IGO</a>. <a href="https://commons.wikimedia.org/wiki/File:PIA19873-Pluto-NewHorizons-FlyingPastImage-20150714-transparent.png" class="external-link">冥王星</a>
 / Courtesy NASA/JPL-Caltech. <a href="https://commons.wikimedia.org/wiki/File:Mummy_icon_-_Noun_Project_4070.svg" class="external-link">ミイラ</a>
@@ -1029,7 +1030,11 @@ <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"><
 </h3>
 <pre class="output" tabindex="0"><code>Switched to a new branch 'main'</code></pre>
 </div>
-<p>プロジェクトのステータスをGitに問うことで、すべてが正しく設定されていることを確認できます:</p>
+<p>We can now start using one of the most important git commands, which
+is particularly helpful to beginners. <code>git status</code> tells us
+the status of our project, and better, a list of changes in the project
+and options on what to do with those changes. We can use it as often as
+we want, whenever we want to understand what is going on.</p>
 <div class="codewrapper sourceCode" id="cb8">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
@@ -1120,7 +1125,7 @@ <h3 class="callout-title">
 <code>git init</code> の間違いを修正する</h3>
 <div class="callout-content">
 <p>ウルフマンはドラキュラに、「入れ子」状態になっているリポジトリがいかに冗長で、混乱を引き起こす可能性があるかを説明しました。
-説明を聞いて、ドラキュラは「入れ子」状態のリポジトリを削除したいと思いました。
+Dracula would like to go back to a single git repository.
 <code>moons</code>サブディレクトリの最後の<code>git init</code>を、ドラキュラはどうやって、元に戻すことができるのでしょうか？</p>
 </div>
 </div>
@@ -1145,15 +1150,17 @@ <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i
 </h3>
 <pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb13-1"><a href="#cb13-1" tabindex="-1"></a><span class="ex">$</span> rm filename</span></code></pre>
 </div>
-<p>同様に、<code>rm -r dirname</code> または <code>rm -rf dirname</code>
-を使ってディレクトリを削除することができます。
+<p>Similarly a directory can be removed using
+<code>rm -r dirname</code>.
 この方法で削除されるファイルやフォルダがGitによって追跡されているなら、次のエピソードで見られるように、それらの削除が、追跡する必要がある別の変更になります。</p>
 </div>
 <div class="section level3">
 <h3 id="解答-1">解答<a class="anchor" aria-label="anchor" href="#%E8%A7%A3%E7%AD%94-1"></a>
 </h3>
-<p>Gitはすべてのファイルを<code>.git</code>ディレクトリに保存します。
-この小さなミスから立ち直るには、ドラキュラは<code>planets</code>ディレクトリの中から次のコマンドを実行して、moonsサブディレクトリの中の<code>.git</code>フォルダを削除すれば良い：</p>
+<p>Gitはすべてのファイルを<code>.git</code>ディレクトリに保存します。 To
+recover from this little mistake, Dracula can remove the
+<code>.git</code> folder in the moons subdirectory by running the
+following command from inside the <code>planets</code> directory:</p>
 <div class="codewrapper sourceCode" id="cb14">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
@@ -1161,7 +1168,8 @@ <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i
 </div>
 <p>しかし、気をつけてください！
 間違ったディレクトリでこのコマンドを実行すると、残しておきたいプロジェクトのGit履歴がすべて削除されてしまいます。
-したがって、常に <code>pwd</code>
+In general, deleting files and directories using <code>rm</code> from
+the command line cannot be reversed. したがって、常に <code>pwd</code>
 コマンドを使用してカレントディレクトリを確認してください。</p>
 </div>
 </div>
@@ -1184,7 +1192,7 @@ <h3 class="callout-title">まとめ</h3>
 </div>
 </div></section><section id="aio-04-changes"><p>Content from <a href="04-changes.html">変更内容の記録</a></p>
 <hr>
-<p>最終更新日：2024-06-06 |
+<p>最終更新日：2024-09-30 |
 
         <a href="https://github.com/swcarpentry-ja/git-novice/edit/main/episodes/04-changes.md" class="external-link">ページの編集 <i aria-hidden="true" data-feather="edit"></i></a></p>
 <p>所要時間：<i aria-hidden="true" data-feather="clock"></i> 20分</p>
@@ -1537,7 +1545,7 @@ <h3 class="callout-title">ステージングエリア</h3>
 </div>
 </div>
 </div>
-<figure><img src="../fig/git-staging-area.svg" alt="Gitのステージング・エリア" class="figure mx-auto d-block"></figure><p>それでは、ファイルの変更点がエディタからステージングエリア、そして長期保存に移る過程を見てみましょう。
+<figure><img src="../fig/git-staging-area.svg" alt='A diagram showing how "git add" registers changes in the staging area, while "git commit" moves changes from the staging area to the repository' class="figure mx-auto d-block"></figure><p>それでは、ファイルの変更点がエディタからステージングエリア、そして長期保存に移る過程を見てみましょう。
 初めに、新しい文章をファイルに加えましょう：</p>
 <div class="codewrapper sourceCode" id="cb29">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
@@ -1809,7 +1817,7 @@ <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i
 <p>まとめると、変更内容をリポジトリに追加したい時は<code>git add</code>
 で変更点をステージングエリアに移してから、<code>git commit</code>
 でステージングエリアの変更点をリポジトリに保存します：</p>
-<figure><img src="../fig/git-committing.svg" alt="git commitのワークフロー" class="figure mx-auto d-block"></figure><div id="コミットメッセージを決める" class="callout challenge">
+<figure><img src="../fig/git-committing.svg" alt="A diagram showing two documents being separately staged using git add, before being combined into one commit using git commit" class="figure mx-auto d-block"></figure><div id="コミットメッセージを決める" class="callout challenge">
 <div class="callout-square">
 <i class="callout-icon" data-feather="zap"></i>
 </div>
@@ -1834,7 +1842,7 @@ <h4 class="accordion-header" id="headingSolution1">
   解答
   </h4>
 </button>
-<div id="collapseSolution1" class="accordion-collapse collapse" aria-labelledby="headingSolution1" data-bs-parent="#accordionSolution1">
+<div id="collapseSolution1" class="accordion-collapse collapse" data-bs-parent="#accordionSolution1" aria-labelledby="headingSolution1">
 <div class="accordion-body">
 <p>１つ目のメッセージは短すぎてコミットの内容が何なのかわかりにくいです。２つ目は<code>git diff</code>で何が変わったのかが分かるので、長い割にはあまり意味がありません。３つ目は、短く、簡潔で、分かりやすいメッセージです。</p>
 </div>
@@ -1884,7 +1892,7 @@ <h4 class="accordion-header" id="headingSolution2">
   解答
   </h4>
 </button>
-<div id="collapseSolution2" class="accordion-collapse collapse" aria-labelledby="headingSolution2" data-bs-parent="#accordionSolution2">
+<div id="collapseSolution2" class="accordion-collapse collapse" data-bs-parent="#accordionSolution2" aria-labelledby="headingSolution2">
 <div class="accordion-body">
 <ol style="list-style-type: decimal">
 <li><p>ファイルがステージングエリアにない限り、コミットできません。</p></li>
@@ -1923,7 +1931,7 @@ <h4 class="accordion-header" id="headingSolution3">
   解答
   </h4>
 </button>
-<div id="collapseSolution3" class="accordion-collapse collapse" aria-labelledby="headingSolution3" data-bs-parent="#accordionSolution3">
+<div id="collapseSolution3" class="accordion-collapse collapse" data-bs-parent="#accordionSolution3" aria-labelledby="headingSolution3">
 <div class="accordion-body">
 <p>以下の<code>cat mars.txt</code>の出力は、この課題で追加された内容のみを反映しています。
 出力は異なる場合があります。</p>
@@ -2011,7 +2019,7 @@ <h4 class="accordion-header" id="headingSolution4">
   解答
   </h4>
 </button>
-<div id="collapseSolution4" class="accordion-collapse collapse" aria-labelledby="headingSolution4" data-bs-parent="#accordionSolution4">
+<div id="collapseSolution4" class="accordion-collapse collapse" data-bs-parent="#accordionSolution4" aria-labelledby="headingSolution4">
 <div class="accordion-body">
 <p>必要であれば、<code>planets</code> から出ましょう：</p>
 <div class="codewrapper sourceCode" id="cb64">
@@ -2076,7 +2084,7 @@ <h3 class="callout-title">まとめ</h3>
 </div>
 </div></section><section id="aio-05-history"><p>Content from <a href="05-history.html">履歴の探索</a></p>
 <hr>
-<p>最終更新日：2024-06-06 |
+<p>最終更新日：2024-09-30 |
 
         <a href="https://github.com/swcarpentry-ja/git-novice/edit/main/episodes/05-history.md" class="external-link">ページの編集 <i aria-hidden="true" data-feather="edit"></i></a></p>
 <p>所要時間：<i aria-hidden="true" data-feather="clock"></i> 25分</p>
@@ -2170,7 +2178,7 @@ <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i
 <div class="codewrapper sourceCode" id="cb6">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
-<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb6-1"><a href="#cb6-1" tabindex="-1"></a><span class="ex">$</span> git diff HEAD~3 mars.txt</span></code></pre>
+<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb6-1"><a href="#cb6-1" tabindex="-1"></a><span class="ex">$</span> git diff HEAD~2 mars.txt</span></code></pre>
 </div>
 <div class="codewrapper">
 <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
@@ -2192,7 +2200,7 @@ <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"><
 <div class="codewrapper sourceCode" id="cb8">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
-<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb8-1"><a href="#cb8-1" tabindex="-1"></a><span class="ex">$</span> git show HEAD~3 mars.txt</span></code></pre>
+<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb8-1"><a href="#cb8-1" tabindex="-1"></a><span class="ex">$</span> git show HEAD~2 mars.txt</span></code></pre>
 </div>
 <div class="codewrapper">
 <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
@@ -2216,7 +2224,7 @@ <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"><
 表記を使用して以前のコミットを参照できるため、<code>HEAD~1</code>
 は「以前のコミット」を意味し、<code>HEAD~123</code>
 は現在の場所から123個前のコミットに戻ります。</p>
-<p><code>git log</code>
+<p><code>git log</code> および <code>git show</code>
 が表示する、数字と文字の長い文字列を使用してコミットを参照することもできます。
 これらは一個一個の変更に対するユニークなIDであり、「ユニーク」は本当に唯一であることを意味します:
 どのコンピューターのどのファイルの変更の組み合わせに対しても、ユニークな40文字の
@@ -2277,17 +2285,17 @@ <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"><
 <pre class="output" tabindex="0"><code>On branch main
 Changes not staged for commit:
   (use "git add &lt;file&gt;..." to update what will be committed)
-  (use "git checkout -- &lt;file&gt;..." to discard changes in working directory)
+  (use "git restore &lt;file&gt;..." to discard changes in working directory)
 
     modified:   mars.txt
 
 no changes added to commit (use "git add" and/or "git commit -a")</code></pre>
 </div>
-<p><code>git checkout</code>を使うと、元の状態に戻すことができます:</p>
+<p><code>git restore</code>を使うと、元の状態に戻すことができます:</p>
 <div class="codewrapper sourceCode" id="cb16">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
-<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb16-1"><a href="#cb16-1" tabindex="-1"></a><span class="ex">$</span> git checkout HEAD mars.txt</span>
+<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb16-1"><a href="#cb16-1" tabindex="-1"></a><span class="ex">$</span> git restore mars.txt</span>
 <span id="cb16-2"><a href="#cb16-2" tabindex="-1"></a><span class="ex">$</span> cat mars.txt</span></code></pre>
 </div>
 <div class="codewrapper">
@@ -2297,15 +2305,16 @@ <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"><
 The two moons may be a problem for Wolfman
 But the Mummy will appreciate the lack of humidity</code></pre>
 </div>
-<p>その名前から推測できるように、<code>git checkout</code>
-はファイルの古いバージョンをチェックアウト (つまり、復元) します。
+<p>その名前から推測できるように、<code>git restore</code>
+はファイルの古いバージョンを復元します。
 この場合、最後に保存されたコミットである <code>HEAD</code>
-に記録されたファイルのバージョン を復元することをGitに伝えています。
-さらに戻りたい場合は、代わりにコミット Id を使うことができます:</p>
+に記録されたファイルのバージョンを復元することをGitに伝えています。
+さらに遡りたい場合は、<code>-s</code>オプションとコミット Id
+を使うことができます:</p>
 <div class="codewrapper sourceCode" id="cb18">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
-<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb18-1"><a href="#cb18-1" tabindex="-1"></a><span class="ex">$</span> git checkout f22b25e mars.txt</span></code></pre>
+<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb18-1"><a href="#cb18-1" tabindex="-1"></a><span class="ex">$</span> git restore <span class="at">-s</span> f22b25e mars.txt</span></code></pre>
 </div>
 <div class="codewrapper sourceCode" id="cb19">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
@@ -2326,95 +2335,39 @@ <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i
 <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
 <pre class="output" tabindex="0"><code>On branch main
-Changes to be committed:
-  (use "git reset HEAD &lt;file&gt;..." to unstage)
+Changes not staged for commit:
+  (use "git add &lt;file&gt;..." to update what will be committed)
+  (use "git restore &lt;file&gt;..." to discard changes in working directory)
+        modified:   mars.txt
 
-    modified:   mars.txt
+no changes added to commit (use "git add" and/or "git commit -a")
 </code></pre>
 </div>
 <p>変更はステージング領域にあることに注意してください。
-繰り返しますが、<code>git checkout</code>
+繰り返しますが、<code>git restore</code>
 を使うと、元の状態に戻すことができます:</p>
 <div class="codewrapper sourceCode" id="cb23">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
-<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb23-1"><a href="#cb23-1" tabindex="-1"></a><span class="ex">$</span> git checkout HEAD mars.txt</span></code></pre>
-</div>
-<div id="head-を見失わないようにしましょう" class="callout">
-<div class="callout-square">
-<i class="callout-icon" data-feather="bell"></i>
-</div>
-<div id="head-を見失わないようにしましょう" class="callout-inner">
-<h3 class="callout-title">HEAD を見失わないようにしましょう</h3>
-<div class="callout-content">
-<p>上記では下記を使いました</p>
-<div class="codewrapper sourceCode" id="cb24">
-<h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
-</h3>
-<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb24-1"><a href="#cb24-1" tabindex="-1"></a><span class="ex">$</span> git checkout f22b25e mars.txt</span></code></pre>
-</div>
-<p><code>mars.txt</code> をコミット <code>f22b25e</code>
-後の状態に戻すためにです。 しかし、気をつけてください！ コマンド
-<code>checkout</code>
-には他の重要な機能があり、入力が正確でない場合、Gitはあなたの意図を誤解する可能性があります。
-たとえば、前のコマンドで <code>mars.txt</code> を忘れた場合です。</p>
-<div class="codewrapper sourceCode" id="cb25">
-<h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
-</h3>
-<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb25-1"><a href="#cb25-1" tabindex="-1"></a><span class="ex">$</span> git checkout f22b25e</span></code></pre>
+<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb23-1"><a href="#cb23-1" tabindex="-1"></a><span class="ex">$</span> git restore mars.txt</span>
+<span id="cb23-2"><a href="#cb23-2" tabindex="-1"></a><span class="ex">$</span> cat mars.txt</span></code></pre>
 </div>
 <div class="codewrapper">
-<h3 class="code-label">エラー<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
+<h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
-<pre class="error" tabindex="0"><code>Note: checking out 'f22b25e'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
- git checkout -b &lt;new-branch-name&gt;
-
-HEAD is now at f22b25e Start notes on Mars as a base</code></pre>
-</div>
-<p>ここでの「HEADが切り離された」状態は「見れるが触ってはいけない」ようなものなので、この状態で変更を加えないでください。
-リポジトリの過去の状態を調査した後、<code>git checkout main</code> で
-<code>HEAD</code>を再接続してください。</p>
-</div>
-</div>
+<pre class="output" tabindex="0"><code>Cold and dry, but everything is my favorite color
+The two moons may be a problem for Wolfman
+But the Mummy will appreciate the lack of humidity</code></pre>
 </div>
 <p>取り消したい変更の一個<strong>前</strong>のコミット番号を使う必要があることを覚えておくことが重要です。
 よくある間違いは、破棄しようとしている変更を行ったコミットの番号を使用することです。
 以下の例では、最新のコミットの前 (<code>HEAD~1</code>)
-、すなわち<code>f22b25e</code>から状態を取得したいと考えています:</p>
-<figure><img src="../fig/git-checkout.svg" alt="Git Checkout" class="figure mx-auto d-block"></figure><p>つまり、すべてをまとめると、Gitがどのように機能するかは次の漫画のようになります:</p>
-<figure><img src="../fig/git_staging.svg" alt="https://figshare.com/articles/How\_Git\_works\_a\_cartoon/1328266" class="figure mx-auto d-block"><div class="figcaption"><a href="https://figshare.com/articles/How%5C_Git%5C_works%5C_a%5C_cartoon/1328266" class="external-link uri">https://figshare.com/articles/How\_Git\_works\_a\_cartoon/1328266</a></div>
-</figure><div id="よくあるケースの簡単化" class="callout">
-<div class="callout-square">
-<i class="callout-icon" data-feather="bell"></i>
-</div>
-<div id="よくあるケースの簡単化" class="callout-inner">
-<h3 class="callout-title">よくあるケースの簡単化</h3>
-<div class="callout-content">
-<p><code>git status</code>
-の出力を注意深く読むと、次のヒントを含んでいることが分かります:</p>
-<div class="codewrapper">
-<h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
-</h3>
-<pre class="output" tabindex="0"><code>(use "git checkout -- &lt;file&gt;..." to discard changes in working directory)</code></pre>
-</div>
-<p>それが言っているように、バージョン識別子のない
-<code>git checkout</code>
-はファイルを<code>HEAD</code>に保存された状態に復元します。
-二重のダッシュ
-<code>--</code>はコマンドから復元されるファイルの名前を区別するために必要です：それがないと、Git
-はファイルの名前をコミット Id として使用しようとします。</p>
-</div>
-</div>
-</div>
-<p>ファイルを1つずつ元に戻すことができるという事実は
+、すなわち<code>f22b25e</code>から状態を取得したいと考えています:
+このとき、<code>.</code>
+を使用することで、全てのファイルを対象にします。</p>
+<figure><img src="../fig/git-restore.svg" alt="以下の図は、git restoreを使って2つのファイルの前のバージョンを復元する方法を示しています" class="figure mx-auto d-block"></figure><p>つまり、すべてをまとめると、Gitがどのように機能するかは次の漫画のようになります:</p>
+<figure><img src="../fig/git_staging.svg" alt="以下の図は、Gitの全体的なワークフローを示しています。ローカルでの変更は、git addを使ってステージングされ、git commitでローカルリポジトリに反映されます。また、git checkoutを使用することで、リポジトリから変更を元に戻すことができます。" class="figure mx-auto d-block"><div class="figcaption"><a href="https://figshare.com/articles/How%5C_Git%5C_works%5C_a%5C_cartoon/1328266" class="external-link uri">https://figshare.com/articles/How\_Git\_works\_a\_cartoon/1328266</a></div>
+</figure><p>ファイルを1つずつ元に戻すことができるという事実は
 人々が研究を整理する方法を変えることがあります。
 すべての変更が1つの大きなドキュメントに含まれている場合、
 後で結論に加えられた変更を元に戻さずに、
@@ -2434,11 +2387,11 @@ <h3 class="callout-title">ファイルの古いバージョンの復元</h3>
 以下のどのコマンドで、<code>data_cruncher.py</code>
 と呼ばれるPythonスクリプトの最後にコミットされたバージョンを復元できるでしょうか？</p>
 <ol style="list-style-type: decimal">
-<li><p><code>$ git checkout HEAD</code></p></li>
-<li><p><code>$ git checkout HEAD data_cruncher.py</code></p></li>
-<li><p><code>$ git checkout HEAD~1 data_cruncher.py</code></p></li>
-<li><p><code>$ git checkout &lt;unique ID of last commit&gt; data_cruncher.py</code></p></li>
-<li><p>Both 2 and 4</p></li>
+<li><p><code>$ git restore</code></p></li>
+<li><p><code>$ git restore data_cruncher.py</code></p></li>
+<li><p><code>$ git restore -s HEAD~1 data_cruncher.py</code></p></li>
+<li><p><code>$ git restore -s &lt;unique ID of last commit&gt; data_cruncher.py</code></p></li>
+<li><p>2番と4番の両方</p></li>
 </ol>
 </div>
 </div>
@@ -2453,24 +2406,17 @@ <h4 class="accordion-header" id="headingSolution1">
 <div id="collapseSolution1" class="accordion-collapse collapse" data-bs-parent="#accordionSolution1" aria-labelledby="headingSolution1">
 <div class="accordion-body">
 <p>答えは (5) - 2 と 4 の両方です。</p>
-<p>The <code>checkout</code> command restores files from the repository,
-overwriting the files in your working directory. Answers 2 and 4 both
-restore the <em>latest</em> version <em>in the repository</em> of the
-file <code>data_cruncher.py</code>. Answer 2 uses <code>HEAD</code> to
-indicate the <em>latest</em>, whereas answer 4 uses the unique ID of the
-last commit, which is what <code>HEAD</code> means.</p>
-<p>Answer 3 gets the version of <code>data_cruncher.py</code> from the
-commit <em>before</em> <code>HEAD</code>, which is NOT what we
-wanted.</p>
-<p>Answer 1 can be dangerous! Without a filename,
-<code>git checkout</code> will restore <strong>all files</strong> in the
-current directory (and all directories below it) to their state at the
-commit specified. This command will restore
-<code>data_cruncher.py</code> to the latest commit version, but it will
-also restore <em>any other files that are changed</em> to that version,
-erasing any changes you may have made to those files! As discussed
-above, you are left in a <em>detached</em> <code>HEAD</code> state, and
-you don’t want to be there.</p>
+<p><code>restore</code>
+コマンドはリポジトリからファイルを復元し、作業ディレクトリのファイルを上書きします。
+2番と4番のコマンドはどちらもリ_ポジトリにある_
+<code>data_cruncher.py</code> の_最新バージョン_を復元します。 2番は
+<code>HEAD</code> を使って_最新バージョン_を指定し、4番は
+<code>HEAD</code> と同じ意味の最後のコミットIDを使います。</p>
+<p>3番のコマンドは、<code>data_cruncher.py</code> の <code>HEAD</code>
+_より前_のコミットから復元するため、今回の目的とは異なります。</p>
+<p>1番はエラーになります。 復元するファイルを指定する必要があります。
+すべてのファイルを復元したい場合は、<code>git restore .</code>
+を使用するべきです。</p>
 </div>
 </div>
 </div>
@@ -2487,9 +2433,10 @@ <h3 class="callout-title">コミットを戻すことについて</h3>
 ジェニファーは、グループリポジトリのみんなが正しい変更を取得できるように、正しく元に戻す必要があります。
 <code>git revert [wrong commit ID]</code>
 は、ジェニファーの誤ったコミットを元に戻す新しいコミットを作ります。</p>
-<p>従って<code>git revert</code>は<code>git checkout [commit ID]</code>とは異なります。なぜなら
-<code>checkout</code>
-はグループのリポジトリにはコミットされていないローカルの変更用のコマンドだからです。</p>
+<p><code>git revert</code> は <code>git restore -s [commit ID] .</code>
+とは異なります。<code>git restore</code>
+は、ローカルリポジトリ内でまだコミットされていないファイルを以前の状態に戻すために使用されるのに対して、<code>git revert</code>
+はローカルリポジトリおよびプロジェクトリポジトリにコミットされた変更を取り消すために使用されます。</p>
 <p>以下は、ジェニファーが<code>git revert</code>を使用するための正しい手順と説明ですが、不足しているコマンドは何でしょうか？</p>
 <ol style="list-style-type: decimal">
 <li><p><code>________ # コミットIDを見つけるために、プロジェクトのgitの 履歴を見ます</code></p></li>
@@ -2511,12 +2458,10 @@ <h4 class="accordion-header" id="headingSolution2">
 </button>
 <div id="collapseSolution2" class="accordion-collapse collapse" data-bs-parent="#accordionSolution2" aria-labelledby="headingSolution2">
 <div class="accordion-body">
-<p>The command <code>git log</code> lists project history with commit
-IDs.</p>
-<p>The command <code>git show HEAD</code> shows changes made at the
-latest commit, and lists the commit ID; however, Jennifer should
-double-check it is the correct commit, and no one else has committed
-changes to the repository.</p>
+<p><code>git log</code>
+コマンドは、コミットIDを含むプロジェクトの履歴を一覧表示します。</p>
+<p><code>git show HEAD</code>
+は、最新のコミットで行われた変更を表示し、コミットIDも確認できます。ただし、ジェニファーはこれが正しいコミットであることを再確認し、他の人がリポジトリに変更をコミットしていないか確認する必要があります。</p>
 </div>
 </div>
 </div>
@@ -2529,16 +2474,16 @@ <h4 class="accordion-header" id="headingSolution2">
 <h3 class="callout-title">ワークフローと履歴の理解</h3>
 <div class="callout-content">
 <p>最後のコマンドの出力は何でしょうか？</p>
-<div class="codewrapper sourceCode" id="cb28">
+<div class="codewrapper sourceCode" id="cb25">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
-<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb28-1"><a href="#cb28-1" tabindex="-1"></a><span class="ex">$</span> cd planets</span>
-<span id="cb28-2"><a href="#cb28-2" tabindex="-1"></a><span class="ex">$</span> echo <span class="st">"Venus is beautiful and full of love"</span> <span class="op">&gt;</span> venus.txt</span>
-<span id="cb28-3"><a href="#cb28-3" tabindex="-1"></a><span class="ex">$</span> git add venus.txt</span>
-<span id="cb28-4"><a href="#cb28-4" tabindex="-1"></a><span class="ex">$</span> echo <span class="st">"Venus is too hot to be suitable as a base"</span> <span class="op">&gt;&gt;</span> venus.txt</span>
-<span id="cb28-5"><a href="#cb28-5" tabindex="-1"></a><span class="ex">$</span> git commit <span class="at">-m</span> <span class="st">"Comment on Venus as an unsuitable base"</span></span>
-<span id="cb28-6"><a href="#cb28-6" tabindex="-1"></a><span class="ex">$</span> git checkout HEAD venus.txt</span>
-<span id="cb28-7"><a href="#cb28-7" tabindex="-1"></a><span class="ex">$</span> cat venus.txt <span class="co">#this will print the contents of venus.txt to the screen</span></span></code></pre>
+<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb25-1"><a href="#cb25-1" tabindex="-1"></a><span class="ex">$</span> cd planets</span>
+<span id="cb25-2"><a href="#cb25-2" tabindex="-1"></a><span class="ex">$</span> echo <span class="st">"Venus is beautiful and full of love"</span> <span class="op">&gt;</span> venus.txt</span>
+<span id="cb25-3"><a href="#cb25-3" tabindex="-1"></a><span class="ex">$</span> git add venus.txt</span>
+<span id="cb25-4"><a href="#cb25-4" tabindex="-1"></a><span class="ex">$</span> echo <span class="st">"Venus is too hot to be suitable as a base"</span> <span class="op">&gt;&gt;</span> venus.txt</span>
+<span id="cb25-5"><a href="#cb25-5" tabindex="-1"></a><span class="ex">$</span> git commit <span class="at">-m</span> <span class="st">"Comment on Venus as an unsuitable base"</span></span>
+<span id="cb25-6"><a href="#cb25-6" tabindex="-1"></a><span class="ex">$</span> git restore venus.txt</span>
+<span id="cb25-7"><a href="#cb25-7" tabindex="-1"></a><span class="ex">$</span> cat venus.txt <span class="co">#this will print the contents of venus.txt to the screen</span></span></code></pre>
 </div>
 <ol style="list-style-type: decimal">
 <li><div class="codewrapper">
@@ -2584,8 +2529,8 @@ <h4 class="accordion-header" id="headingSolution3">
 repository is the one from the staging area and has only one line.</p>
 <p>At this time, the working copy still has the second line (and
 <code>git status</code> will show that the file is modified). However,
-<code>git checkout HEAD venus.txt</code> replaces the working copy with
-the most recently committed version of <code>venus.txt</code>.</p>
+<code>git restore venus.txt</code> replaces the working copy with the
+most recently committed version of <code>venus.txt</code>.</p>
 <p>So, <code>cat venus.txt</code> will output</p>
 <div class="codewrapper">
 <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
@@ -2621,10 +2566,10 @@ <h3 class="callout-title">
 <div id="ステージされた変更の除去" class="callout-inner">
 <h3 class="callout-title">ステージされた変更の除去</h3>
 <div class="callout-content">
-<p><code>git checkout</code> は、ステージされていない変更があったときに
+<p><code>git restore</code> は、ステージされていない変更があったときに
 以前のコミットを復元するために使用できます。しかしそれはステージされているがコミットされていない変更に対しても機能するでしょうか?
 <code>mars.txt</code>
-に変更を用意し、その変更を加え（<code>git add</code>を使い）、<code>git checkout</code>
+に変更を用意し、その変更を加え（<code>git add</code>を使い）、<code>git restore</code>
 を使い変更を取り除くことができるかどうか確かめましょう。</p>
 </div>
 </div>
@@ -2638,41 +2583,32 @@ <h4 class="accordion-header" id="headingSolution4">
 </button>
 <div id="collapseSolution4" class="accordion-collapse collapse" data-bs-parent="#accordionSolution4" aria-labelledby="headingSolution4">
 <div class="accordion-body">
-<p>After adding a change, <code>git checkout</code> can not be used
-directly. Let’s look at the output of <code>git status</code>:</p>
+<p>変更を追加した後、<code>git restore</code> は直接使用できません。
+次に、<code>git status</code> の出力を確認してみましょう。</p>
 <div class="codewrapper">
 <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
 <pre class="output" tabindex="0"><code>On branch main
 Changes to be committed:
-  (use "git reset HEAD &lt;file&gt;..." to unstage)
-
+  (use "git restore --staged &lt;file&gt;..." to unstage)
         modified:   mars.txt
 </code></pre>
 </div>
-<p>Note that if you don’t have the same output you may either have
-forgotten to change the file, or you have added it <em>and</em>
-committed it.</p>
-<p>Using the command <code>git checkout -- mars.txt</code> now does not
-give an error, but it does not restore the file either. Git helpfully
-tells us that we need to use <code>git reset</code> first to unstage the
-file:</p>
-<div class="codewrapper sourceCode" id="cb35">
+<p>この出力が表示されない場合、ファイルの変更を忘れているか、すでにファイルを追加してコミットした可能性があります。</p>
+<p>この時点で、<code>git restore mars.txt</code>
+コマンドを実行してもエラーは発生しませんが、ファイルは元に戻りません。
+Gitは、まず <code>git restore --staged</code>
+を使用してステージングエリアからファイルを戻す必要があることを教えてくれます。</p>
+<div class="codewrapper sourceCode" id="cb32">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
-<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb35-1"><a href="#cb35-1" tabindex="-1"></a><span class="ex">$</span> git reset HEAD mars.txt</span></code></pre>
+<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb32-1"><a href="#cb32-1" tabindex="-1"></a><span class="ex">$</span> git restore <span class="at">--staged</span> mars.txt</span></code></pre>
 </div>
-<div class="codewrapper">
-<h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
-</h3>
-<pre class="output" tabindex="0"><code>Unstaged changes after reset:
-M	mars.txt</code></pre>
-</div>
-<p>Now, <code>git status</code> gives us:</p>
-<div class="codewrapper sourceCode" id="cb37">
+<p>次に、<code>git status</code> の出力を確認します。</p>
+<div class="codewrapper sourceCode" id="cb33">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
-<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb37-1"><a href="#cb37-1" tabindex="-1"></a><span class="ex">$</span> git status</span></code></pre>
+<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb33-1"><a href="#cb33-1" tabindex="-1"></a><span class="ex">$</span> git status</span></code></pre>
 </div>
 <div class="codewrapper">
 <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
@@ -2680,19 +2616,19 @@ <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"><
 <pre class="output" tabindex="0"><code>On branch main
 Changes not staged for commit:
   (use "git add &lt;file&gt;..." to update what will be committed)
-  (use "git checkout -- &lt;file&gt;..." to discard changes in working directory)
+  (use "git git restore &lt;file&gt;..." to discard changes in working directory)
 
         modified:   mars.txt
 
 no changes added to commit (use "git add" and/or "git commit -a")</code></pre>
 </div>
-<p>This means we can now use <code>git checkout</code> to restore the
-file to the previous commit:</p>
-<div class="codewrapper sourceCode" id="cb39">
+<p>ここで、<code>git restore</code>
+コマンドを使ってファイルを前のコミットの状態に戻すことができます。</p>
+<div class="codewrapper sourceCode" id="cb35">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
-<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb39-1"><a href="#cb39-1" tabindex="-1"></a><span class="ex">$</span> git checkout <span class="at">--</span> mars.txt</span>
-<span id="cb39-2"><a href="#cb39-2" tabindex="-1"></a><span class="ex">$</span> git status</span></code></pre>
+<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb35-1"><a href="#cb35-1" tabindex="-1"></a><span class="ex">$</span> git restore mars.txt</span>
+<span id="cb35-2"><a href="#cb35-2" tabindex="-1"></a><span class="ex">$</span> git status</span></code></pre>
 </div>
 <div class="codewrapper">
 <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
@@ -2722,28 +2658,29 @@ <h3 class="callout-title">履歴を探索し、要約する</h3>
 コマンドを使用すると、1つの特定のファイルを探索できることを思い出してください、
 例えば、<code>git diff mars.txt</code> 。
 ここでも同様のアイデアを適用できます。</p>
-<div class="codewrapper sourceCode" id="cb41">
+<div class="codewrapper sourceCode" id="cb37">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
-<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb41-1"><a href="#cb41-1" tabindex="-1"></a><span class="ex">$</span> git log mars.txt</span></code></pre>
+<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb37-1"><a href="#cb37-1" tabindex="-1"></a><span class="ex">$</span> git log mars.txt</span></code></pre>
 </div>
-<p>Unfortunately some of these commit messages are very ambiguous, e.g.,
-<code>update files</code>. How can you search through these files?</p>
-<p>Both <code>git diff</code> and <code>git log</code> are very useful
-and they summarize a different part of the history for you. Is it
-possible to combine both? Let’s try the following:</p>
-<div class="codewrapper sourceCode" id="cb42">
+<p>残念ながら、一部のコミットメッセージは
+<code>update files</code>（「ファイルを更新する」）などのように非常に曖昧です。
+これらのファイルをどうやって調べたら良いでしょうか？</p>
+<p><code>git diff</code> と <code>git log</code>
+はどちらも非常に便利で、それぞれリポジトリの異なる部分の履歴を要約してくれます。
+これらを組み合わせることは可能でしょうか？
+次のコマンドを試してみましょう：</p>
+<div class="codewrapper sourceCode" id="cb38">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
-<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb42-1"><a href="#cb42-1" tabindex="-1"></a><span class="ex">$</span> git log <span class="at">--patch</span> mars.txt</span></code></pre>
+<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb38-1"><a href="#cb38-1" tabindex="-1"></a><span class="ex">$</span> git log <span class="at">--patch</span> mars.txt</span></code></pre>
 </div>
-<p>You should get a long list of output, and you should be able to see
-both commit messages and the difference between each commit.</p>
-<p>Question: What does the following command do?</p>
-<div class="codewrapper sourceCode" id="cb43">
+<p>長い出力が表示され、各コミットメッセージと、そのコミット間での違い（差分）が確認できるはずです。</p>
+<p>質問: 次のコマンドは何をしますか？</p>
+<div class="codewrapper sourceCode" id="cb39">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
-<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb43-1"><a href="#cb43-1" tabindex="-1"></a><span class="ex">$</span> git log <span class="at">--patch</span> HEAD~9 <span class="pp">*</span>.txt</span></code></pre>
+<pre class="sourceCode bash" tabindex="0"><code class="sourceCode bash"><span id="cb39-1"><a href="#cb39-1" tabindex="-1"></a><span class="ex">$</span> git log <span class="at">--patch</span> HEAD~9 <span class="pp">*</span>.txt</span></code></pre>
 </div>
 </div>
 </div>
@@ -3234,7 +3171,7 @@ <h3 class="callout-title">まとめ</h3>
 </div>
 </div></section><section id="aio-07-github"><p>Content from <a href="07-github.html">GitHub におけるリモート</a></p>
 <hr>
-<p>最終更新日：2024-06-06 |
+<p>最終更新日：2024-09-30 |
 
         <a href="https://github.com/swcarpentry-ja/git-novice/edit/main/episodes/07-github.md" class="external-link">ページの編集 <i aria-hidden="true" data-feather="edit"></i></a></p>
 <p>所要時間：<i aria-hidden="true" data-feather="clock"></i> 45分</p>
@@ -3284,7 +3221,7 @@ <h3 class="card-title">目的</h3>
 <p><a href="https://github.com" class="external-link">GitHub</a>
 にログインし、右上隅のアイコンをクリックして <code>planets</code>
 という名前の新しいリポジトリを作成してみましょう：</p>
-<figure><img src="../fig/github-create-repo-01.png" alt="Creating a Repository on GitHub (Step 1)" class="figure mx-auto d-block"></figure><p>リポジトリに「planets」という名前を付けて、「Create
+<figure><img src="../fig/github-create-repo-01.png" alt='The first step in creating a repository on GitHub: clicking the "create new" button' class="figure mx-auto d-block"></figure><p>リポジトリに「planets」という名前を付けて、「Create
 Repository」をクリックします。</p>
 <p>注:
 このリポジトリはローカルのリポジトリに接続されるため、空にしておく必要があります。
@@ -3293,9 +3230,9 @@ <h3 class="card-title">目的</h3>
 license.」の両方のオプションを「None」のままにします。
 リポジトリを空にしておく必要がある理由の完全な説明については、以下の「GitHub
 ライセンスと README ファイル」の演習を参照してください。</p>
-<figure><img src="../fig/github-create-repo-02.png" alt="Creating a Repository on GitHub (Step 2)" class="figure mx-auto d-block"></figure><p>リポジトリが作成されるとすぐに、GitHub には ある URL
+<figure><img src="../fig/github-create-repo-02.png" alt="The second step in creating a repository on GitHub: filling out the new repository form to provide the repository name, and specify that neither a readme nor a license should be created" class="figure mx-auto d-block"></figure><p>リポジトリが作成されるとすぐに、GitHub には ある URL
 と、ローカルのリポジトリの構成方法に関する情報が記載されたページが表示されます。</p>
-<figure><img src="../fig/github-create-repo-03.png" alt="Creating a Repository on GitHub (Step 3)" class="figure mx-auto d-block"></figure><p>これにより、GitHub のサーバー上で次のことが効果的に行われます。</p>
+<figure><img src="../fig/github-create-repo-03.png" alt="The summary page displayed by GitHub after a new repository has been created. It contains instructions for configuring the new GitHub repository as a git remote" class="figure mx-auto d-block"></figure><p>これにより、GitHub のサーバー上で次のことが効果的に行われます。</p>
 <div class="codewrapper sourceCode" id="cb1">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
@@ -3307,8 +3244,8 @@ <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i
 を覚えていれば、私達は <code>mars.txt</code>
 に以前の作業を追加してコミットしました。
 ローカルリポジトリのダイアグラムは次のようになります：</p>
-<figure><img src="../fig/git-staging-area.svg" alt="The Local Repository with Git Staging Area" class="figure mx-auto d-block"></figure><p>Now that we have two repositories, we need a diagram like this:</p>
-<figure><img src="../fig/git-freshly-made-github-repo.svg" alt="Freshly-Made GitHub Repository" class="figure mx-auto d-block"></figure><p>Note that our local repository still contains our earlier work on
+<figure><img src="../fig/git-staging-area.svg" alt='A diagram showing how "git add" registers changes in the staging area, while "git commit" moves changes from the staging area to the repository' class="figure mx-auto d-block"></figure><p>Now that we have two repositories, we need a diagram like this:</p>
+<figure><img src="../fig/git-freshly-made-github-repo.svg" alt='A diagram illustrating how the GitHub "planets" repository is also a git repository like our local repository, but that it is currently empty' class="figure mx-auto d-block"></figure><p>Note that our local repository still contains our earlier work on
 <code>mars.txt</code>, but the remote repository on GitHub appears empty
 as it doesn’t contain any files yet.</p>
 </section><section><h2 class="section-heading" id="connect-local-to-remote-repository">2. Connect local to remote repository<a class="anchor" aria-label="anchor" href="#connect-local-to-remote-repository"></a>
@@ -3318,7 +3255,7 @@ <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i
 repository a <a href="reference.html#remote">remote</a> for the local
 repository. The home page of the repository on GitHub includes the URL
 string we need to identify it:</p>
-<figure><img src="../fig/github-find-repo-string.png" alt="Where to Find Repository URL on GitHub" class="figure mx-auto d-block"></figure><p>Click on the ‘SSH’ link to change the <a href="reference.html#protocol">protocol</a> from HTTPS to SSH.</p>
+<figure><img src="../fig/github-find-repo-string.png" alt="Clicking the &quot;Copy to Clipboard&quot; button on GitHub to obtain the repository's URL" class="figure mx-auto d-block"></figure><p>Click on the ‘SSH’ link to change the <a href="reference.html#protocol">protocol</a> from HTTPS to SSH.</p>
 <div id="https-vs.-ssh" class="callout">
 <div class="callout-square">
 <i class="callout-icon" data-feather="bell"></i>
@@ -3333,7 +3270,7 @@ <h3 class="callout-title">HTTPS vs. SSH</h3>
 </div>
 </div>
 </div>
-<figure><img src="../fig/github-change-repo-string.png" alt="Changing the Repository URL on GitHub" class="figure mx-auto d-block"></figure><p>Copy that URL from the browser, go into the local
+<figure><img src="../fig/github-change-repo-string.png" alt='A screenshot showing that clicking on "SSH" will make GitHub provide the SSH URL for a repository instead of the HTTPS URL' class="figure mx-auto d-block"></figure><p>Copy that URL from the browser, go into the local
 <code>planets</code> repository, and run this command:</p>
 <div class="codewrapper sourceCode" id="cb2">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
@@ -3467,7 +3404,10 @@ <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"><
 <p>Now, it is prompting Dracula for a passphrase. Since he is using his
 lab’s laptop that other people sometimes have access to, he wants to
 create a passphrase. Be sure to use something memorable or save your
-passphrase somewhere, as there is no “reset my password” option.</p>
+passphrase somewhere, as there is no “reset my password” option. Note
+that, when typing a passphrase on a terminal, there won’t be any visual
+feedback of your typing. This is normal: your passphrase will be
+recorded even if you see nothing changing on your screen.</p>
 <div class="codewrapper">
 <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
 </h3>
@@ -3653,7 +3593,7 @@ <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i
 </div>
 </div>
 <p>Our local and remote repositories are now in this state:</p>
-<figure><img src="../fig/github-repo-after-first-push.svg" alt="GitHub Repository After First Push" class="figure mx-auto d-block"></figure><div id="the--u-flag" class="callout">
+<figure><img src="../fig/github-repo-after-first-push.svg" alt='A diagram showing how "git push origin" will push changes from the local repository to the remote, making the remote repository an exact copy of the local repository.' class="figure mx-auto d-block"></figure><div id="the--u-flag" class="callout">
 <div class="callout-square">
 <i class="callout-icon" data-feather="bell"></i>
 </div>
@@ -3903,7 +3843,7 @@ <h3 class="callout-title">まとめ</h3>
 </div>
 </section></section><section id="aio-08-collab"><p>Content from <a href="08-collab.html">Collaborating</a></p>
 <hr>
-<p>最終更新日：2024-06-06 |
+<p>最終更新日：2024-09-30 |
 
         <a href="https://github.com/swcarpentry-ja/git-novice/edit/main/episodes/08-collab.md" class="external-link">ページの編集 <i aria-hidden="true" data-feather="edit"></i></a></p>
 <p>所要時間：<i aria-hidden="true" data-feather="clock"></i> 25分</p>
@@ -3959,7 +3899,7 @@ <h3 class="callout-title">Practicing By Yourself</h3>
 page on GitHub, click the “Settings” button on the right, select
 “Collaborators”, click “Add people”, and then enter your partner’s
 username.</p>
-<figure><img src="../fig/github-add-collaborators.png" alt="screenshot of repository page with Settings then Collaborators selected, showing how to add Collaborators in a GitHub repository" class="figure mx-auto d-block"></figure><p>To accept access to the Owner’s repo, the Collaborator needs to go to
+<figure><img src="../fig/github-add-collaborators.png" alt='A screenshot of the GitHub Collaborators settings page, which is accessed by clicking "Settings" then "Collaborators"' class="figure mx-auto d-block"></figure><p>To accept access to the Owner’s repo, the Collaborator needs to go to
 <a href="https://github.com/notifications" class="external-link">https://github.com/notifications</a>
 or check for email notification. Once there she can accept access to the
 Owner’s repo.</p>
@@ -3980,7 +3920,7 @@ <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i
 (<code>~/Desktop/vlad-planets</code>) specified at the end, you will
 clone inside your own planets folder! Make sure to navigate to the
 <code>Desktop</code> folder first.</p>
-<figure><img src="../fig/github-collaboration.svg" alt="After Creating Clone of Repository" class="figure mx-auto d-block"></figure><p>The Collaborator can now make a change in her clone of the Owner’s
+<figure><img src="../fig/github-collaboration.svg" alt='A diagram showing that "git clone" can create a copy of a remote GitHub repository, allowing a second person to create their own local repository that they can make changes to.' class="figure mx-auto d-block"></figure><p>The Collaborator can now make a change in her clone of the Owner’s
 repository, exactly the same way as we’ve been doing before:</p>
 <div class="codewrapper sourceCode" id="cb2">
 <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i><i aria-hidden="true" data-feather="chevron-right"></i>
@@ -4160,7 +4100,7 @@ <h3 class="callout-title">Review Changes</h3>
 <button class="accordion-button solution-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseSolution1" aria-expanded="false" aria-controls="collapseSolution1">
   <h4 class="accordion-header" id="headingSolution1"> 回答を表示する </h4>
 </button>
-<div id="collapseSolution1" class="accordion-collapse collapse" data-bs-parent="#accordionSolution1" aria-labelledby="headingSolution1">
+<div id="collapseSolution1" class="accordion-collapse collapse" aria-labelledby="headingSolution1" data-bs-parent="#accordionSolution1">
 <div class="accordion-body">
 <p>On the command line, the Collaborator can use
 <code>git fetch origin main</code> to get the remote changes into the
@@ -4221,7 +4161,7 @@ <h3 class="callout-title">まとめ</h3>
 </div>
 </div></section><section id="aio-09-conflict"><p>Content from <a href="09-conflict.html">Conflicts</a></p>
 <hr>
-<p>最終更新日：2024-06-06 |
+<p>最終更新日：2024-09-30 |
 
         <a href="https://github.com/swcarpentry-ja/git-novice/edit/main/episodes/09-conflict.md" class="external-link">ページの編集 <i aria-hidden="true" data-feather="edit"></i></a></p>
 <p>所要時間：<i aria-hidden="true" data-feather="clock"></i> 15分</p>
@@ -4369,7 +4309,7 @@ <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"><
 hint: (e.g., 'git pull ...') before pushing again.
 hint: See the 'Note about fast-forwards' in 'git push --help' for details.</code></pre>
 </div>
-<figure><img src="../fig/conflict.svg" alt="The Conflicting Changes" class="figure mx-auto d-block"></figure><p>Git rejects the push because it detects that the remote repository
+<figure><img src="../fig/conflict.svg" alt="A diagram showing a conflict that might occur when two sets of independent changes are merged" class="figure mx-auto d-block"></figure><p>Git rejects the push because it detects that the remote repository
 has new updates that have not been incorporated into the local branch.
 What we have to do is pull the changes from GitHub, <a href="reference.html#merge">merge</a> them into the copy we’re currently
 working in, and then push that. Let’s start by pulling:</p>
@@ -4593,7 +4533,7 @@ <h3 class="callout-title">Conflicts on Non-textual files</h3>
 <button class="accordion-button solution-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseSolution1" aria-expanded="false" aria-controls="collapseSolution1">
   <h4 class="accordion-header" id="headingSolution1"> 回答を表示する </h4>
 </button>
-<div id="collapseSolution1" class="accordion-collapse collapse" data-bs-parent="#accordionSolution1" aria-labelledby="headingSolution1">
+<div id="collapseSolution1" class="accordion-collapse collapse" aria-labelledby="headingSolution1" data-bs-parent="#accordionSolution1">
 <div class="accordion-body">
 <p>Let’s try it. Suppose Dracula takes a picture of Martian surface and
 calls it <code>mars.jpg</code>.</p>
@@ -4823,7 +4763,7 @@ <h3 class="callout-title">A Typical Work Session</h3>
 <tr class="even">
 <td>6</td>
 <td>Celebrate!</td>
-<td><code>AFK</code></td>
+<td></td>
 </tr>
 </tbody>
 </table>
@@ -4835,7 +4775,7 @@ <h3 class="callout-title">A Typical Work Session</h3>
 <button class="accordion-button solution-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseSolution2" aria-expanded="false" aria-controls="collapseSolution2">
   <h4 class="accordion-header" id="headingSolution2"> 回答を表示する </h4>
 </button>
-<div id="collapseSolution2" class="accordion-collapse collapse" data-bs-parent="#accordionSolution2" aria-labelledby="headingSolution2">
+<div id="collapseSolution2" class="accordion-collapse collapse" aria-labelledby="headingSolution2" data-bs-parent="#accordionSolution2">
 <div class="accordion-body">
 <table class="table">
 <colgroup>
@@ -4877,7 +4817,7 @@ <h4 class="accordion-header" id="headingSolution2"> 回答を表示する </h4>
 <tr class="even">
 <td>6</td>
 <td>Celebrate!</td>
-<td><code>AFK</code></td>
+<td></td>
 </tr>
 </tbody>
 </table>
@@ -5199,7 +5139,7 @@ <h3 class="callout-title">まとめ</h3>
 </div>
 </div></section><section id="aio-12-citation"><p>Content from <a href="12-citation.html">Citation</a></p>
 <hr>
-<p>最終更新日：2024-06-06 |
+<p>最終更新日：2024-09-30 |
 
         <a href="https://github.com/swcarpentry-ja/git-novice/edit/main/episodes/12-citation.md" class="external-link">ページの編集 <i aria-hidden="true" data-feather="edit"></i></a></p>
 <p>所要時間：<i aria-hidden="true" data-feather="clock"></i> 2分</p>
@@ -5234,30 +5174,18 @@ <h3 class="card-title">目的</h3>
 <p>You may want to include a file called <code>CITATION</code> or
 <code>CITATION.txt</code> that describes how to reference your project;
 the one for Software Carpentry states:</p>
-<pre class="source"><code>To reference Software Carpentry in publications, please cite both of the following:
+<pre class="source"><code>To reference Software Carpentry in publications, please cite:
 
-Greg Wilson: "Software Carpentry: Getting Scientists to Write Better
-Code by Making Them More Productive".  Computing in Science &amp;
-Engineering, Nov-Dec 2006.
+Greg Wilson: "Software Carpentry: Lessons Learned". F1000Research,
+2016, 3:62 (doi: 10.12688/f1000research.3-62.v2).
 
-Greg Wilson: "Software Carpentry: Lessons Learned". arXiv:1307.5448,
-July 2013.
-
-@article{wilson-software-carpentry-2006,
-    author =  {Greg Wilson},
-    title =   {Software Carpentry: Getting Scientists to Write Better Code by Making Them More Productive},
-    journal = {Computing in Science \&amp; Engineering},
-    month =   {November--December},
-    year =    {2006},
-}
-
-@online{wilson-software-carpentry-2013,
+@online{wilson-software-carpentry-2016,
   author      = {Greg Wilson},
   title       = {Software Carpentry: Lessons Learned},
-  version     = {1},
-  date        = {2013-07-20},
-  eprinttype  = {arxiv},
-  eprint      = {1307.5448}
+  version     = {2},
+  date        = {2016-01-28},
+  url         = {http://f1000research.com/articles/3-62/v2},
+  doi         = {10.12688/f1000research.3-62.v2}
 }</code></pre>
 <p>More detailed advice, and other ways to make your code citable can be
 found <a href="https://www.software.ac.uk/publication/how-cite-and-describe-software" class="external-link">at
@@ -5284,7 +5212,7 @@ <h3 class="callout-title">まとめ</h3>
 </div>
 </div></section><section id="aio-13-hosting"><p>Content from <a href="13-hosting.html">Hosting</a></p>
 <hr>
-<p>最終更新日：2024-06-06 |
+<p>最終更新日：2024-09-30 |
 
         <a href="https://github.com/swcarpentry-ja/git-novice/edit/main/episodes/13-hosting.md" class="external-link">ページの編集 <i aria-hidden="true" data-feather="edit"></i></a></p>
 <p>所要時間：<i aria-hidden="true" data-feather="clock"></i> 10分</p>
@@ -5316,8 +5244,9 @@ <h3 class="card-title">目的</h3>
 </div>
 </div>
 </div>
-<p>自分たちの仕事をオープンにしたいグループにとって次に大きな問題は、コードとデータをどこにホストするかです。
-1
+<p>After <a href="11-licensing.html">choosing a license</a>, another big
+question for groups that want to open up their work is where to host
+their code and data. 1
 つのオプションは、研究室、学部、または大学がサーバーを提供し、アカウントやバックアップなどを管理することです。
 これの主な利点は、誰が何を所有しているかを明確にすることです。
 それは、題材が機密性の高いもの
@@ -5417,7 +5346,7 @@ <h3 class="callout-title">まとめ</h3>
 </div>
 </div></section><section id="aio-14-supplemental-rstudio"><p>Content from <a href="14-supplemental-rstudio.html">Supplemental: Using Git from RStudio</a></p>
 <hr>
-<p>最終更新日：2024-06-06 |
+<p>最終更新日：2024-09-30 |
 
         <a href="https://github.com/swcarpentry-ja/git-novice/edit/main/episodes/14-supplemental-rstudio.md" class="external-link">ページの編集 <i aria-hidden="true" data-feather="edit"></i></a></p>
 <p>所要時間：<i aria-hidden="true" data-feather="clock"></i> 10分</p>
@@ -5515,26 +5444,26 @@ <h3 id="tell-rstudio-where-to-find-github">Tell RStudio where to find GitHub<a c
 <p>Next, RStudio will ask which existing directory we want to use. Click
 “Browse…” and navigate to the correct directory, then click “Create
 Project”:</p>
-<figure><img src="../fig/RStudio_screenshot_navigateexisting.png" class="figure mx-auto d-block"></figure><p>Ta-da! We have created a new project in RStudio within the existing
+<figure><img src="../fig/RStudio_screenshot_navigateexisting.png" alt='RStudio window showing the "Create Project From Existing Directory" dialog. In the dialog, the project working directory has been set to "~/Desktop/planets"' class="figure mx-auto d-block"></figure><p>Ta-da! We have created a new project in RStudio within the existing
 planets repository. Notice the vertical “Git” menu in the menu bar.
 RStudio has recognized that the current directory is a Git repository,
 and gives us a number of tools to use Git:</p>
 <figure><img src="../fig/RStudio_screenshot_afterclone.png" alt="RStudio window after new project is created with large arrow pointing to vertical Git menu bar." class="figure mx-auto d-block"></figure><p>To edit the existing files in the repository, we can click on them in
 the “Files” panel on the lower right. Now let’s add some additional
 information about Pluto:</p>
-<figure><img src="../fig/RStudio_screenshot_editfiles.png" class="figure mx-auto d-block"></figure><p>Once we have saved our edited files, we can use RStudio to commit the
+<figure><img src="../fig/RStudio_screenshot_editfiles.png" alt='RStudio window demonstrating the use of the editor panel to modify the "pluto.txt" file' class="figure mx-auto d-block"></figure><p>Once we have saved our edited files, we can use RStudio to commit the
 changes by clicking on “Commit…” in the Git menu:</p>
-<figure><img src="../fig/RStudio_screenshot_commit.png" alt='RStudio screenshot showing the Git menu dropdown with "Commit..." selected' class="figure mx-auto d-block"></figure><p>This will open a dialogue where we can select which files to commit
+<figure><img src="../fig/RStudio_screenshot_commit.png" alt='RStudio screenshot showing the Git menu dropdown with the "Commit..." option selected' class="figure mx-auto d-block"></figure><p>This will open a dialogue where we can select which files to commit
 (by checking the appropriate boxes in the “Staged” column), and enter a
 commit message (in the upper right panel). The icons in the “Status”
 column indicate the current status of each file. Clicking on a file
 shows information about changes in the lower panel (using output of
 <code>git diff</code>). Once everything is the way we want it, we click
 “Commit”:</p>
-<figure><img src="../fig/RStudio_screenshot_review.png" class="figure mx-auto d-block"></figure><p>The changes can be pushed by selecting “Push Branch” from the Git
+<figure><img src="../fig/RStudio_screenshot_review.png" alt='RStudio screenshow showing the "Review Changes" dialog. The top left panel shows the list of files that can be included or excluded from the commit. The top right panel is for writing a commit message. The bottom panel shows information about the currently selected file in the top left panel.' class="figure mx-auto d-block"></figure><p>The changes can be pushed by selecting “Push Branch” from the Git
 menu. There are also options to pull from the remote repository, and to
 view the commit history:</p>
-<figure><img src="../fig/RStudio_screenshot_history.png" alt='RStudio screenshot showing the git menu dropdown with "History" selected' class="figure mx-auto d-block"></figure><div id="are-the-pushpull-commands-grayed-out" class="callout">
+<figure><img src="../fig/RStudio_screenshot_history.png" alt='RStudio screenshot showing the git menu dropdown with the "History" option selected' class="figure mx-auto d-block"></figure><div id="are-the-pushpull-commands-grayed-out" class="callout">
 <div class="callout-square">
 <i class="callout-icon" data-feather="bell"></i>
 </div>
@@ -5550,7 +5479,7 @@ <h3 class="callout-title">Are the Push/Pull Commands Grayed Out?</h3>
 </div>
 <p>If we click on “History”, we can see a graphical version of what
 <code>git log</code> would tell us:</p>
-<figure><img src="../fig/RStudio_screenshot_viewhistory.png" class="figure mx-auto d-block"></figure><p>RStudio creates a number of files that it uses to keep track of a
+<figure><img src="../fig/RStudio_screenshot_viewhistory.png" alt='RStudio screenshot showing the "Review Changes" dialog after pressing the "History" button. The top panel lists the commits in the repository, similar to git log. The bottom panel shows the changes included in the commit that has been selected in the top panel.' class="figure mx-auto d-block"></figure><p>RStudio creates a number of files that it uses to keep track of a
 project. We often don’t want to track these, in which case we add them
 to our <code>.gitignore</code> file:</p>
 <figure><img src="../fig/RStudio_screenshot_gitignore.png" alt="RStudio screenshot showing .gitignore open in the editor pane with the files .Rproj.user, .Rhistory, .RData, and *.Rproj added to the end" class="figure mx-auto d-block"></figure><div id="tip-versioning-disposable-output" class="callout">
@@ -5669,8 +5598,8 @@ <h3 class="callout-title">まとめ</h3>
   "url": "https://swcarpentry-ja.github.io/git-novice/instructor/aio.html",
   "identifier": "https://swcarpentry-ja.github.io/git-novice/instructor/aio.html",
   "dateCreated": "2014-12-04",
-  "dateModified": "2024-09-27",
-  "datePublished": "2024-09-27"
+  "dateModified": "2024-09-30",
+  "datePublished": "2024-09-30"
 }
 
   </script><script>
diff --git a/instructor/discuss.html b/instructor/discuss.html
index 4e0a904eba..499b554928 100644
--- a/instructor/discuss.html
+++ b/instructor/discuss.html
@@ -851,7 +851,7 @@ <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"><
 <button class="accordion-button solution-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseSolution1" aria-expanded="false" aria-controls="collapseSolution1">
   <h4 class="accordion-header" id="headingSolution1"> 回答を表示する </h4>
 </button>
-<div id="collapseSolution1" class="accordion-collapse collapse" aria-labelledby="headingSolution1" data-bs-parent="#accordionSolution1">
+<div id="collapseSolution1" class="accordion-collapse collapse" data-bs-parent="#accordionSolution1" aria-labelledby="headingSolution1">
 <div class="accordion-body">
 <p>To do this, your .gitignore would look like this:</p>
 <div class="codewrapper">
@@ -926,7 +926,7 @@ <h3 class="code-label">出力<i aria-hidden="true" data-feather="chevron-left"><
   "identifier": "https://swcarpentry-ja.github.io/git-novice/instructor/discuss.html",
   "dateCreated": "2014-12-04",
   "dateModified": "2024-06-06",
-  "datePublished": "2024-09-27"
+  "datePublished": "2024-09-30"
 }
 
   </script><script>
diff --git a/instructor/images.html b/instructor/images.html
index c4662bcf13..a3b4bced3d 100644
--- a/instructor/images.html
+++ b/instructor/images.html
@@ -465,20 +465,21 @@ <h3 id="01-basics-figure-1">図の1</h3>
 </div>
 </figure><hr>
 <h3 id="01-basics-figure-2">図の2</h3>
-<p aria-hidden="true">画像1/1: ‘変更は連続して保存されます’</p>
-<figure><img src="../fig/play-changes.svg" alt="変更は連続して保存されます" class="figure mx-auto d-block"></figure><hr>
+<p aria-hidden="true">画像1/1: ‘A diagram demonstrating how a single document grows as the result of sequential changes’</p>
+<figure><img src="../fig/play-changes.svg" alt="A diagram demonstrating how a single document grows as the result of sequential changes" class="figure mx-auto d-block"></figure><hr>
 <h3 id="01-basics-figure-3">図の3</h3>
-<p aria-hidden="true">画像1/1: ‘異なるバージョンの保存ができます’</p>
-<figure><img src="../fig/versions.svg" alt="異なるバージョンの保存ができます" class="figure mx-auto d-block"></figure><hr>
+<p aria-hidden="true">画像1/1: ‘A diagram with one source document that has been modified in two different ways to produce two different versions of the document’</p>
+<figure><img src="../fig/versions.svg" alt="A diagram with one source document that has been modified in two different ways to produce two different versions of the document" class="figure mx-auto d-block"></figure><hr>
 <h3 id="01-basics-figure-4">図の4</h3>
-<p aria-hidden="true">画像1/1: ‘複数のバージョンをマージできます’</p>
-<figure><img src="../fig/merge.svg" alt="複数のバージョンをマージできます" class="figure mx-auto d-block"></figure><hr></section><section id="02-setup"><h2 class="section-heading"><a href="02-setup.html">Gitの設定</a></h2>
+<p aria-hidden="true">画像1/1: ‘A diagram that shows the merging of two different document versions into one document that contains all of the changes from both versions’</p>
+<figure><img src="../fig/merge.svg" alt="A diagram that shows the merging of two different document versions into one document that contains all of the changes from both versions" class="figure mx-auto d-block"></figure><hr></section><section id="02-setup"><h2 class="section-heading"><a href="02-setup.html">Gitの設定</a></h2>
 <hr class="half-width"></section><section id="03-create"><h2 class="section-heading"><a href="03-create.html">リポジトリの作成</a></h2>
 <hr class="half-width">
 <h3 id="03-create-figure-1">図の1</h3>
-<p aria-hidden="true">画像1/1: ‘motivatingexample’</p>
-<p><img src="../fig/motivatingexample.png" alt="motivatingexample" class="figure"><a href="https://www.deviantart.com/b-maze/art/Werewolf-vs-Dracula-124893530" class="external-link">ウルフマン対ドラキュラ</a>
-by <a href="https://www.deviantart.com/b-maze" class="external-link">b-maze</a> / <a href="https://www.deviantart.com/" class="external-link">Deviant Art</a>. <a href="https://en.wikipedia.org/wiki/File:OSIRIS_Mars_true_color.jpg" class="external-link">火星</a>
+<p aria-hidden="true">画像1/1: ‘The main elements of the story: Dracula, Wolfman, the Mummy, Mars, Pluto and The Moon’</p>
+<p><img src="../fig/motivatingexample.png" alt="The main elements of the story: Dracula, Wolfman, the Mummy, Mars, Pluto and The Moon" class="figure"><a href="https://www.deviantart.com/b-maze/art/Werewolf-vs-Dracula-124893530" class="external-link">Werewolf
+vs dracula</a> by <a href="https://www.deviantart.com/b-maze" class="external-link">b-maze</a>
+/ <a href="https://www.deviantart.com/" class="external-link">Deviant Art</a>. <a href="https://en.wikipedia.org/wiki/File:OSIRIS_Mars_true_color.jpg" class="external-link">火星</a>
 by European Space Agency / <a href="https://creativecommons.org/licenses/by/3.0/deed.en" class="external-link">CC-BY-SA 3.0
 IGO</a>. <a href="https://commons.wikimedia.org/wiki/File:PIA19873-Pluto-NewHorizons-FlyingPastImage-20150714-transparent.png" class="external-link">冥王星</a>
 / Courtesy NASA/JPL-Caltech. <a href="https://commons.wikimedia.org/wiki/File:Mummy_icon_-_Noun_Project_4070.svg" class="external-link">ミイラ</a>
@@ -490,56 +491,56 @@ <h3 id="03-create-figure-1">図の1</h3>
 <hr></section><section id="04-changes"><h2 class="section-heading"><a href="04-changes.html">変更内容の記録</a></h2>
 <hr class="half-width">
 <h3 id="04-changes-figure-1">図の1</h3>
-<p aria-hidden="true">画像1/1: ‘Gitのステージング・エリア’</p>
-<figure><img src="../fig/git-staging-area.svg" alt="Gitのステージング・エリア" class="figure mx-auto d-block"></figure><hr>
+<p aria-hidden="true">画像1/1: ‘A diagram showing how "git add" registers changes in the staging area, while "git commit" moves changes from the staging area to the repository’</p>
+<figure><img src="../fig/git-staging-area.svg" alt='A diagram showing how "git add" registers changes in the staging area, while "git commit" moves changes from the staging area to the repository' class="figure mx-auto d-block"></figure><hr>
 <h3 id="04-changes-figure-2">図の2</h3>
-<p aria-hidden="true">画像1/1: ‘git commitのワークフロー’</p>
-<figure><img src="../fig/git-committing.svg" alt="git commitのワークフロー" class="figure mx-auto d-block"></figure><hr></section><section id="05-history"><h2 class="section-heading"><a href="05-history.html">履歴の探索</a></h2>
+<p aria-hidden="true">画像1/1: ‘A diagram showing two documents being separately staged using git add, before being combined into one commit using git commit’</p>
+<figure><img src="../fig/git-committing.svg" alt="A diagram showing two documents being separately staged using git add, before being combined into one commit using git commit" class="figure mx-auto d-block"></figure><hr></section><section id="05-history"><h2 class="section-heading"><a href="05-history.html">履歴の探索</a></h2>
 <hr class="half-width">
 <h3 id="05-history-figure-1">図の1</h3>
-<p aria-hidden="true">画像1/1: ‘Git Checkout’</p>
-<figure><img src="../fig/git-checkout.svg" alt="Git Checkout" class="figure mx-auto d-block"></figure><hr>
+<p aria-hidden="true">画像1/1: ‘以下の図は、git restoreを使って2つのファイルの前のバージョンを復元する方法を示しています’</p>
+<figure><img src="../fig/git-restore.svg" alt="以下の図は、git restoreを使って2つのファイルの前のバージョンを復元する方法を示しています" class="figure mx-auto d-block"></figure><hr>
 <h3 id="05-history-figure-2">図の2</h3>
-<p aria-hidden="true">画像1/1: ‘https://figshare.com/articles/How\_Git\_works\_a\_cartoon/1328266’</p>
-<figure><img src="../fig/git_staging.svg" alt="https://figshare.com/articles/How\_Git\_works\_a\_cartoon/1328266" class="figure mx-auto d-block"><div class="figcaption"><a href="https://figshare.com/articles/How%5C_Git%5C_works%5C_a%5C_cartoon/1328266" class="external-link uri">https://figshare.com/articles/How\_Git\_works\_a\_cartoon/1328266</a></div>
+<p aria-hidden="true">画像1/1: ‘以下の図は、Gitの全体的なワークフローを示しています。ローカルでの変更は、git addを使ってステージングされ、git commitでローカルリポジトリに反映されます。また、git checkoutを使用することで、リポジトリから変更を元に戻すことができます。’</p>
+<figure><img src="../fig/git_staging.svg" alt="以下の図は、Gitの全体的なワークフローを示しています。ローカルでの変更は、git addを使ってステージングされ、git commitでローカルリポジトリに反映されます。また、git checkoutを使用することで、リポジトリから変更を元に戻すことができます。" class="figure mx-auto d-block"><div class="figcaption"><a href="https://figshare.com/articles/How%5C_Git%5C_works%5C_a%5C_cartoon/1328266" class="external-link uri">https://figshare.com/articles/How\_Git\_works\_a\_cartoon/1328266</a></div>
 </figure><hr></section><section id="06-ignore"><h2 class="section-heading"><a href="06-ignore.html">ファイルを無視する</a></h2>
 <hr class="half-width"></section><section id="07-github"><h2 class="section-heading"><a href="07-github.html">GitHub におけるリモート</a></h2>
 <hr class="half-width">
 <h3 id="07-github-figure-1">図の1</h3>
-<p aria-hidden="true">画像1/1: ‘Creating a Repository on GitHub (Step 1)’</p>
-<figure><img src="../fig/github-create-repo-01.png" alt="Creating a Repository on GitHub (Step 1)" class="figure mx-auto d-block"></figure><hr>
+<p aria-hidden="true">画像1/1: ‘The first step in creating a repository on GitHub: clicking the "create new" button’</p>
+<figure><img src="../fig/github-create-repo-01.png" alt='The first step in creating a repository on GitHub: clicking the "create new" button' class="figure mx-auto d-block"></figure><hr>
 <h3 id="07-github-figure-2">図の2</h3>
-<p aria-hidden="true">画像1/1: ‘Creating a Repository on GitHub (Step 2)’</p>
-<figure><img src="../fig/github-create-repo-02.png" alt="Creating a Repository on GitHub (Step 2)" class="figure mx-auto d-block"></figure><hr>
+<p aria-hidden="true">画像1/1: ‘The second step in creating a repository on GitHub: filling out the new repository form to provide the repository name, and specify that neither a readme nor a license should be created’</p>
+<figure><img src="../fig/github-create-repo-02.png" alt="The second step in creating a repository on GitHub: filling out the new repository form to provide the repository name, and specify that neither a readme nor a license should be created" class="figure mx-auto d-block"></figure><hr>
 <h3 id="07-github-figure-3">図の3</h3>
-<p aria-hidden="true">画像1/1: ‘Creating a Repository on GitHub (Step 3)’</p>
-<figure><img src="../fig/github-create-repo-03.png" alt="Creating a Repository on GitHub (Step 3)" class="figure mx-auto d-block"></figure><hr>
+<p aria-hidden="true">画像1/1: ‘The summary page displayed by GitHub after a new repository has been created. It contains instructions for configuring the new GitHub repository as a git remote’</p>
+<figure><img src="../fig/github-create-repo-03.png" alt="The summary page displayed by GitHub after a new repository has been created. It contains instructions for configuring the new GitHub repository as a git remote" class="figure mx-auto d-block"></figure><hr>
 <h3 id="07-github-figure-4">図の4</h3>
-<p aria-hidden="true">画像1/1: ‘The Local Repository with Git Staging Area’</p>
-<figure><img src="../fig/git-staging-area.svg" alt="The Local Repository with Git Staging Area" class="figure mx-auto d-block"></figure><hr>
+<p aria-hidden="true">画像1/1: ‘A diagram showing how "git add" registers changes in the staging area, while "git commit" moves changes from the staging area to the repository’</p>
+<figure><img src="../fig/git-staging-area.svg" alt='A diagram showing how "git add" registers changes in the staging area, while "git commit" moves changes from the staging area to the repository' class="figure mx-auto d-block"></figure><hr>
 <h3 id="07-github-figure-5">図の5</h3>
-<p aria-hidden="true">画像1/1: ‘Freshly-Made GitHub Repository’</p>
-<figure><img src="../fig/git-freshly-made-github-repo.svg" alt="Freshly-Made GitHub Repository" class="figure mx-auto d-block"></figure><hr>
+<p aria-hidden="true">画像1/1: ‘A diagram illustrating how the GitHub "planets" repository is also a git repository like our local repository, but that it is currently empty’</p>
+<figure><img src="../fig/git-freshly-made-github-repo.svg" alt='A diagram illustrating how the GitHub "planets" repository is also a git repository like our local repository, but that it is currently empty' class="figure mx-auto d-block"></figure><hr>
 <h3 id="07-github-figure-6">図の6</h3>
-<p aria-hidden="true">画像1/1: ‘Where to Find Repository URL on GitHub’</p>
-<figure><img src="../fig/github-find-repo-string.png" alt="Where to Find Repository URL on GitHub" class="figure mx-auto d-block"></figure><hr>
+<p aria-hidden="true">画像1/1: ‘Clicking the "Copy to Clipboard" button on GitHub to obtain the repository's URL’</p>
+<figure><img src="../fig/github-find-repo-string.png" alt="Clicking the &quot;Copy to Clipboard&quot; button on GitHub to obtain the repository's URL" class="figure mx-auto d-block"></figure><hr>
 <h3 id="07-github-figure-7">図の7</h3>
-<p aria-hidden="true">画像1/1: ‘Changing the Repository URL on GitHub’</p>
-<figure><img src="../fig/github-change-repo-string.png" alt="Changing the Repository URL on GitHub" class="figure mx-auto d-block"></figure><hr>
+<p aria-hidden="true">画像1/1: ‘A screenshot showing that clicking on "SSH" will make GitHub provide the SSH URL for a repository instead of the HTTPS URL’</p>
+<figure><img src="../fig/github-change-repo-string.png" alt='A screenshot showing that clicking on "SSH" will make GitHub provide the SSH URL for a repository instead of the HTTPS URL' class="figure mx-auto d-block"></figure><hr>
 <h3 id="07-github-figure-8">図の8</h3>
-<p aria-hidden="true">画像1/1: ‘GitHub Repository After First Push’</p>
-<figure><img src="../fig/github-repo-after-first-push.svg" alt="GitHub Repository After First Push" class="figure mx-auto d-block"></figure><hr></section><section id="08-collab"><h2 class="section-heading"><a href="08-collab.html">Collaborating</a></h2>
+<p aria-hidden="true">画像1/1: ‘A diagram showing how "git push origin" will push changes from the local repository to the remote, making the remote repository an exact copy of the local repository.’</p>
+<figure><img src="../fig/github-repo-after-first-push.svg" alt='A diagram showing how "git push origin" will push changes from the local repository to the remote, making the remote repository an exact copy of the local repository.' class="figure mx-auto d-block"></figure><hr></section><section id="08-collab"><h2 class="section-heading"><a href="08-collab.html">Collaborating</a></h2>
 <hr class="half-width">
 <h3 id="08-collab-figure-1">図の1</h3>
-<p aria-hidden="true">画像1/1: ‘screenshot of repository page with Settings then Collaborators selected, showing how to add Collaborators in a GitHub repository’</p>
-<figure><img src="../fig/github-add-collaborators.png" alt="screenshot of repository page with Settings then Collaborators selected, showing how to add Collaborators in a GitHub repository" class="figure mx-auto d-block"></figure><hr>
+<p aria-hidden="true">画像1/1: ‘A screenshot of the GitHub Collaborators settings page, which is accessed by clicking "Settings" then "Collaborators"’</p>
+<figure><img src="../fig/github-add-collaborators.png" alt='A screenshot of the GitHub Collaborators settings page, which is accessed by clicking "Settings" then "Collaborators"' class="figure mx-auto d-block"></figure><hr>
 <h3 id="08-collab-figure-2">図の2</h3>
-<p aria-hidden="true">画像1/1: ‘After Creating Clone of Repository’</p>
-<figure><img src="../fig/github-collaboration.svg" alt="After Creating Clone of Repository" class="figure mx-auto d-block"></figure><hr></section><section id="09-conflict"><h2 class="section-heading"><a href="09-conflict.html">Conflicts</a></h2>
+<p aria-hidden="true">画像1/1: ‘A diagram showing that "git clone" can create a copy of a remote GitHub repository, allowing a second person to create their own local repository that they can make changes to.’</p>
+<figure><img src="../fig/github-collaboration.svg" alt='A diagram showing that "git clone" can create a copy of a remote GitHub repository, allowing a second person to create their own local repository that they can make changes to.' class="figure mx-auto d-block"></figure><hr></section><section id="09-conflict"><h2 class="section-heading"><a href="09-conflict.html">Conflicts</a></h2>
 <hr class="half-width">
 <h3 id="09-conflict-figure-1">図の1</h3>
-<p aria-hidden="true">画像1/1: ‘The Conflicting Changes’</p>
-<figure><img src="../fig/conflict.svg" alt="The Conflicting Changes" class="figure mx-auto d-block"></figure><hr></section><section id="10-open"><h2 class="section-heading"><a href="10-open.html">オープン サイエンス</a></h2>
+<p aria-hidden="true">画像1/1: ‘A diagram showing a conflict that might occur when two sets of independent changes are merged’</p>
+<figure><img src="../fig/conflict.svg" alt="A diagram showing a conflict that might occur when two sets of independent changes are merged" class="figure mx-auto d-block"></figure><hr></section><section id="10-open"><h2 class="section-heading"><a href="10-open.html">オープン サイエンス</a></h2>
 <hr class="half-width"></section><section id="11-licensing"><h2 class="section-heading"><a href="11-licensing.html">Licensing</a></h2>
 <hr class="half-width"></section><section id="12-citation"><h2 class="section-heading"><a href="12-citation.html">Citation</a></h2>
 <hr class="half-width"></section><section id="13-hosting"><h2 class="section-heading"><a href="13-hosting.html">Hosting</a></h2>
@@ -552,22 +553,26 @@ <h3 id="14-supplemental-rstudio-figure-2">図の2</h3>
 <p aria-hidden="true">画像1/1: ‘RStudio screenshot showing New Project dialog window with "Create project from existing directory" selected’</p>
 <figure><img src="../fig/RStudio_screenshot_existingdirectory.png" alt='RStudio screenshot showing New Project dialog window with "Create project from existing directory" selected' class="figure mx-auto d-block"></figure><hr>
 <h3 id="14-supplemental-rstudio-figure-3">図の3</h3>
-<figure><img src="../fig/RStudio_screenshot_navigateexisting.png" class="figure mx-auto d-block"></figure><hr>
+<p aria-hidden="true">画像1/1: ‘RStudio window showing the "Create Project From Existing Directory" dialog. In the dialog, the project working directory has been set to "~/Desktop/planets"’</p>
+<figure><img src="../fig/RStudio_screenshot_navigateexisting.png" alt='RStudio window showing the "Create Project From Existing Directory" dialog. In the dialog, the project working directory has been set to "~/Desktop/planets"' class="figure mx-auto d-block"></figure><hr>
 <h3 id="14-supplemental-rstudio-figure-4">図の4</h3>
 <p aria-hidden="true">画像1/1: ‘RStudio window after new project is created with large arrow pointing to vertical Git menu bar.’</p>
 <figure><img src="../fig/RStudio_screenshot_afterclone.png" alt="RStudio window after new project is created with large arrow pointing to vertical Git menu bar." class="figure mx-auto d-block"></figure><hr>
 <h3 id="14-supplemental-rstudio-figure-5">図の5</h3>
-<figure><img src="../fig/RStudio_screenshot_editfiles.png" class="figure mx-auto d-block"></figure><hr>
+<p aria-hidden="true">画像1/1: ‘RStudio window demonstrating the use of the editor panel to modify the "pluto.txt" file’</p>
+<figure><img src="../fig/RStudio_screenshot_editfiles.png" alt='RStudio window demonstrating the use of the editor panel to modify the "pluto.txt" file' class="figure mx-auto d-block"></figure><hr>
 <h3 id="14-supplemental-rstudio-figure-6">図の6</h3>
-<p aria-hidden="true">画像1/1: ‘RStudio screenshot showing the Git menu dropdown with "Commit..." selected’</p>
-<figure><img src="../fig/RStudio_screenshot_commit.png" alt='RStudio screenshot showing the Git menu dropdown with "Commit..." selected' class="figure mx-auto d-block"></figure><hr>
+<p aria-hidden="true">画像1/1: ‘RStudio screenshot showing the Git menu dropdown with the "Commit..." option selected’</p>
+<figure><img src="../fig/RStudio_screenshot_commit.png" alt='RStudio screenshot showing the Git menu dropdown with the "Commit..." option selected' class="figure mx-auto d-block"></figure><hr>
 <h3 id="14-supplemental-rstudio-figure-7">図の7</h3>
-<figure><img src="../fig/RStudio_screenshot_review.png" class="figure mx-auto d-block"></figure><hr>
+<p aria-hidden="true">画像1/1: ‘RStudio screenshow showing the "Review Changes" dialog. The top left panel shows the list of files that can be included or excluded from the commit. The top right panel is for writing a commit message. The bottom panel shows information about the currently selected file in the top left panel.’</p>
+<figure><img src="../fig/RStudio_screenshot_review.png" alt='RStudio screenshow showing the "Review Changes" dialog. The top left panel shows the list of files that can be included or excluded from the commit. The top right panel is for writing a commit message. The bottom panel shows information about the currently selected file in the top left panel.' class="figure mx-auto d-block"></figure><hr>
 <h3 id="14-supplemental-rstudio-figure-8">図の8</h3>
-<p aria-hidden="true">画像1/1: ‘RStudio screenshot showing the git menu dropdown with "History" selected’</p>
-<figure><img src="../fig/RStudio_screenshot_history.png" alt='RStudio screenshot showing the git menu dropdown with "History" selected' class="figure mx-auto d-block"></figure><hr>
+<p aria-hidden="true">画像1/1: ‘RStudio screenshot showing the git menu dropdown with the "History" option selected’</p>
+<figure><img src="../fig/RStudio_screenshot_history.png" alt='RStudio screenshot showing the git menu dropdown with the "History" option selected' class="figure mx-auto d-block"></figure><hr>
 <h3 id="14-supplemental-rstudio-figure-9">図の9</h3>
-<figure><img src="../fig/RStudio_screenshot_viewhistory.png" class="figure mx-auto d-block"></figure><hr>
+<p aria-hidden="true">画像1/1: ‘RStudio screenshot showing the "Review Changes" dialog after pressing the "History" button. The top panel lists the commits in the repository, similar to git log. The bottom panel shows the changes included in the commit that has been selected in the top panel.’</p>
+<figure><img src="../fig/RStudio_screenshot_viewhistory.png" alt='RStudio screenshot showing the "Review Changes" dialog after pressing the "History" button. The top panel lists the commits in the repository, similar to git log. The bottom panel shows the changes included in the commit that has been selected in the top panel.' class="figure mx-auto d-block"></figure><hr>
 <h3 id="14-supplemental-rstudio-figure-10">図の10</h3>
 <p aria-hidden="true">画像1/1: ‘RStudio screenshot showing .gitignore open in the editor pane with the files .Rproj.user, .Rhistory, .RData, and *.Rproj added to the end’</p>
 <figure><img src="../fig/RStudio_screenshot_gitignore.png" alt="RStudio screenshot showing .gitignore open in the editor pane with the files .Rproj.user, .Rhistory, .RData, and *.Rproj added to the end" class="figure mx-auto d-block"></figure><hr></section>
@@ -619,8 +624,8 @@ <h3 id="14-supplemental-rstudio-figure-10">図の10</h3>
   "url": "https://swcarpentry-ja.github.io/git-novice/instructor/images.html",
   "identifier": "https://swcarpentry-ja.github.io/git-novice/instructor/images.html",
   "dateCreated": "2014-12-04",
-  "dateModified": "2024-09-27",
-  "datePublished": "2024-09-27"
+  "dateModified": "2024-09-30",
+  "datePublished": "2024-09-30"
 }
 
   </script><script>
diff --git a/instructor/index.html b/instructor/index.html
index e2af54c793..91d3b0117d 100644
--- a/instructor/index.html
+++ b/instructor/index.html
@@ -648,8 +648,8 @@ <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i
   "url": "https://swcarpentry-ja.github.io/git-novice/instructor/index.html",
   "identifier": "https://swcarpentry-ja.github.io/git-novice/instructor/index.html",
   "dateCreated": "2014-12-04",
-  "dateModified": "2024-09-27",
-  "datePublished": "2024-09-27"
+  "dateModified": "2024-09-30",
+  "datePublished": "2024-09-30"
 }
 
   </script><script>
diff --git a/instructor/instructor-notes.html b/instructor/instructor-notes.html
index 30b6230539..e79c40d4d6 100644
--- a/instructor/instructor-notes.html
+++ b/instructor/instructor-notes.html
@@ -888,8 +888,8 @@ <h3 class="code-label">BASH<i aria-hidden="true" data-feather="chevron-left"></i
   "url": "https://swcarpentry-ja.github.io/git-novice/instructor/instructor-notes.html",
   "identifier": "https://swcarpentry-ja.github.io/git-novice/instructor/instructor-notes.html",
   "dateCreated": "2014-12-04",
-  "dateModified": "2024-09-27",
-  "datePublished": "2024-09-27"
+  "dateModified": "2024-09-30",
+  "datePublished": "2024-09-30"
 }
 
   </script><script>
diff --git a/instructor/key-points.html b/instructor/key-points.html
index 3bcfd2837c..1f042a63e6 100644
--- a/instructor/key-points.html
+++ b/instructor/key-points.html
@@ -611,8 +611,8 @@ <h2 class="accordion-header" id="flush-headingTwelve">
   "url": "https://swcarpentry-ja.github.io/git-novice/instructor/key-points.html",
   "identifier": "https://swcarpentry-ja.github.io/git-novice/instructor/key-points.html",
   "dateCreated": "2014-12-04",
-  "dateModified": "2024-09-27",
-  "datePublished": "2024-09-27"
+  "dateModified": "2024-09-30",
+  "datePublished": "2024-09-30"
 }
 
   </script><script>
diff --git a/instructor/profiles.html b/instructor/profiles.html
index 8ecf270c14..7bf3c234b0 100644
--- a/instructor/profiles.html
+++ b/instructor/profiles.html
@@ -409,8 +409,8 @@ <h1>学習者プロフィール</h1>
   "url": "https://swcarpentry-ja.github.io/git-novice/instructor/profiles.html",
   "identifier": "https://swcarpentry-ja.github.io/git-novice/instructor/profiles.html",
   "dateCreated": "2014-12-04",
-  "dateModified": "2024-09-27",
-  "datePublished": "2024-09-27"
+  "dateModified": "2024-09-30",
+  "datePublished": "2024-09-30"
 }
 
   </script><script>
diff --git a/instructor/reference.html b/instructor/reference.html
index 58fc40289c..398cf7392c 100644
--- a/instructor/reference.html
+++ b/instructor/reference.html
@@ -551,7 +551,7 @@ <h1>Git Cheatsheets for Quick Reference</h1>
   "identifier": "https://swcarpentry-ja.github.io/git-novice/instructor/reference.html",
   "dateCreated": "2014-12-04",
   "dateModified": "2024-06-06",
-  "datePublished": "2024-09-27"
+  "datePublished": "2024-09-30"
 }
 
   </script><script>
diff --git a/key-points.html b/key-points.html
index 2c1d65dadc..fc1256a6ba 100644
--- a/key-points.html
+++ b/key-points.html
@@ -609,8 +609,8 @@ <h2 class="accordion-header" id="flush-headingTwelve">
   "url": "https://swcarpentry-ja.github.io/git-novice/key-points.html",
   "identifier": "https://swcarpentry-ja.github.io/git-novice/key-points.html",
   "dateCreated": "2014-12-04",
-  "dateModified": "2024-09-27",
-  "datePublished": "2024-09-27"
+  "dateModified": "2024-09-30",
+  "datePublished": "2024-09-30"
 }
 
   </script><script>
diff --git a/md5sum.txt b/md5sum.txt
index 4402a90dee..954a906761 100644
--- a/md5sum.txt
+++ b/md5sum.txt
@@ -1,25 +1,25 @@
 "file" "checksum" "built" "date"
 "CODE_OF_CONDUCT.md" "074f369216dfb004bd1aa5f4d1d5c997" "site/built/CODE_OF_CONDUCT.md" "2024-06-06"
-"LICENSE.md" "6ad34c0cffdde44c1ac62bd88a0bdecb" "site/built/LICENSE.md" "2024-06-06"
+"LICENSE.md" "0b760cd1578cf70fc851c49627a971cc" "site/built/LICENSE.md" "2024-09-30"
 "config.yaml" "c005ce7906e5fa0eaf2025e7ffbdb9df" "site/built/config.yaml" "2024-09-27"
 "index.md" "e8881e5dce9d5ce929aa7697a8c75500" "site/built/index.md" "2024-06-06"
-"episodes/01-basics.md" "0665ca62d0ff675f63ed0845022ba167" "site/built/01-basics.md" "2024-06-06"
+"episodes/01-basics.md" "af6efb4057ae1af2af2f18d03fe0c676" "site/built/01-basics.md" "2024-09-30"
 "episodes/02-setup.md" "a92cb3667b0d5e5f9240eeb5b3ecabb7" "site/built/02-setup.md" "2024-06-06"
-"episodes/03-create.md" "09681c18482b4646736c2dd4ea66f24f" "site/built/03-create.md" "2024-06-06"
-"episodes/04-changes.md" "72c6005b4e2fa3bcf1deb7c75b8436e6" "site/built/04-changes.md" "2024-06-06"
-"episodes/05-history.md" "cf4c063c107785d2617d0624b98d55dd" "site/built/05-history.md" "2024-06-06"
+"episodes/03-create.md" "f86030bfacfdbf99c5b6bad697b01ff5" "site/built/03-create.md" "2024-09-30"
+"episodes/04-changes.md" "d808723f4198142c3900d9082f516c66" "site/built/04-changes.md" "2024-09-30"
+"episodes/05-history.md" "23214da768b27b6302f214c56856c3e4" "site/built/05-history.md" "2024-09-30"
 "episodes/06-ignore.md" "86efd455074d6fc253031edcd8282ee5" "site/built/06-ignore.md" "2024-06-06"
-"episodes/07-github.md" "3f4e40cd04fa61a064cba65e10533572" "site/built/07-github.md" "2024-06-06"
-"episodes/08-collab.md" "99ab7144c3631bb5952a83115e7fae85" "site/built/08-collab.md" "2024-06-06"
-"episodes/09-conflict.md" "a1c4893c9f83ca1a0fa28f1bc89079f4" "site/built/09-conflict.md" "2024-06-06"
+"episodes/07-github.md" "d6b63c328002cb89e5ad928fb0f64394" "site/built/07-github.md" "2024-09-30"
+"episodes/08-collab.md" "0870abe739b020b7fec4fecad73379bf" "site/built/08-collab.md" "2024-09-30"
+"episodes/09-conflict.md" "1cf97cb11ceb1168a5c6c8f54df127e7" "site/built/09-conflict.md" "2024-09-30"
 "episodes/10-open.md" "82c019e04706ed92bf0586d09aa274dc" "site/built/10-open.md" "2024-06-06"
 "episodes/11-licensing.md" "f1ae69063f4103a7a32456e9757d9075" "site/built/11-licensing.md" "2024-06-06"
-"episodes/12-citation.md" "e35e2c6ca35ae866ae252c90ab06127b" "site/built/12-citation.md" "2024-06-06"
-"episodes/13-hosting.md" "47486b207801b83534734ca1d0d68ab2" "site/built/13-hosting.md" "2024-06-06"
-"episodes/14-supplemental-rstudio.md" "8798fd6acfa7244672b1a1b40fa0c74a" "site/built/14-supplemental-rstudio.md" "2024-06-06"
+"episodes/12-citation.md" "927e5f5667ff8495e25eb1bfff9c6a4b" "site/built/12-citation.md" "2024-09-30"
+"episodes/13-hosting.md" "35f215b1b60370c7a635bf83e3217ac3" "site/built/13-hosting.md" "2024-09-30"
+"episodes/14-supplemental-rstudio.md" "aa63c275d464e09505fe2bd4fcb3765e" "site/built/14-supplemental-rstudio.md" "2024-09-30"
 "instructors/instructor-notes.md" "8ecd90d3f042a2944e74d17d5bfc4451" "site/built/instructor-notes.md" "2024-06-06"
 "learners/discuss.md" "ce3d3ad4146c026ef2fbf2697874970c" "site/built/discuss.md" "2024-06-06"
 "learners/reference.md" "3f205209ed4d5580b7efbe7a676f0df2" "site/built/reference.md" "2024-06-06"
-"learners/setup.md" "01dd6525f0ce4b6ad0a5b5670dc730db" "site/built/setup.md" "2024-06-06"
+"learners/setup.md" "de1a17e547234916eedf802418fe7455" "site/built/setup.md" "2024-09-30"
 "profiles/learner-profiles.md" "5fe5bf7537072422b91ed393ada03f9a" "site/built/learner-profiles.md" "2024-06-06"
-"renv/profiles/lesson-requirements/renv.lock" NA "site/built/renv.lock" "2024-09-27"
+"renv/profiles/lesson-requirements/renv.lock" NA "site/built/renv.lock" "2024-09-30"
diff --git a/pkgdown.yml b/pkgdown.yml
index f316132900..f4d19f90b5 100644
--- a/pkgdown.yml
+++ b/pkgdown.yml
@@ -2,4 +2,4 @@ pandoc: 3.1.11
 pkgdown: 2.1.1
 pkgdown_sha: ~
 articles: {}
-last_built: 2024-09-27T09:24Z
+last_built: 2024-09-30T05:01Z
diff --git a/profiles.html b/profiles.html
index 4a9be86f98..d8005fbe81 100644
--- a/profiles.html
+++ b/profiles.html
@@ -409,8 +409,8 @@ <h1>学習者プロフィール</h1>
   "url": "https://swcarpentry-ja.github.io/git-novice/profiles.html",
   "identifier": "https://swcarpentry-ja.github.io/git-novice/profiles.html",
   "dateCreated": "2014-12-04",
-  "dateModified": "2024-09-27",
-  "datePublished": "2024-09-27"
+  "dateModified": "2024-09-30",
+  "datePublished": "2024-09-30"
 }
 
   </script><script>
diff --git a/reference.html b/reference.html
index 2a88675949..d4e68e93f1 100644
--- a/reference.html
+++ b/reference.html
@@ -549,7 +549,7 @@ <h1>Git Cheatsheets for Quick Reference</h1>
   "identifier": "https://swcarpentry-ja.github.io/git-novice/reference.html",
   "dateCreated": "2014-12-04",
   "dateModified": "2024-06-06",
-  "datePublished": "2024-09-27"
+  "datePublished": "2024-09-30"
 }
 
   </script><script>