emacs-jabber README,1.21,1.22 jabber.texi,1.86,1.87 NEWS,1.66,1.67

[Magnus H. <leg...@us...>]

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv7746

Modified Files:
	README jabber.texi NEWS 
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-488
Creator:  Magnus Henoch <ma...@fr...>

More documentation hacking


Index: README
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/README,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- README	24 Apr 2008 02:19:38 -0000	1.21
+++ README	24 Apr 2008 02:19:59 -0000	1.22
@@ -71,8 +71,8 @@
 After installation by either method, add (load "jabber-autoloads") to
 your .emacs file.
 
-Also, users upgrading from 0.7-0.7.x may meet some configuration
-issues. Please, report them as bugs in tracker, to help update docs.
+If you are upgrading from 0.7-0.7.x, you need to update your
+configuration.  See the section "Account settings" in the manual.
 
 Usage
 =====

Index: NEWS
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/NEWS,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- NEWS	21 Feb 2008 15:16:23 -0000	1.66
+++ NEWS	24 Apr 2008 02:19:59 -0000	1.67
@@ -2,6 +2,10 @@
 
 * New features in jabber.el 0.8
 
+** Support for multiple accounts
+Configuration variables have changed.  See section "Account settings"
+in the manual.
+
 ** OSD alerts (message, MUC, MUC-personal)
 
 ** Family of personal MUC alerts added
@@ -10,16 +14,13 @@
 ** MUC nicks completion
 See sectin "Groupchat" in manual.
 
-** Support for multiple accounts
-See section "Account settings" in manual.
-
 ** Automatic reconnection
 Not enabled by default; See "Reconnecting" section in manual.
 
-** support for XEP-0085
+** Support for XEP-0085
 This means "contact is typing" notifications when chatting with Gajim
 or Google Talk users, among others.
-See "XEP-0085" section in manual
+See "Typing notifications" section in the manual.
 
 ** Option: hide offline contacts in roster
 See "The roster buffer" in manual.

Index: jabber.texi
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber.texi,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -d -r1.86 -r1.87
--- jabber.texi	24 Apr 2008 02:19:48 -0000	1.86
+++ jabber.texi	24 Apr 2008 02:19:59 -0000	1.87
@@ -53,7 +53,7 @@
 * Time queries::                
 * Useful features::             
 * Message history::             
-* Message events::              
+* Typing notifications::        
 * Roster import and export::    
 * XMPP URIs::                   
 * Customization::               
@@ -130,7 +130,8 @@
 
 I'll assume that you have already successfully installed jabber.el; if
 not, consult the @file{README} file.  Also, make sure you have
-@code{(require 'jabber)} in your @file{.emacs}.
+@code{(require 'jabber)} or @code{(load "jabber-autoloads")}in your
+@file{.emacs}.
 
 Now, type @kbd{M-x jabber-customize}. This brings up a customize
 buffer for jabber.el. One variable to customize are
@@ -379,7 +380,7 @@
 
 @menu
 * Automation::                  
-* Bookmarks::                
+* Bookmarks::                   
 * Invitations::                 
 * Private messages::            
 * MUC Administration::          
@@ -863,7 +864,7 @@
 * Autoaway::                    
 * Modeline status::             
 * Keepalive::                   
-* Reconnecting::
+* Reconnecting::                
 * Tracking activity::           
 * Watch buddies::               
 * Spell checking::              
@@ -1055,7 +1056,7 @@
 For more information about Emacs spell checking, @xref{Spelling, ,
 Checking and Correcting Spelling, emacs, GNU Emacs Manual}.
 
-@node Message history, Message events, Useful features, Top
+@node Message history, Typing notifications, Useful features, Top
 @chapter Message history
 
 @cindex History
@@ -1120,8 +1121,14 @@
 Truncation limit may be set by customizing
 @code{jabber-log-lines-to-keep} variable.
 
-@node Message events, Roster import and export, Message history, Top
-@chapter Message events
+@node Typing notifications, Roster import and export, Message history, Top
+@chapter Typing notifications
+
+There are two protocols for ``contact is typing'' notifications in
+Jabber.  jabber.el supports both of them, displaying various information
+in the header line of chat buffers.
+
+@section Message events
 
 @cindex Composing
 @cindex Delivered
@@ -1131,9 +1138,9 @@
 @vindex jabber-events-confirm-displayed
 @vindex jabber-events-confirm-composing
 
-In the status line of the chat buffer, you can sometimes see
-notifications about the progress of the message you just sent.  These
-states are possible:
+The older protocol is called Message Events (@pxref{XEP-0022}).  Besides
+typing notification, it lets you know what happens to the messages you send.
+These states are possible:
 
 @itemize @bullet
 @item
@@ -1146,7 +1153,7 @@
 Displayed to user
 
 @item
-User is composing a reply
+User is typing a message
 
 @end itemize
 
@@ -1161,7 +1168,40 @@
 not to request such information by customizing
 @code{jabber-events-request-these}.
 
-@node Roster import and export, XMPP URIs, Message events, Top
+@section Chat states
+
+@vindex jabber-chatstates-confirm
+
+The newer protocol is called Chat States (@pxref{XEP-0085}).  Rather
+than dealing with individual messages, it describes the state of the
+chat session between two people.  The following states are possible:
+
+@itemize @bullet
+@item
+Active (the default state, not displayed)
+
+@item
+Inactive
+
+@item
+Composing
+
+@item
+Paused (i.e., taking a short pause in composing)
+
+@item
+Gone
+
+@end itemize
+
+jabber.el can display all five states, but only ever sends ``active''
+and ``composing'' itself.
+
+To customize sending of chat states, customize the variable
+@code{jabber-chatstates-confirm}.
+
+
+@node Roster import and export, XMPP URIs, Typing notifications, Top
 @chapter Roster import and export
 
 @findex jabber-export-roster
@@ -1273,12 +1313,56 @@
 @cindex Password
 @cindex JID
 @cindex Resource
+@cindex Network server
 
 All account settings reside in @code{jabber-account-list} variable.
-By customizing it, you cat set JID, password, resource, and turn
-account on/off. Optionally, you can set alternative network server,
-port and connection type. See comments for this variable to learn how
-to set it up.
+Usually you only need to set the JID, in the form
+@samp{username@@server} (or @samp{username@@server/resource} to use a
+specific resource name).  These are the other account options:
+
+@table @asis
+@item Disabled
+If the account is disabled, @code{jabber-connect-all} will not attempt
+to connect it.  You can still connect it manually with
+@code{jabber-connect}.
+
+@item Password
+You can set the password of the account, so you don't have to enter it
+when you connect.  Note that it will be stored unencrypted in your
+customization file.
+
+@item Network server
+If the JID of the Jabber server is not also its DNS name, you may have
+to enter the real DNS name or IP address of the server here.
+
+@item Connection type
+This option specifies whether to use an encrypted connection to the
+server.  Usually you want ``STARTTLS'' (@code{starttls}), which means
+that encryption is activated if the server supports it.  The other
+possibilities are ``unencrypted'' (@code{network}), which means just
+that, and ``legacy SSL/TLS'' (@code{ssl}), which means that encryption
+is activated on connection.
+
+@item Port
+If the Jabber server uses a nonstandard port, specify it here.  The
+default is 5222 for STARTTLS and unencrypted connections, and 5223 for
+legacy SSL connections.
+@end table
+
+@subsection For Google Talk
+
+@cindex Google Talk
+
+If you have a very new version of @file{dns.el}, you can connect to
+Google Talk just by specifying your Gmail address.  If not, set
+``network server'' to @kbd{talk.google.com} and ``connection type'' to
+``legacy SSL''.
+
+@subsection Upgrade note
+
+Previous versions of jabber.el had the variables @code{jabber-username},
+@code{jabber-server}, @code{jabber-resource} and
+@code{jabber-password}.  These are now obsolete and not used.
 
 @node Miscellaneous settings, Customizing the roster buffer, Account settings, Customization
 @section Miscellaneous settings
@@ -2198,9 +2282,6 @@
 notifications are @emph{sent} though all five notifications are handled on
 receipt.
 
-To customize sending of chat states, customize
-@code{jabber-chatstates-confirm} variable.
-
 @node XEP-0086, XEP-0090, XEP-0085, Protocol support
 @section XEP-0086 (Error Condition Mappings)