Skip to content

Commit b046ffd

Browse files
authored
Merge pull request #45 from github/vdye/followups-to-tech-docs
Minor fixups from #44 (for tech docs & VSCode settings)
2 parents b8eaf6a + 3f2c022 commit b046ffd

File tree

2 files changed

+18
-9
lines changed

2 files changed

+18
-9
lines changed

.vscode/settings.json

+17-8
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,39 @@
11
{
22
// File formatting
3+
// General settings
4+
"editor.wordWrap": "off",
5+
"files.trimTrailingWhitespace": true,
6+
7+
// Language-specific settings
38
"[markdown]": {
49
"editor.detectIndentation": false,
510
"editor.insertSpaces": true,
611
"editor.tabSize": 4,
7-
"editor.wordWrap": "off",
8-
"files.trimTrailingWhitespace": true,
912
},
1013
"[makefile]": {
1114
"editor.detectIndentation": false,
1215
"editor.insertSpaces": false,
1316
"editor.tabSize": 8,
14-
"editor.wordWrap": "off",
15-
"files.trimTrailingWhitespace": true,
1617
},
1718
"[asciidoc]": {
1819
"editor.detectIndentation": false,
1920
"editor.insertSpaces": true,
2021
"editor.tabSize": 2,
21-
"editor.wordWrap": "off",
22-
"files.trimTrailingWhitespace": true,
2322
},
2423
"[shellscript]": {
2524
"editor.detectIndentation": false,
2625
"editor.insertSpaces": false,
2726
"editor.tabSize": 8,
28-
"editor.wordWrap": "off",
29-
"files.trimTrailingWhitespace": true,
27+
},
28+
"[javascript]": {
29+
"editor.detectIndentation": false,
30+
"editor.insertSpaces": true,
31+
"editor.tabSize": 2,
32+
},
33+
"[typescript]": {
34+
"editor.detectIndentation": false,
35+
"editor.insertSpaces": true,
36+
"editor.tabSize": 2,
3037
},
3138
"files.associations": {
3239
"*.adoc": "asciidoc",
@@ -35,6 +42,8 @@
3542
"*.sh": "shellscript",
3643
"prerm": "shellscript",
3744
"postinstall": "shellscript",
45+
"*.js": "javascript",
46+
"*.ts": "typescript",
3847
"Makefile": "makefile"
3948
},
4049

docs/technical/architecture.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ flowchart TB;
222222
setBundleUri["Set <code>bundleUri</code> to the value of fetch.bundleUri"]
223223
creationTokenExists{{"fetch.bundleCreationToken config is set?"}}
224224
setCreationToken["Set <code>minCreationToken</code> to the value\nof fetch.bundleCreationToken"]
225-
setCreationTokenZero["Set <code>creationToken</code> to 0"]
225+
setCreationTokenZero["Set <code>minCreationToken</code> to 0"]
226226
downloadAndUnbundle(["Download and unbundle from list"])
227227
bundleSuccess{{"Bundles downloaded and unpacked successfully?"}}
228228
saveCreationToken["Set fetch.bundleCreationToken to highest\nunbundled creationToken"]

0 commit comments

Comments
 (0)