Skip to content

Commit e277f12

Browse files
authored
Merge pull request #408 from intersystems-community/testdocs
Testdocs
2 parents 7f09815 + b9374ed commit e277f12

File tree

5 files changed

+206
-209
lines changed

5 files changed

+206
-209
lines changed

docs/Configuration.md

Lines changed: 38 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -8,94 +8,81 @@ nav_order: 5
88

99
The settings that define an InterSystems IRIS server and the connection to the server are crucial to the functioning of VS Code in developing in ObjectScript.
1010

11-
Open the VS Code Settings Editor by selecting **File > Preferences > Settings** (**Code > Preferences > Settings** on macOS) from the menu, or by pressing <kbd>Ctrl/Cmd</kbd>+<kbd>,</kbd> (comma).
12-
13-
> Pro tip: If you know the name of the setting you want to change, or a phrase that occurs in its descrition, start typing this into the 'Search settings' field, for example `intersystems` or `objectscript` or `udl`.
14-
1511
## Configuring a Server
1612

17-
First, configure one or more servers. Open the settings editor by selecting **File > Preferences > Settings** (**Code > Preferences > Settings** on macOS) from the menu, or by pressing <kbd>Ctrl/Cmd</kbd>+<kbd>,</kbd> (comma).
18-
19-
Select the **User** or **Workspace** settings level by selecting it at the top of the settings window. **User** level is normally selected by default, and where to put your server definitions so they can be used by any of your workspaces. You can learn more about the difference between these levels in the [Settings](../settings) section of this documentation.
20-
21-
The following screen shot shows **Workspace** selected:
13+
First, configure one or more servers. Open the settings editor by selecting **File > Preferences > Settings** (**Code > Preferences > Settings** on Mac) from the menu. Select the **User** or **Workspace** settings level by selecting it at the top of the settings window. For example, the following screen shot shows Workspace selected:
2214

2315
![Workspace selected.](../assets/images/ClickWorkspace.png "workspace selected")
2416

25-
Find **Extensions** in the list in the left pane of the editor window, click to open, then select **InterSystems Server Manager** from the list to find the correct place in the settings UI.
26-
27-
If you don't see this entry, check that you have [installed](../installation) that extension and that it has not been disabled.
28-
29-
The following screen shot shows InterSystems Server Manager selected:
17+
Find Extensions in the list in the left pane of the editor window, click to open, then select InterSystems Server Manager from the list to find the correct place in the settings UI. The following screen shot shows InterSystems Server Manager selected:
3018

3119
![Select server manager.](../assets/images/ServerManagerSelect.png "select server manager")
3220

33-
And this screen shot shows the Server Manager area of the edit pane:
21+
And this screen shot shows Server Manager area of the edit pane:
3422

3523
![Server manager settings.](../assets/images/ServerManagerSettings.png "server manager settings")
3624

37-
The **InterSystems: Servers** setting is a structured object that is too complex to be edited in the settings UI, so your only option is to click *Edit in settings.json*.
38-
39-
If you are defining this setting for the first time, a default settings object will be offered for you to amend. A completion list may also appear. Press <kbd>Esc</kbd> to dismiss this.
25+
You need to edit the server configuration in the settings.json file, so your only option is to click *Edit in settings.json*.
4026

41-
To configure a server, enter something like this:
27+
To configure a server, enter code something like this:
4228

43-
```json
29+
```js
4430
"intersystems.servers": {
4531
"test": {
4632
"webServer": {
4733
"scheme": "http",
4834
"host": "localhost",
4935
"port": 52774,
5036
},
51-
"username": "_SYSTEM",
37+
"username": "_SYSTEM",
5238
},
5339
},
5440
```
5541

5642
The components of this server definition are:
5743

58-
- **test** - your choice of name to identify this InterSystems server in your settings. The name can only contain lowercase 'a' to 'z', digits 0 to 9, and limited punctuation (`-._~`).
59-
- **webServer** - a collection of properties that define its associated web server, as follows:
60-
- **scheme** - protocol used for connections (http or https).
61-
- **host** - hostname or IP address of the web server server.
62-
- **port** - port number of this web server. This is the same port as you connect to when using the InterSystems Management Portal from your browser. If you already use InterSystems Studio do not confuse the web server port number with the port number Studio connects to (sometimes called the superserver).
63-
- **username** - username to use when logging in to this server. This is optional. If omitted the user will be prompted for it at connection time, then cached for the session.
64-
- **password** - password for the specified username. This is optional, and the example above omits it. Storing the password in a settings file should only be done in limited situations where there is very low need for security or where default credentials are being used (e.g. `_SYSTEM`/`SYS`).
44+
- **test** - an arbitrary name to identify this server
45+
- **webServer** - The collection of properties that define the web server.
46+
- **scheme** - The protocol used for connections.
47+
- **host** - the host for this server
48+
- **port** - the WebServer port number for this server
49+
- **username** - the username to use in logging in to this server.
50+
- **password** - password for the specified username. Entering the password in this file is acceptable only in limited situations with very low need for security.
6551

66-
If you do not add a password to the server definition, the user will need to enter the password when connecting. It will then then be cached for the session. Alternatively you can store the password securely in keychain of your local workstation. The InterSystems Server Manager extension adds the following commands to the Command Palette for managing stored passwords:
52+
If you do not add a password to the server definition, anyone using the server needs to supply the password. Or, you can store the password securely in the system Keychain. The InterSystems Server Manager adds the following commands for managing stored passwords to the Command Palette:
6753

68-
- **InterSystems Server Manager: Store Password in Keychain** - select a server and enter a password.
69-
- **InterSystems Server Manager: Clear Password from Keychain** - remove password for selected server.
54+
- **InterSystems Server Manager: Clear Password from Keychain** - remove password for selected server
55+
- **InterSystems Server Manager: Store Password in Keychain** - select a server and enter a password
56+
- **InterSystems Server Manager: Test Server Selection**
57+
- **InterSystems Server Manager: Test Server Selection (flush cached credentials)**
58+
- **InterSystems Server Manager: Test Server Selection with Details**
7059

7160
## Configuring a Server Connection
7261

73-
Select **InterSystems ObjectScript** from the settings editor's **Extensions** list. You need to edit the connection configuration in the settings.json file, so click *Edit in settings.json* under the heading **Objectscript: conn**.
62+
Select InterSystems ObjectScript from the settings editor extensions list. You need to edit the server configuration in the settings.json file, so your click *Edit in settings.json* under the heading **Objectscript: conn**.
7463

7564
You should enter code something like this:
7665

77-
```json
66+
```js
7867
"objectscript.conn": {
79-
"server": "test",
8068
"ns": "USER",
69+
"server": "tst",
8170
"active": true,
8271
},
8372
```
84-
The components of this connection definition are:
73+
The components of this server definition are:
8574

86-
- **server** - server name as specified in the `intersystems.servers` configuration described in the previous section of these instructions.
87-
- **ns** - namespace to use on the server.
75+
- **ns** - namespace to use on the server
76+
- **server** - server name as specified in the server configuration
8877
- **active** - specifies whether the connection is active.
8978

9079
## Configuring Export from Server
9180

92-
Default settings for export are suitable for many situations, but if you need to adjust them here's how.
93-
94-
Select **InterSystems ObjectScript** from the settings editor **Extensions** list. Find the section labeled **Objectscript: export**. You can change many of the export settings directly in the settings editor. For others you need to edit the settings.json file.
81+
Select InterSystems ObjectScript from the settings editor extensions list. Find the section labeled **Objectscript: export**. You can edit many of the export settings in the settings editor. For others you need to edit the settings.json file.
9582

96-
When viewed in JSON format your export configuration looks something like this:
83+
You export configuration looks something like this:
9784

98-
```json
85+
```js
9986
"objectscript.export": {
10087
"folder": "",
10188
"addCategory": true,
@@ -110,12 +97,12 @@ When viewed in JSON format your export configuration looks something like this:
11097
```
11198
The components of this export definition are:
11299

113-
- **folder** - Folder for source code within workspace.
114-
- **addCategory** - Add a category folder to the beginning of the export path.
115-
- **atelier** - Export source code as Atelier did it, with packages as subfolders.
116-
- **generated** - Export generated source code files, such as INTs generated from classes.
117-
- **filter** - SQL filter to limit what to export.
118-
- **category** - Category of source code to export: `CLS` = classes; `RTN` = routines; `CSP` = csp files; `OTH` = other. The default is `*` which exports everything.
119-
- **noStorage** - Strip the storage definition on export. Can be useful when working across multiple systems.
120-
- **dontExportIfNoChanges** - Do not rewrite the local file if the content is identical to what came from the server.
121-
- **maxConcurrentConnections** - The maximum number of concurrent export connections. (0 = unlimited)
100+
- **folder** - Folder for source code.
101+
- **addCategory** - Add a category folder to the export path.
102+
- **atelier** - Export source code as Atelier does, with packages placed in subfolders.
103+
- **generated** - Export generated source code files.
104+
- **filter** - An SQL filter that can be used to match the names.
105+
- **category** - Specifies a category of source code to export: CLS = classes; RTN = routines; CSP = csp files; OTH = other. The default is *, export everything.
106+
- **noStorage** - Strip the storage XML on export. This is useful for multiple systems.
107+
- **dontExportIfNoChanges** - Don't update the local file if the content is identical to what is on the server.
108+
- **maxConcurrentConnections** - The maximum number of export connections. (0 = Unlimited)

docs/Gemfile.lock

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,12 @@ GEM
2525
ethon (0.12.0)
2626
ffi (>= 1.3.0)
2727
eventmachine (1.2.7)
28+
eventmachine (1.2.7-x64-mingw32)
2829
execjs (2.7.0)
2930
faraday (1.0.1)
3031
multipart-post (>= 1.2, < 3)
3132
ffi (1.13.1)
33+
ffi (1.13.1-x64-mingw32)
3234
forwardable-extended (2.6.0)
3335
gemoji (3.0.1)
3436
github-pages (207)
@@ -210,6 +212,8 @@ GEM
210212
multipart-post (2.1.1)
211213
nokogiri (1.10.10)
212214
mini_portile2 (~> 2.4.0)
215+
nokogiri (1.10.10-x64-mingw32)
216+
mini_portile2 (~> 2.4.0)
213217
octokit (4.18.0)
214218
faraday (>= 0.9)
215219
sawyer (~> 0.8.0, >= 0.5.3)
@@ -242,14 +246,19 @@ GEM
242246
ethon (>= 0.9.0)
243247
tzinfo (1.2.7)
244248
thread_safe (~> 0.1)
249+
tzinfo-data (1.2020.1)
250+
tzinfo (>= 1.0.0)
245251
unf (0.1.4)
246252
unf_ext
247253
unf_ext (0.0.7.7)
254+
unf_ext (0.0.7.7-x64-mingw32)
248255
unicode-display_width (1.7.0)
256+
wdm (0.1.1)
249257
zeitwerk (2.4.0)
250258

251259
PLATFORMS
252260
ruby
261+
x64-mingw32
253262

254263
DEPENDENCIES
255264
github-pages

docs/Installation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ nav_order: 2
88

99
## Install VS Code
1010

11-
Your first step is to install VS Code:
11+
Your first step is to install VS Code:
1212

1313
1. Go to the [Visual Studio Code download page](https://code.visualstudio.com/).
1414
2. Download an appropriate build for your platform.

0 commit comments

Comments
 (0)