[1188] in BarnOwl Developers
[D-O-H] r1129 - trunk/owl
daemon@ATHENA.MIT.EDU (geofft@MIT.EDU)
Thu Oct 29 18:13:55 2009
Resent-From: nelhage@mit.edu
Resent-To: barnowl-dev-mtg@charon.mit.edu
X-Original-To: nelhage@nelhage.com
Date: Thu, 18 Sep 2008 18:51:15 -0400 (EDT)
To: dirty-owl-hackers@MIT.EDU
From: geofft@MIT.EDU
Reply-to: dirty-owl-hackers@MIT.EDU
Author: geofft
Date: 2008-09-18 18:51:15 -0400 (Thu, 18 Sep 2008)
New Revision: 1129
Modified:
trunk/owl/commands.c
trunk/owl/variable.c
trunk/owl/zephyr.c
Log:
A bunch of spelling and grammar fixes, some obvious, some pedantic
Modified: trunk/owl/commands.c
===================================================================
--- trunk/owl/commands.c 2008-09-18 22:13:49 UTC (rev 1128)
+++ trunk/owl/commands.c 2008-09-18 22:51:15 UTC (rev 1129)
@@ -50,7 +50,7 @@
"logout notification. By default a login notification is sent\n"
"when owl is started and a logout notification is sent when owl\n"
"is exited. This behavior can be changed with the 'startuplogin'\n"
- "and 'shudownlogout' variables. If a tty is specified for zlog in\n"
+ "and 'shutdownlogout' variables. If a tty is specified for zlog in\n"
"then the owl variable 'tty' will be set to that string, causing\n"
"it to be used as the zephyr location tty.\n"),
@@ -193,7 +193,7 @@
OWLCMD_ARGS("subscribe", owl_command_subscribe, OWL_CTX_ANY,
"subscribe to a zephyr class, instance, recipient",
"subscribe [-t] <class> [instance [recipient]]",
- "Subscribe the specified class and instance. If the\n"
+ "Subscribe to the specified class and instance. If the\n"
"instance or recipient is not listed on the command\n"
"line they default to * (the wildcard recipient).\n"
"If the -t option is present the subscription will\n"
@@ -264,7 +264,7 @@
"zpunt <class> <instance> [recipient]\n"
"zpunt <instance>",
"The zpunt command will supress message to the specified\n"
- "zephyr triplet. In the second usage messages as supressed\n"
+ "zephyr triplet. In the second usage messages are suppressed\n"
"for class MESSAGE and the named instance.\n\n"
"SEE ALSO: zunpunt, show zpunts\n"),
@@ -272,7 +272,7 @@
"undo a previous zpunt",
"zunpunt <class> <instance> [recipient]\n"
"zunpunt <instance>",
- "The zunpunt command will allow messages that were previosly\n"
+ "The zunpunt command will allow messages that were previously\n"
"suppressed to be received again.\n\n"
"SEE ALSO: zpunt, show zpunts\n"),
@@ -546,7 +546,7 @@
"And additionally you may use the static values:\n"
" true\n"
" false\n"
- "Spaces must be present before and after parenthesis. If the\n"
+ "Spaces must be present before and after parentheses. If the\n"
"optional color arguments are used they specifies the colors that\n"
"messages matching this filter should be displayed in.\n\n"
"SEE ALSO: view, viewclass, viewuser\n"),
@@ -593,23 +593,23 @@
"smartnarrow [-i | --instance]",
"If the curmsg is a personal message narrow\n"
" to the conversation with that user.\n"
- "If the curmsg is a class message, instance foo, recip *\n"
- " message, narrow to the class, inst.\n"
- "If the curmsg is a class message then narrow\n"
+ "If the curmsg is a <MESSAGE, foo, *>\n"
+ " message, narrow to the instance.\n"
+ "If the curmsg is a class message, narrow\n"
" to the class.\n"
- "If the curmsg is a class message and '-i' is specied\n"
- " then narrow to the class, instance\n"),
+ "If the curmsg is a class message and '-i' is specified\n"
+ " then narrow to the class and instance.\n"),
OWLCMD_ARGS("smartfilter", owl_command_smartfilter, OWL_CTX_INTERACTIVE,
"returns the name of a filter based on the current message",
"smartfilter [-i | --instance]",
"If the curmsg is a personal message, the filter is\n"
" the conversation with that user.\n"
- "If the curmsg is a class message, instance foo, recip *\n"
- " message, the filter is the class, inst.\n"
+ "If the curmsg is a <MESSAGE, foo, *>\n"
+ " message, the filter is to that instance.\n"
"If the curmsg is a class message, the filter is that class.\n"
"If the curmsg is a class message and '-i' is specied\n"
- " the filter is that <class,instance> pair\n"),
+ " the filter is to that class and instance.\n"),
OWLCMD_ARGS("viewclass", owl_command_viewclass, OWL_CTX_INTERACTIVE,
"view messages matching a particular class",
@@ -675,7 +675,7 @@
"delete trash",
"If no message id is specified the current message is marked\n"
"for deletion. Otherwise the message with the given message\n"
- "id is marked for deltion.\n"
+ "id is marked for deletion.\n"
"If '--no-move' is specified, don't move after deletion.\n"
"If 'trash' is specified, deletes all trash/auto messages\n"
"in the current view.\n"
@@ -689,7 +689,7 @@
"undelete view",
"If no message id is specified the current message is\n"
"unmarked for deletion. Otherwise the message with the\n"
- "given message id is marked for undeltion.\n"
+ "given message id is unmarked for deletion.\n"
"If '--no-move' is specified, don't move after deletion.\n"
"If 'view' is specified, undeletes all messages\n"
"in the current view.\n"),
@@ -728,7 +728,7 @@
"The search command will find messages that contain the\n"
"specified string and move the cursor there. If no string\n"
"argument is supplied then the previous one is used. By\n"
- "default searches are done fowards, if -r is used the search\n"
+ "default searches are done forwards; if -r is used the search\n"
"is performed backwards"),
OWLCMD_ARGS("setsearch", owl_command_setsearch, OWL_CTX_INTERACTIVE,
@@ -737,7 +737,7 @@
"The setsearch command highlights all occurences of its\n"
"argument and makes it the default argument for future\n"
"search commands, but does not move the cursor. With\n"
- "no argument, it makes search inactive."),
+ "no argument, it makes search highlighting inactive."),
OWLCMD_ARGS("aimlogin", owl_command_aimlogin, OWL_CTX_ANY,
"login to an AIM account",
@@ -2615,7 +2615,7 @@
}
cmd = owl_message_get_attribute_value(m, "yescommand");
if(!cmd) {
- owl_function_error("No yes command!");
+ owl_function_error("No 'yes' command!");
return;
}
@@ -2649,7 +2649,7 @@
}
cmd = owl_message_get_attribute_value(m, "nocommand");
if(!cmd) {
- owl_function_error("No no command!");
+ owl_function_error("No 'no' command!");
return;
}
Modified: trunk/owl/variable.c
===================================================================
--- trunk/owl/variable.c 2008-09-18 22:13:49 UTC (rev 1128)
+++ trunk/owl/variable.c 2008-09-18 22:51:15 UTC (rev 1129)
@@ -83,7 +83,7 @@
"send pings", "" ),
OWLVAR_BOOL( "sepbar_disable" /* %OwlVarStub */, 0,
- "disable printing information in the seperator bar", "" ),
+ "disable printing information in the separator bar", "" ),
OWLVAR_BOOL( "smartstrip" /* %OwlVarStub */, 1,
"strip kerberos instance for reply", ""),
@@ -141,7 +141,7 @@
"When this is enabled, Owl will periodically check the zephyr\n"
"location of users in your .anyone file. If a user is present\n"
"but sent no login message, or a user is not present that sent no\n"
- "logout message a pseudo login or logout message wil be created\n",
+ "logout message, a pseudo login or logout message wil be created\n",
NULL, owl_variable_pseudologins_set, NULL),
OWLVAR_BOOL( "ignorelogins" /* %OwlVarStub */, 0,
Modified: trunk/owl/zephyr.c
===================================================================
--- trunk/owl/zephyr.c 2008-09-18 22:13:49 UTC (rev 1128)
+++ trunk/owl/zephyr.c 2008-09-18 22:51:15 UTC (rev 1129)
@@ -805,7 +805,7 @@
if (numlocs==0) {
myuser=short_zuser(user);
- sprintf(out, "%s: Hidden or not logged-in\n", myuser);
+ sprintf(out, "%s: Hidden or not logged in\n", myuser);
owl_free(myuser);
return;
}
