diff options
6 files changed, 7 insertions, 7 deletions
diff --git a/doc/admin.rst b/doc/admin.rst
index a5850a7..ec80112 100644
--- a/doc/admin.rst
+++ b/doc/admin.rst
@@ -205,7 +205,7 @@ ca_file
Specifies which file should be used as the list of trusted CA when
-negociating a TLS session. By default this value is unset and biboumi
+negotiating a TLS session. By default this value is unset and biboumi
tries a list of well-known paths.
@@ -242,7 +242,7 @@ policy_directory
A directory that should contain the policy files, used to customize
-Botan’s behaviour when negociating the TLS connections with the IRC
+Botan’s behaviour when negotiating the TLS connections with the IRC
servers. If not specified, the directory is the one where biboumi’s
configuration file is located: for example if biboumi reads its
configuration from /etc/biboumi/biboumi.cfg, the policy_directory value
diff --git a/src/irc/irc_client.cpp b/src/irc/irc_client.cpp
index 5f0d9b9..1f2a21b 100644
--- a/src/irc/irc_client.cpp
+++ b/src/irc/irc_client.cpp
@@ -307,7 +307,7 @@ void IrcClient::on_connected()
this->send_message({"AUTHENTICATE", {"PLAIN"}});
- log_warning("negociating SASL now...");
+ log_warning("negotiating SASL now...");
diff --git a/src/irc/irc_client.hpp b/src/irc/irc_client.hpp
index ac2f6a9..3423228 100644
--- a/src/irc/irc_client.hpp
+++ b/src/irc/irc_client.hpp
@@ -238,7 +238,7 @@ public:
void on_invited(const IrcMessage& message);
- * The IRC server sends a CAP message, as part of capabilities negociation. It could be a ACK,
+ * The IRC server sends a CAP message, as part of capabilities negotiation. It could be a ACK,
* NACK, or something else
void on_cap(const IrcMessage& message);
diff --git a/src/network/credentials_manager.cpp b/src/network/credentials_manager.cpp
index 89c694c..47f8514 100644
--- a/src/network/credentials_manager.cpp
+++ b/src/network/credentials_manager.cpp
@@ -102,7 +102,7 @@ void BasicCredentialsManager::load_certs()
if (BasicCredentialsManager::try_to_open_one_ca_bundle(paths))
BasicCredentialsManager::certs_loaded = true;
- log_warning("The CA could not be loaded, TLS negociation will probably fail.");
+ log_warning("The CA could not be loaded, TLS negotiation will probably fail.");
std::vector<Botan::Certificate_Store*> BasicCredentialsManager::trusted_certificate_authorities(const std::string&, const std::string&)
diff --git a/src/network/tcp_socket_handler.cpp b/src/network/tcp_socket_handler.cpp
index e05caad..ae23b3c 100644
--- a/src/network/tcp_socket_handler.cpp
+++ b/src/network/tcp_socket_handler.cpp
@@ -277,7 +277,7 @@ void TCPSocketHandler::tls_recv()
void TCPSocketHandler::tls_send(std::string&& data)
// We may not be connected yet, or the tls session has
- // not yet been negociated
+ // not yet been negotiated
if (this->tls && this->tls->is_active())
const bool was_active = this->tls->is_active();
diff --git a/src/network/tcp_socket_handler.hpp b/src/network/tcp_socket_handler.hpp
index c598641..b12ae57 100644
--- a/src/network/tcp_socket_handler.hpp
+++ b/src/network/tcp_socket_handler.hpp
@@ -212,7 +212,7 @@ private:
* calls the output_fn callback with it as soon as it is created.
* Therefore, we do not want to create it if we do not intend to send any
* TLS-encrypted message. We create the object only when needed (for
- * example after we have negociated a TLS session using a STARTTLS
+ * example after we have negotiated a TLS session using a STARTTLS
* message, or stuf like that).
* See start_tls for the method where this object is created.