diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-10-05 12:59:16 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-10-05 12:59:16 +0000 |
commit | 5ed18ae859f6c20afa070d6fa04fafe0d8936cf5 (patch) | |
tree | f64edb600e4bd4bd0236d89b193d5795a6787401 | |
parent | 660c1d610b9ae61814d501b73c4bb745201e023d (diff) | |
download | gnunet-5ed18ae859f6c20afa070d6fa04fafe0d8936cf5.tar.gz gnunet-5ed18ae859f6c20afa070d6fa04fafe0d8936cf5.zip |
-man page for gnunet-conversation
-rw-r--r-- | doc/man/Makefile.am | 1 | ||||
-rw-r--r-- | doc/man/gnunet-conversation.1 | 38 | ||||
-rw-r--r-- | doc/man/gnunet-publish.1 | 2 | ||||
-rw-r--r-- | src/conversation/gnunet-conversation-new.c | 6 |
4 files changed, 43 insertions, 4 deletions
diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am index 2b6fdc737..ba383e6d2 100644 --- a/doc/man/Makefile.am +++ b/doc/man/Makefile.am | |||
@@ -5,6 +5,7 @@ man_MANS = \ | |||
5 | gnunet-auto-share.1 \ | 5 | gnunet-auto-share.1 \ |
6 | gnunet-config.1 \ | 6 | gnunet-config.1 \ |
7 | gnunet-core.1 \ | 7 | gnunet-core.1 \ |
8 | gnunet-conversation.1 \ | ||
8 | gnunet-directory.1 \ | 9 | gnunet-directory.1 \ |
9 | gnunet-dns2gns.1 \ | 10 | gnunet-dns2gns.1 \ |
10 | gnunet-datastore.1 \ | 11 | gnunet-datastore.1 \ |
diff --git a/doc/man/gnunet-conversation.1 b/doc/man/gnunet-conversation.1 new file mode 100644 index 000000000..5048bdbcd --- /dev/null +++ b/doc/man/gnunet-conversation.1 | |||
@@ -0,0 +1,38 @@ | |||
1 | .TH GNUNET\-CONVERSATION 1 "Oct 5, 2013" "GNUnet" | ||
2 | |||
3 | .SH NAME | ||
4 | gnunet\-conversation \- have a conversation with your peers | ||
5 | |||
6 | .SH SYNOPSIS | ||
7 | .B gnunet\-conversation \-e NAME [OPTIONS] | ||
8 | .RI URI | ||
9 | .br | ||
10 | |||
11 | .SH DESCRIPTION | ||
12 | \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. | ||
13 | |||
14 | .SH OPTIONS | ||
15 | .B | ||
16 | .IP "\-c FILENAME, \-\-config=FILENAME" | ||
17 | Use the configuration file FILENAME. | ||
18 | .B | ||
19 | .IP "\-e NAME, \-\-ego=NAME" | ||
20 | Specifies the NAME of the ego to use (for caller ID) and the GNS master zone for our own lookups. | ||
21 | .B | ||
22 | .IP "\-h, \-\-help" | ||
23 | Print short help on options. | ||
24 | .B | ||
25 | .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL" | ||
26 | Use LOGLEVEL for logging. Valid values are DEBUG, INFO, WARNING and ERROR. | ||
27 | .B | ||
28 | .IP "\-p LINE, \-\-phone=LINE" | ||
29 | 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. | ||
30 | .B | ||
31 | .IP "\-v, \-\-version" | ||
32 | Print GNUnet version number. | ||
33 | |||
34 | |||
35 | .SH BUGS | ||
36 | Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending electronic mail to <gnunet\-developers@gnu.org> | ||
37 | .SH "SEE ALSO" | ||
38 | \fBgnunet\-identity\fP(1), \fBgnunet\-namestore\fP(1), \fBgnunet\-gns\fP(1) | ||
diff --git a/doc/man/gnunet-publish.1 b/doc/man/gnunet-publish.1 index 467f45a56..2f2055074 100644 --- a/doc/man/gnunet-publish.1 +++ b/doc/man/gnunet-publish.1 | |||
@@ -169,4 +169,4 @@ GNUnet configuration file | |||
169 | .SH "REPORTING BUGS" | 169 | .SH "REPORTING BUGS" |
170 | Report bugs to <https://gnunet.org/bugs/> or by sending electronic mail to <gnunet\-developers@gnu.org> | 170 | Report bugs to <https://gnunet.org/bugs/> or by sending electronic mail to <gnunet\-developers@gnu.org> |
171 | .SH "SEE ALSO" | 171 | .SH "SEE ALSO" |
172 | \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) | 172 | \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) |
diff --git a/src/conversation/gnunet-conversation-new.c b/src/conversation/gnunet-conversation-new.c index 4be8f11aa..fdf6155fd 100644 --- a/src/conversation/gnunet-conversation-new.c +++ b/src/conversation/gnunet-conversation-new.c | |||
@@ -827,12 +827,12 @@ int | |||
827 | main (int argc, char *const *argv) | 827 | main (int argc, char *const *argv) |
828 | { | 828 | { |
829 | static const struct GNUNET_GETOPT_CommandLineOption options[] = { | 829 | static const struct GNUNET_GETOPT_CommandLineOption options[] = { |
830 | {'p', "phone", "LINE", | ||
831 | gettext_noop ("sets the LINE to use for the phone"), | ||
832 | 1, &GNUNET_GETOPT_set_uint, &line}, | ||
833 | {'e', "ego", "NAME", | 830 | {'e', "ego", "NAME", |
834 | gettext_noop ("sets the NAME of the ego to use for the phone (and name resolution)"), | 831 | gettext_noop ("sets the NAME of the ego to use for the phone (and name resolution)"), |
835 | 1, &GNUNET_GETOPT_set_string, &ego_name}, | 832 | 1, &GNUNET_GETOPT_set_string, &ego_name}, |
833 | {'p', "phone", "LINE", | ||
834 | gettext_noop ("sets the LINE to use for the phone"), | ||
835 | 1, &GNUNET_GETOPT_set_uint, &line}, | ||
836 | GNUNET_GETOPT_OPTION_END | 836 | GNUNET_GETOPT_OPTION_END |
837 | }; | 837 | }; |
838 | int flags; | 838 | int flags; |