3 files changed, 26 insertions, 1 deletions

diff --git a/debian/patches/doc-upstart.patch b/debian/patches/doc-upstart.patch
new file mode 100644
index 000000000..5f35ac0c8
--- /dev/null
+++ b/debian/patches/doc-upstart.patch
@@ -0,0 +1,21 @@
+Description: Refer to ssh's Upstart job as well as its init script
+Author: Colin Watson <cjwatson@ubuntu.com>
+Forwarded: not-needed
+Last-Update: 2012-11-26
+
+Index: b/sshd.8
+===================================================================
+--- a/sshd.8
++++ b/sshd.8
+@@ -69,7 +69,10 @@
+ .Nm
+ listens for connections from clients.
+ It is normally started at boot from
+-.Pa /etc/init.d/ssh .
++.Pa /etc/init.d/ssh
++(or
++.Pa /etc/init/ssh.conf
++on systems using the Upstart init daemon).
+ It forks a new
+ daemon for each incoming connection.
+ The forked daemons handle
diff --git a/debian/patches/series b/debian/patches/series
index c5cf8de4b..c940d8384 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -39,6 +39,7 @@ lintian-symlink-pickiness.patch
 openbsd-docs.patch
 ssh-argv0.patch
 doc-hash-tab-completion.patch
+doc-upstart.patch
 
 # Debian-specific configuration
 gnome-ssh-askpass2-icon.patch
diff --git a/sshd.8 b/sshd.8
index bccd238b0..b74ab47c0 100644
--- a/sshd.8
+++ b/sshd.8
@@ -69,7 +69,10 @@ over an insecure network.
 .Nm
 listens for connections from clients.
 It is normally started at boot from
-.Pa /etc/init.d/ssh .
+.Pa /etc/init.d/ssh
+(or
+.Pa /etc/init/ssh.conf
+on systems using the Upstart init daemon).
 It forks a new
 daemon for each incoming connection.
 The forked daemons handle