Skip to content

Commit

Permalink
Merge pull request #113 from lbragaglia/fix-reserved-chars
Browse files Browse the repository at this point in the history
Fix html reserved chars and other minor typos
  • Loading branch information
Jessica Lord committed Mar 15, 2016
2 parents 249ad09 + ee60cae commit 7ed9c51
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion challenge-content-ja/7_branches_arent_just_for_birds.html
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ <h4>ファイルがcontributorsの中にない</h4>

<h4>Branch name expected: _____</h4>
<p>ブランチ名はあなたのユーザー名と完全に一致していないといけません。ブランチ名を変更するには:</p>
<p><code>$ git branch -M &#60;NEWBRANCHNAME&#62;</code></p>
<p><code>$ git branch -m &#60;NEWBRANCHNAME&#62;</code></p>
<p>うまくできたら、もう一回 verify してみましょう!</p>
</div>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ <h4>File NOT in contributors folder</h4>

<h4><n>Branch</n> name expected: _____</h4>
<p><n>Branch</n> 的名字應該要跟你的帳號名稱一模一樣。用以下的指令修改 <n>branch</n> 的名字:</p>
<p><code class="shell">git branch -M &#60;NEWBRANCHNAME&#62;</code></p>
<p><code class="shell">git branch -m &#60;NEWBRANCHNAME&#62;</code></p>
<p>完成以上的動作之後,再執行一次 <code>git-it verify</code></p>
</div>

Expand Down
2 changes: 1 addition & 1 deletion challenge-content/7_branches_arent_just_for_birds.html
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ <h4>File NOT in contributors folder</h4>

<h4>Branch name expected: _____</h4>
<p>The branch name should match your user name exactly. To change your branch name:</p>
<p><code class="shell">git branch -M &#60;NEWBRANCHNAME&#62;</code></p>
<p><code class="shell">git branch -m &#60;NEWBRANCHNAME&#62;</code></p>
<p>When you've made your updates, verify again!</p>
</div>

Expand Down
2 changes: 1 addition & 1 deletion challenges/branches_arent_just_for_birds.html
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ <h4>File NOT in contributors folder</h4>

<h4>Branch name expected: _____</h4>
<p>The branch name should match your user name exactly. To change your branch name:</p>
<p><code class="shell">git branch -M &#60;NEWBRANCHNAME&#62;</code></p>
<p><code class="shell">git branch -m &#60;NEWBRANCHNAME&#62;</code></p>
<p>When you've made your updates, verify again!</p>
</div>

Expand Down
8 changes: 4 additions & 4 deletions pages-content/dictionary.html
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ <h2>Git Remotes</h2>
<li><strong>Add remote connections</strong></li>
<code class="shell">git remote add &#60;REMOTENAME&#62; &#60;URL&#62;</code>
<li><strong>Set a URL to a remote</strong></li>
<code class="shell">git remote set-url &#60;REMOTENAME&#62; <URL></code>
<code class="shell">git remote set-url &#60;REMOTENAME&#62; &#60;URL&#62;</code>
<li><strong>View remote connections</strong></li>
<code class="shell">git remote -v</code>
</ul>
Expand All @@ -79,9 +79,9 @@ <h2>Pulling in Git</h2>
<div class="blue-border-box">
<ul class="no-list-style">
<li><strong>Pull in changes</strong></li>
<code class="shell">git pull &#60;REMOTENAME&#62; &#60;BRANCHNAME&#62;</code>
<code class="shell">git pull</code>
<li><strong>Pull in changes from a remote branch</strong></li>
<code class="shell">git pull <REMOTENAME> <REMOTEBRANCH></code>
<code class="shell">git pull &#60;REMOTENAME&#62; &#60;REMOTEBRANCH&#62;</code>
<li><strong>See changes to the remote before you pull in</strong></li>
<code class="shell">git fetch --dry-run</code>
</ul>
Expand All @@ -91,7 +91,7 @@ <h2>Push &#38; Merge in Git</h2>
<div class="blue-border-box">
<ul class="no-list-style">
<li><strong>Push changes</strong></li>
<code class="shell">git push &#60;REMOTENAME&#62; <BRANCH></code>
<code class="shell">git push &#60;REMOTENAME&#62; &#60;BRANCHNAME&#62;</code>
<li><strong>Merge a branch into current branch</strong></li>
<code class="shell">git merge &#60;BRANCHNAME&#62;</code>
</ul>
Expand Down
8 changes: 4 additions & 4 deletions pages/dictionary.html
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ <h2>Git Remotes</h2>
<li><strong>Add remote connections</strong></li>
<code class="shell">git remote add &#60;REMOTENAME&#62; &#60;URL&#62;</code>
<li><strong>Set a URL to a remote</strong></li>
<code class="shell">git remote set-url &#60;REMOTENAME&#62; <URL></code>
<code class="shell">git remote set-url &#60;REMOTENAME&#62; &#60;URL&#62;</code>
<li><strong>View remote connections</strong></li>
<code class="shell">git remote -v</code>
</ul>
Expand All @@ -118,9 +118,9 @@ <h2>Pulling in Git</h2>
<div class="blue-border-box">
<ul class="no-list-style">
<li><strong>Pull in changes</strong></li>
<code class="shell">git pull &#60;REMOTENAME&#62; &#60;BRANCHNAME&#62;</code>
<code class="shell">git pull</code>
<li><strong>Pull in changes from a remote branch</strong></li>
<code class="shell">git pull <REMOTENAME> <REMOTEBRANCH></code>
<code class="shell">git pull &#60;REMOTENAME&#62; &#60;REMOTEBRANCH&#62;</code>
<li><strong>See changes to the remote before you pull in</strong></li>
<code class="shell">git fetch --dry-run</code>
</ul>
Expand All @@ -130,7 +130,7 @@ <h2>Push &#38; Merge in Git</h2>
<div class="blue-border-box">
<ul class="no-list-style">
<li><strong>Push changes</strong></li>
<code class="shell">git push &#60;REMOTENAME&#62; <BRANCH></code>
<code class="shell">git push &#60;REMOTENAME&#62; &#60;BRANCHNAME&#62;</code>
<li><strong>Merge a branch into current branch</strong></li>
<code class="shell">git merge &#60;BRANCHNAME&#62;</code>
</ul>
Expand Down

0 comments on commit 7ed9c51

Please sign in to comment.