summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES.txt4
-rw-r--r--pyramid/scripts/pserve.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 8ed3e1137..b71af30cb 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -218,8 +218,8 @@ Deprecations
Please use a real process manager in the future instead of relying on the
``pserve`` to daemonize itself. Many options exist including your Operating
- System's services such as systemd or upstart, as well as the excellent
- and simple supervisord.
+ System's services such as Systemd or Upstart, as well as Python-based
+ solutions like Circus and Supervisor.
See https://github.com/Pylons/pyramid/pull/1641
diff --git a/pyramid/scripts/pserve.py b/pyramid/scripts/pserve.py
index a30ea5985..094a811a4 100644
--- a/pyramid/scripts/pserve.py
+++ b/pyramid/scripts/pserve.py
@@ -622,7 +622,7 @@ class PServeCommand(object):
self.out('''\
The daemon options have been deprecated in Pyramid 1.6. They will be removed
in a future release per Pyramid's deprecation policy. Please consider using
-a real process manager for handling your processes like supervisord or systemd.
+a real process manager for your processes like Systemd, Circus, or Supervisor.
The following commands are deprecated:
[start,stop,restart,status] --daemon, --stop-server, --status, --pid-file