Merge branch 'client-to-desktop' into 10-0-0-update

Author: vicenter-gitkraken

README.md

@@ -1,2 +1,2 @@
 # gitkraken-client-docs
-Documentation for the GitKraken Client. To view the documentation live, go to the [GitKraken Help Center](https://help.gitkraken.com/gitkraken-client/gitkraken-client-home/).
+Documentation for the GitKraken Desktop. To view the documentation live, go to the [GitKraken Help Center](https://help.gitkraken.com/gitkraken-client/gitkraken-client-home/).

gitkraken-client/activity-logs.md

@@ -1,23 +1,23 @@
 ---
 
 title: Activity Logs 
-description: Learn where to find feedback Activity Logs in GitKraken Client.
+description: Learn where to find feedback Activity Logs in GitKraken Desktop.
 taxonomy:
     category: gitkraken-client
 
 ---
 
-Learn how to view all Git actions made to repositories and all application actions made in GitKraken Client through Activity Logs.
+Learn how to view all Git actions made to repositories and all application actions made in GitKraken Desktop through Activity Logs.
 
 ***
 
 ## Activity Logs 
 
 Looking to increase your project scope?
 
-Pop open the hood of your project and check out the <kbd>Activity Logs</kbd> located in the footer toolbar of GitKraken Client.
+Pop open the hood of your project and check out the <kbd>Activity Logs</kbd> located in the footer toolbar of GitKraken Desktop.
 
-<kbd>Activity Logs</kbd> provide real time feedback of application and repository-level interactions that occurred in GitKraken Client.
+<kbd>Activity Logs</kbd> provide real time feedback of application and repository-level interactions that occurred in GitKraken Desktop.
 
 <img src='/wp-content/uploads/activity.gif' class='img-bordered img-responsive center'>
 
@@ -29,7 +29,7 @@ Pop open the hood of your project and check out the <kbd>Activity Logs</kbd> loc
 
 ### Application Log
 
-The *Applications* tab in <kbd>Activity Logs</kbd> contains messages about actions made in GitKraken Client application. Discover events from your GitKraken Client instance such as: project creation, clearing SSH, setting global gitconfig, etc.
+The *Applications* tab in <kbd>Activity Logs</kbd> contains messages about actions made in GitKraken Desktop application. Discover events from your GitKraken Desktop instance such as: project creation, clearing SSH, setting global gitconfig, etc.
 
 <img src='/wp-content/uploads/app-level.png' srcset='/wp-content/uploads/[email protected]' class='img-bordered img-responsive center'>
 

gitkraken-client/adding-and-removing.md

@@ -1,17 +1,17 @@
 ---
 
 title: Adding and Removing
-description: Learn how to add and remove files in GitKraken Client.
+description: Learn how to add and remove files in GitKraken Desktop.
 taxonomy:
     category: gitkraken-client
 
 ---
-Learn how to add and remove files in GitKraken Client.
+Learn how to add and remove files in GitKraken Desktop.
 ***
 
 ## Adding a file
 
-Add a file to GitKraken Client using the Command Palette.
+Add a file to GitKraken Desktop using the Command Palette.
 
 To initiate the Command Palette, hit <kbd>Ctrl</kbd>/<kbd>Cmd</kbd> + <kbd>P</kbd>, type `Create File`, and hit <kbd>Enter</kbd>.
 

gitkraken-client/authentication.md

@@ -1,13 +1,13 @@
 ---
 
 title: Other Integrations
-description: Learn how to authenticate with GitKraken Client to manage your SSH keys for repositories and integrations.  Create a SSH key pair or bring your own!
+description: Learn how to authenticate with GitKraken Desktop to manage your SSH keys for repositories and integrations.  Create a SSH key pair or bring your own!
 taxonomy:
     category: gitkraken-client
 
 ---
 
-GitKraken Client can connect to repositories hosted on most services (like TFS, AWS CodeCommit, [Google Cloud Source Repositories](/integrations/authentication/#google-cloud-source-repositories), custom service, etc), over HTTPS or SSH.
+GitKraken Desktop can connect to repositories hosted on most services (like TFS, AWS CodeCommit, [Google Cloud Source Repositories](/integrations/authentication/#google-cloud-source-repositories), custom service, etc), over HTTPS or SSH.
 
 <div class='embed-container embed-container--16-9'>
     <iframe width="560" height="315" src="https://www.youtube.com/embed/OA9o09Bq5M8?ecver=1" frameborder="0" allowfullscreen></iframe>
@@ -24,7 +24,7 @@ To clone a remote repository over HTTPS, first navigate to your hosting service
 
 
 
-Then go to GitKraken Client and clone the project through <kbd><strong>File > Clone Repo</strong></kbd>.
+Then go to GitKraken Desktop and clone the project through <kbd><strong>File > Clone Repo</strong></kbd>.
 
 <img src='/wp-content/uploads/clone.png' srcset='/wp-content/uploads/[email protected] 2x' class='img-bordered img-responsive center'>
 
@@ -39,21 +39,21 @@ By default when cloning a repo using HTTPS, your remote tracking at `origin` wil
     <iframe width="560" height="315" src="https://www.youtube.com/embed/z7jVOenqFYk?ecver=1" frameborder="0" allowfullscreen></iframe>
 </div>
 
-Before you can clone a repo over SSH, you must first set up your SSH keys in GitKraken Client.
+Before you can clone a repo over SSH, you must first set up your SSH keys in GitKraken Desktop.
 
 Navigate to <kbd><strong>Preferences > SSH</strong></kbd>.
 
 <img src="/wp-content/uploads/authentication.png" srcset="/wp-content/uploads/[email protected]" class="img-bordered img-responsive center">
 
-Here you may choose an SSH key pair by browsing your file system, or let GitKraken Client generate a key for you (recommended). Make sure that you copy your public SSH key and paste it into your remote hosting service!
+Here you may choose an SSH key pair by browsing your file system, or let GitKraken Desktop generate a key for you (recommended). Make sure that you copy your public SSH key and paste it into your remote hosting service!
 
 Once your keys are set up, you are ready to clone.
 
 ### Clone over SSH
 
 To clone a remote repository over SSH, first navigate to your hosting service and copy the SSH link.
 
-Then go to GitKraken Client and clone the project through <em class='context-menu'>File <i class="fa fa-caret-right"></i> Clone</em>.
+Then go to GitKraken Desktop and clone the project through <em class='context-menu'>File <i class="fa fa-caret-right"></i> Clone</em>.
 
 <img src='/wp-content/uploads/clone.png' srcset='/wp-content/uploads/[email protected] 2x' class='img-bordered img-responsive center'>
 
@@ -110,13 +110,13 @@ This way, provided your keys are loaded, every action requiring a chat with your
 ### I'm having an SSH issue.
 Well if it's not working 100% of the time, the most common issues are:
 
-* SSH-agent on Windows &mdash; GitKraken Client currently only supports Pageant for the SSH agent for Windows.
+* SSH-agent on Windows &mdash; GitKraken Desktop currently only supports Pageant for the SSH agent for Windows.
  * You can download PuTTY and Pageant from their page <a href='http://www.chiark.greenend.org.uk/~sgtatham/putty/download.html' target='_blank'>here</a>.
 * Misconfigured SSH settings &mdash; remote URL format
  * Check in <kbd><strong>Preferences > SSH</strong></kbd> to confirm that your SSH settings are correct.
  * Edit remotes in the left ref panel to ensure push and pull urls are set and in the correct format
-* Expected use of SSH config &mdash; GitKraken Client does not currently respect your SSH config and cannot make use of any remote server nicknames or identities.
- * You can either load your SSH key directly into GitKraken Client or use your system&rsquo;s SSH agent to authenticate with your remote.
+* Expected use of SSH config &mdash; GitKraken Desktop does not currently respect your SSH config and cannot make use of any remote server nicknames or identities.
+ * You can either load your SSH key directly into GitKraken Desktop or use your system&rsquo;s SSH agent to authenticate with your remote.
 
 
 ***
@@ -132,18 +132,18 @@ Use this if you need the app to prompt for username or password for remote actio
 
 ## Proxy configuration
 
-GitKraken Client supports proxies for Windows, OSX, and Linux. GitKraken Client should recognize your proxy settings by default, however please review the additional instructions below if you are using an authenticated proxy such as <em>basic</em>, <em>NTLM</em>, <em>Negotiate</em>, or <em>Digest</em>.
+GitKraken Desktop supports proxies for Windows, OSX, and Linux. GitKraken Desktop should recognize your proxy settings by default, however please review the additional instructions below if you are using an authenticated proxy such as <em>basic</em>, <em>NTLM</em>, <em>Negotiate</em>, or <em>Digest</em>.
 
 ### Windows
 
-For Windows users, your Windows machine will prompt for your proxy credentials on GitKraken’s behalf. Enter the credentials to complete the proxy configuration with GitKraken Client.
+For Windows users, your Windows machine will prompt for your proxy credentials on GitKraken’s behalf. Enter the credentials to complete the proxy configuration with GitKraken Desktop.
 
 ### OSX
 
-If you’re using an authenticated proxy on OSX, GitKraken will directly ask for the proxy credentials. Enter the credentials to complete the proxy configuration with GitKraken Client.
+If you’re using an authenticated proxy on OSX, GitKraken will directly ask for the proxy credentials. Enter the credentials to complete the proxy configuration with GitKraken Desktop.
 
 ### Linux
-If you are using an authenticated proxy on Linux, GitKraken Client will directly ask for the proxy credentials. Additionally, you will need to run GitKraken Client with the command line flag:
+If you are using an authenticated proxy on Linux, GitKraken Desktop will directly ask for the proxy credentials. Additionally, you will need to run GitKraken Desktop with the command line flag:
 
     --proxy-server=10.200.0.1:8080
 
@@ -152,7 +152,7 @@ where <code>10.200.0.1</code> and <code>8080</code> are the proxy IP and proxy p
 
 ## Google Cloud Source Repositories
 
-Due to the non-standard way Google Source Cloud Repositories use HTTPS and SSH URLs, GitKraken Client will have trouble parsing the URLs. The SSH URL is normally formatted in this manner:
+Due to the non-standard way Google Source Cloud Repositories use HTTPS and SSH URLs, GitKraken Desktop will have trouble parsing the URLs. The SSH URL is normally formatted in this manner:
 
     ssh://[email protected]@source.developers.google.com:2021/p/test-project-12345/r/Test-Repo-1
 

gitkraken-client/bitbucket-server.md

@@ -1,13 +1,13 @@
 ---
 
 title: Bitbucket Server Integration
-description: Integrate GitKraken Client with your Bitbucket Server repository by following these steps.
+description: Integrate GitKraken Desktop with your Bitbucket Server repository by following these steps.
 taxonomy:
     category: gitkraken-client
 
 ---
 
-GitKraken Client allows you to authenticate with Bitbucket Server, which will help you find repos on Bitbucket Server when cloning or adding your remotes.
+GitKraken Desktop allows you to authenticate with Bitbucket Server, which will help you find repos on Bitbucket Server when cloning or adding your remotes.
 
 **Benefits**
 
@@ -23,7 +23,7 @@ GitKraken Client allows you to authenticate with Bitbucket Server, which will he
 ## Connecting to Bitbucket Server
 
 <div class='callout callout'>
-    <p>Note 📝 - GitKraken Client supports any version of Bitbucket Server released within one year.</p>
+    <p>Note 📝 - GitKraken Desktop supports any version of Bitbucket Server released within one year.</p>
 </div>
 
 To authenticate with Bitbucket Server, navigate to the upper right corner to access <kbd><i> <i class="fas fa-cog"></i> Preferences    <i class='fa fa-caret-right'></i>     Integrations</i></kbd>
@@ -42,17 +42,17 @@ This opens a web browser where you will log in with your Bitbucket Server creden
 
 <img src='/wp-content/uploads/BitbucketServerPAT.png' class="img-responsive center img-bordered">
 
-Copy the token and paste it into GitKraken Client, then click the <button class='button button--success button--ui button--nolink'>Connect</span></button> button.
+Copy the token and paste it into GitKraken Desktop, then click the <button class='button button--success button--ui button--nolink'>Connect</span></button> button.
 
 <img src="/wp-content/uploads/bitbucket-server-connected.png" srcset="/wp-content/uploads/[email protected] 2x" class="img-responsive center img-bordered">
 
 ***
 ## Generating SSH keys for Bitbucket Server.
 <div class='callout callout'>
-    <p>Note 📝 - GitKraken Client uses your SSH key defined in <kbd><i>Preferences  <i class='fa fa-caret-right'></i>  SSH</i></kbd> for git operations unless you set up a BitBucket-specific SSH key, or enable your local SSH Agent.</p>
+    <p>Note 📝 - GitKraken Desktop uses your SSH key defined in <kbd><i>Preferences  <i class='fa fa-caret-right'></i>  SSH</i></kbd> for git operations unless you set up a BitBucket-specific SSH key, or enable your local SSH Agent.</p>
 </div>
 
-Once your Bitbucket Server account has been connected to your GitKraken Client, you may then generate an SSH key and add it to your Bitbucket Server account from <em class='context-menu'>Preferences     <i class='fa fa-caret-right'></i>    Integrations</em>
+Once your Bitbucket Server account has been connected to your GitKraken Desktop, you may then generate an SSH key and add it to your Bitbucket Server account from <em class='context-menu'>Preferences     <i class='fa fa-caret-right'></i>    Integrations</em>
 
 Click <button class='button button--success button--ui button--nolink'>Generate SSH key and copy to clipboard</span></button> and follow the toast prompt to add the key to your Bitbucket Server account. If you miss the toast pop-up or need to copy the public key later, you can use the link as well.
 
@@ -74,7 +74,7 @@ First, you may search through your existing repositories when cloning:
 
 <img src="/wp-content/uploads/bitbucket-server-clone-menu.png" srcset="/wp-content/uploads/[email protected] 2x" class="img-responsive center img-bordered">
 
-Next, GitKraken Client presents a list of forks of the current repository when adding remotes:
+Next, GitKraken Desktop presents a list of forks of the current repository when adding remotes:
 
 <img src="/wp-content/uploads/bitbucket-server-add-remote.png" class="img-responsive center img-bordered">
 

gitkraken-client/bitbucket.md

@@ -1,13 +1,13 @@
 ---
 
-title: GitKraken Client Bitbucket Integration
+title: GitKraken Desktop Bitbucket Integration
 description: Integrate GitKraken with your Bitbucket repository by following these steps.
 taxonomy:
     category: gitkraken-client
 
 ---
 
-GitKraken Client allows you to authenticate with Bitbucket, which will help you find repos on Bitbucket when cloning or adding your remotes.
+GitKraken Desktop allows you to authenticate with Bitbucket, which will help you find repos on Bitbucket when cloning or adding your remotes.
 
 **Benefits**
 
@@ -51,7 +51,7 @@ Alternativley, you can connect the integration by copy and pasting the OAuth tok
 ***
 ## Generating SSH keys for Bitbucket.
 <div class='callout callout'>
-    <p>Note 📝 - GitKraken Client uses your SSH key defined in <kbd><i>Preferences  <i class='fa fa-caret-right'></i>  SSH</i></kbd> for git operations unless you set up a BitBucket-specific SSH key, or enable your local SSH Agent.</p>
+    <p>Note 📝 - GitKraken Desktop uses your SSH key defined in <kbd><i>Preferences  <i class='fa fa-caret-right'></i>  SSH</i></kbd> for git operations unless you set up a BitBucket-specific SSH key, or enable your local SSH Agent.</p>
 </div>
 
 Once your Bitbucket account has been connected to GitKraken, you may then generate an SSH key and add it to your Bitbucket account from <kbd><i>Preferences    <i class='fa fa-caret-right'></i>    Integrations</i></kbd>
@@ -68,7 +68,7 @@ First, you may search through your existing repositories when cloning:
 
 <img src="/wp-content/uploads//clone.png" srcset="/wp-content/uploads//[email protected]" class="img-bordered img-responsive center">
 
-Next, GitKraken Client presents a list of forks of the current repository when adding remotes:
+Next, GitKraken Desktop presents a list of forks of the current repository when adding remotes:
 
 <img src="/wp-content/uploads//remote.png" srcset="/wp-content/uploads//[email protected]" class="img-bordered img-responsive center">
 

gitkraken-client/boards.md

@@ -1,7 +1,7 @@
 ---
 
 title: GitKraken Boards
-description: Integrate GitKraken Client with your GitKraken Boards for easy task tracking.
+description: Integrate GitKraken Desktop with your GitKraken Boards for easy task tracking.
 taxonomy:
     category: gitkraken-client
 

gitkraken-client/branching-and-merging.md

@@ -1,13 +1,13 @@
 ---
 
 title: Branching and Merging
-description: Learn about branching and merging in GitKraken Client.
+description: Learn about branching and merging in GitKraken Desktop.
 taxonomy:
     category: gitkraken-client
 
 ---
 
-Learn how to branch and merge in GitKraken Client. 🌳 🔀
+Learn how to branch and merge in GitKraken Desktop. 🌳 🔀
 
 <div class='embed-container embed-container--16-9'>
     <iframe width='560' height='315' src='https://www.youtube.com/embed/8-qRKyy-v7I?rel=0&vq=hd1080' frameborder='0' allowfullscreen></iframe>
@@ -29,7 +29,7 @@ Branch checkout updates files in the working directory to reflect the version de
 
 New commits are added to the checked out branch. If you find yourself on the wrong branch, <a href="/gitkraken-client/stashing">stash</a> your changes, switch to the correct branch, and then *pop* the stash.
 
-When you create a new branch, GitKraken Client will automatically checkout the branch for you:
+When you create a new branch, GitKraken Desktop will automatically checkout the branch for you:
 
 <figure class='figure center'>
     <img src='/wp-content/uploads/Add-branch.gif'>
@@ -75,9 +75,9 @@ Drag and drop one branch onto another to initiate a merge, or just right click t
 
 Merge conflicts may happen when team members make different changes to the same line of the same file, or when one team member edits a file and another deletes the same file. Oops!
 
-When collaboration goes wrong, GitKraken Client Merge Conflict Editor is here to clear the murky waters.
+When collaboration goes wrong, GitKraken Desktop Merge Conflict Editor is here to clear the murky waters.
 
-If your merge attempt triggers a merge conflict, GitKraken Client display the conflicting files in the Commit Panel.
+If your merge attempt triggers a merge conflict, GitKraken Desktop display the conflicting files in the Commit Panel.
 
 <img src="/wp-content/uploads/merge-conflict.png" srcset="/wp-content/uploads/[email protected]" class="img-bordered img-responsive center">
 
@@ -115,11 +115,11 @@ After the conflict is resolved, save the output and commit the changes.
 
 
 ### External merge tools
-Configure GitKraken Client to launch your tool of choice by navigating to <em class='context-menu'>Preferences <i class='fa fa-caret-right'></i> General</em>:
+Configure GitKraken Desktop to launch your tool of choice by navigating to <em class='context-menu'>Preferences <i class='fa fa-caret-right'></i> General</em>:
 
 <img src="/wp-content/uploads/configureExternalTool.png" srcset="/wp-content/uploads/[email protected]" class="img-bordered img-responsive center">
 
-GitKraken Client currently supports the following merge tools:
+GitKraken Desktop currently supports the following merge tools:
 
 * Beyond Compare
 * FileMerge
@@ -132,14 +132,14 @@ If your merge tool from the list above is installed and is not showing up in the
 
 <img src='/wp-content/uploads/beyond-compare.png' srcset='/wp-content/uploads/[email protected]' class='img-bordered img-responsive center' />
 
-GitKraken Client does _not support_ the following merge tools:
+GitKraken Desktop does _not support_ the following merge tools:
 
 * Meld
 * SemanticMerge
 * TortoiseMerge
 * WinMerge
 
-While GitKraken Client allows Git Config Default merge tools, not all tools will be compatible. Find more information about configuring a <a href="https://git-scm.com/book/en/v2/Customizing-Git-Git-Configuration#_external_merge_tools">default merge tool in your Git Config</a>.
+While GitKraken Desktop allows Git Config Default merge tools, not all tools will be compatible. Find more information about configuring a <a href="https://git-scm.com/book/en/v2/Customizing-Git-Git-Configuration#_external_merge_tools">default merge tool in your Git Config</a>.
 
 ### Resolving a conflicted file using current or incoming