[GNUnet-SVN] r29858 - in gnunet: doc/man src/conversation

[gnunet]

Author: grothoff
Date: 2013-10-05 14:59:16 +0200 (Sat, 05 Oct 2013)
New Revision: 29858

Added:
   gnunet/doc/man/gnunet-conversation.1
Modified:
   gnunet/doc/man/Makefile.am
   gnunet/doc/man/gnunet-publish.1
   gnunet/src/conversation/gnunet-conversation-new.c
Log:
-man page for gnunet-conversation

Modified: gnunet/doc/man/Makefile.am
===================================================================
--- gnunet/doc/man/Makefile.am  2013-10-05 12:52:48 UTC (rev 29857)
+++ gnunet/doc/man/Makefile.am  2013-10-05 12:59:16 UTC (rev 29858)
@@ -5,6 +5,7 @@
   gnunet-auto-share.1 \
   gnunet-config.1 \
   gnunet-core.1 \
+  gnunet-conversation.1 \
   gnunet-directory.1 \
   gnunet-dns2gns.1 \
   gnunet-datastore.1 \

Added: gnunet/doc/man/gnunet-conversation.1
===================================================================
--- gnunet/doc/man/gnunet-conversation.1                                (rev 0)
+++ gnunet/doc/man/gnunet-conversation.1        2013-10-05 12:59:16 UTC (rev 
29858)
@@ -0,0 +1,38 @@
+.TH GNUNET\-CONVERSATION 1 "Oct 5, 2013" "GNUnet"
+
+.SH NAME
+gnunet\-conversation \- have a conversation with your peers
+
+.SH SYNOPSIS
+.B gnunet\-conversation \-e NAME [OPTIONS]
+.RI URI
+.br
+
+.SH DESCRIPTION
+\fBgnunet\-conversation\fP can be used to have a conversation with other 
GNUnet users.  You can make calls and receive incoming calls.  You need to 
setup an ego using gnunet\-identity first.  For others to be able to call you, 
you must add a PHONE record to your zone in the GNU Name System (using 
gnunet\-namestore).  gnunet\-conversation has an interactive help system via 
the /help command.
+
+.SH OPTIONS
+.B
+.IP "\-c FILENAME,  \-\-config=FILENAME"
+Use the configuration file FILENAME.
+.B
+.IP "\-e NAME,  \-\-ego=NAME"
+Specifies the NAME of the ego to use (for caller ID) and the GNS master zone 
for our own lookups.
+.B
+.IP "\-h, \-\-help"
+Print short help on options.
+.B
+.IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
+Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and ERROR.
+.B
+.IP "\-p LINE,  \-\-phone=LINE"
+Optional argument that can be used to specify the phone LINE to be used with 
the conversation service.  The default LINE is zero, which should be fine for 
most users.
+.B
+.IP "\-v, \-\-version"
+Print GNUnet version number.
+
+
+.SH BUGS
+Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending 
electronic mail to <address@hidden>
+.SH "SEE ALSO"
+\fBgnunet\-identity\fP(1), \fBgnunet\-namestore\fP(1), \fBgnunet\-gns\fP(1)

Modified: gnunet/doc/man/gnunet-publish.1
===================================================================
--- gnunet/doc/man/gnunet-publish.1     2013-10-05 12:52:48 UTC (rev 29857)
+++ gnunet/doc/man/gnunet-publish.1     2013-10-05 12:59:16 UTC (rev 29858)
@@ -169,4 +169,4 @@
 .SH "REPORTING BUGS"
 Report bugs to <https://gnunet.org/bugs/> or by sending electronic mail to 
<address@hidden>
 .SH "SEE ALSO"
-\fBgnunet\-auto\-share\fP(1), \fBgnunet\-fs\-gtk\fP(1), 
\fBgnunet\-pseudonym\fP(1), \fBgnunet\-search\fP(1), \fBgnunet\-download\fP(1), 
\fBgnunet.conf\fP(5), \fBextract\fP(1)
+\fBgnunet\-auto\-share\fP(1), \fBgnunet\-fs\-gtk\fP(1), 
\fBgnunet\-search\fP(1), \fBgnunet\-download\fP(1), \fBgnunet.conf\fP(5), 
\fBextract\fP(1)

Modified: gnunet/src/conversation/gnunet-conversation-new.c
===================================================================
--- gnunet/src/conversation/gnunet-conversation-new.c   2013-10-05 12:52:48 UTC 
(rev 29857)
+++ gnunet/src/conversation/gnunet-conversation-new.c   2013-10-05 12:59:16 UTC 
(rev 29858)
@@ -827,12 +827,12 @@
 main (int argc, char *const *argv)
 {
   static const struct GNUNET_GETOPT_CommandLineOption options[] = {
+    {'e', "ego", "NAME",
+     gettext_noop ("sets the NAME of the ego to use for the phone (and name 
resolution)"),
+     1, &GNUNET_GETOPT_set_string, &ego_name},
     {'p', "phone", "LINE",
       gettext_noop ("sets the LINE to use for the phone"),
      1, &GNUNET_GETOPT_set_uint, &line},
-    {'e', "ego", "NAME",
-     gettext_noop ("sets the NAME of the ego to use for the phone (and name 
resolution)"),
-     1, &GNUNET_GETOPT_set_string, &ego_name},
     GNUNET_GETOPT_OPTION_END
   };
   int flags;