Merge pull request #5714 from alexischr/update_bockbuild

[mono.git] / man / mono-service.1

diff --git a/man/mono-service.1 b/man/mono-service.1
index 7473f43cf500397236ee738bfb4b4bfc5288f2d8..8a1a99caf1c93823c2521b1c026e7d46d89153f8 100644 (file)
--- a/man/mono-service.1
+++ b/man/mono-service.1
@@ -8,9 +8,9 @@
 .if t .sp .5v
 .if n .sp
 ..
-.TH Mono "Mono 1.0"
+.TH Mono "mono-service"
 .SH NAME
-mono-service \- Mono ServiceProcess host
+mono-service, mono-service2 \- Mono ServiceProcess host
 .SH SYNOPSIS
 .PP
 .B mono-service [options] program.exe
@@ -18,11 +18,19 @@ mono-service \- Mono ServiceProcess host
 The \fImono-service\fP is a host to run services built with the
 ServiceProcess assembly.
 .PP
+Use \fImono-service\fP to run services that use the 1.0 assemblies and
+use \fImono-service2\fP to run services that use the 2.0 assemblies.
+.PP
 Services can be paused by sending the SIGUSR1 signal to the process,
 and execution can be resumed by sending the SIGUSR2 signal.   The
 service can be cleanly shutdown by sending the SIGTERM signal to the
 process. 
 .PP
+Mono programs started with mono-service run with the 
+.B MONO_DISABLE_SHM
+variable set.    This means that certain Mono features that depend on
+it are not available to services.
+.PP
 The following options can be used to control the service:
 .TP
 .I "-d:DIRECTORY"