diff --git a/docs/profanity.1 b/docs/profanity.1 index 1f4a61b7..9cdf2d31 100644 --- a/docs/profanity.1 +++ b/docs/profanity.1 @@ -3,7 +3,7 @@ Profanity \- a simple console based XMPP chat client. .SH SYNOPSIS .B profanity -[-vhd] [-l level] +[\-vhd] [\-l level] .SH DESCRIPTION .B Profanity is a simple lightweight console based XMPP chat client. It's emphasis is @@ -23,7 +23,7 @@ Show help on command line arguments. .BI "\-a, \-\-account" Auto connect to an account on startup. .TP -.BI "\-d, \-\-disable-tls" +.BI "\-d, \-\-disable\-tls" Disable TLS for servers that either don't support it, or claim to but do not complete the handshake. .TP @@ -62,7 +62,7 @@ or with a Github account by logging issues on the issue tracker at: .PP .SH LICENSE -Copyright (C) 2012 - 2014 James Booth . +Copyright (C) 2012 \- 2014 James Booth . License GPLv3+: GNU GPL version 3 or later This is free software; you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. diff --git a/src/command/command.c b/src/command/command.c index 42fee1ce..9e8283e2 100644 --- a/src/command/command.c +++ b/src/command/command.c @@ -513,7 +513,7 @@ static struct cmd_t command_defs[] = { "/flash on|off", "Terminal flash on new messages.", { "/flash on|off", "-------------", - "Make the terminal flash when incoming messages are recieved.", + "Make the terminal flash when incoming messages are received.", "The flash will only occur if you are not in the chat window associated with the user sending the message.", "If the terminal doesn't support flashing, it may attempt to beep.", NULL } } }, diff --git a/src/otr/otrlibv4.c b/src/otr/otrlibv4.c index a91bbe43..27b99f06 100644 --- a/src/otr/otrlibv4.c +++ b/src/otr/otrlibv4.c @@ -72,7 +72,7 @@ cb_otr_error_message(void *opdata, ConnContext *context, switch(err_code) { case OTRL_ERRCODE_ENCRYPTION_ERROR: - return strdup("OTR Error: occured while encrypting a message"); + return strdup("OTR Error: occurred while encrypting a message"); case OTRL_ERRCODE_MSG_NOT_IN_PRIVATE: return strdup("OTR Error: Sent encrypted message to somebody who is not in a mutual OTR session"); case OTRL_ERRCODE_MSG_UNREADABLE: diff --git a/src/profanity.c b/src/profanity.c index 1692fceb..07c51788 100644 --- a/src/profanity.c +++ b/src/profanity.c @@ -179,7 +179,7 @@ prof_handle_activity(void) gboolean process_input(char *inp) { - log_debug("Input recieved: %s", inp); + log_debug("Input received: %s", inp); gboolean result = FALSE; g_strstrip(inp); diff --git a/src/xmpp/iq.c b/src/xmpp/iq.c index 1c9ad0aa..65d20b07 100644 --- a/src/xmpp/iq.c +++ b/src/xmpp/iq.c @@ -155,7 +155,7 @@ _error_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza, if (id != NULL) { log_error("IQ error received, id: %s.", id); } else { - log_error("IQ error recieved."); + log_error("IQ error received."); } return 1; @@ -434,7 +434,7 @@ static int _disco_info_result_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza, void * const userdata) { - log_debug("Recieved diso#info response"); + log_debug("Received diso#info response"); const char *id = xmpp_stanza_get_attribute(stanza, STANZA_ATTR_ID); const char *from = xmpp_stanza_get_attribute(stanza, STANZA_ATTR_FROM); @@ -603,7 +603,7 @@ _disco_items_result_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stan void * const userdata) { - log_debug("Recieved diso#items response"); + log_debug("Received diso#items response"); const char *id = xmpp_stanza_get_attribute(stanza, STANZA_ATTR_ID); const char *from = xmpp_stanza_get_attribute(stanza, STANZA_ATTR_FROM); GSList *items = NULL; diff --git a/src/xmpp/message.c b/src/xmpp/message.c index 8efe90af..84137b04 100644 --- a/src/xmpp/message.c +++ b/src/xmpp/message.c @@ -381,7 +381,7 @@ _groupchat_handler(xmpp_conn_t * const conn, // room not active in profanity if (!muc_room_is_active(jid->barejid)) { - log_error("Message recieved for inactive chat room: %s", jid->str); + log_error("Message received for inactive chat room: %s", jid->str); jid_destroy(jid); return 1; }