Fix spelling errors.

Found by codespell.

diff --git a/doc/tinc.8.in b/doc/tinc.8.in
index aaa3547..ee96e86 100644 (file)
--- a/doc/tinc.8.in
+++ b/doc/tinc.8.in
@@ -75,7 +75,7 @@ option, the value of this environment variable is used.
 .Sh COMMANDS
 .Bl -tag -width indent
 .It init Op Ar name
-Create initial configuration files and RSA and Ed25519 keypairs with default length.
+Create initial configuration files and RSA and Ed25519 key pairs with default length.
 If no
 .Ar name
 for this node is given, it will be asked for.
@@ -149,11 +149,11 @@ will be made.
 Shows the PID of the currently running
 .Xr tincd 8 .
 .It generate-keys Op bits
-Generate both RSA and Ed25519 keypairs (see below) and exit.
+Generate both RSA and Ed25519 key pairs (see below) and exit.
 .It generate-ed25519-keys
-Generate public/private Ed25519 keypair and exit.
+Generate public/private Ed25519 key pair and exit.
 .It generate-rsa-keys Op bits
-Generate public/private RSA keypair and exit.
+Generate public/private RSA key pair and exit.
 If
 .Ar bits
 is omitted, the default length will be 2048 bits.

diff --git a/doc/tinc.conf.5.in b/doc/tinc.conf.5.in
index acdce0f..7494227 100644 (file)
--- a/doc/tinc.conf.5.in
+++ b/doc/tinc.conf.5.in
@@ -64,7 +64,7 @@ or by using
 .Sh PUBLIC/PRIVATE KEYS
 The
 .Nm tinc Li init
-command will have generated both RSA and Ed25519 public/private keypairs.
+command will have generated both RSA and Ed25519 public/private key pairs.
 The private keys should be stored in files named
 .Pa rsa_key.priv
 and

diff --git a/doc/tinc.texi b/doc/tinc.texi
index 9c45965..9f0f18e 100644 (file)
--- a/doc/tinc.texi
+++ b/doc/tinc.texi
@@ -683,7 +683,7 @@ A good resource on networking is the
 
 If you have everything clearly pictured in your mind,
 proceed in the following order:
-First, create the initial configuration files and public/private keypairs using the following command:
+First, create the initial configuration files and public/private key pairs using the following command:
 @example
 tinc -n @var{NETNAME} init @var{NAME}
 @end example
@@ -1555,7 +1555,7 @@ you have to make the scripts executable, using the command @samp{chmod a+x scrip
 
 @subsubheading Step 1.  Creating initial configuration files.
 
-The initial directory structure, configuration files and public/private keypairs are created using the following command:
+The initial directory structure, configuration files and public/private key pairs are created using the following command:
 
 @example
 tinc -n @var{netname} init @var{name}
@@ -1882,7 +1882,7 @@ Address = 4.5.6.7
 
 @subsubheading Key files
 
-A, B, C and D all have their own public/private keypairs:
+A, B, C and D all have their own public/private key pairs:
 
 The private RSA key is stored in @file{@value{sysconfdir}/tinc/company/rsa_key.priv},
 the private Ed25519 key is stored in @file{@value{sysconfdir}/tinc/company/ed25519_key.priv},
@@ -2138,7 +2138,7 @@ Some of them will only be visible if the debug level is high enough.
 @item Error reading RSA key file `rsa_key.priv': No such file or directory
 
 @itemize
-@item You forgot to create a public/private keypair.
+@item You forgot to create a public/private key pair.
 @item Specify the complete pathname to the private key file with the @samp{PrivateKeyFile} option.
 @end itemize
 
@@ -2206,8 +2206,8 @@ You can add @samp{TCPOnly = yes} to host configuration files to force all VPN tr
 @item Got bad/bogus/unauthorized REQUEST from foo (1.2.3.4 port 12345)
 
 @itemize
-@item Node foo does not have the right public/private keypair.
-Generate new keypairs and distribute them again.
+@item Node foo does not have the right public/private key pair.
+Generate new key pairs and distribute them again.
 @item An attacker tries to gain access to your VPN.
 @item A network error caused corruption of metadata sent from foo.
 @end itemize
@@ -2312,7 +2312,7 @@ the value of this environment variable is used.
 
 @cindex init
 @item init [@var{name}]
-Create initial configuration files and RSA and Ed25519 keypairs with default length.
+Create initial configuration files and RSA and Ed25519 key pairs with default length.
 If no @var{name} for this node is given, it will be asked for.
 
 @cindex get
@@ -2397,17 +2397,17 @@ Shows the PID of the currently running @samp{tincd}.
 
 @cindex generate-keys
 @item generate-keys [@var{bits}]
-Generate both RSA and Ed25519 keypairs (see below) and exit.
+Generate both RSA and Ed25519 key pairs (see below) and exit.
 tinc will ask where you want to store the files, but will default to the
 configuration directory (you can use the -c or -n option).
 
 @cindex generate-ed25519-keys
 @item generate-ed25519-keys
-Generate public/private Ed25519 keypair and exit.
+Generate public/private Ed25519 key pair and exit.
 
 @cindex generate-rsa-keys
 @item generate-rsa-keys [@var{bits}]
-Generate public/private RSA keypair and exit.  If @var{bits} is omitted, the
+Generate public/private RSA key pair and exit.  If @var{bits} is omitted, the
 default length will be 2048 bits.  When saving keys to existing files, tinc
 will not delete the old keys; you have to remove them manually.
 

diff --git a/src/net_setup.c b/src/net_setup.c
index 1f0e74c..6181631 100644 (file)
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -215,7 +215,7 @@ static bool read_ecdsa_private_key(void) {
                logger(DEBUG_ALWAYS, LOG_ERR, "Error reading Ed25519 private key file `%s': %s", fname, strerror(errno));
 
                if(errno == ENOENT) {
-                       logger(DEBUG_ALWAYS, LOG_INFO, "Create an Ed25519 keypair with `tinc -n %s generate-ed25519-keys'.", netname ? netname : ".");
+                       logger(DEBUG_ALWAYS, LOG_INFO, "Create an Ed25519 key pair with `tinc -n %s generate-ed25519-keys'.", netname ? netname : ".");
                }
 
                free(fname);
@@ -307,7 +307,7 @@ static bool read_rsa_private_key(void) {
                       fname, strerror(errno));
 
                if(errno == ENOENT) {
-                       logger(DEBUG_ALWAYS, LOG_INFO, "Create an RSA keypair with `tinc -n %s generate-rsa-keys'.", netname ? netname : ".");
+                       logger(DEBUG_ALWAYS, LOG_INFO, "Create an RSA key pair with `tinc -n %s generate-rsa-keys'.", netname ? netname : ".");
                }
 
                free(fname);

diff --git a/src/tincctl.c b/src/tincctl.c
index 99a34c7..2cc98d1 100644 (file)
--- a/src/tincctl.c
+++ b/src/tincctl.c
@@ -126,12 +126,12 @@ static void usage(bool status) {
                       "  reload                     Partially reload configuration of running tincd.\n"
                       "  pid                        Show PID of currently running tincd.\n"
 #ifdef DISABLE_LEGACY
-                      "  generate-keys              Generate a new Ed25519 public/private keypair.\n"
+                      "  generate-keys              Generate a new Ed25519 public/private key pair.\n"
 #else
-                      "  generate-keys [bits]       Generate new RSA and Ed25519 public/private keypairs.\n"
-                      "  generate-rsa-keys [bits]   Generate a new RSA public/private keypair.\n"
+                      "  generate-keys [bits]       Generate new RSA and Ed25519 public/private key pairs.\n"
+                      "  generate-rsa-keys [bits]   Generate a new RSA public/private key pair.\n"
 #endif
-                      "  generate-ed25519-keys      Generate a new Ed25519 public/private keypair.\n"
+                      "  generate-ed25519-keys      Generate a new Ed25519 public/private key pair.\n"
                       "  dump                       Dump a list of one of the following things:\n"
                       "    [reachable] nodes        - all known nodes in the VPN\n"
                       "    edges                    - all known connections in the VPN\n"
@@ -419,7 +419,7 @@ ask_filename:
 }
 
 /*
-  Generate a public/private Ed25519 keypair, and ask for a file to store
+  Generate a public/private Ed25519 key pair, and ask for a file to store
   them in.
 */
 static bool ed25519_keygen(bool ask) {
@@ -427,7 +427,7 @@ static bool ed25519_keygen(bool ask) {
        FILE *f;
        char fname[PATH_MAX];
 
-       fprintf(stderr, "Generating Ed25519 keypair:\n");
+       fprintf(stderr, "Generating Ed25519 key pair:\n");
 
        if(!(key = ecdsa_generate())) {
                fprintf(stderr, "Error during key generation!\n");
@@ -483,7 +483,7 @@ error:
 
 #ifndef DISABLE_LEGACY
 /*
-  Generate a public/private RSA keypair, and ask for a file to store
+  Generate a public/private RSA key pair, and ask for a file to store
   them in.
 */
 static bool rsa_keygen(int bits, bool ask) {