Merge commit '1678ee'

diff --git a/client.c b/client.c
index 2242d40e3589fd7211eae249e04b53869c102fd7..0ae015139fc915d5446cbb58b6eacf78d2d9eb2a 100644 (file)
--- a/client.c
+++ b/client.c
@@ -601,7 +601,7 @@ int main(int argc, char *argv[])
         */
        sit.btrn = btr_new_node(&(struct btr_node_description)
                EMBRACE(.name = "stdin"));
-       ret = client_open(argc, argv, &ct, &client_loglevel, sit.btrn, NULL, &sched);
+       ret = client_connect(ct, &sched, sit.btrn, NULL);
        if (ret < 0)
                goto out;
        sot.btrn = btr_new_node(&(struct btr_node_description)

diff --git a/web/manual.m4 b/web/manual.m4
index 041457e6157a585cd479edba8e65ab45fcd5e207..e665ea7bf99f183ea0a1479386f580cba7feb113 100644 (file)
--- a/web/manual.m4
+++ b/web/manual.m4
@@ -494,7 +494,7 @@ including ssh and gpg. An RSA key consists in fact of two keys,
 called the public key and the private key. A message can be encrypted
 with either key and only the counterpart of that key can decrypt
 the message. While RSA can be used for both signing and encrypting
-a message, paraslash only uses RSA only for the latter purpose. The
+a message, paraslash uses RSA only for the latter purpose. The
 RSA public key encryption and signatures algorithms are defined in
 detail in RFC 2437.