aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Merge branch 'master' into osx-functional

Browse Source
This commit is contained in:
James Booth 2015-09-28 21:35:10 +01:00
commit f861cd95f2
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/command/command.c
View File

@ -1210,7 +1210,7 @@ static struct cmd_t command_defs[] =
"/otr secret <secret>", "/otr secret <secret>",
"/otr question <question> <answer>", "/otr question <question> <answer>",
"/otr answer <answer>", "/otr answer <answer>",
"/otr policy manual|opportunistic|always", "/otr policy manual|opportunistic|always [<contact>]",
"/otr log on|off|redact", "/otr log on|off|redact",
"/otr char <char>") "/otr char <char>")
CMD_DESC( CMD_DESC(
@ -1227,14 +1227,18 @@ static struct cmd_t command_defs[] =
{ "question <question> <answer>", "Verify a contact's identity using a question and expected answer." }, { "question <question> <answer>", "Verify a contact's identity using a question and expected answer." },
{ "answer <answer>", "Respond to a question answer verification request with your answer." }, { "answer <answer>", "Respond to a question answer verification request with your answer." },
{ "policy manual", "Set the global OTR policy to manual, OTR sessions must be started manually." }, { "policy manual", "Set the global OTR policy to manual, OTR sessions must be started manually." },
{ "policy opportunistic", "Set the global OTR policy to opportunistic, and OTR sessions will be attempted upon starting a conversation." }, { "policy manual <contact>", "Set the OTR policy to manual for a specific contact." },
{ "policy opportunistic", "Set the global OTR policy to opportunistic, an OTR session will be attempted upon starting a conversation." },
{ "policy opportunistic <contact>", "Set the OTR policy to opportunistic for a specific contact." },
{ "policy always", "Set the global OTR policy to always, an error will be displayed if an OTR session cannot be initiated upon starting a conversation." }, { "policy always", "Set the global OTR policy to always, an error will be displayed if an OTR session cannot be initiated upon starting a conversation." },
{ "policy always <contact>", "Set the OTR policy to always for a specific contact." },
{ "log on|off", "Enable or disable plaintext logging of OTR encrypted messages." }, { "log on|off", "Enable or disable plaintext logging of OTR encrypted messages." },
{ "log redact", "Log OTR encrypted messages, but replace the contents with [redacted]. This is the default." }, { "log redact", "Log OTR encrypted messages, but replace the contents with [redacted]. This is the default." },
{ "char <char>", "Set the character to be displayed next to OTR encrypted messages." }) { "char <char>", "Set the character to be displayed next to OTR encrypted messages." })
CMD_EXAMPLES( CMD_EXAMPLES(
"/otr log off", "/otr log off",
"/otr policy manual", "/otr policy manual",
"/otr policy opportunistic mrfriend@workchat.org",
"/otr gen", "/otr gen",
"/otr start buddy@buddychat.org", "/otr start buddy@buddychat.org",
"/otr myfp", "/otr myfp",