Skip to content

Commit 38018ce

Browse files
authored
Merge branch 'master' into pread
2 parents 77f3306 + e8a43ec commit 38018ce

File tree

16 files changed

+262
-542
lines changed

16 files changed

+262
-542
lines changed

docs/basics/errors.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -621,7 +621,7 @@ On launch
621621
error | explanation
622622
------|------------
623623
{timestamp} couldn't connect to license daemon | Could not connect to KX license server ([kdb+ On Demand](../learn/licensing.md#licensing-server-for-kdb-on-demand))
624-
[](){#cores}cores | The license is for [fewer cores than available](../kb/cpu-affinity.md)
624+
[](){#cores}cores | The license is for [fewer cores than available](../learn/licensing.md#core-restrictions)
625625
[](){#cpu}cpu | The license is for fewer CPUs than available
626626
[](){#exp}exp | License expiry date is prior to system date
627627
[](){#host}host | The hostname reported by the OS does not match the hostname or hostname-pattern in the license.<br><br>If you see `255.255.255.255` in the kdb+ banner, the machine likely cannot resolve its hostname to an IP address, which will cause a `host` error.<br><br>Since 4.1t 2022.07.01,4.0 2022.07.01 the detected hostname is printed. It can be used to compare with the hostname used within the license.

docs/basics/internal.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,20 @@ Possible error scenarios:
308308
View TLS settings on a handle or current process `-26!handle` or `-26!()`.
309309
Since V3.4 2016.05.12.
310310
311+
```q
312+
q)(-26!)[]
313+
SSLEAY_VERSION | OpenSSL 1.0.2g 1 Mar 2016
314+
SSL_CERT_FILE | /Users/kdb/certs/server-crt.pem
315+
SSL_CA_CERT_FILE | /Users/kdb/certs/ca.pem
316+
SSL_CA_CERT_PATH | /Users/kdb/certs/
317+
SSL_KEY_FILE | /Users/kdb/certs/server-key.pem
318+
SSL_CIPHER_LIST | ALL
319+
SSL_VERIFY_CLIENT| NO
320+
SSL_VERIFY_SERVER| YES
321+
```
322+
323+
In the result, all keys except `SSLEAY_VERSION` are initialized from their corresponding environment variables.
324+
311325
:fontawesome-solid-graduation-cap:
312326
[SSL](../kb/ssl.md)
313327

docs/basics/joins.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ Keyed: As of:
1414
[lj ljf](../ref/lj.md) left [asof](../ref/asof.md) simple as-of
1515
[pj](../ref/pj.md) plus [wj wj1](../ref/wj.md) window
1616
[uj ujf](../ref/uj.md) union
17-
[upsert](../ref/upsert.md) [, Join](../ref/join.md) [^ Coalesce](../ref/coalesce.md)
17+
[upsert](../ref/upsert.md)
18+
[, join](../ref/join.md)
19+
[\^ coalesce](../ref/coalesce.md)
1820
</div>
1921

2022

@@ -144,4 +146,4 @@ _Q for Mortals_
144146
----
145147
:fontawesome-solid-street-view:
146148
_Q for Mortals_
147-
[§9.9 Joins](/q4m3/9_Queries_q-sql/#99-joins)
149+
[§9.9 Joins](/q4m3/9_Queries_q-sql/#99-joins)

docs/basics/listening-port.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ keywords: ephemeral, kdb+, listen, multi-threaded, port, q, socket, unix
77

88

99

10-
Use the `-p` [command-line option](cmdline.md) or the `\p` [system command](syscmds.md) to tell kdb+ to listen to a port. The command-line option and the system command take the same parameters.
10+
Use the [`-p` command-line option](cmdline.md#-p-listening-port) or the [`\p` system command](syscmds.md#p-listening-port) to tell kdb+ to listen to a port. The command-line option and the system command take the same parameters.
1111

1212
```txt
1313
\p [rp,][hostname:][portnumber|servicename]
@@ -38,8 +38,6 @@ q)\p
3838
0i
3939
```
4040

41-
Use for [client/server](../kb/client-server.md), e.g. kdbc(JDBC ODBC), HTTP (HTML XML TXT CSV).
42-
4341
Given a servicename, q will look up its port number in `/etc/services`.
4442

4543
```q

docs/cloud/gcpm/index.md

Lines changed: 0 additions & 33 deletions
This file was deleted.

docs/cloud/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ Some motivations for cloud deployments:
5353
KX customers have deployed kdb+ and other KX solutions successfully in the cloud, including the three main cloud vendors:
5454

5555
- [kdb+ on Amazon Web Services](aws/index.md) :fontawesome-brands-aws:
56-
- [kdb+ on Google Cloud Platform](gcpm/index.md)
57-
- Microsoft Azure
56+
- [kdb+ on Google Cloud Platform](gcpm/architecture.md)
57+
- [kdb+ on Microsoft Azure](azure/architecture.md)
5858

5959

docs/kb/client-server.md

Lines changed: 0 additions & 143 deletions
This file was deleted.

docs/kb/digitalocean.md

Lines changed: 0 additions & 138 deletions
This file was deleted.

0 commit comments

Comments
 (0)