Skip to content

Commit 1447aea

Browse files
matifalimatifali
committed
fixup!
1 parent 5ca11b0 commit 1447aea

File tree

11 files changed

+30
-38
lines changed

11 files changed

+30
-38
lines changed

‎Makefile

-8
Original file line numberDiff line numberDiff line change
@@ -487,12 +487,8 @@ gen: \
487487
site/src/api/typesGenerated.ts \
488488
coderd/rbac/object_gen.go \
489489
codersdk/rbacresources_gen.go \
490-
<<<<<<< HEAD
491490
site/src/api/rbacresources_gen.ts \
492-
docs/admin/prometheus.md \
493-
=======
494491
docs/admin/integrations/prometheus.md \
495-
>>>>>>> 0e1703387 (modify prometheus location)
496492
docs/reference/cli/README.md \
497493
docs/admin/security/audit-logs.md \
498494
coderd/apidoc/swagger.json \
@@ -522,13 +518,9 @@ gen/mark-fresh:
522518
$(DB_GEN_FILES) \
523519
site/src/api/typesGenerated.ts \
524520
coderd/rbac/object_gen.go \
525-
<<<<<<< HEAD
526521
codersdk/rbacresources_gen.go \
527522
site/src/api/rbacresources_gen.ts \
528-
docs/admin/prometheus.md \
529-
=======
530523
docs/admin/integrations/prometheus.md \
531-
>>>>>>> 0e1703387 (modify prometheus location)
532524
docs/reference/cli/README.md \
533525
docs/admin/security/audit-logs.md \
534526
coderd/apidoc/swagger.json \

‎docs/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ and whatever else Terraform lets you dream up.
4040
4141
## IDE Support
4242
43-
You can use any Web IDE ([code-server](https://github.com/coder/code-server), [projector](https://github.com/JetBrains/projector-server), [Jupyter](https://jupyter.org/), etc.), [JetBrains Gateway](https://www.JetBrains.com/remote-development/gateway/), [VS Code Remote](https://code.visualstudio.com/docs/remote/ssh-tutorial) or even a file sync such as [mutagen](https://mutagen.io/).
43+
You can use any Web IDE ([code-server](https://github.com/coder/code-server), [projector](https://github.com/JetBrains/projector-server), [Jupyter](https://jupyter.org/), etc.), [JetBrains Gateway](https://www.jetbrains.com/remote-development/gateway/), [VS Code Remote](https://code.visualstudio.com/docs/remote/ssh-tutorial) or even a file sync such as [mutagen](https://mutagen.io/).
4444
4545
<p align="center">
4646
<img src="./images/ide-icons.svg" height=72>

‎docs/admin/networking/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ In order for clients to be able to establish direct connections:
3434
- The client is connecting using the CLI (e.g. `coder ssh` or
3535
`coder port-forward`). Note that the
3636
[VSCode extension](https://marketplace.visualstudio.com/items?itemName=coder.coder-remote)
37-
and [JetBrains Plugin](https://plugins.JetBrains.com/plugin/19620-coder/), and
37+
and [JetBrains Plugin](https://plugins.jetbrains.com/plugin/19620-coder/), and
3838
[`ssh coder.<workspace>`](../cli/config-ssh.md) all utilize the CLI to
3939
establish a workspace connection.
4040
- Either the client or workspace agent are able to discover a reachable

‎docs/changelogs/v2.1.0.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
### Documentation
6060

6161
- Add
62-
[offline docs](https://www.JetBrains.com/help/idea/fully-offline-mode.html)
62+
[offline docs](https://www.jetbrains.com/help/idea/fully-offline-mode.html)
6363
for JetBrains Gateway (#9039) (@ericpaulsen)
6464
- Add `coder login` to CI docs (#9038) (@ericpaulsen)
6565
- Expand [JFrog platform](https://coder.com/docs/v2/v2.1.0/platforms/jfrog) and

‎docs/faqs.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ The Coder plugin will appear in the Gateway UI when opened.
329329

330330
Selecting the most suitable template depends on how the deployment manages
331331
JetBrains IDE versions. If downloading from
332-
[JetBrains.com](https://www.JetBrains.com/remote-development/gateway/) is
332+
[jetbrains.com](https://www.jetbrains.com/remote-development/gateway/) is
333333
acceptable, see the example templates below which specifies the product code,
334334
IDE version and build number in the
335335
[`coder_app`](https://registry.terraform.io/providers/coder/coder/latest/docs/resources/app#share)

‎docs/ides/fleet.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
JetBrains Fleet is a code editor and lightweight IDE designed to support various
44
programming languages and development environments.
55

6-
[See JetBrains' website to learn about Fleet](https://www.JetBrains.com/fleet/)
6+
[See JetBrains' website to learn about Fleet](https://www.jetbrains.com/fleet/)
77

88
Fleet can connect to a Coder workspace by following these steps.
99

10-
1. [Install Fleet](https://www.JetBrains.com/fleet/download)
10+
1. [Install Fleet](https://www.jetbrains.com/fleet/download)
1111
2. Install Coder CLI
1212
```shell
1313
curl -L https://coder.com/install.sh | sh

‎docs/ides/gateway.md

+9-9
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
JetBrains Gateway is a compact desktop app that allows you to work remotely with
44
a JetBrains IDE without even downloading one.
5-
[See JetBrains' website to learn about and Gateway.](https://www.JetBrains.com/remote-development/gateway/)
5+
[See JetBrains' website to learn about and Gateway.](https://www.jetbrains.com/remote-development/gateway/)
66

77
Gateway can connect to a Coder workspace by using Coder's Gateway plugin or
88
manually setting up an SSH connection.
@@ -13,7 +13,7 @@ manually setting up an SSH connection.
1313
> [create a GitHub issue](https://github.com/coder/coder/issues) or share in
1414
> [our Discord channel](https://discord.gg/coder).
1515
16-
1. [Install Gateway](https://www.JetBrains.com/help/idea/JetBrains-gateway.html)
16+
1. [Install Gateway](https://www.jetbrains.com/help/idea/JetBrains-gateway.html)
1717
1. Open Gateway and click the Coder icon to install the Coder plugin.
1818
1. Click the "Coder" icon under Install More Providers at the bottom of the
1919
Gateway home screen
@@ -110,7 +110,7 @@ keytool -import -alias coder -file cacert.pem -keystore /Applications/JetBrains\
110110
> This is in lieu of using Coder's Gateway plugin which automatically performs
111111
> these steps.
112112
113-
1. [Install Gateway](https://www.JetBrains.com/help/idea/JetBrains-gateway.html)
113+
1. [Install Gateway](https://www.jetbrains.com/help/idea/JetBrains-gateway.html)
114114

115115
1. [Configure the `coder` CLI](../ides.md#ssh-configuration)
116116

@@ -167,7 +167,7 @@ keytool -import -alias coder -file cacert.pem -keystore /Applications/JetBrains\
167167
## Using an existing JetBrains installation in the workspace
168168

169169
If you would like to use an existing JetBrains IDE in a Coder workspace (or you
170-
are air-gapped, and cannot reach JetBrains.com), run the following script in the
170+
are air-gapped, and cannot reach jetbrains.com), run the following script in the
171171
JetBrains IDE directory to point the default Gateway directory to the IDE
172172
directory. This step must be done before configuring Gateway.
173173

@@ -179,15 +179,15 @@ cd /opt/idea/bin
179179
> Gateway only works with paid versions of JetBrains IDEs so the script will not
180180
> be located in the `bin` directory of JetBrains Community editions.
181181
182-
[Here is the JetBrains article](https://www.JetBrains.com/help/idea/remote-development-troubleshooting.html#setup:~:text=Can%20I%20point%20Remote%20Development%20to%20an%20existing%20IDE%20on%20my%20remote%20server%3F%20Is%20it%20possible%20to%20install%20IDE%20manually%3F)
182+
[Here is the JetBrains article](https://www.jetbrains.com/help/idea/remote-development-troubleshooting.html#setup:~:text=Can%20I%20point%20Remote%20Development%20to%20an%20existing%20IDE%20on%20my%20remote%20server%3F%20Is%20it%20possible%20to%20install%20IDE%20manually%3F)
183183
explaining this IDE specification.
184184

185185
## JetBrains Gateway in an offline environment
186186

187187
In networks that restrict access to the internet, you will need to leverage the
188188
JetBrains Client Installer to download and save the IDE clients locally. Please
189189
see the
190-
[JetBrains documentation for more information](https://www.JetBrains.com/help/idea/fully-offline-mode.html).
190+
[JetBrains documentation for more information](https://www.jetbrains.com/help/idea/fully-offline-mode.html).
191191

192192
### Configuration Steps
193193

@@ -200,7 +200,7 @@ We deployed a simple Ubuntu VM and installed the JetBrains Client Downloader
200200
binary. Note that the server must be a Linux-based distribution.
201201

202202
```shell
203-
wget https://download.JetBrains.com/idea/code-with-me/backend/JetBrains-clients-downloader-linux-x86_64-1867.tar.gz && \
203+
wget https://download.jetbrains.com/idea/code-with-me/backend/JetBrains-clients-downloader-linux-x86_64-1867.tar.gz && \
204204
tar -xzvf JetBrains-clients-downloader-linux-x86_64-1867.tar.gz
205205
```
206206

@@ -211,7 +211,7 @@ JetBrains Gateway requires both a backend to be installed on the remote host
211211
can host both on the server in this example.
212212

213213
See here for the full
214-
[JetBrains product list and builds](https://data.services.JetBrains.com/products).
214+
[JetBrains product list and builds](https://data.services.jetbrains.com/products).
215215
Below is the full list of supported `--platforms-filter` values:
216216

217217
```console
@@ -329,7 +329,7 @@ Gateway. Here is the documentation to
329329
[setup SSH config via the Coder CLI](../ides.md#ssh-configuration). On the
330330
Gateway side, follow our guide here until step 16.
331331

332-
Instead of downloading from JetBrains.com, we will point Gateway to our server
332+
Instead of downloading from jetbrains.com, we will point Gateway to our server
333333
endpoint. Select `Installation options...` and select `Use download link`. Note
334334
that the URL must explicitly reference the archive file:
335335

‎docs/start/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ and whatever else Terraform lets you dream up.
3232

3333
## IDE Support
3434

35-
You can use any Web IDE ([code-server](https://github.com/coder/code-server), [projector](https://github.com/JetBrains/projector-server), [Jupyter](https://jupyter.org/), etc.), [JetBrains Gateway](https://www.JetBrains.com/remote-development/gateway/), [VS Code Remote](https://code.visualstudio.com/docs/remote/ssh-tutorial) or even a file sync such as [mutagen](https://mutagen.io/).
35+
You can use any Web IDE ([code-server](https://github.com/coder/code-server), [projector](https://github.com/JetBrains/projector-server), [Jupyter](https://jupyter.org/), etc.), [JetBrains Gateway](https://www.jetbrains.com/remote-development/gateway/), [VS Code Remote](https://code.visualstudio.com/docs/remote/ssh-tutorial) or even a file sync such as [mutagen](https://mutagen.io/).
3636

3737
<p align="center">
3838
<img src="./images/ide-icons.svg" height=72>

‎docs/tutorials/faqs.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ The Coder plugin will appear in the Gateway UI when opened.
336336

337337
Selecting the most suitable template depends on how the deployment manages
338338
JetBrains IDE versions. If downloading from
339-
[JetBrains.com](https://www.JetBrains.com/remote-development/gateway/) is
339+
[jetbrains.com](https://www.jetbrains.com/remote-development/gateway/) is
340340
acceptable, see the example templates below which specifies the product code,
341341
IDE version and build number in the
342342
[`coder_app`](https://registry.terraform.io/providers/coder/coder/latest/docs/resources/app#share)

‎docs/user-guides/workspace-access/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ Read more details on [using VSCode in your workspace](./vscode.md).
7272

7373
## JetBrains IDEs
7474

75-
We support JetBrains IDEs using [Gateway](https://www.JetBrains.com/remote-development/gateway/). The following IDEs are supported for remote development:
75+
We support JetBrains IDEs using [Gateway](https://www.jetbrains.com/remote-development/gateway/). The following IDEs are supported for remote development:
7676

7777
- IntelliJ IDEA
7878
- CLion

‎docs/user-guides/workspace-access/jetbrains.md

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# JetBrains IDEs
22

33
We support JetBrains IDEs using
4-
[Gateway](https://www.JetBrains.com/remote-development/gateway/). The following
4+
[Gateway](https://www.jetbrains.com/remote-development/gateway/). The following
55
IDEs are supported for remote development:
66

77
- IntelliJ IDEA
@@ -17,7 +17,7 @@ IDEs are supported for remote development:
1717

1818
JetBrains Gateway is a compact desktop app that allows you to work remotely with
1919
a JetBrains IDE without even downloading one.
20-
[See JetBrains' website to learn about and Gateway.](https://www.JetBrains.com/remote-development/gateway/)
20+
[See JetBrains' website to learn about and Gateway.](https://www.jetbrains.com/remote-development/gateway/)
2121

2222
Gateway can connect to a Coder workspace by using Coder's Gateway plugin or
2323
manually setting up an SSH connection.
@@ -28,7 +28,7 @@ manually setting up an SSH connection.
2828
> [create a GitHub issue](https://github.com/coder/coder/issues) or share in
2929
> [our Discord channel](https://discord.gg/coder).
3030
31-
1. [Install Gateway](https://www.JetBrains.com/help/idea/JetBrains-gateway.html)
31+
1. [Install Gateway](https://www.jetbrains.com/help/idea/JetBrains-gateway.html)
3232
1. Open Gateway and click the Coder icon to install the Coder plugin.
3333
1. Click the "Coder" icon under Install More Providers at the bottom of the
3434
Gateway home screen
@@ -125,7 +125,7 @@ keytool -import -alias coder -file cacert.pem -keystore /Applications/JetBrains\
125125
> This is in lieu of using Coder's Gateway plugin which automatically performs
126126
> these steps.
127127
128-
1. [Install Gateway](https://www.JetBrains.com/help/idea/JetBrains-gateway.html)
128+
1. [Install Gateway](https://www.jetbrains.com/help/idea/JetBrains-gateway.html)
129129

130130
1. [Configure the `coder` CLI](../ides.md#ssh-configuration)
131131

@@ -182,7 +182,7 @@ keytool -import -alias coder -file cacert.pem -keystore /Applications/JetBrains\
182182
## Using an existing JetBrains installation in the workspace
183183

184184
If you would like to use an existing JetBrains IDE in a Coder workspace (or you
185-
are air-gapped, and cannot reach JetBrains.com), run the following script in the
185+
are air-gapped, and cannot reach jetbrains.com), run the following script in the
186186
JetBrains IDE directory to point the default Gateway directory to the IDE
187187
directory. This step must be done before configuring Gateway.
188188

@@ -194,15 +194,15 @@ cd /opt/idea/bin
194194
> Gateway only works with paid versions of JetBrains IDEs so the script will not
195195
> be located in the `bin` directory of JetBrains Community editions.
196196
197-
[Here is the JetBrains article](https://www.JetBrains.com/help/idea/remote-development-troubleshooting.html#setup:~:text=Can%20I%20point%20Remote%20Development%20to%20an%20existing%20IDE%20on%20my%20remote%20server%3F%20Is%20it%20possible%20to%20install%20IDE%20manually%3F)
197+
[Here is the JetBrains article](https://www.jetbrains.com/help/idea/remote-development-troubleshooting.html#setup:~:text=Can%20I%20point%20Remote%20Development%20to%20an%20existing%20IDE%20on%20my%20remote%20server%3F%20Is%20it%20possible%20to%20install%20IDE%20manually%3F)
198198
explaining this IDE specification.
199199

200200
## JetBrains Gateway in an offline environment
201201

202202
In networks that restrict access to the internet, you will need to leverage the
203203
JetBrains Client Installer to download and save the IDE clients locally. Please
204204
see the
205-
[JetBrains documentation for more information](https://www.JetBrains.com/help/idea/fully-offline-mode.html).
205+
[JetBrains documentation for more information](https://www.jetbrains.com/help/idea/fully-offline-mode.html).
206206

207207
### Configuration Steps
208208

@@ -215,7 +215,7 @@ We deployed a simple Ubuntu VM and installed the JetBrains Client Downloader
215215
binary. Note that the server must be a Linux-based distribution.
216216

217217
```shell
218-
wget https://download.JetBrains.com/idea/code-with-me/backend/JetBrains-clients-downloader-linux-x86_64-1867.tar.gz && \
218+
wget https://download.jetbrains.com/idea/code-with-me/backend/JetBrains-clients-downloader-linux-x86_64-1867.tar.gz && \
219219
tar -xzvf JetBrains-clients-downloader-linux-x86_64-1867.tar.gz
220220
```
221221

@@ -226,7 +226,7 @@ JetBrains Gateway requires both a backend to be installed on the remote host
226226
can host both on the server in this example.
227227

228228
See here for the full
229-
[JetBrains product list and builds](https://data.services.JetBrains.com/products).
229+
[JetBrains product list and builds](https://data.services.jetbrains.com/products).
230230
Below is the full list of supported `--platforms-filter` values:
231231

232232
```console
@@ -344,7 +344,7 @@ Gateway. Here is the documentation to
344344
[setup SSH config via the Coder CLI](../ides.md#ssh-configuration). On the
345345
Gateway side, follow our guide here until step 16.
346346

347-
Instead of downloading from JetBrains.com, we will point Gateway to our server
347+
Instead of downloading from jetbrains.com, we will point Gateway to our server
348348
endpoint. Select `Installation options...` and select `Use download link`. Note
349349
that the URL must explicitly reference the archive file:
350350

@@ -359,11 +359,11 @@ respectively.
359359
JetBrains Fleet is a code editor and lightweight IDE designed to support various
360360
programming languages and development environments.
361361

362-
[See JetBrains' website to learn about Fleet](https://www.JetBrains.com/fleet/)
362+
[See JetBrains' website to learn about Fleet](https://www.jetbrains.com/fleet/)
363363

364364
Fleet can connect to a Coder workspace by following these steps.
365365

366-
1. [Install Fleet](https://www.JetBrains.com/fleet/download)
366+
1. [Install Fleet](https://www.jetbrains.com/fleet/download)
367367
2. Install Coder CLI
368368
```shell
369369
curl -L https://coder.com/install.sh | sh

0 commit comments

Comments
 (0)