diff --git a/src/applications/daemon/management/PhabricatorDaemonManagementRestartWorkflow.php b/src/applications/daemon/management/PhabricatorDaemonManagementRestartWorkflow.php
--- a/src/applications/daemon/management/PhabricatorDaemonManagementRestartWorkflow.php
+++ b/src/applications/daemon/management/PhabricatorDaemonManagementRestartWorkflow.php
@@ -6,7 +6,10 @@
   protected function didConstruct() {
     $this
       ->setName('restart')
-      ->setSynopsis(pht('Stop, then start the standard daemon loadout.'))
+      ->setSynopsis(
+        pht(
+          'Stop daemon processes on this host, then start the standard '.
+          'daemon loadout.'))
       ->setArguments(
         array(
           array(
@@ -18,16 +21,14 @@
             'default' => 15,
           ),
           array(
-            'name' => 'gently',
+            'name' => 'force',
             'help' => pht(
-              'Ignore running processes that look like daemons but do not '.
-              'have corresponding PID files.'),
+              'Stop all daemon processes on this host, even if they belong '.
+              'to another Phabricator instance.'),
           ),
           array(
-            'name' => 'force',
-            'help' => pht(
-              'Also stop running processes that look like daemons but do '.
-              'not have corresponding PID files.'),
+            'name' => 'gently',
+            'help' => pht('Deprecated. Has no effect.'),
           ),
           $this->getAutoscaleReserveArgument(),
         ));
@@ -38,8 +39,8 @@
       array(
         'graceful' => $args->getArg('graceful'),
         'force' => $args->getArg('force'),
-        'gently' => $args->getArg('gently'),
       ));
+
     if ($err) {
       return $err;
     }
diff --git a/src/applications/daemon/management/PhabricatorDaemonManagementStopWorkflow.php b/src/applications/daemon/management/PhabricatorDaemonManagementStopWorkflow.php
--- a/src/applications/daemon/management/PhabricatorDaemonManagementStopWorkflow.php
+++ b/src/applications/daemon/management/PhabricatorDaemonManagementStopWorkflow.php
@@ -6,11 +6,7 @@
   protected function didConstruct() {
     $this
       ->setName('stop')
-      ->setSynopsis(
-        pht(
-          'Stop all running daemons, or specific daemons identified by PIDs. '.
-          'Use **%s** to find PIDs.',
-          'phd status'))
+      ->setSynopsis(pht('Stop daemon processes on this host.'))
       ->setArguments(
         array(
           array(
@@ -24,18 +20,12 @@
           array(
             'name' => 'force',
             'help' => pht(
-              'Also stop running processes that look like daemons but do '.
-              'not have corresponding PID files.'),
+              'Stop all daemon processes on this host, even if they belong '.
+              'to another Phabricator instance.'),
           ),
           array(
             'name' => 'gently',
-            'help' => pht(
-              'Ignore running processes that look like daemons but do not '.
-              'have corresponding PID files.'),
-          ),
-          array(
-            'name' => 'pids',
-            'wildcard' => true,
+            'help' => pht('Deprecated. Has no effect.'),
           ),
         ));
   }
@@ -45,7 +35,6 @@
       array(
         'graceful' => $args->getArg('graceful'),
         'force' => $args->getArg('force'),
-        'gently' => $args->getArg('gently'),
       ));
   }