diff doc/gaim.1.in @ 8736:374477c0dd76

[gaim-migrate @ 9491] (21:37:35) nosnilmot: LSchiere: do you want this? http://nosnilmot.com/patches/gaim-0.77cvs-doclove.patch (21:38:43) LSchiere: oh wow (21:38:44) LSchiere: sure (21:38:56) nosnilmot: oh crap, does that spelling nonsense conflict with it? (21:40:22) nosnilmot: LSchiere: apparently the spelling police avoided doc/ , so that patch should still apply (21:40:29) KingAnt: :-) (21:40:31) LSchiere: nosnilmot: commit message? (21:40:44) KingAnt: "Dr. Love" (21:40:54) nosnilmot: "I never knew EvilDennisR did anything, now I do" (21:41:05) LSchiere: and the serious commit message? but apparently we aren't being serious tonight. committer: Tailor Script <[e-mail]>

--- a/doc/gaim.1.in	Wed Apr 21 01:34:26 2004 +0000
+++ b/doc/gaim.1.in	Wed Apr 21 01:43:16 2004 +0000
@@ -39,8 +39,8 @@
 .B \-d, \-\-debug
 Print debugging messages to stdout.  These are the same debugging messages that are displayed in the \fBDebug\fR window.
 .TP
-.B \-f, \-\-file=\fIFILE\fB
-Use \fIFILE\fR as the configuration file instead of \fI~/.gaimrc\fR.
+.B \-c, \-\-config=\fIDIR\fB
+Use \fIDIR\fR as the directory for config files instead of \fI~/.gaim\fR.
 .TP
 .B \-h, \-\-help
 Print this help and exit.
@@ -72,7 +72,7 @@
 A Buddy Pounce is a configurable automated action to be performed when the buddy's state changes.  This will open the \fBBuddy Pounce\fR dialog to be discussed later.
 .TP 
 .B View Log
-\fBgaim\fR is capable of automatically log its activities.  These logs are html files (with a .log extenstion) located in the \fI~/.gaim/logs\fR directory.  This menu command will attempt to view this file with \fBgaim\fR's internal log viewer.
+\fBgaim\fR is capable of automatically log its activities.  These logs are either plain text files (with a .log extension) or  html files (with a .html extenstion) located under the \fI~/.gaim/logs\fR directory.  This menu command will attempt to view this file with \fBgaim\fR's internal log viewer.
 .TP
 .B Alias
 Create an alias for this buddy.  This will open up a new dialog in which one can give this buddy an alternate name to appear on the buddy list and in conversataions.
@@ -119,11 +119,11 @@
 \fIDisplay remote nicknames if no alias is set\fR: Toggles whether server nickname data should be used if no local alias exists.
 
 .TP
-.B Themes
-Allows the user to choose between different emoticon themes.
+.B Smiley Themes
+Allows the user to choose between different smiley themes.
 .TP
 .B Fonts
-Lets the user pick a default font style/face/color for all accounts (only available in protocols that accept HTML messages).
+Lets the user pick a default font style/face/color for all accounts (only applicable to protocols that support HTML formatting in messages).
 .TP
 .B Message Text
 \fIShow graphical smileys\fR: Enables the replacement of text emoticons with their graphical equivalents.
@@ -138,26 +138,44 @@
 Allows the user to determine which keyboard shortcuts are available.
 .TP
 .B Buddy List
-\fIHide IM/Info/Chat buttons\fR: Disables the display of these buttons on the
-\fBBuddy List\fR's \fBOnline\fR pane.
+\fISorting\fR: Toggles the order in which buddies are shown in your \fBBuddy List\fR between none, alphabetical, by status and by log size.
 
-\fIShow pictures on buttons\fR: Toggles between picture-only and text-only views of the buttons on the \fBBuddy List\fR.
-
-\fISave window size/position\fR: If enabled, \fBgaim\fR will place the \fBBuddy List\fR at its last screen position at start-up.
+\fIShow buttons as\fR: Toggles between picture-only, text-only, picure and text or no buttons view of the buttons on the \fBBuddy List\fR.
 
 \fIRaise window on events\fR: Tells \fBgaim\fR to bring the \fBBuddy List\fR window to the top when buddies sign in or out.
 
-\fIHide groups with no online buddies\fR: Groups in which no buddies are currently logged in will not be shown in the \fBOnline\fR pane.
-
 \fIShow numbers in groups\fR: The number of buddies from each group currently logged in will be shown along with the total number of buddies in the group.
 
-\fIShow buddy type icons\fR: The icons showing which protocol each buddy uses and whether or not the buddy is away will not be shown.
+\fIShow buddy icons\fR: Toggles the display of buddies' custom icons.
 
 \fIShow warning levels\fR: Each buddy's warning level will be displayed next to the screen name. As a buddy's warning level increases, outgoing messages are more and more severely rate-limited.
 
 \fIShow idle times\fR: The amount of time each buddy has been idle will be displayed next to the screen name (if the buddy has opted to have their client report this information).
 
-\fIGrey idle buddies\fR: If enabled, idle buddies will be displayed in grey text instead of black text.
+\fIDim idle buddies\fR: If enabled, idle buddies will be displayed in grey text instead of black text.
+
+\fIAutomatically expand contacts\fR: If enabled, contacts will automatically expand to show the associated buddies when the mouse is held over the contact for a short period.
+
+.SH Conversations
+
+\fIPlacement...\fR: Determines where new conversations will be placed (Last created window / New window / windows grouped by group or account).
+
+\fISend URLs as links\fR: Automatically turns URLs into clickable links when sent on protocols that support HTML.
+
+\fIShow formatting toolbar\fR: Display the formatting toolbar between the upper and lower text boxes in conversations.
+
+\fIShow aliases in tabs/titles\fR: Displays buddy alias instead of screen name in window tabs and titles.
+
+\fITab Placement...\fR: Specifies where tabs are shown in the conversation window.
+
+\fIShow IMs and chats in tabbed windows\fR: Tabbed chatting allows one to have multiple conversations without multiple windows.
+
+\fIShow IMs and chats in same tabbed window\fR: Uses the same window for both IMs and chats.
+
+\fIShow close buttons on tabs\fR: Adds a close button to each tab.
+
+\fIShow status icons on tabs\fR: Adds an icon to each tab representing the buddy's status.
+
 .TP
 .B IM Window
 \fIShow buttons as...\fR: The selected item will determine whether picture-only, text-only, or combined picture/text buttons will be used for \fBConversation\fR windows.
@@ -186,8 +204,6 @@
 
 \fIColorize screennames\fR: Color code the screen names of users in chat rooms.
 .TP
-.B Tabs
-Tabbed chatting allows one to have multiple conversations without multiple windows. \fbTabs\fR show which conversations have unanswered messages, and can identify a user either by screen name or by alias.
 
 .SH Proxy
 
@@ -203,7 +219,7 @@
 
 .SH Sounds
 
-\fINo sounds when you log in\fR: Makes the log-in process silent.
+\fISounds when you log in\fR: Enables sounds during log-in.
 
 \fISounds while away\fR: Determines whether sounds are played when an away message is up.
 
@@ -244,40 +260,37 @@
 Some plugins can be configured.  If you load such a plugin, its configuration preferences will appear as a submenu to \fBPlugins\fR, with the submenu title determined by the plugin's name.
 
 .SH CONVERSATIONS
-When starting a new conversation, the user is presented with the \fBConversation\fR window.  The conversation appears in the upper text box and the user types his/her message in the lower text box.  Between the two is a row of settings, represented by icons.  From left to right:
+When starting a new conversation, the user is presented with the \fBConversation\fR window.  The conversation appears in the upper text box and the user types his/her message in the lower text box.  Between the two is a row of settings, represented by icons.  Some or all buttons may not be active if the protocol does not support the specific formatting. From left to right:
 .TP
 .B Bold
-adds <b></b> to your message
+Turns on/off bold.
 .TP
 .B Italics
-adds <i></i> to your message
+Turns on/off italics.
 .TP
 .B Underline
-adds <u></u> to your message
+Turns on/off underline.
 .TP
 .B Decrease font size
-adds <font size="1"></font> to your message
-.TP
-.B Default font size
-adds <font size="3"></font> to your message
+Increases the size of the message text.
 .TP
 .B Increase font size
-adds <font size="5"></font> to your message
+Decreases the size of the message text.
 .TP
 .B Select a foreground color
-adds an appropriate font tag to your message.
+Changes the foreground color of the message text.
 .TP
 .B Select a background color
-adds an appropriate body tag to your message.
+Changes the background color of the message text.
 .TP
 .B Add image
-inserts an appropriate img tag (not available in all protocols).
+Inserts an in-line image in the message.
 .TP
 .B Add hyperlink
-adds an appropriate a href tag to your message.
+Adds a clickable link to the message.
 .TP
 .B Add smiley
-adds an ASCII smiley to your message.  This will become a graphic smiley in the upper text box if the option for graphical smileys is set.
+Adds an emoticon (smiley) to your message.
 
 Beneath the lower text box is a row of buttons that execute commands:
 .TP
@@ -334,6 +347,9 @@
 .SH PERL
 \fBGaim\fR allows for perl scripting.  See \fIPerl Scripting HOWTO\fR in the Gaim documentation for more information about perl scripting.
 
+.SH TCL
+\fBGaim\fR allows for Tcl scripting. See \fIplugins/tcl/TCL-HOWTO\fR for more information about Tcl scripting.
+
 .SH FILES
 \fI@prefix@/bin/gaim\fR: \fBgaim\fR's location.
 .br
@@ -347,15 +363,21 @@
 .br
 \fI~/.gaim/pounces.xml\fR: stores your buddy pounces.
 .br
-\fI~/.gaim/logs/SCREENNAME.log\fR: a log of all conversation with \fISCREENNAME\fR.
+\fI~/.gaim/logs/PROTOCOL/ACCOUNT/SCREENNAME/DATE.log\fR: conversation logs.
 .br
 \fI~/.gaim/blist.xml\fR: the buddy list.
+.br
+\fI~/.gaim/plugins/\fR: users local plugins
 
 .SH BUGS
-Known bugs are listed at \fIhttp://sourceforge.net/tracker/?group_id=235&atid=100235\fR.
+Known bugs are listed at
+.br
+\fIhttp://sourceforge.net/tracker/?group_id=235&atid=100235\fR
 
 .SH PATCHES
-If you fix a bug in \fBgaim\fR (or otherwise enhance it), please submit a patch (using \fIcvs diff -u > my.diff\fR against the latest CVS version) at \fIhttp://sourceforge.net/tracker/?func=add&group_id=235&atid=300235\fR.
+If you fix a bug in \fBgaim\fR (or otherwise enhance it), please submit a patch (using \fIcvs diff -up > my.diff\fR against the latest CVS version) at
+.br
+\fIhttp://sourceforge.net/tracker/?func=add&group_id=235&atid=300235\fR
 
 Before sending a bug report, please verify that you have the latest 
 version of \fBgaim\fR.  Many bugs (major and minor) are fixed