githubtraining · amyschoen · Jun 30, 2020 · Jun 30, 2020 · Jun 30, 2020
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,7 +1,7 @@
 # Contributing
 
-[fork]: https://github.com/githubtraining/training-manual/fork
-[pr]: https://github.com/githubtraining/training-manual/compare
+[fork]: https://github.com/github/github-training-manual/fork
+[pr]: https://github.com/github/github-training-manual/compare
 [code-of-conduct]: CODE_OF_CONDUCT.md
 
 Hi there! We're thrilled that you'd like to contribute to this project. Your help is essential for keeping it great.

diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ The content is all written in [Markdown](https://guides.github.com/features/mast
 
 ## Technologies used
 
-This manual is served using GitHub Pages and [docsify](https://docsify.js.org), and can be found at [githubtraining.github.io/training-manual](https://githubtraining.github.io/training-manual/#/).
+This manual is served using GitHub Pages and [docsify](https://docsify.js.org), and can be found at [github.github.io/github-training-manual](https://github.github.io/github-training-manual/#/).
 
 ## Goals and scope
 

diff --git a/docs/GH4D/index.html b/docs/GH4D/index.html
@@ -1,10 +1,10 @@
 <html>
 <head>
 <title>Moved</title>
-<meta http-equiv="refresh" content="0; url=https://githubtraining.github.io/training-manual/" />
+<meta http-equiv="refresh" content="0; url=https://github.github.io/github-training-manual/" />
 </head>
 <body>
 <h1>Moved</h1>
-<p>This page has moved to <a href="https://githubtraining.github.io/training-manual/">https://githubtraining.github.io/training-manual/</a>.</p>
+<p>This page has moved to <a href="https://github.github.io/github-training-manual/">https://github.github.io/github-training-manual/</a>.</p>
 </body>
 </html>
diff --git a/docs/GH4DJA/index.html b/docs/GH4DJA/index.html
@@ -1,10 +1,10 @@
 <html>
 <head>
 <title>Moved</title>
-<meta http-equiv="refresh" content="0; url=https://githubtraining.github.io/training-manual/#/ja/" />
+<meta http-equiv="refresh" content="0; url=https://github.github.io/github-training-manual/#/ja/" />
 </head>
 <body>
 <h1>Moved</h1>
-<p>This page has moved to <a href="https://githubtraining.github.io/training-manual/#/ja/">https://githubtraining.github.io/training-manual/#/ja/</a>.</p>
+<p>This page has moved to <a href="https://github.github.io/github-training-manual/#/ja/">https://github.github.io/github-training-manual/#/ja/</a>.</p>
 </body>
 </html>
diff --git a/docs/ja/README.md b/docs/ja/README.md
@@ -1,8 +1,8 @@
 ## 開発者向けのGitHubへようこそ
 
-> 注：本書は更新版のマニュアルであり、新しいカリキュラムにおける学習内容が記載されています。 [旧版のトレーニングマニュアル](https://githubtraining.github.io/training-manual/legacy-manual.pdf)はこちらです。
+> 注：本書は更新版のマニュアルであり、新しいカリキュラムにおける学習内容が記載されています。 [旧版のトレーニングマニュアル](https://github.github.io/github-training-manual/legacy-manual.pdf)はこちらです。
 
-本マニュアルのPDFは、[こちら](https://githubtraining.github.io/training-manual/GH4D.pdf)からダウンロードできます。
+本マニュアルのPDFは、[こちら](https://github.github.io/github-training-manual/GH4D.pdf)からダウンロードできます。
 
 今日は、GitとGitHubの使い方を学習する、エキサイティングな新しいアドベンチャーに取り組みます。
 

diff --git a/docs/ja/app_Day_1_activities.md b/docs/ja/app_Day_1_activities.md
@@ -6,7 +6,7 @@
 
 1. 新しいブランチを作成し、そのブランチにチェックアウトします。`git checkout -b NEWBRANCHNAME（新規ブランチ名）`
 2. `_posts`ディレクトリに新しいファイルを作成する。そのファイル名は、YYYY-MM-DD-username-description.md （年-月-日-ユーザ名-ファイル内容）のようにする。 (日付は、過去の日付でなければならず、将来の日付は表示されません。)
-3. "[Activity: Edit Your File](https://githubtraining.github.io/training-manual/#/ja/06_working_locally)"にある、一緒に作成した同じ実習の指示に従います。
+3. "[Activity: Edit Your File](https://github.github.io/github-training-manual/#/ja/06_working_locally)"にある、一緒に作成した同じ実習の指示に従います。
 4. キャプションをただ追加するのではなく、イメージリストから新しいイメージを見つけ、テンプレートへの入力に使用します。 ``` \--- layout: slide \---
 
  IMAGEURL

diff --git a/script/create-repo b/script/create-repo
@@ -80,7 +80,7 @@ function CloneRepo() {
  ############
  # Clone it #
  ############
- git clone --bare "https://github.com/githubtraining/${TYPE}" "${REPO_NAME}" >> log.out 2>&1
+ git clone --bare "$ROOT_URL/$CLASS_ORG/${TYPE}" "${REPO_NAME}" >> log.out 2>&1
  else
  echo "Cloning from Enterprise Instance"
  ############
@@ -97,7 +97,7 @@ function CloneRepo() {
  # Check the shell for errors #
  ##############################
  if [ $ERROR_CODE -ne 0 ]; then
- echo "!!! Couldn't clone template repo at all. Please grab a copy from https://github.com/githubtraining/${TYPE} and upload it to your GHE instance."
+ echo "!!! Couldn't clone template repo at all. Please grab a copy from $ROOT_URL/$CLASS_ORG/${TYPE} and upload it to your GHE instance."
  exit 1
  fi
  fi

diff --git a/script/reset-game b/script/reset-game
@@ -131,15 +131,15 @@ function DuplicateRepo() {
  #####################
  # Remove local repo #
  #####################
- echo "Clone $REPO_NAME template from githubtraining org..."
+ echo "Clone $REPO_NAME template from $CLASS_ORG org..."
  rm -rf "$REPO_NAME"
 
  ##################
  # Clone the repo #
  ##################
  echo "Trying to clone a template repo from github.com. If you're behind a firewall, this command may time out and we'll try to clone from your instance, instead."
  echo "The timeout may take some time..."
- git clone --bare "https://github.com/githubtraining/$REPO_NAME" "$REPO_NAME" >> log.out 2>&1
+ git clone --bare "$ROOT_URL/$CLASS_ORG/$REPO_NAME" "$REPO_NAME" >> log.out 2>&1
 
  #######################
  # Load the error code #
@@ -165,7 +165,7 @@ function DuplicateRepo() {
  # Check the shell for errors #
  ##############################
  if [ $ERROR_CODE -ne 0 ]; then
- echo "!!! Couldn't clone template repo at all. Please grab a copy from https://github.com/githubtraining/$REPO_NAME and upload it to your GHE instance."
+ echo "!!! Couldn't clone template repo at all. Please grab a copy from $ROOT_URL/$CLASS_ORG/$REPO_NAME and upload it to your GHE instance."
  exit 1
  fi
  fi