Skip to content

Commit 4bcd25b

Browse files
authored
Merge pull request #211 from jkelroy/feedback
Fixes typos
2 parents 53ceba0 + a8ffde5 commit 4bcd25b

File tree

8 files changed

+14
-14
lines changed

8 files changed

+14
-14
lines changed

gitkraken-client/commit-signing-with-gpg.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -144,11 +144,10 @@ There will be several prompts to make sure that you *really* want to delete your
144144

145145
###Commit Signing with SSH
146146

147-
Commit Signing with SSH is available in Gitkraken Client through Git Executable feature.
147+
Commit Signing with SSH is available in GitKraken Client through Git Executable feature.
148148

149149
<img src="/wp-content/uploads/gkc-gpg-ssh-preferences.png" class="img-bordered img-responsive center">
150150

151-
152151
####Requirements
153152

154153
- MacOS and Linux: Git and OpenSSH should be pre-installed. To check if are installed, open a terminal and run
@@ -164,7 +163,6 @@ Open a Terminal and run this command:
164163

165164
<img src="/wp-content/uploads/gkc-ssh-keygen.png" srcset="/wp-content/uploads/[email protected] 2x" class="img-bordered img-responsive center">
166165

167-
168166
####Enable Git Executable feature
169167

170168
Go to <kbd>Preferences > Experimental > Git Executable</kbd> and enable it.
@@ -177,7 +175,7 @@ Go to <kbd>Preferences > Experimental > Git Executable</kbd> and enable it.
177175

178176
At <kbd>Preferences > GPG > GPG Format</kbd>, select <kbd>SSH</kbd>.
179177

180-
Automatically Gitkraken client will change your preferences in `.gitconfig` and populate GPG SSH Program with ssh-keygen.
178+
Automatically GitKraken Client will change your preferences in `.gitconfig` and populate GPG SSH Program with ssh-keygen.
181179

182180
####Select the signing key
183181

@@ -186,18 +184,20 @@ Automatically Gitkraken client will change your preferences in `.gitconfig` and
186184
On <kbd>Signing key</kbd>, click on <kbd>Browse</kbd> and select the `.pub` key file previously generated.
187185

188186
####Create allowed_signers file
187+
189188
This file is needed to verify the key used to sign the commits is valid and known by git.
189+
190190
[See this documentation to create the allowed_signers file](https://git-scm.com/docs/git-config#Documentation/git-config.txt-gpgsshallowedSignersFile)
191191

192192
On your terminal, run:
193193
```
194194
touch ~/.ssh/allowed_signers
195195
echo "$(git config --get user.email) namespaces=\"git\" $(cat ~/.ssh/<MY_KEY>.pub)" >> ~/.ssh/allowed_signers
196-
197196
```
198-
And select the file in Gitkraken client.
199197

200-
####Enable Commit Signing by Default in Gitkraken:
198+
And select the file in GitKraken Client.
199+
200+
####Enable Commit Signing by Default in GitKraken Client:
201201

202202
Preferences > GPG > Sign Commits/Tags By default
203203

gitkraken-client/git-flow.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ When finishing a hotfix, GitKraken Client will merge the changes into both `mast
7272

7373
Tags are used to mark a specific point in the repository's history. They are often used to mark a release.
7474

75-
Tags can be created from the Gitflow menu, or from the command line. When creating a tag from the Gitflow menu, GitKraken Client will create a tag with the same name as the branch. For example, if you create a tag from a `release/1.0.0` branch, GitKraken Client will create a tag named `1.0.0`. Additionally, you can add a tag message when fishing a branch. This message will be added to the tag.
75+
Tags can be created from the Gitflow menu, or from the command line. When creating a tag from the Gitflow menu, GitKraken Client will create a tag with the same name as the branch. For example, if you create a tag from a `release/1.0.0` branch, GitKraken Client will create a tag named `1.0.0`. Additionally, you can add a tag message when finishing a branch. This message will be added to the tag.
7676

7777
<img src="/wp-content/uploads//finish-release-tag.gif" class="img-bordered img-responsive center">
7878

gitkraken-client/github-issues.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Note that required fields are denoted by `*`. Your new issue will automatically
6060

6161
### Create Filters
6262

63-
You may create filters to view the issues you need. We use the same syntax that GitHub uses for thier issues.
63+
You may create filters to view the issues you need. We use the same syntax that GitHub uses for their issues.
6464

6565
<img src="/wp-content/uploads/new-filter-github-issues.png" srcset="/wp-content/uploads/[email protected]" class="img-bordered img-responsive center">
6666

gitkraken-client/gitlab-self-hosted.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Or alternatively if you are in the <kbd>New Tab</kbd> view, click on <kbd>Prefer
4040

4141
From the _Integrations_ window, enter your _Host Domain_, then click the Generate a token on GitLab link. Note the permissions that need to be assigned to the token on your GitLab Self-Managed server.
4242

43-
<img src="/wp-content/uploads/authentication.png" srcset="/wp-content/uploads/[email protected]" class="img-bordered img-responsive center">
43+
<img src="/wp-content/uploads/authentication-gitlab-self-managed.png" srcset="/wp-content/uploads/authentication-gitlab-self-managed@2x.png" class="img-bordered img-responsive center">
4444

4545
This opens a web browser where you will log in with your GitLab Self-Managed credentials and generate an access token.
4646

gitkraken-client/how-to-install.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ GitKraken Client data is stored in `/Users/{user}/.gitkraken` == `~/.gitkraken`.
7575
GitKraken Client has a simple package available for Debian based distributions.
7676
```
7777
wget https://release.gitkraken.com/linux/gitkraken-amd64.deb
78-
sudo apt install gitkraken-amd64.deb
78+
sudo apt install ./gitkraken-amd64.deb
7979
```
8080
Or [download the file](https://gitkraken.com/download/linux-deb).
8181

gitkraken-client/interface.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ In addition to Undo and Redo, the main toolbar houses common repo actions.
108108
<img src='/wp-content/uploads//gk-lfs-icon.svg' class='img-responsive'>
109109
</div>
110110
<div class="flex-item">
111-
<p> Have large files in your repo? This button will appear when you have <a href="/git-workflows-and-extensions/intro-and-requirements/">LFS</a> enabled on the repository.</p>
111+
<p> Have large files in your repo? This button will appear when you have <a href="/gitkraken-client/git-lfs/">LFS</a> enabled on the repository.</p>
112112
</div>
113113
</div>
114114

gitkraken-client/preferences.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ The Owner and any Admins are able to:
2626

2727

2828
<div class='callout callout--warning'>
29-
<p><strong>Note:</strong> the Organization section is only availibe to users who have a Pro or Enterprise license.
29+
<p><strong>Note:</strong> the Organization section is only available to users who have a Pro or Enterprise license.
3030
</p>
3131
</div>
3232

gitkraken-client/themes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ If your system is capabale of it, you can set GitKraken Client to match your ope
2727

2828
## Custom Themes
2929

30-
In addition to the default themes, GitKraken Client supports custom user-defined themes. Each of the .jsonc-default theme files you see in this folder can act as a template "base" for your new custom theme.
30+
In addition to the default themes, GitKraken Client supports custom user-defined themes. Theme files are located in `~\.gitkraken\themes\` - you can open the path to this directory from `Preferences > UI Customization > Theme` or find the Data Location on your operating system [here](/gitkraken-client/how-to-install/). Each of the .jsonc-default theme files you see in this folder can act as a template "base" for your new custom theme.
3131

3232
### Making Your Own Theme
3333

0 commit comments

Comments
 (0)