mirror of
https://gitea.psi.ch/ELOG/elog.git
synced 2026-09-08 17:13:56 +00:00
Patch from Recai
SVN revision: 1157
This commit is contained in:
parent
dc4ddf0478
commit
5e9b24f1eb
@ -54,6 +54,9 @@ messages automatically into the logbook.
|
|||||||
.SH OPTIONS
|
.SH OPTIONS
|
||||||
\fBelog\fP accepts the following options:
|
\fBelog\fP accepts the following options:
|
||||||
.TP
|
.TP
|
||||||
|
.BR \-H
|
||||||
|
submit entry in HTML format
|
||||||
|
.TP
|
||||||
.BI -a " attribute=value"
|
.BI -a " attribute=value"
|
||||||
set attribute to value
|
set attribute to value
|
||||||
.TP
|
.TP
|
||||||
|
|||||||
12
man/elogd.8
12
man/elogd.8
@ -21,9 +21,9 @@ elogd \- web server program for Electronic Logbook ELOG
|
|||||||
.sp
|
.sp
|
||||||
\fBelog\fR [ \fB-a \fIpassword\fB\fR ] [ \fB-C \fIurl\fB\fR ] [ \fB-c \fIfile\fB\fR ]
|
\fBelog\fR [ \fB-a \fIpassword\fB\fR ] [ \fB-C \fIurl\fB\fR ] [ \fB-c \fIfile\fB\fR ]
|
||||||
[ \fB-D\fR ] [ \fB-d \fIdirectory\fB\fR ] [ \fB-f \fIfile\fB\fR ] [ \fB-k\fR ]
|
[ \fB-D\fR ] [ \fB-d \fIdirectory\fB\fR ] [ \fB-f \fIfile\fB\fR ] [ \fB-k\fR ]
|
||||||
[ \fB-l \fIlogbook\fB\fR ] [ \fB-n \fIhostname\fB\fR ] [ \fB-p \fIport\fB\fR ]
|
[ \fB-l \fIlogbook\fB\fR ] [ \fB-M\fR ] [ \fB-m\fR ] [ \fB-n \fIhostname\fB\fR ]
|
||||||
[ \fB-r \fIpassword\fB\fR ] [ \fB-S\fR ] [ \fB-s \fIdirectory\fB\fR ] [ \fB-v\fR ]
|
[ \fB-p \fIport\fB\fR ] [ \fB-r \fIpassword\fB\fR ] [ \fB-S\fR ]
|
||||||
[ \fB-w \fIpassword\fB\fR ] [ \fB-x\fR ]
|
[ \fB-s \fIdirectory\fB\fR ] [ \fB-v\fR ] [ \fB-w \fIpassword\fB\fR ] [ \fB-x\fR ]
|
||||||
|
|
||||||
.SH DESCRIPTION
|
.SH DESCRIPTION
|
||||||
.PP
|
.PP
|
||||||
@ -59,6 +59,12 @@ specify logbook root directory
|
|||||||
.BI -f " file"
|
.BI -f " file"
|
||||||
specify PID file
|
specify PID file
|
||||||
.TP
|
.TP
|
||||||
|
.BI -M
|
||||||
|
synchronize with removing deleted entries
|
||||||
|
.TP
|
||||||
|
.BI -m
|
||||||
|
synchronize logbook(s) with remote server
|
||||||
|
.TP
|
||||||
.BI -n " host"
|
.BI -n " host"
|
||||||
host where
|
host where
|
||||||
.B elogd
|
.B elogd
|
||||||
|
|||||||
13
src/elogd.c
13
src/elogd.c
@ -6,6 +6,9 @@
|
|||||||
Contents: Web server program for Electronic Logbook ELOG
|
Contents: Web server program for Electronic Logbook ELOG
|
||||||
|
|
||||||
$Log$
|
$Log$
|
||||||
|
Revision 1.527 2004/12/29 13:42:38 midas
|
||||||
|
Patch from Recai
|
||||||
|
|
||||||
Revision 1.526 2004/12/20 16:14:58 midas
|
Revision 1.526 2004/12/20 16:14:58 midas
|
||||||
Version 2.5.5-3
|
Version 2.5.5-3
|
||||||
|
|
||||||
@ -21488,14 +21491,14 @@ int main(int argc, char *argv[])
|
|||||||
else {
|
else {
|
||||||
usage:
|
usage:
|
||||||
printf("%s\n", ELOGID);
|
printf("%s\n", ELOGID);
|
||||||
printf("usage: elogd [-a <pwd>] [-c <file>] [-C <url>] [-D] [-d <dir>] ");
|
printf("usage: elogd [-a <pwd>] [-C <url>] [-c <file>] [-D] [-d <dir>] ");
|
||||||
printf("[-f <file>] [-h] [-k] [-l <logbook>] [-n <hostname>] [-p <port>] ");
|
printf("[-f <file>] [-h] [-k] [-l <logbook>] [-M] [-m] [-n <hostname>] ");
|
||||||
printf("[-r <pwd>] [-S] [-s <dir>] [-v] [-w <pwd>] [-x]\n\n");
|
printf("[-p <port>] [-r <pwd>] [-S] [-s <dir>] [-v] [-w <pwd>] [-x]\n\n");
|
||||||
printf(" -a <pwd> create/overwrite admin password in config file\n");
|
printf(" -a <pwd> create/overwrite admin password in config file\n");
|
||||||
printf(" -c <file> specify configuration file\n");
|
|
||||||
printf(" -C <url> clone remote elogd configuration\n");
|
printf(" -C <url> clone remote elogd configuration\n");
|
||||||
printf(" -m synchronize logbook(s) with remote server\n");
|
printf(" -c <file> specify configuration file\n");
|
||||||
printf(" -M synchronize with removing deleted entries\n");
|
printf(" -M synchronize with removing deleted entries\n");
|
||||||
|
printf(" -m synchronize logbook(s) with remote server\n");
|
||||||
printf(" -D become a daemon\n");
|
printf(" -D become a daemon\n");
|
||||||
printf(" -d <dir> specify logbook root directory\n");
|
printf(" -d <dir> specify logbook root directory\n");
|
||||||
#ifdef OS_UNIX
|
#ifdef OS_UNIX
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user