diff --git a/downloads/github-git-cheat-sheet.md b/downloads/github-git-cheat-sheet.md index e3c5a2ccb..f8203510b 100644 --- a/downloads/github-git-cheat-sheet.md +++ b/downloads/github-git-cheat-sheet.md @@ -9,11 +9,8 @@ leadingpath: ../../ ## Install Git GitHub provides desktop clients that include a graphical user interface for the most common repository actions and an automatically updating command line edition of Git for advanced scenarios. -### GitHub for Windows -http://windows.github.com - -### GitHub for Mac -http://mac.github.com +### GitHub Desktop +https://desktop.github.com/ Git distributions for Linux and POSIX systems are available on the official Git SCM website. diff --git a/downloads/ja/github-git-cheat-sheet.md b/downloads/ja/github-git-cheat-sheet.md index b2fa5ff5a..9744ccf0f 100644 --- a/downloads/ja/github-git-cheat-sheet.md +++ b/downloads/ja/github-git-cheat-sheet.md @@ -8,11 +8,8 @@ leadingpath: ../../../ ## gitのインストール GitHubは、利用頻度の高いリポジトリへのアクションを可能にするGUI版と、上級向けに自動的にアップデートされるGitのコマンドライン版を含むデスクトップクライアントを提供しています。 -### GitHub for Windows -http://windows.github.com - -### GitHub for Mac -http://mac.github.com +### GitHub Desktop +https://desktop.github.com/ LinuxまたはPOSIXシステムのためのGitディストリビューションは公式のGit SCMウェブサイトから入手できます。 diff --git a/downloads/zh_CN/github-git-cheat-sheet.md b/downloads/zh_CN/github-git-cheat-sheet.md index 3277c7af1..bf6b5c6de 100644 --- a/downloads/zh_CN/github-git-cheat-sheet.md +++ b/downloads/zh_CN/github-git-cheat-sheet.md @@ -9,11 +9,8 @@ leadingpath: ../../../ ## 安装Git GitHub提供了包含图形界面的桌面客户端，通过客户端可以完成大部分常用的仓库操作，同时可以自动更新Git的命令行版本，以适应新的场景。 -### GitHub for Windows -http://windows.github.com - -### GitHub for Mac -http://mac.github.com +### GitHub Desktop +https://desktop.github.com/ GitHub的Linux和POSIX版本可以在官方的Git SCM网站上获取。 diff --git a/foundations/index-simple.md b/foundations/index-simple.md index 34bd0ca3a..9945503a4 100644 --- a/foundations/index-simple.md +++ b/foundations/index-simple.md @@ -64,8 +64,7 @@ Three important concepts of this version control system are: #### Installers The command line version of Git has a very light footprint. For most platforms, you can simply copy the binaries to a folder that is on the executable search $PATH. Git is primarily written in C, which means there is a unique installer for each operating system. -* **Windows**: [GitHub for Windows installer](http://windows.github.com) -* **Mac**: [GitHub for Mac installer](http://mac.github.com) +* **Windows or Mac**: [GitHub Desktop](https://desktop.github.com/) * **Linux**: Git's source code and a listing of supported package managers can be found [on the git-scm.com site](http://git-scm.com/download/linux). * **Any platform**: [Pro Git Book: Installing Git](http://git-scm.com/book/en/Getting-Started-Installing-Git) @@ -388,7 +387,7 @@ A branch is a divergent path in the history of the code base. It may contain an ### Details In many cases, working with a code project means retrieving it to the local disk so that you can leverage your language-specific IDE when making changes. To retrieve a repository to the local disk is to `clone` it, in Git parlance. -Optionally, the process of synchronizing can be done on the command line, in addition to graphical clients like [GitHub for Windows](https://windows.github.com) and [GitHub for Mac](https://mac.github.com): +Optionally, the process of synchronizing can be done on the command line, in addition to graphical clients like [GitHub Desktop](https://desktop.github.com/): ``` # Retrieve GitHub changes diff --git a/foundations/index.md b/foundations/index.md index c79e0caca..2776b8fa8 100644 --- a/foundations/index.md +++ b/foundations/index.md @@ -87,8 +87,7 @@ Three important concepts of this version control system are: #### Installers The command line version of Git has a very light footprint. For most platforms, you can simply copy the binaries to a folder that is on the executable search $PATH. Git is primarily written in C, which means there is a unique installer for each operating system. -* **Windows**: [GitHub for Windows installer](http://windows.github.com) -* **Mac**: [GitHub for Mac installer](http://mac.github.com) +* **Windows or Mac**: [GitHub Desktop](https://desktop.github.com/) * **Linux**: Git's source code and a listing of supported package managers can be found [on the git-scm.com site](http://git-scm.com/download/linux). * **Any platform**: [Pro Git Book: Installing Git](http://git-scm.com/book/en/Getting-Started-Installing-Git) @@ -424,7 +423,7 @@ Publish and synchronize local commit history with a GitHub hosted repository fro ### Details In many cases, working with a code project means retrieving it to the local disk so that you can leverage your language-specific IDE when making changes. To retrieve a repository to the local disk is to `clone` it, in Git parlance. -Optionally, the process of synchronizing can be done on the command line, in addition to graphical clients like [GitHub for Windows](https://windows.github.com) and [GitHub for Mac](https://mac.github.com): +Optionally, the process of synchronizing can be done on the command line, in addition to graphical clients like [GitHub Desktop](https://desktop.github.com/): ``` # Retrieve GitHub changes diff --git a/glossary/ja.yml b/glossary/ja.yml index 75c7d28cf..9078d2514 100644 --- a/glossary/ja.yml +++ b/glossary/ja.yml @@ -6,8 +6,7 @@ ja: file: "ファイル" git: "git" GitHub: "GitHub" - GitHub_for_Mac: "GitHub for Mac" - GitHub_for_Windows: "GitHub for Windows" + GitHub_Desktop: "GitHub Desktop" install: "インストール" local: "ローカル" open_source: "オープンソース" diff --git a/intermediate/index.md b/intermediate/index.md index cc3ceb63c..a79618028 100644 --- a/intermediate/index.md +++ b/intermediate/index.md @@ -91,7 +91,7 @@ $ git config --global user.email someaccount@example.com ``` -If using the GitHub for Windows or GitHub for Mac GUIs, these values are set, system-wide, by each GUI's configuration dialog. +If using GitHub Desktop, these values are set, system-wide, by the configuration dialog. To set the same values to apply to *any* of your repositories: