Skip to content

Commit

Permalink
Merge pull request jlord#231 from jhiner/master
Browse files Browse the repository at this point in the history
Fixed typos in the branch challenge and readme
  • Loading branch information
Jessica Lord authored Aug 10, 2016
2 parents f532bd7 + b2136d6 commit 19b3946
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ Hi, there! This is the repository for the original Git-it, the version that runs

| :computer: | README |
| --- | --- |
| ![ss](https://raw.githubusercontent.com/jlord/git-it/master/git-it-ss.png) | The original `readme` is now avilable as [original-readme.md](original-readme.md). |
| ![ss](https://raw.githubusercontent.com/jlord/git-it/master/git-it-ss.png) | The original `readme` is now available as [original-readme.md](original-readme.md). |
2 changes: 1 addition & 1 deletion guide/challenges-zhtw/branches_arent_just_for_birds.html
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ <h2>&#x6B65;&#x9A5F;&#xFF1A;&#x65B0;&#x589E;&#x6A94;&#x6848;</h2>
<ul>
<li>&#x65B0;&#x589E;&#x4E00;&#x500B;&#x6A94;&#x6848;&#x4E26;&#x547D;&#x540D;&#x70BA; <span style="white-space: nowrap;">&#x300C;add-&lt;USERNAME&gt;.txt&#x300D;</span>&#xFF0C;&#x8ACB;&#x7528;&#x4F60;&#x7684;&#x5E33;&#x865F;&#x540D;&#x7A31;&#x66FF;&#x63DB; &apos;username&apos;&#xFF0C;&#x50CF;&#x9019;&#x6A23;&#xFF0C;&#x300C;add-jlord.txt&#x300D;&#x3002;</li>
<li>&#x5728;&#x6A94;&#x6848;&#x88E1;&#x5BEB;&#x4E0B;&#x4F60;&#x7684; GitHub &#x5E33;&#x865F;&#x540D;&#x7A31;&#x3002;&#x4F8B;&#x5982;&#xFF0C;&#x6211;&#x5C31;&#x6703;&#x5BEB; &apos;jlord&apos;&#x3002;</li>
<li>&#x5C07;&#x6A94;&#x6848;&#x5B58;&#x5230;&#x5728; Patchwork &#x88E1;&#x7684; &apos;contributors&apos; &#x8CC7;&#x6599;&#x593E;&#xFF1A; <strong>Patchwork/contributors/add-yourusername.txt</strong></li>
<li>&#x5C07;&#x6A94;&#x6848;&#x5B58;&#x5230;&#x5728; patchwork &#x88E1;&#x7684; &apos;contributors&apos; &#x8CC7;&#x6599;&#x593E;&#xFF1A; <strong>patchwork/contributors/add-yourusername.txt</strong></li>
<li>&#x63A5;&#x8457;&#xFF0C;&#x628A;&#x4F60;&#x7684;&#x4FEE;&#x6539;&#x8A18;&#x9304;&#x4E0B;&#x4F86;&#xFF01;</li>
</ul>

Expand Down
2 changes: 1 addition & 1 deletion guide/challenges/branches_arent_just_for_birds.html
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ <h2>Step: Create a new file</h2>
<li>Then, just write your
GitHub username in it, that's it and that's all. For instance,
I'd type 'jlord'.</li>
<li>Save this file in the 'contributors' folder in Patchwork: <strong>Patchwork/contributors/add-yourusername.txt</strong></li>
<li>Save this file in the 'contributors' folder in patchwork: <strong>patchwork/contributors/add-yourusername.txt</strong></li>
<li>Next, check in your changes!</li>
</ul>

Expand Down
4 changes: 2 additions & 2 deletions guide/raw-content-zhtw/7_branches_arent_just_for_birds.html
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ <h2>步驟:新增檔案</h2>
<ul>
<li>新增一個檔案並命名為 <span style="white-space: nowrap;">「add-&#60;USERNAME&#62;.txt」</span>,請用你的帳號名稱替換 'username',像這樣,「add-jlord.txt」。</li>
<li>在檔案裡寫下你的 GitHub 帳號名稱。例如,我就會寫 'jlord'。</li>
<li>將檔案存到在 Patchwork 裡的 'contributors' 資料夾: <strong>Patchwork/contributors/add-yourusername.txt</strong></li>
<li>將檔案存到在 patchwork 裡的 'contributors' 資料夾: <strong>patchwork/contributors/add-yourusername.txt</strong></li>
<li>接著,把你的修改記錄下來!</li>
</ul>

Expand All @@ -61,7 +61,7 @@ <h3>前往下一個關卡</h3><code>git-it</code>
<h2><code>git-it verify</code> 的時候沒有通過?</h2>

<h4>File NOT in contributors folder</h4>
<p>剛才新增的檔案應該要放到 Patchwork <n>repository</n> 的 'contributors'
<p>剛才新增的檔案應該要放到 patchwork <n>repository</n> 的 'contributors'
資料夾裡。如果不小心放到別的地方,請打開 Finder 或是 Windows 的檔案總管將該檔案移到
'contributors' 資料夾,然後可以用 <code>git status</code> 看你剛才移動檔案之後所造成的結果。用以下的指令 <v>Stage</v> 並且 <v>commit</v> 全部的修改(加上 -A,會將新增檔案跟刪除檔案的動作一起記錄下來):</p>
<p><code>$ git add -A</code></p>
Expand Down
2 changes: 1 addition & 1 deletion guide/raw-content/7_branches_arent_just_for_birds.html
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ <h2>Step: Create a new file</h2>
<li>Then, just write your
GitHub username in it, that's it and that's all. For instance,
I'd type 'jlord'.</li>
<li>Save this file in the 'contributors' folder in Patchwork: <strong>Patchwork/contributors/add-yourusername.txt</strong></li>
<li>Save this file in the 'contributors' folder in patchwork: <strong>patchwork/contributors/add-yourusername.txt</strong></li>
<li>Next, check in your changes!</li>
</ul>

Expand Down

0 comments on commit 19b3946

Please sign in to comment.