From f5322e8e1264eedbd258dae42af7b6ca7a793bcd Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Thu, 1 Feb 2007 17:22:32 +0000
Subject: [PATCH] svn merge -r10892:10907
https://eris.llnl.gov/svn/slurm/branches/slum-1.1
---
doc/man/man3/slurm_free_job_info_msg.3 | 2 +-
src/slurmctld/controller.c | 4 +++-
src/slurmd/slurmd/slurmd.c | 10 ++++++----
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/doc/man/man3/slurm_free_job_info_msg.3 b/doc/man/man3/slurm_free_job_info_msg.3
index 7b39654b7c6..c04db73aa35 100644
--- a/doc/man/man3/slurm_free_job_info_msg.3
+++ b/doc/man/man3/slurm_free_job_info_msg.3
@@ -98,7 +98,7 @@ ISLURM_GET_REM_TIME2() is equivalent to ISLURM_GET_REM_TIME() except
that the JOBID is taken from the SLURM_JOBID environment variable,
which is set by SLURM for tasks which it launches.
Both functions return the number of seconds remaining before the job
-reaches the end of it\'s allocated time.
+reaches the end of it's allocated time.
.SH "ARGUMENTS"
.TP
diff --git a/src/slurmctld/controller.c b/src/slurmctld/controller.c
index 4871eb09857..d2cfed7e57c 100644
--- a/src/slurmctld/controller.c
+++ b/src/slurmctld/controller.c
@@ -1049,13 +1049,15 @@ static void _usage(char *prog_name)
fprintf(stderr, " -h "
"\tPrint this help message.\n");
fprintf(stderr, " -L logfile "
- "\tLog messages to the specified file\n");
+ "\tLog messages to the specified file.\n");
#if (DEFAULT_RECOVER == 0)
fprintf(stderr, " -r "
"\tRecover state from last checkpoint.\n");
#endif
fprintf(stderr, " -v "
"\tVerbose mode. Multiple -v's increase verbosity.\n");
+ fprintf(stderr, " -V "
+ "\tPrint version information and exit.\n");
}
/*
diff --git a/src/slurmd/slurmd/slurmd.c b/src/slurmd/slurmd/slurmd.c
index 58fbad91358..733e8a257a4 100644
--- a/src/slurmd/slurmd/slurmd.c
+++ b/src/slurmd/slurmd/slurmd.c
@@ -1092,12 +1092,14 @@ _usage()
{
fprintf(stderr, "\
Usage: %s [OPTIONS]\n\
- -L logfile Log messages to the file `logfile'\n\
- -v Verbose mode. Multiple -v's increase verbosity.\n\
+ -c Force cleanup of slurmd shared memory.\n\
-D Run daemon in foreground.\n\
-M Use mlock() to lock slurmd pages into memory.\n\
- -c Force cleanup of slurmd shared memory.\n\
- -h Print this help message.\n", conf->prog);
+ -h Print this help message.\n\
+ -f config Read configuration from the specified file.\n\
+ -L logfile Log messages to the file `logfile'.\n\
+ -v Verbose mode. Multiple -v's increase verbosity.\n\
+ -V Print version information and exit.\n", conf->prog);
return;
}
--
GitLab