Merge Phacility/master into phorge

.arclint

@@ -80,7 +80,8 @@
     "xhpast": {
       "type": "xhpast",
       "include": "(\\.php$)",
-      "standard": "phutil.xhpast"
+      "standard": "phutil.xhpast",
+      "xhpast.php-version": "5.5"
     }
   }
 }

NOTICE

@@ -1,7 +1,7 @@
 Phabricator
 Copyright 2014 Phacility, Inc.
 
-This software is primarily developed and maintained by Phacility, Inc.
+Phabricator was originally developed and maintained by Phacility, Inc.
 
   http://www.phacility.com/
 

resources/celerity/map.php

@@ -9,11 +9,11 @@ return array(
   'names' => array(
     'conpherence.pkg.css' => '0e3cf785',
     'conpherence.pkg.js' => '020aebcf',
-    'core.pkg.css' => '0ae696de',
+    'core.pkg.css' => 'b816811e',
-    'core.pkg.js' => '68f29322',
+    'core.pkg.js' => 'd2de90d9',
     'dark-console.pkg.js' => '187792c2',
     'differential.pkg.css' => 'ffb69e3d',
-    'differential.pkg.js' => '8deec4cd',
+    'differential.pkg.js' => 'c60bec1b',
     'diffusion.pkg.css' => '42c75c37',
     'diffusion.pkg.js' => '78c9885d',
     'maniphest.pkg.css' => '35995d6d',
@@ -104,10 +104,6 @@ return array(
     'rsrc/css/application/project/project-card-view.css' => 'a9f2c2dd',
     'rsrc/css/application/project/project-triggers.css' => 'cd9c8bb9',
     'rsrc/css/application/project/project-view.css' => '567858b3',
-    'rsrc/css/application/releeph/releeph-core.css' => 'f81ff2db',
-    'rsrc/css/application/releeph/releeph-preview-branch.css' => '22db5c07',
-    'rsrc/css/application/releeph/releeph-request-differential-create-dialog.css' => '0ac1ea31',
-    'rsrc/css/application/releeph/releeph-request-typeahead.css' => 'bce37359',
     'rsrc/css/application/search/application-search-view.css' => '0f7c06d8',
     'rsrc/css/application/search/search-results.css' => '9ea70ace',
     'rsrc/css/application/slowvote/slowvote.css' => '1694baed',
@@ -151,7 +147,7 @@ return array(
     'rsrc/css/phui/phui-comment-form.css' => '68a2d99a',
     'rsrc/css/phui/phui-comment-panel.css' => 'ec4e31c0',
     'rsrc/css/phui/phui-crumbs-view.css' => '614f43cf',
-    'rsrc/css/phui/phui-curtain-object-ref-view.css' => '5f752bdb',
+    'rsrc/css/phui/phui-curtain-object-ref-view.css' => '51d93266',
     'rsrc/css/phui/phui-curtain-view.css' => '68c5efb6',
     'rsrc/css/phui/phui-document-pro.css' => 'b9613a10',
     'rsrc/css/phui/phui-document-summary.css' => 'b068eed1',
@@ -171,7 +167,7 @@ return array(
     'rsrc/css/phui/phui-invisible-character-view.css' => 'c694c4a4',
     'rsrc/css/phui/phui-left-right.css' => '68513c34',
     'rsrc/css/phui/phui-lightbox.css' => '4ebf22da',
-    'rsrc/css/phui/phui-list.css' => '2f253c22',
+    'rsrc/css/phui/phui-list.css' => '0c04affd',
     'rsrc/css/phui/phui-object-box.css' => 'b8d7eea0',
     'rsrc/css/phui/phui-pager.css' => 'd022c7ad',
     'rsrc/css/phui/phui-pinboard-view.css' => '1f08f5d8',
@@ -246,7 +242,7 @@ return array(
     'rsrc/externals/javelin/ext/view/__tests__/ViewInterpreter.js' => 'a9f35511',
     'rsrc/externals/javelin/ext/view/__tests__/ViewRenderer.js' => '3a1b81f6',
     'rsrc/externals/javelin/lib/Cookie.js' => '05d290ef',
-    'rsrc/externals/javelin/lib/DOM.js' => '94681e22',
+    'rsrc/externals/javelin/lib/DOM.js' => 'e4c7622a',
     'rsrc/externals/javelin/lib/History.js' => '030b4f7a',
     'rsrc/externals/javelin/lib/JSON.js' => '541f81c3',
     'rsrc/externals/javelin/lib/Leader.js' => '0d2490ce',
@@ -435,9 +431,6 @@ return array(
     'rsrc/js/application/projects/behavior-project-boards.js' => '58cb6a88',
     'rsrc/js/application/projects/behavior-project-create.js' => '34c53422',
     'rsrc/js/application/projects/behavior-reorder-columns.js' => '8ac32fd9',
-    'rsrc/js/application/releeph/releeph-preview-branch.js' => '75184d68',
-    'rsrc/js/application/releeph/releeph-request-state-change.js' => '9f081f05',
-    'rsrc/js/application/releeph/releeph-request-typeahead.js' => 'aa3a100c',
     'rsrc/js/application/repository/repository-crossreference.js' => '44d48cd1',
     'rsrc/js/application/search/behavior-reorder-profile-menu-items.js' => 'e5bdb730',
     'rsrc/js/application/search/behavior-reorder-queries.js' => 'b86f297f',
@@ -480,8 +473,8 @@ return array(
     'rsrc/js/core/behavior-copy.js' => 'cf32921f',
     'rsrc/js/core/behavior-detect-timezone.js' => '78bc5d94',
     'rsrc/js/core/behavior-device.js' => 'ac2b1e01',
-    'rsrc/js/core/behavior-drag-and-drop-textarea.js' => '7ad020a5',
+    'rsrc/js/core/behavior-drag-and-drop-textarea.js' => '3277c62d',
-    'rsrc/js/core/behavior-fancy-datepicker.js' => 'e77fcc9d',
+    'rsrc/js/core/behavior-fancy-datepicker.js' => 'b545d0a0',
     'rsrc/js/core/behavior-form.js' => '55d7b788',
     'rsrc/js/core/behavior-gesture.js' => 'b58d1a2a',
     'rsrc/js/core/behavior-global-drag-and-drop.js' => '1cab0e9a',
@@ -596,7 +589,7 @@ return array(
     'javelin-behavior-aphlict-listen' => '4e61fa88',
     'javelin-behavior-aphlict-status' => 'c3703a16',
     'javelin-behavior-aphront-basic-tokenizer' => '3b4899b0',
-    'javelin-behavior-aphront-drag-and-drop-textarea' => '7ad020a5',
+    'javelin-behavior-aphront-drag-and-drop-textarea' => '3277c62d',
     'javelin-behavior-aphront-form-disable-on-submit' => '55d7b788',
     'javelin-behavior-aphront-more' => '506aa3f4',
     'javelin-behavior-audio-source' => '3dc5ad43',
@@ -635,7 +628,7 @@ return array(
     'javelin-behavior-editengine-reorder-configs' => '4842f137',
     'javelin-behavior-editengine-reorder-fields' => '0ad8d31f',
     'javelin-behavior-event-all-day' => '0b1bc990',
-    'javelin-behavior-fancy-datepicker' => 'e77fcc9d',
+    'javelin-behavior-fancy-datepicker' => 'b545d0a0',
     'javelin-behavior-global-drag-and-drop' => '1cab0e9a',
     'javelin-behavior-harbormaster-log' => 'b347a301',
     'javelin-behavior-herald-rule-editor' => '0922e81d',
@@ -686,9 +679,6 @@ return array(
     'javelin-behavior-read-only-warning' => 'b9109f8f',
     'javelin-behavior-redirect' => '407ee861',
     'javelin-behavior-refresh-csrf' => '46116c01',
-    'javelin-behavior-releeph-preview-branch' => '75184d68',
-    'javelin-behavior-releeph-request-state-change' => '9f081f05',
-    'javelin-behavior-releeph-request-typeahead' => 'aa3a100c',
     'javelin-behavior-remarkup-load-image' => '202bfa3f',
     'javelin-behavior-remarkup-preview' => 'd8a86cfb',
     'javelin-behavior-reorder-applications' => 'aa371860',
@@ -717,7 +707,7 @@ return array(
     'javelin-color' => '78f811c9',
     'javelin-cookie' => '05d290ef',
     'javelin-diffusion-locate-file-source' => '94243d89',
-    'javelin-dom' => '94681e22',
+    'javelin-dom' => 'e4c7622a',
     'javelin-dynval' => '202a2e85',
     'javelin-event' => 'c03f2fb4',
     'javelin-external-editor-link-engine' => '48a8641f',
@@ -848,7 +838,7 @@ return array(
     'phui-comment-form-css' => '68a2d99a',
     'phui-comment-panel-css' => 'ec4e31c0',
     'phui-crumbs-view-css' => '614f43cf',
-    'phui-curtain-object-ref-view-css' => '5f752bdb',
+    'phui-curtain-object-ref-view-css' => '51d93266',
     'phui-curtain-view-css' => '68c5efb6',
     'phui-document-summary-view-css' => 'b068eed1',
     'phui-document-view-css' => '52b748a5',
@@ -872,7 +862,7 @@ return array(
     'phui-invisible-character-view-css' => 'c694c4a4',
     'phui-left-right-css' => '68513c34',
     'phui-lightbox-css' => '4ebf22da',
-    'phui-list-view-css' => '2f253c22',
+    'phui-list-view-css' => '0c04affd',
     'phui-object-box-css' => 'b8d7eea0',
     'phui-oi-big-ui-css' => 'fa74cc35',
     'phui-oi-color-css' => 'b517bfa0',
@@ -913,10 +903,6 @@ return array(
     'project-card-view-css' => 'a9f2c2dd',
     'project-triggers-css' => 'cd9c8bb9',
     'project-view-css' => '567858b3',
-    'releeph-core' => 'f81ff2db',
-    'releeph-preview-branch' => '22db5c07',
-    'releeph-request-differential-create-dialog' => '0ac1ea31',
-    'releeph-request-typeahead-css' => 'bce37359',
     'setup-issue-css' => '5eed85b2',
     'sprite-login-css' => '18b368a6',
     'sprite-tokens-css' => 'f1896dc5',
@@ -1209,6 +1195,13 @@ return array(
       'javelin-install',
       'javelin-util',
     ),
+    '3277c62d' => array(
+      'javelin-behavior',
+      'javelin-dom',
+      'javelin-json',
+      'phabricator-drag-and-drop-file-upload',
+      'phabricator-textareautils',
+    ),
     '32db8374' => array(
       'javelin-behavior',
       'javelin-stratcom',
@@ -1599,12 +1592,6 @@ return array(
       'javelin-behavior',
       'javelin-dom',
     ),
-    '75184d68' => array(
-      'javelin-behavior',
-      'javelin-dom',
-      'javelin-uri',
-      'javelin-request',
-    ),
     '78bc5d94' => array(
       'javelin-behavior',
       'javelin-uri',
@@ -1617,12 +1604,6 @@ return array(
       'javelin-install',
       'javelin-dom',
     ),
-    '7ad020a5' => array(
-      'javelin-behavior',
-      'javelin-dom',
-      'phabricator-drag-and-drop-file-upload',
-      'phabricator-textareautils',
-    ),
     '7b139193' => array(
       'javelin-behavior',
       'javelin-stratcom',
@@ -1774,13 +1755,6 @@ return array(
       'javelin-uri',
       'javelin-routable',
     ),
-    '94681e22' => array(
-      'javelin-magical-init',
-      'javelin-install',
-      'javelin-util',
-      'javelin-vector',
-      'javelin-stratcom',
-    ),
     '9623adc1' => array(
       'javelin-behavior',
       'javelin-stratcom',
@@ -1821,14 +1795,6 @@ return array(
       'javelin-uri',
       'phabricator-textareautils',
     ),
-    '9f081f05' => array(
-      'javelin-behavior',
-      'javelin-dom',
-      'javelin-stratcom',
-      'javelin-workflow',
-      'javelin-util',
-      'phabricator-keyboard-shortcut',
-    ),
     'a17b84f1' => array(
       'javelin-behavior',
       'javelin-dom',
@@ -1896,13 +1862,6 @@ return array(
       'javelin-dom',
       'phabricator-draggable-list',
     ),
-    'aa3a100c' => array(
-      'javelin-behavior',
-      'javelin-dom',
-      'javelin-typeahead',
-      'javelin-typeahead-ondemand-source',
-      'javelin-dom',
-    ),
     'aa51efb4' => array(
       'javelin-dom',
     ),
@@ -1987,6 +1946,13 @@ return array(
     'b517bfa0' => array(
       'phui-oi-list-view-css',
     ),
+    'b545d0a0' => array(
+      'javelin-behavior',
+      'javelin-util',
+      'javelin-dom',
+      'javelin-stratcom',
+      'javelin-vector',
+    ),
     'b557770a' => array(
       'javelin-install',
       'javelin-util',
@@ -2160,6 +2126,13 @@ return array(
       'javelin-dom',
       'phuix-dropdown-menu',
     ),
+    'e4c7622a' => array(
+      'javelin-magical-init',
+      'javelin-install',
+      'javelin-util',
+      'javelin-vector',
+      'javelin-stratcom',
+    ),
     'e5bdb730' => array(
       'javelin-behavior',
       'javelin-stratcom',
@@ -2167,13 +2140,6 @@ return array(
       'javelin-dom',
       'phabricator-draggable-list',
     ),
-    'e77fcc9d' => array(
-      'javelin-behavior',
-      'javelin-util',
-      'javelin-dom',
-      'javelin-stratcom',
-      'javelin-vector',
-    ),
     'e8240b50' => array(
       'javelin-behavior',
       'javelin-stratcom',

resources/sprite/manifest/login.json

@@ -59,7 +59,7 @@
     "login-MediaWiki": {
       "name": "login-MediaWiki",
       "rule": ".login-MediaWiki",
-      "hash": "f1f0a9382434081a9a84e7584828c2dd"
+      "hash": "68eba44e85ea942ecf14d3c08992a2e2"
     },
     "login-PayPal": {
       "name": "login-PayPal",

resources/sql/autopatches/20140904.macroattach.php

@@ -16,7 +16,7 @@ foreach (new LiskMigrationIterator($table) as $macro) {
     foreach ($phids as $phid) {
       $editor->addEdge(
         $macro->getPHID(),
-        PhabricatorObjectHasFileEdgeType::EDGECONST,
+        25,
         $phid);
     }
     $editor->save();

resources/sql/autopatches/20210625.owners.01.authority.sql

@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_owners.owners_package
+  ADD authorityMode VARCHAR(32) NOT NULL COLLATE {$COLLATE_TEXT};

resources/sql/autopatches/20210625.owners.02.authority-default.sql

@@ -0,0 +1,3 @@
+UPDATE {$NAMESPACE}_owners.owners_package
+  SET authorityMode = 'strong'
+  WHERE authorityMode = '';

resources/sql/autopatches/20210713.harborcommand.01.migrate.sql

@@ -0,0 +1,4 @@
+INSERT IGNORE INTO {$NAMESPACE}_harbormaster.harbormaster_buildmessage
+  (authorPHID, receiverPHID, type, isConsumed, dateCreated, dateModified)
+  SELECT authorPHID, targetPHID, command, 0, dateCreated, dateModified
+    FROM {$NAMESPACE}_harbormaster.harbormaster_buildcommand;

resources/sql/autopatches/20210713.harborcommand.02.drop.sql

@@ -0,0 +1 @@
+DROP TABLE IF EXISTS {$NAMESPACE}_harbormaster.harbormaster_buildcommand;

resources/sql/autopatches/20210715.harborcommand.01.xactions.php

@@ -0,0 +1,34 @@
+<?php
+
+// See T13072. Turn the old "process a command" transaction into modular
+// transactions that each handle one particular type of command.
+
+$xactions_table = new HarbormasterBuildTransaction();
+$xactions_conn = $xactions_table->establishConnection('w');
+$row_iterator = new LiskRawMigrationIterator(
+  $xactions_conn,
+  $xactions_table->getTableName());
+
+$map = array(
+  '"pause"' => 'message/pause',
+  '"abort"' => 'message/abort',
+  '"resume"' => 'message/resume',
+  '"restart"' => 'message/restart',
+);
+
+foreach ($row_iterator as $row) {
+  if ($row['transactionType'] !== 'harbormaster:build:command') {
+    continue;
+  }
+
+  $raw_value = $row['newValue'];
+
+  if (isset($map[$raw_value])) {
+    queryfx(
+      $xactions_conn,
+      'UPDATE %R SET transactionType = %s WHERE id = %d',
+      $xactions_table,
+      $map[$raw_value],
+      $row['id']);
+  }
+}

resources/sql/autopatches/20220401.phameinteract.01.sql

@@ -0,0 +1,5 @@
+UPDATE {$NAMESPACE}_phame.phame_blog
+  SET editPolicy = 'admin' WHERE editPolicy IS NULL;
+
+ALTER TABLE {$NAMESPACE}_phame.phame_blog
+  CHANGE editPolicy editPolicy VARBINARY(64) NOT NULL;

resources/sql/autopatches/20220401.phameinteract.02.sql

@@ -0,0 +1,5 @@
+UPDATE {$NAMESPACE}_phame.phame_blog
+  SET viewPolicy = 'admin' WHERE viewPolicy IS NULL;
+
+ALTER TABLE {$NAMESPACE}_phame.phame_blog
+  CHANGE viewPolicy viewPolicy VARBINARY(64) NOT NULL;

resources/sql/autopatches/20220401.phameinteract.03.sql

@@ -0,0 +1,6 @@
+ALTER TABLE {$NAMESPACE}_phame.phame_blog
+  ADD interactPolicy VARBINARY(64) NOT NULL;
+
+UPDATE {$NAMESPACE}_phame.phame_blog
+  SET interactPolicy = 'users'
+  WHERE interactPolicy = '';

resources/sql/autopatches/20220401.phameinteract.04.postinteract.sql

@@ -0,0 +1,6 @@
+ALTER TABLE {$NAMESPACE}_phame.phame_post
+  ADD interactPolicy VARBINARY(64) NOT NULL;
+
+UPDATE {$NAMESPACE}_phame.phame_post
+  SET interactPolicy = 'obj.phame.blog'
+  WHERE interactPolicy = '';

resources/sql/autopatches/20220510.file.01.attach.sql

@@ -0,0 +1,9 @@
+CREATE TABLE {$NAMESPACE}_file.file_attachment (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  objectPHID VARBINARY(64) NOT NULL,
+  filePHID VARBINARY(64) NOT NULL,
+  attacherPHID VARBINARY(64),
+  attachmentMode VARCHAR(32) NOT NULL COLLATE {$COLLATE_TEXT},
+  dateCreated INT UNSIGNED NOT NULL,
+  dateModified INT UNSIGNED NOT NULL
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};

resources/sql/autopatches/20220519.file.02.migrate.sql

@@ -0,0 +1,7 @@
+INSERT IGNORE INTO {$NAMESPACE}_file.file_attachment
+  (objectPHID, filePHID, attachmentMode, attacherPHID,
+    dateCreated, dateModified)
+  SELECT dst, src, 'attach', null, dateCreated, dateCreated
+    FROM {$NAMESPACE}_file.edge
+    WHERE type = 26
+    ORDER BY dateCreated ASC;

resources/sql/autopatches/20220525.slowvote.01.mailkey.php

@@ -0,0 +1,28 @@
+<?php
+
+$poll_table = new PhabricatorSlowvotePoll();
+$poll_conn = $poll_table->establishConnection('w');
+
+$properties_table = new PhabricatorMetaMTAMailProperties();
+$conn = $properties_table->establishConnection('w');
+
+$iterator = new LiskRawMigrationIterator(
+  $poll_conn,
+  $poll_table->getTableName());
+
+foreach ($iterator as $row) {
+  queryfx(
+    $conn,
+    'INSERT IGNORE INTO %R
+        (objectPHID, mailProperties, dateCreated, dateModified)
+      VALUES
+        (%s, %s, %d, %d)',
+    $properties_table,
+    $row['phid'],
+    phutil_json_encode(
+      array(
+        'mailKey' => $row['mailKey'],
+      )),
+    PhabricatorTime::getNow(),
+    PhabricatorTime::getNow());
+}

resources/sql/autopatches/20220525.slowvote.02.mailkey-drop.sql

@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_slowvote.slowvote_poll
+  DROP mailKey;

resources/sql/autopatches/20220525.slowvote.03.response-type.sql

@@ -0,0 +1,3 @@
+ALTER TABLE {$NAMESPACE}_slowvote.slowvote_poll
+  CHANGE responseVisibility
+    responseVisibility VARCHAR(32) NOT NULL COLLATE {$COLLATE_TEXT};

resources/sql/autopatches/20220525.slowvote.04.response-value.sql

@@ -0,0 +1,8 @@
+UPDATE {$NAMESPACE}_slowvote.slowvote_poll
+  SET responseVisibility = 'visible' WHERE responseVisibility = '0';
+
+UPDATE {$NAMESPACE}_slowvote.slowvote_poll
+  SET responseVisibility = 'voters' WHERE responseVisibility = '1';
+
+UPDATE {$NAMESPACE}_slowvote.slowvote_poll
+  SET responseVisibility = 'owner' WHERE responseVisibility = '2';

resources/sql/autopatches/20220525.slowvote.05.response-xactions.sql

@@ -0,0 +1,23 @@
+UPDATE {$NAMESPACE}_slowvote.slowvote_transaction
+  SET oldValue = '"visible"' WHERE
+    transactionType = 'vote:responses' AND oldValue IN ('0', '"0"');
+
+UPDATE {$NAMESPACE}_slowvote.slowvote_transaction
+  SET newValue = '"visible"' WHERE
+    transactionType = 'vote:responses' AND newValue IN ('0', '"0"');
+
+UPDATE {$NAMESPACE}_slowvote.slowvote_transaction
+  SET oldValue = '"voters"' WHERE
+    transactionType = 'vote:responses' AND oldValue IN ('1', '"1"');
+
+UPDATE {$NAMESPACE}_slowvote.slowvote_transaction
+  SET newValue = '"voters"' WHERE
+    transactionType = 'vote:responses' AND newValue IN ('1', '"1"');
+
+UPDATE {$NAMESPACE}_slowvote.slowvote_transaction
+  SET oldValue = '"owner"' WHERE
+    transactionType = 'vote:responses' AND oldValue IN ('2', '"2"');
+
+UPDATE {$NAMESPACE}_slowvote.slowvote_transaction
+  SET newValue = '"owner"' WHERE
+    transactionType = 'vote:responses' AND newValue IN ('2', '"2"');

resources/sql/autopatches/20220525.slowvote.06.method-type.sql

@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_slowvote.slowvote_poll
+  CHANGE method method VARCHAR(32) NOT NULL COLLATE {$COLLATE_TEXT};

resources/sql/autopatches/20220525.slowvote.07.method-value.sql

@@ -0,0 +1,5 @@
+UPDATE {$NAMESPACE}_slowvote.slowvote_poll
+  SET method = 'plurality' WHERE method = '0';
+
+UPDATE {$NAMESPACE}_slowvote.slowvote_poll
+  SET method = 'approval' WHERE method = '1';

resources/sql/autopatches/20220525.slowvote.08.status-type.sql

@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_slowvote.slowvote_poll
+  CHANGE isClosed status VARCHAR(32) NOT NULL COLLATE {$COLLATE_TEXT};

resources/sql/autopatches/20220525.slowvote.09.status-value.sql

@@ -0,0 +1,5 @@
+UPDATE {$NAMESPACE}_slowvote.slowvote_poll
+  SET status = 'open' WHERE status = '0';
+
+UPDATE {$NAMESPACE}_slowvote.slowvote_poll
+  SET status = 'closed' WHERE status = '1';

resources/sql/autopatches/20220525.slowvote.10.status-xactions.sql

@@ -0,0 +1,19 @@
+UPDATE {$NAMESPACE}_slowvote.slowvote_transaction
+  SET transactionType = 'vote:status'
+    WHERE transactionType = 'vote:close';
+
+UPDATE {$NAMESPACE}_slowvote.slowvote_transaction
+  SET oldValue = '"open"' WHERE
+    transactionType = 'vote:status' AND oldValue IN ('0', '"0"', 'false');
+
+UPDATE {$NAMESPACE}_slowvote.slowvote_transaction
+  SET newValue = '"open"' WHERE
+    transactionType = 'vote:status' AND newValue IN ('0', '"0"', 'false');
+
+UPDATE {$NAMESPACE}_slowvote.slowvote_transaction
+  SET oldValue = '"closed"' WHERE
+    transactionType = 'vote:status' AND oldValue IN ('1', '"1"', 'true');
+
+UPDATE {$NAMESPACE}_slowvote.slowvote_transaction
+  SET newValue = '"closed"' WHERE
+    transactionType = 'vote:status' AND newValue IN ('1', '"1"', 'true');

resources/sql/patches/20130611.migrateoauth.php

@@ -7,8 +7,8 @@ $table_name = 'user_oauthinfo';
 foreach (new LiskRawMigrationIterator($conn, $table_name) as $row) {
   throw new Exception(
     pht(
-      'Your Phabricator install has ancient OAuth account data and is '.
+      'This database has ancient OAuth account data and is too old to '.
-      'too old to upgrade directly to a modern version of Phabricator. '.
+      'upgrade directly to a modern software version. Upgrade to a version '.
-      'Upgrade to a version released between June 2013 and February 2019 '.
+      'released between June 2013 and February 2019 first, then upgrade to '.
-      'first, then upgrade to a modern version.'));
+      'a modern version.'));
 }

resources/sql/patches/20130611.nukeldap.php

@@ -7,8 +7,8 @@ $table_name = 'user_ldapinfo';
 foreach (new LiskRawMigrationIterator($conn, $table_name) as $row) {
   throw new Exception(
     pht(
-      'Your Phabricator install has ancient LDAP account data and is '.
+      'This database has ancient LDAP account data and is too old to upgrade '.
-      'too old to upgrade directly to a modern version of Phabricator. '.
+      'directly to a modern version of the software. Upgrade to a version '.
-      'Upgrade to a version released between June 2013 and February 2019 '.
+      'released between June 2013 and February 2019 first, then upgrade to a '.
-      'first, then upgrade to a modern version.'));
+      'modern version.'));
 }

resources/sql/patches/20130820.file-mailkey-populate.php

@@ -1,6 +1,6 @@
 <?php
 
-echo pht('Populating Phabricator files with mail keys xactions...')."\n";
+echo pht('Populating files with mail keys...')."\n";
 
 $table = new PhabricatorFile();
 $table_name = $table->getTableName();

resources/sql/patches/20131004.dxreviewers.php

@@ -29,8 +29,7 @@ foreach (new LiskMigrationIterator($table) as $revision) {
   foreach ($reviewer_phids as $dst) {
     if (phid_get_type($dst) == PhabricatorPHIDConstants::PHID_TYPE_UNKNOWN) {
       // At least one old install ran into some issues here. Skip the row if we
-      // can't figure out what the destination PHID is. See here:
+      // can't figure out what the destination PHID is.
-      // https://github.com/phacility/phabricator/pull/507
       continue;
     }
 

resources/sql/quickstart.sql

@@ -7552,113 +7552,6 @@ CREATE TABLE `phortune_subscription` (
   KEY `key_merchant` (`merchantPHID`)
 ) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
 
-CREATE DATABASE /*!32312 IF NOT EXISTS*/ `{$NAMESPACE}_phragment` /*!40100 DEFAULT CHARACTER SET {$CHARSET} COLLATE {$COLLATE_TEXT} */;
-
-USE `{$NAMESPACE}_phragment`;
-
- SET NAMES utf8 ;
-
- SET character_set_client = {$CHARSET} ;
-
-CREATE TABLE `edge` (
-  `src` varbinary(64) NOT NULL,
-  `type` int(10) unsigned NOT NULL,
-  `dst` varbinary(64) NOT NULL,
-  `dateCreated` int(10) unsigned NOT NULL,
-  `seq` int(10) unsigned NOT NULL,
-  `dataID` int(10) unsigned DEFAULT NULL,
-  PRIMARY KEY (`src`,`type`,`dst`),
-  UNIQUE KEY `key_dst` (`dst`,`type`,`src`),
-  KEY `src` (`src`,`type`,`dateCreated`,`seq`)
-) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
-
-USE `{$NAMESPACE}_phragment`;
-
- SET NAMES utf8 ;
-
- SET character_set_client = {$CHARSET} ;
-
-CREATE TABLE `edgedata` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `data` longtext CHARACTER SET {$CHARSET} COLLATE {$COLLATE_TEXT} NOT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
-
-USE `{$NAMESPACE}_phragment`;
-
- SET NAMES utf8 ;
-
- SET character_set_client = {$CHARSET} ;
-
-CREATE TABLE `phragment_fragment` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `phid` varbinary(64) NOT NULL,
-  `path` varchar(128) CHARACTER SET {$CHARSET} COLLATE {$COLLATE_TEXT} NOT NULL,
-  `depth` int(10) unsigned NOT NULL,
-  `latestVersionPHID` varbinary(64) DEFAULT NULL,
-  `viewPolicy` varbinary(64) NOT NULL,
-  `editPolicy` varbinary(64) NOT NULL,
-  `dateCreated` int(10) unsigned NOT NULL,
-  `dateModified` int(10) unsigned NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `key_phid` (`phid`),
-  UNIQUE KEY `key_path` (`path`)
-) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
-
-USE `{$NAMESPACE}_phragment`;
-
- SET NAMES utf8 ;
-
- SET character_set_client = {$CHARSET} ;
-
-CREATE TABLE `phragment_fragmentversion` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `phid` varbinary(64) NOT NULL,
-  `sequence` int(10) unsigned NOT NULL,
-  `fragmentPHID` varbinary(64) NOT NULL,
-  `filePHID` varbinary(64) DEFAULT NULL,
-  `dateCreated` int(10) unsigned NOT NULL,
-  `dateModified` int(10) unsigned NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `key_version` (`fragmentPHID`,`sequence`),
-  UNIQUE KEY `key_phid` (`phid`)
-) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
-
-USE `{$NAMESPACE}_phragment`;
-
- SET NAMES utf8 ;
-
- SET character_set_client = {$CHARSET} ;
-
-CREATE TABLE `phragment_snapshot` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `phid` varbinary(64) NOT NULL,
-  `primaryFragmentPHID` varbinary(64) NOT NULL,
-  `name` varchar(128) CHARACTER SET {$CHARSET} COLLATE {$COLLATE_TEXT} NOT NULL,
-  `dateCreated` int(10) unsigned NOT NULL,
-  `dateModified` int(10) unsigned NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `key_phid` (`phid`),
-  UNIQUE KEY `key_name` (`primaryFragmentPHID`,`name`)
-) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
-
-USE `{$NAMESPACE}_phragment`;
-
- SET NAMES utf8 ;
-
- SET character_set_client = {$CHARSET} ;
-
-CREATE TABLE `phragment_snapshotchild` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `snapshotPHID` varbinary(64) NOT NULL,
-  `fragmentPHID` varbinary(64) NOT NULL,
-  `fragmentVersionPHID` varbinary(64) DEFAULT NULL,
-  `dateCreated` int(10) unsigned NOT NULL,
-  `dateModified` int(10) unsigned NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `key_child` (`snapshotPHID`,`fragmentPHID`,`fragmentVersionPHID`)
-) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
-
 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `{$NAMESPACE}_phrequent` /*!40100 DEFAULT CHARACTER SET {$CHARSET} COLLATE {$COLLATE_TEXT} */;
 
 USE `{$NAMESPACE}_phrequent`;
@@ -8667,190 +8560,6 @@ CREATE TABLE `project_triggerusage` (
   UNIQUE KEY `key_trigger` (`triggerPHID`)
 ) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
 
-CREATE DATABASE /*!32312 IF NOT EXISTS*/ `{$NAMESPACE}_releeph` /*!40100 DEFAULT CHARACTER SET {$CHARSET} COLLATE {$COLLATE_TEXT} */;
-
-USE `{$NAMESPACE}_releeph`;
-
- SET NAMES utf8 ;
-
- SET character_set_client = {$CHARSET} ;
-
-CREATE TABLE `releeph_branch` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `dateCreated` int(10) unsigned NOT NULL,
-  `dateModified` int(10) unsigned NOT NULL,
-  `basename` varchar(64) CHARACTER SET {$CHARSET} COLLATE {$COLLATE_TEXT} NOT NULL,
-  `releephProjectID` int(10) unsigned NOT NULL,
-  `createdByUserPHID` varbinary(64) NOT NULL,
-  `cutPointCommitPHID` varbinary(64) NOT NULL,
-  `isActive` tinyint(1) NOT NULL DEFAULT '1',
-  `symbolicName` varchar(64) CHARACTER SET {$CHARSET} COLLATE {$COLLATE_TEXT} DEFAULT NULL,
-  `details` longtext CHARACTER SET {$CHARSET} COLLATE {$COLLATE_TEXT} NOT NULL,
-  `phid` varbinary(64) NOT NULL,
-  `name` varchar(128) CHARACTER SET {$CHARSET} COLLATE {$COLLATE_TEXT} NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `releephProjectID_2` (`releephProjectID`,`basename`),
-  UNIQUE KEY `releephProjectID_name` (`releephProjectID`,`name`),
-  UNIQUE KEY `key_phid` (`phid`),
-  UNIQUE KEY `releephProjectID` (`releephProjectID`,`symbolicName`)
-) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
-
-USE `{$NAMESPACE}_releeph`;
-
- SET NAMES utf8 ;
-
- SET character_set_client = {$CHARSET} ;
-
-CREATE TABLE `releeph_branchtransaction` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `phid` varbinary(64) NOT NULL,
-  `authorPHID` varbinary(64) NOT NULL,
-  `objectPHID` varbinary(64) NOT NULL,
-  `viewPolicy` varbinary(64) NOT NULL,
-  `editPolicy` varbinary(64) NOT NULL,
-  `commentPHID` varbinary(64) DEFAULT NULL,
-  `commentVersion` int(10) unsigned NOT NULL,
-  `transactionType` varchar(32) CHARACTER SET {$CHARSET} COLLATE {$COLLATE_TEXT} NOT NULL,
-  `oldValue` longtext CHARACTER SET {$CHARSET} COLLATE {$COLLATE_TEXT} NOT NULL,
-  `newValue` longtext CHARACTER SET {$CHARSET} COLLATE {$COLLATE_TEXT} NOT NULL,
-  `contentSource` longtext CHARACTER SET {$CHARSET} COLLATE {$COLLATE_TEXT} NOT NULL,
-  `metadata` longtext CHARACTER SET {$CHARSET} COLLATE {$COLLATE_TEXT} NOT NULL,
-  `dateCreated` int(10) unsigned NOT NULL,
-  `dateModified` int(10) unsigned NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `key_phid` (`phid`),
-  KEY `key_object` (`objectPHID`)
-) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
-
-USE `{$NAMESPACE}_releeph`;
-
- SET NAMES utf8 ;
-
- SET character_set_client = {$CHARSET} ;
-
-CREATE TABLE `releeph_producttransaction` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `phid` varbinary(64) NOT NULL,
-  `authorPHID` varbinary(64) NOT NULL,
-  `objectPHID` varbinary(64) NOT NULL,
-  `viewPolicy` varbinary(64) NOT NULL,
-  `editPolicy` varbinary(64) NOT NULL,
-  `commentPHID` varbinary(64) DEFAULT NULL,
-  `commentVersion` int(10) unsigned NOT NULL,
-  `transactionType` varchar(32) CHARACTER SET {$CHARSET} COLLATE {$COLLATE_TEXT} NOT NULL,
-  `oldValue` longtext CHARACTER SET {$CHARSET} COLLATE {$COLLATE_TEXT} NOT NULL,
-  `newValue` longtext CHARACTER SET {$CHARSET} COLLATE {$COLLATE_TEXT} NOT NULL,
-  `contentSource` longtext CHARACTER SET {$CHARSET} COLLATE {$COLLATE_TEXT} NOT NULL,
-  `metadata` longtext CHARACTER SET {$CHARSET} COLLATE {$COLLATE_TEXT} NOT NULL,
-  `dateCreated` int(10) unsigned NOT NULL,
-  `dateModified` int(10) unsigned NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `key_phid` (`phid`),
-  KEY `key_object` (`objectPHID`)
-) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
-
-USE `{$NAMESPACE}_releeph`;
-
- SET NAMES utf8 ;
-
- SET character_set_client = {$CHARSET} ;
-
-CREATE TABLE `releeph_project` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `dateCreated` int(10) unsigned NOT NULL,
-  `dateModified` int(10) unsigned NOT NULL,
-  `phid` varbinary(64) NOT NULL,
-  `name` varchar(128) CHARACTER SET {$CHARSET} COLLATE {$COLLATE_TEXT} NOT NULL,
-  `trunkBranch` varchar(255) CHARACTER SET {$CHARSET} COLLATE {$COLLATE_TEXT} NOT NULL,
-  `repositoryPHID` varbinary(64) NOT NULL,
-  `createdByUserPHID` varbinary(64) NOT NULL,
-  `isActive` tinyint(1) NOT NULL DEFAULT '1',
-  `details` longtext CHARACTER SET {$CHARSET} COLLATE {$COLLATE_TEXT} NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `projectName` (`name`),
-  UNIQUE KEY `key_phid` (`phid`)
-) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
-
-USE `{$NAMESPACE}_releeph`;
-
- SET NAMES utf8 ;
-
- SET character_set_client = {$CHARSET} ;
-
-CREATE TABLE `releeph_request` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `dateCreated` int(10) unsigned NOT NULL,
-  `dateModified` int(10) unsigned NOT NULL,
-  `phid` varbinary(64) NOT NULL,
-  `branchID` int(10) unsigned NOT NULL,
-  `requestUserPHID` varbinary(64) NOT NULL,
-  `requestCommitPHID` varbinary(64) DEFAULT NULL,
-  `commitIdentifier` varchar(40) CHARACTER SET {$CHARSET} COLLATE {$COLLATE_TEXT} DEFAULT NULL,
-  `commitPHID` varbinary(64) DEFAULT NULL,
-  `pickStatus` int(10) unsigned DEFAULT NULL,
-  `details` longtext CHARACTER SET {$CHARSET} COLLATE {$COLLATE_TEXT} NOT NULL,
-  `userIntents` longtext CHARACTER SET {$CHARSET} COLLATE {$COLLATE_TEXT},
-  `inBranch` tinyint(1) NOT NULL DEFAULT '0',
-  `mailKey` binary(20) NOT NULL,
-  `requestedObjectPHID` varbinary(64) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `phid` (`phid`),
-  UNIQUE KEY `requestIdentifierBranch` (`requestCommitPHID`,`branchID`),
-  KEY `branchID` (`branchID`),
-  KEY `key_requestedObject` (`requestedObjectPHID`)
-) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
-
-USE `{$NAMESPACE}_releeph`;
-
- SET NAMES utf8 ;
-
- SET character_set_client = {$CHARSET} ;
-
-CREATE TABLE `releeph_requesttransaction` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `phid` varbinary(64) NOT NULL,
-  `authorPHID` varbinary(64) NOT NULL,
-  `objectPHID` varbinary(64) NOT NULL,
-  `viewPolicy` varbinary(64) NOT NULL,
-  `editPolicy` varbinary(64) NOT NULL,
-  `commentPHID` varbinary(64) DEFAULT NULL,
-  `commentVersion` int(10) unsigned NOT NULL,
-  `transactionType` varchar(32) CHARACTER SET {$CHARSET} COLLATE {$COLLATE_TEXT} NOT NULL,
-  `oldValue` longtext CHARACTER SET {$CHARSET} COLLATE {$COLLATE_TEXT} NOT NULL,
-  `newValue` longtext CHARACTER SET {$CHARSET} COLLATE {$COLLATE_TEXT} NOT NULL,
-  `metadata` longtext CHARACTER SET {$CHARSET} COLLATE {$COLLATE_TEXT} NOT NULL,
-  `contentSource` longtext CHARACTER SET {$CHARSET} COLLATE {$COLLATE_TEXT} NOT NULL,
-  `dateCreated` int(10) unsigned NOT NULL,
-  `dateModified` int(10) unsigned NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `key_phid` (`phid`),
-  KEY `key_object` (`objectPHID`)
-) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
-
-USE `{$NAMESPACE}_releeph`;
-
- SET NAMES utf8 ;
-
- SET character_set_client = {$CHARSET} ;
-
-CREATE TABLE `releeph_requesttransaction_comment` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `phid` varbinary(64) NOT NULL,
-  `transactionPHID` varbinary(64) DEFAULT NULL,
-  `authorPHID` varbinary(64) NOT NULL,
-  `viewPolicy` varbinary(64) NOT NULL,
-  `editPolicy` varbinary(64) NOT NULL,
-  `commentVersion` int(10) unsigned NOT NULL,
-  `content` longtext CHARACTER SET {$CHARSET} COLLATE {$COLLATE_TEXT} NOT NULL,
-  `contentSource` longtext CHARACTER SET {$CHARSET} COLLATE {$COLLATE_TEXT} NOT NULL,
-  `isDeleted` tinyint(1) NOT NULL,
-  `dateCreated` int(10) unsigned NOT NULL,
-  `dateModified` int(10) unsigned NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `key_phid` (`phid`),
-  UNIQUE KEY `key_version` (`transactionPHID`,`commentVersion`)
-) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
-
 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `{$NAMESPACE}_repository` /*!40100 DEFAULT CHARACTER SET {$CHARSET} COLLATE {$COLLATE_TEXT} */;
 
 USE `{$NAMESPACE}_repository`;

scripts/install/install_rhel-derivs.sh

@@ -1,143 +0,0 @@
-#!/bin/bash
-
-confirm() {
-  echo "Press RETURN to continue, or ^C to cancel.";
-  read -e ignored
-}
-
-RHEL_VER_FILE="/etc/redhat-release"
-INSTALL_URI="   https://we.phorge.it/book/phorge/article/installation_guide/"
-CONFIG_URI="   https://we.phorge.it/book/phorge/article/configuration_guide/"
-REPOSITORY_URI="https://we.phorge.it/source"
-NAME_MAIN="phorge"
-NAME_ARC="arcanist"
-
-if [[ ! -f $RHEL_VER_FILE ]]
-then
-  echo "It looks like you're not running a Red Hat-derived distribution."
-  echo "This script is intended to install $NAME_MAIN on RHEL-derived"
-  echo "distributions such as RHEL, Fedora, CentOS, and Scientific Linux."
-  echo "Proceed with caution."
-  confirm
-fi
-
-echo "$NAME_MAIN RED HAT DERIVATIVE INSTALLATION SCRIPT";
-echo "This script will install $NAME_MAIN and all of its core dependencies.";
-echo "Run it from the directory you want to install into.";
-echo
-
-RHEL_REGEX="release ([0-9]+)\."
-
-if [[ $(cat $RHEL_VER_FILE) =~ $RHEL_REGEX ]]
-then
-  RHEL_MAJOR_VER=${BASH_REMATCH[1]}
-else
-  echo "Ut oh, we were unable to determine your distribution's major"
-  echo "version number. Please make sure you're running 6.0+ before"
-  echo "proceeding."
-  confirm
-fi
-
-if [[ $RHEL_MAJOR_VER < 6 && $RHEL_MAJOR_VER > 0 ]]
-then
-  echo "** WARNING **"
-  echo "A major version less than 6 was detected. Because of this,"
-  echo "several needed dependencies are not available via default repos."
-  echo "Specifically, RHEL 5 does not have a PEAR package for php53-*."
-  echo "We will attempt to install it manually, for APC. Please be careful."
-  confirm
-fi
-
-echo "$NAME_MAIN will be installed to: $(pwd).";
-confirm
-
-echo "Testing sudo/root..."
-if [[ $EUID -ne 0 ]] # Check if we're root. If we are, continue.
-then
-  sudo true
-  SUDO="sudo"
-  if [[ $? -ne 0 ]]
-  then
-    echo "ERROR: You must be able to sudo to run this script, or run it as root.";
-    exit 1
-  fi
-
-fi
-
-if [[ $RHEL_MAJOR_VER == 5 ]]
-then
-  # RHEL 5's "php" package is actually 5.1. The "php53" package won't let us install php-pecl-apc.
-  # (it tries to pull in php 5.1 stuff) ...
-  yum repolist | grep -i epel
-  if [ $? -ne 0 ]; then
-    echo "It doesn't look like you have the EPEL repo enabled. We are to add it"
-    echo "for you, so that we can install git."
-    $SUDO rpm -Uvh https://download.fedoraproject.org/pub/epel/5/i386/epel-release-5-4.noarch.rpm
-  fi
-  YUMCOMMAND="$SUDO yum install httpd git php53 php53-cli php53-mysql php53-process php53-devel php53-gd gcc wget make pcre-devel mysql-server"
-else
-  # RHEL 6+ defaults with php 5.3
-  YUMCOMMAND="$SUDO yum install httpd git php php-cli php-mysql php-process php-devel php-gd php-pecl-apc php-pecl-json php-mbstring mysql-server"
-fi
-
-echo "Dropping to yum to install dependencies..."
-echo "Running: ${YUMCOMMAND}"
-echo "Yum will prompt you with [Y/n] to continue installing."
-
-$YUMCOMMAND
-
-if [[ $? -ne 0 ]]
-then
-  echo "The yum command failed. Please fix the errors and re-run this script."
-  exit 1
-fi
-
-if [[ $RHEL_MAJOR_VER == 5 ]]
-then
-  # Now that we've ensured all the devel packages required for pecl/apc are there, let's
-  # set up PEAR, and install apc.
-  echo "Attempting to install PEAR"
-  wget https://pear.php.net/go-pear.phar
-  $SUDO php go-pear.phar && $SUDO pecl install apc
-fi
-
-if [[ $? -ne 0 ]]
-then
-  echo "The apc install failed. Continuing without APC, performance may be impacted."
-fi
-
-pidof httpd 2>&1 > /dev/null
-if [[ $? -eq 0 ]]
-then
-  echo "If php was installed above, please run: /etc/init.d/httpd graceful"
-else
-  echo "Please remember to start the httpd with: /etc/init.d/httpd start"
-fi
-
-pidof mysqld 2>&1 > /dev/null
-if [[ $? -ne 0 ]]
-then
-  echo "Please remember to start the mysql server: /etc/init.d/mysqld start"
-fi
-
-confirm
-
-if [[ ! -e "$NAME_ARC" ]]
-then
-  git clone "$REPOSITORY_URI/$NAME_ARC.git"
-else
-  (cd "$NAME_ARC" && git pull --rebase)
-fi
-
-if [[ ! -e "$NAME_MAIN" ]]
-then
-  git clone "$REPOSITORY_URI/$NAME_MAIN.git"
-else
-  (cd "$NAME_MAIN" && git pull --rebase)
-fi
-
-echo
-echo
-echo "Install probably worked mostly correctly. Continue with the 'Configuration Guide':";
-echo
-echo $CONFIG_URI

scripts/install/install_ubuntu.sh

@@ -1,123 +0,0 @@
-#!/bin/bash
-
-confirm() {
-  echo "Press RETURN to continue, or ^C to cancel.";
-  read -e ignored
-}
-
-INSTALL_URI="   https://we.phorge.it/book/phorge/article/installation_guide/"
-CONFIG_URI="   https://we.phorge.it/book/phorge/article/configuration_guide/"
-REPOSITORY_URI="https://we.phorge.it/source"
-NAME_MAIN="phorge"
-NAME_ARC="arcanist"
-
-NAME_UPPER="$(echo $NAME_MAIN | tr a-z A-Z)"
-
-failed() {
-  echo
-  echo
-  echo "Installation has failed."
-  echo "Text above this message might be useful to understanding what exactly failed."
-  echo
-  echo "Please follow this guide to manually complete installation:"
-  echo
-  echo $INSTALL_URI
-  echo
-  echo "We apologize for the inconvenience."
-  exit 3
-}
-
-ISSUE=`cat /etc/issue`
-if [[ $ISSUE != Ubuntu* ]]
-then
-  echo "This script is intended for use on Ubuntu, but this system appears";
-  echo "to be something else. Your results may vary.";
-  echo
-  confirm
-fi
-
-echo "$NAME_UPPER UBUNTU INSTALL SCRIPT";
-echo "This script will install Apache, $NAME_MAIN and its core dependencies.";
-echo "Run it from the directory you want to install into.";
-echo
-
-echo "Testing sudo..."
-sudo true
-if [ $? -ne 0 ]
-then
-  echo "ERROR: You must be able to sudo to run this script.";
-  exit 1;
-fi;
-
-echo 'Testing Ubuntu version...'
-
-VERSION=`lsb_release -rs`
-MAJOR=`expr match "$VERSION" '\([0-9]*\)'`
-
-if [ "$MAJOR" -lt 16 ]
-then
-  echo 'This script is intented to install on modern operating systems; Your '
-  echo 'operating system is too old for this script.'
-  echo 'You can still install $NAME_MAIN manually - please consult the'
-  echo 'installation guide to see how:'
-  echo
-  echo $INSTALL_URI
-  echo
-  exit 2
-fi
-
-# Ubuntu 16.04 LTS only has php 7.0 in their repos, so they need this extra ppa.
-# Ubuntu 17.4 and up have official 7.2 builds.
-if [ "$MAJOR" -eq 16 ]
-then
-  echo 'This version of Ubuntu requires additional resources in order to install'
-  echo 'and run $NAME_MAIN.'
-  echo 'We will now add a the following package repository to your system:'
-  echo '  https://launchpad.net/~ondrej/+archive/ubuntu/php'
-  echo
-  echo 'This repository is generally considered safe to use.'
-  confirm
-
-  sudo add-apt-repository -y ppa:ondrej/php  || failed
-fi
-
-ROOT=`pwd`
-echo "$NAME_MAIN will be installed to: ${ROOT}.";
-confirm
-
-echo "Installing dependencies: git, apache, mysql, php...";
-echo
-sudo apt-get -qq update
-sudo apt-get install \
-  git mysql-server apache2 libapache2-mod-php \
-  php php-mysql php-gd php-curl php-apcu php-cli php-json php-mbstring \
-  || failed
-
-echo "Enabling mod_rewrite in Apache..."
-echo
-sudo a2enmod rewrite  || failed
-
-echo "Downloading $NAME_MAIN and dependencies..."
-echo
-
-if [ ! -e "$NAME_ARC" ]
-then
-  git clone "$REPOSITORY_URI/$NAME_ARC.git"
-else
-  (cd "$NAME_ARC" && git pull --rebase)
-fi
-
-if [ ! -e "$NAME_MAIN" ]
-then
-  git clone "$REPOSITORY_URI/$NAME_MAIN.git"
-else
-  (cd "$NAME_MAIN" && git pull --rebase)
-fi
-
-echo
-echo
-echo "Install probably worked mostly correctly. Continue with the 'Configuration Guide':";
-echo
-echo $CONFIG_URI
-echo
-echo 'Next step is "Configuring Apache webserver".'

scripts/repository/commit_hook.php

@@ -122,9 +122,9 @@ if ($is_svnrevprop) {
   if (!strlen($username)) {
     throw new Exception(
       pht(
-        'No Direct Pushes: You are pushing directly to a repository hosted '.
+        'No Direct Pushes: You are pushing directly to a hosted repository. '.
-        'by Phabricator. This will not work. See "No Direct Pushes" in the '.
+        'This will not work. See "No Direct Pushes" in the documentation '.
-        'documentation for more information.'));
+        'for more information.'));
   }
 
   if ($repository->isHg()) {

scripts/setup/manage_celerity.php

@@ -2,7 +2,7 @@
 <?php
 
 $root = dirname(dirname(dirname(__FILE__)));
-require_once $root.'/scripts/__init_script__.php';
+require_once $root.'/scripts/init/init-setup.php';
 
 $args = new PhutilArgumentParser($argv);
 $args->setTagline(pht('manage celerity'));

scripts/sql/manage_storage.php

@@ -5,13 +5,13 @@ $root = dirname(dirname(dirname(__FILE__)));
 require_once $root.'/scripts/init/init-setup.php';
 
 $args = new PhutilArgumentParser($argv);
-$args->setTagline(pht('manage Phabricator storage and schemata'));
+$args->setTagline(pht('manage storage and schemata'));
 $args->setSynopsis(<<<EOHELP
 **storage** __workflow__ [__options__]
-Manage Phabricator database storage and schema versioning.
+Manage database storage and schema versioning.
 
 **storage** upgrade
-Initialize or upgrade Phabricator storage.
+Initialize or upgrade storage.
 
 **storage** upgrade --user __root__ --password __hunter2__
 Use administrative credentials for schema changes.
@@ -74,7 +74,7 @@ try {
         'name'    => 'disable-utf8mb4',
         'help'    => pht(
           'Disable %s, even if the database supports it. This is an '.
-          'advanced feature used for testing changes to Phabricator; you '.
+          'advanced feature used for testing internal changes; you '.
           'should not normally use this flag.',
           'utf8mb4'),
       ),
@@ -95,7 +95,7 @@ if (!$refs) {
 
 $host = $args->getArg('host');
 $ref_key = $args->getArg('ref');
-if (strlen($host) || strlen($ref_key)) {
+if (($host !== null) || ($ref_key !== null)) {
   if ($host && $ref_key) {
     throw new PhutilArgumentUsageException(
       pht(
@@ -168,9 +168,9 @@ foreach ($refs as $ref) {
         'Unable to connect to MySQL using the configured credentials. '.
         'You must configure standard credentials before you can upgrade '.
         'storage. Run these commands to set up credentials:'),
-      "  phabricator/ $ ./bin/config set mysql.host __host__\n".
+      "  $ ./bin/config set mysql.host __host__\n".
-      "  phabricator/ $ ./bin/config set mysql.user __username__\n".
+      "  $ ./bin/config set mysql.user __username__\n".
-      "  phabricator/ $ ./bin/config set mysql.pass __password__",
+      "  $ ./bin/config set mysql.pass __password__",
       pht(
         'These standard credentials are separate from any administrative '.
         'credentials provided to this command with __%s__ or '.

scripts/ssh/ssh-connect.php

@@ -154,6 +154,6 @@ $pattern = implode(' ', $pattern);
 array_unshift($arguments, $pattern);
 
 $err = newv('PhutilExecPassthru', $arguments)
-  ->execute();
+  ->resolve();
 
 exit($err);

scripts/ssh/ssh-exec.php

@@ -130,9 +130,9 @@ try {
     if (!PhabricatorEnv::isClusterAddress($remote_address)) {
       throw new Exception(
         pht(
-          'This request originates from outside of the Phabricator cluster '.
+          'This request originates from outside of the cluster address range. '.
-          'address range. Requests signed with a trusted device key must '.
+          'Requests signed with a trusted device key must originate from '.
-          'originate from trusted hosts.'));
+          'trusted hosts.'));
     }
 
     $device = id(new AlmanacDeviceQuery())
@@ -228,7 +228,9 @@ try {
   $command_list = implode(', ', $command_list);
 
   $error_lines = array();
-  $error_lines[] = pht('Welcome to Phabricator.');
+  $error_lines[] = pht(
+    'Welcome to %s.',
+    PlatformSymbols::getPlatformServerName());
   $error_lines[] = pht(
     'You are logged in as %s.',
     $user_name);
@@ -236,7 +238,7 @@ try {
   if (!$original_argv) {
     $error_lines[] = pht(
       'You have not specified a command to run. This means you are requesting '.
-      'an interactive shell, but Phabricator does not provide interactive '.
+      'an interactive shell, but this server does not provide interactive '.
       'shells over SSH.');
     $error_lines[] = pht(
       '(Usually, you should run a command like "git clone" or "hg push" '.
@@ -270,7 +272,7 @@ try {
   if (empty($workflows[$command])) {
     $error_lines[] = pht(
       'You have specified the command "%s", but that command is not '.
-      'supported by Phabricator. As received by Phabricator, your entire '.
+      'supported by this server. As received by this server, your entire '.
       'argument list was:',
       $command);
 

src/__phutil_library_map__.php

@@ -88,6 +88,7 @@ phutil_register_library_map(array(
     'AlmanacInterfaceSearchEngine' => 'applications/almanac/query/AlmanacInterfaceSearchEngine.php',
     'AlmanacInterfaceTableView' => 'applications/almanac/view/AlmanacInterfaceTableView.php',
     'AlmanacInterfaceTransaction' => 'applications/almanac/storage/AlmanacInterfaceTransaction.php',
+    'AlmanacInterfaceTransactionQuery' => 'applications/almanac/query/AlmanacInterfaceTransactionQuery.php',
     'AlmanacInterfaceTransactionType' => 'applications/almanac/xaction/AlmanacInterfaceTransactionType.php',
     'AlmanacKeys' => 'applications/almanac/util/AlmanacKeys.php',
     'AlmanacManageClusterServicesCapability' => 'applications/almanac/capability/AlmanacManageClusterServicesCapability.php',
@@ -238,6 +239,7 @@ phutil_register_library_map(array(
     'AphrontIsolatedDatabaseConnection' => 'infrastructure/storage/connection/AphrontIsolatedDatabaseConnection.php',
     'AphrontIsolatedDatabaseConnectionTestCase' => 'infrastructure/storage/__tests__/AphrontIsolatedDatabaseConnectionTestCase.php',
     'AphrontIsolatedHTTPSink' => 'aphront/sink/AphrontIsolatedHTTPSink.php',
+    'AphrontJSONHTTPParameterType' => 'aphront/httpparametertype/AphrontJSONHTTPParameterType.php',
     'AphrontJSONResponse' => 'aphront/response/AphrontJSONResponse.php',
     'AphrontJavelinView' => 'view/AphrontJavelinView.php',
     'AphrontKeyboardShortcutsAvailableView' => 'view/widget/AphrontKeyboardShortcutsAvailableView.php',
@@ -271,6 +273,7 @@ phutil_register_library_map(array(
     'AphrontRedirectResponse' => 'aphront/response/AphrontRedirectResponse.php',
     'AphrontRedirectResponseTestCase' => 'aphront/response/__tests__/AphrontRedirectResponseTestCase.php',
     'AphrontReloadResponse' => 'aphront/response/AphrontReloadResponse.php',
+    'AphrontRemarkupHTTPParameterType' => 'aphront/httpparametertype/AphrontRemarkupHTTPParameterType.php',
     'AphrontRequest' => 'aphront/AphrontRequest.php',
     'AphrontRequestExceptionHandler' => 'aphront/handler/AphrontRequestExceptionHandler.php',
     'AphrontRequestStream' => 'aphront/requeststream/AphrontRequestStream.php',
@@ -338,6 +341,7 @@ phutil_register_library_map(array(
     'ChatLogConduitAPIMethod' => 'applications/chatlog/conduit/ChatLogConduitAPIMethod.php',
     'ChatLogQueryConduitAPIMethod' => 'applications/chatlog/conduit/ChatLogQueryConduitAPIMethod.php',
     'ChatLogRecordConduitAPIMethod' => 'applications/chatlog/conduit/ChatLogRecordConduitAPIMethod.php',
+    'ConduitAPIDocumentationPage' => 'applications/conduit/data/ConduitAPIDocumentationPage.php',
     'ConduitAPIMethod' => 'applications/conduit/method/ConduitAPIMethod.php',
     'ConduitAPIMethodTestCase' => 'applications/conduit/method/__tests__/ConduitAPIMethodTestCase.php',
     'ConduitAPIRequest' => 'applications/conduit/protocol/ConduitAPIRequest.php',
@@ -586,7 +590,6 @@ phutil_register_library_map(array(
     'DifferentialQueryConduitAPIMethod' => 'applications/differential/conduit/DifferentialQueryConduitAPIMethod.php',
     'DifferentialQueryDiffsConduitAPIMethod' => 'applications/differential/conduit/DifferentialQueryDiffsConduitAPIMethod.php',
     'DifferentialRawDiffRenderer' => 'applications/differential/render/DifferentialRawDiffRenderer.php',
-    'DifferentialReleephRequestFieldSpecification' => 'applications/releeph/differential/DifferentialReleephRequestFieldSpecification.php',
     'DifferentialRemarkupRule' => 'applications/differential/remarkup/DifferentialRemarkupRule.php',
     'DifferentialReplyHandler' => 'applications/differential/mail/DifferentialReplyHandler.php',
     'DifferentialRepositoryField' => 'applications/differential/customfield/DifferentialRepositoryField.php',
@@ -904,6 +907,7 @@ phutil_register_library_map(array(
     'DiffusionLowLevelResolveRefsQuery' => 'applications/diffusion/query/lowlevel/DiffusionLowLevelResolveRefsQuery.php',
     'DiffusionMercurialBlameQuery' => 'applications/diffusion/query/blame/DiffusionMercurialBlameQuery.php',
     'DiffusionMercurialCommandEngine' => 'applications/diffusion/protocol/DiffusionMercurialCommandEngine.php',
+    'DiffusionMercurialCommandEngineTests' => 'applications/diffusion/protocol/__tests__/DiffusionMercurialCommandEngineTests.php',
     'DiffusionMercurialFileContentQuery' => 'applications/diffusion/query/filecontent/DiffusionMercurialFileContentQuery.php',
     'DiffusionMercurialFlagInjectionException' => 'applications/diffusion/exception/DiffusionMercurialFlagInjectionException.php',
     'DiffusionMercurialRawDiffQuery' => 'applications/diffusion/query/rawdiff/DiffusionMercurialRawDiffQuery.php',
@@ -1227,6 +1231,8 @@ phutil_register_library_map(array(
     'DrydockLeaseStatus' => 'applications/drydock/constants/DrydockLeaseStatus.php',
     'DrydockLeaseUpdateWorker' => 'applications/drydock/worker/DrydockLeaseUpdateWorker.php',
     'DrydockLeaseViewController' => 'applications/drydock/controller/DrydockLeaseViewController.php',
+    'DrydockLeaseWaitingForActivationLogType' => 'applications/drydock/logtype/DrydockLeaseWaitingForActivationLogType.php',
+    'DrydockLeaseWaitingForReclamationLogType' => 'applications/drydock/logtype/DrydockLeaseWaitingForReclamationLogType.php',
     'DrydockLeaseWaitingForResourcesLogType' => 'applications/drydock/logtype/DrydockLeaseWaitingForResourcesLogType.php',
     'DrydockLog' => 'applications/drydock/storage/DrydockLog.php',
     'DrydockLogController' => 'applications/drydock/controller/DrydockLogController.php',
@@ -1290,7 +1296,6 @@ phutil_register_library_map(array(
     'DrydockWorkingCopyBlueprintImplementation' => 'applications/drydock/blueprint/DrydockWorkingCopyBlueprintImplementation.php',
     'EdgeSearchConduitAPIMethod' => 'infrastructure/edges/conduit/EdgeSearchConduitAPIMethod.php',
     'FeedConduitAPIMethod' => 'applications/feed/conduit/FeedConduitAPIMethod.php',
-    'FeedPublishConduitAPIMethod' => 'applications/feed/conduit/FeedPublishConduitAPIMethod.php',
     'FeedPublisherHTTPWorker' => 'applications/feed/worker/FeedPublisherHTTPWorker.php',
     'FeedPublisherWorker' => 'applications/feed/worker/FeedPublisherWorker.php',
     'FeedPushWorker' => 'applications/feed/worker/FeedPushWorker.php',
@@ -1386,8 +1391,9 @@ phutil_register_library_map(array(
     'HarbormasterBuildArtifactPHIDType' => 'applications/harbormaster/phid/HarbormasterBuildArtifactPHIDType.php',
     'HarbormasterBuildArtifactQuery' => 'applications/harbormaster/query/HarbormasterBuildArtifactQuery.php',
     'HarbormasterBuildAutoplan' => 'applications/harbormaster/autoplan/HarbormasterBuildAutoplan.php',
-    'HarbormasterBuildCommand' => 'applications/harbormaster/storage/HarbormasterBuildCommand.php',
     'HarbormasterBuildDependencyDatasource' => 'applications/harbormaster/typeahead/HarbormasterBuildDependencyDatasource.php',
+    'HarbormasterBuildEditAPIMethod' => 'applications/harbormaster/conduit/HarbormasterBuildEditAPIMethod.php',
+    'HarbormasterBuildEditEngine' => 'applications/harbormaster/editor/HarbormasterBuildEditEngine.php',
     'HarbormasterBuildEngine' => 'applications/harbormaster/engine/HarbormasterBuildEngine.php',
     'HarbormasterBuildFailureException' => 'applications/harbormaster/exception/HarbormasterBuildFailureException.php',
     'HarbormasterBuildGraph' => 'applications/harbormaster/engine/HarbormasterBuildGraph.php',
@@ -1407,7 +1413,12 @@ phutil_register_library_map(array(
     'HarbormasterBuildLogView' => 'applications/harbormaster/view/HarbormasterBuildLogView.php',
     'HarbormasterBuildLogViewController' => 'applications/harbormaster/controller/HarbormasterBuildLogViewController.php',
     'HarbormasterBuildMessage' => 'applications/harbormaster/storage/HarbormasterBuildMessage.php',
+    'HarbormasterBuildMessageAbortTransaction' => 'applications/harbormaster/xaction/build/HarbormasterBuildMessageAbortTransaction.php',
+    'HarbormasterBuildMessagePauseTransaction' => 'applications/harbormaster/xaction/build/HarbormasterBuildMessagePauseTransaction.php',
     'HarbormasterBuildMessageQuery' => 'applications/harbormaster/query/HarbormasterBuildMessageQuery.php',
+    'HarbormasterBuildMessageRestartTransaction' => 'applications/harbormaster/xaction/build/HarbormasterBuildMessageRestartTransaction.php',
+    'HarbormasterBuildMessageResumeTransaction' => 'applications/harbormaster/xaction/build/HarbormasterBuildMessageResumeTransaction.php',
+    'HarbormasterBuildMessageTransaction' => 'applications/harbormaster/xaction/build/HarbormasterBuildMessageTransaction.php',
     'HarbormasterBuildPHIDType' => 'applications/harbormaster/phid/HarbormasterBuildPHIDType.php',
     'HarbormasterBuildPlan' => 'applications/harbormaster/storage/configuration/HarbormasterBuildPlan.php',
     'HarbormasterBuildPlanBehavior' => 'applications/harbormaster/plan/HarbormasterBuildPlanBehavior.php',
@@ -1458,6 +1469,7 @@ phutil_register_library_map(array(
     'HarbormasterBuildTransaction' => 'applications/harbormaster/storage/HarbormasterBuildTransaction.php',
     'HarbormasterBuildTransactionEditor' => 'applications/harbormaster/editor/HarbormasterBuildTransactionEditor.php',
     'HarbormasterBuildTransactionQuery' => 'applications/harbormaster/query/HarbormasterBuildTransactionQuery.php',
+    'HarbormasterBuildTransactionType' => 'applications/harbormaster/xaction/build/HarbormasterBuildTransactionType.php',
     'HarbormasterBuildUnitMessage' => 'applications/harbormaster/storage/build/HarbormasterBuildUnitMessage.php',
     'HarbormasterBuildUnitMessageQuery' => 'applications/harbormaster/query/HarbormasterBuildUnitMessageQuery.php',
     'HarbormasterBuildView' => 'applications/harbormaster/view/HarbormasterBuildView.php',
@@ -1466,9 +1478,12 @@ phutil_register_library_map(array(
     'HarbormasterBuildable' => 'applications/harbormaster/storage/HarbormasterBuildable.php',
     'HarbormasterBuildableActionController' => 'applications/harbormaster/controller/HarbormasterBuildableActionController.php',
     'HarbormasterBuildableAdapterInterface' => 'applications/harbormaster/herald/HarbormasterBuildableAdapterInterface.php',
+    'HarbormasterBuildableEditAPIMethod' => 'applications/harbormaster/conduit/HarbormasterBuildableEditAPIMethod.php',
+    'HarbormasterBuildableEditEngine' => 'applications/harbormaster/editor/HarbormasterBuildableEditEngine.php',
     'HarbormasterBuildableEngine' => 'applications/harbormaster/engine/HarbormasterBuildableEngine.php',
     'HarbormasterBuildableInterface' => 'applications/harbormaster/interface/HarbormasterBuildableInterface.php',
     'HarbormasterBuildableListController' => 'applications/harbormaster/controller/HarbormasterBuildableListController.php',
+    'HarbormasterBuildableMessageTransaction' => 'applications/harbormaster/xaction/buildable/HarbormasterBuildableMessageTransaction.php',
     'HarbormasterBuildablePHIDType' => 'applications/harbormaster/phid/HarbormasterBuildablePHIDType.php',
     'HarbormasterBuildableQuery' => 'applications/harbormaster/query/HarbormasterBuildableQuery.php',
     'HarbormasterBuildableSearchAPIMethod' => 'applications/harbormaster/conduit/HarbormasterBuildableSearchAPIMethod.php',
@@ -1477,6 +1492,7 @@ phutil_register_library_map(array(
     'HarbormasterBuildableTransaction' => 'applications/harbormaster/storage/HarbormasterBuildableTransaction.php',
     'HarbormasterBuildableTransactionEditor' => 'applications/harbormaster/editor/HarbormasterBuildableTransactionEditor.php',
     'HarbormasterBuildableTransactionQuery' => 'applications/harbormaster/query/HarbormasterBuildableTransactionQuery.php',
+    'HarbormasterBuildableTransactionType' => 'applications/harbormaster/xaction/buildable/HarbormasterBuildableTransactionType.php',
     'HarbormasterBuildableViewController' => 'applications/harbormaster/controller/HarbormasterBuildableViewController.php',
     'HarbormasterBuildkiteBuildStepImplementation' => 'applications/harbormaster/integration/buildkite/HarbormasterBuildkiteBuildStepImplementation.php',
     'HarbormasterBuildkiteBuildableInterface' => 'applications/harbormaster/interface/HarbormasterBuildkiteBuildableInterface.php',
@@ -1513,6 +1529,7 @@ phutil_register_library_map(array(
     'HarbormasterManagementUpdateWorkflow' => 'applications/harbormaster/management/HarbormasterManagementUpdateWorkflow.php',
     'HarbormasterManagementWorkflow' => 'applications/harbormaster/management/HarbormasterManagementWorkflow.php',
     'HarbormasterManagementWriteLogWorkflow' => 'applications/harbormaster/management/HarbormasterManagementWriteLogWorkflow.php',
+    'HarbormasterMessageException' => 'applications/harbormaster/exception/HarbormasterMessageException.php',
     'HarbormasterMessageType' => 'applications/harbormaster/engine/HarbormasterMessageType.php',
     'HarbormasterObject' => 'applications/harbormaster/storage/HarbormasterObject.php',
     'HarbormasterOtherBuildStepGroup' => 'applications/harbormaster/stepgroup/HarbormasterOtherBuildStepGroup.php',
@@ -1524,13 +1541,11 @@ phutil_register_library_map(array(
     'HarbormasterPlanRunController' => 'applications/harbormaster/controller/HarbormasterPlanRunController.php',
     'HarbormasterPlanViewController' => 'applications/harbormaster/controller/HarbormasterPlanViewController.php',
     'HarbormasterPrototypeBuildStepGroup' => 'applications/harbormaster/stepgroup/HarbormasterPrototypeBuildStepGroup.php',
-    'HarbormasterPublishFragmentBuildStepImplementation' => 'applications/harbormaster/step/HarbormasterPublishFragmentBuildStepImplementation.php',
     'HarbormasterQueryAutotargetsConduitAPIMethod' => 'applications/harbormaster/conduit/HarbormasterQueryAutotargetsConduitAPIMethod.php',
     'HarbormasterQueryBuildablesConduitAPIMethod' => 'applications/harbormaster/conduit/HarbormasterQueryBuildablesConduitAPIMethod.php',
     'HarbormasterQueryBuildsConduitAPIMethod' => 'applications/harbormaster/conduit/HarbormasterQueryBuildsConduitAPIMethod.php',
     'HarbormasterQueryBuildsSearchEngineAttachment' => 'applications/harbormaster/engineextension/HarbormasterQueryBuildsSearchEngineAttachment.php',
     'HarbormasterRemarkupRule' => 'applications/harbormaster/remarkup/HarbormasterRemarkupRule.php',
-    'HarbormasterRestartException' => 'applications/harbormaster/exception/HarbormasterRestartException.php',
     'HarbormasterRunBuildPlansHeraldAction' => 'applications/harbormaster/herald/HarbormasterRunBuildPlansHeraldAction.php',
     'HarbormasterSchemaSpec' => 'applications/harbormaster/storage/HarbormasterSchemaSpec.php',
     'HarbormasterScratchTable' => 'applications/harbormaster/storage/HarbormasterScratchTable.php',
@@ -2002,7 +2017,6 @@ phutil_register_library_map(array(
     'OwnersConduitAPIMethod' => 'applications/owners/conduit/OwnersConduitAPIMethod.php',
     'OwnersEditConduitAPIMethod' => 'applications/owners/conduit/OwnersEditConduitAPIMethod.php',
     'OwnersPackageReplyHandler' => 'applications/owners/mail/OwnersPackageReplyHandler.php',
-    'OwnersQueryConduitAPIMethod' => 'applications/owners/conduit/OwnersQueryConduitAPIMethod.php',
     'OwnersSearchConduitAPIMethod' => 'applications/owners/conduit/OwnersSearchConduitAPIMethod.php',
     'PHIDConduitAPIMethod' => 'applications/phid/conduit/PHIDConduitAPIMethod.php',
     'PHIDInfoConduitAPIMethod' => 'applications/phid/conduit/PHIDInfoConduitAPIMethod.php',
@@ -3441,6 +3455,8 @@ phutil_register_library_map(array(
     'PhabricatorFile' => 'applications/files/storage/PhabricatorFile.php',
     'PhabricatorFileAES256StorageFormat' => 'applications/files/format/PhabricatorFileAES256StorageFormat.php',
     'PhabricatorFileAltTextTransaction' => 'applications/files/xaction/PhabricatorFileAltTextTransaction.php',
+    'PhabricatorFileAttachment' => 'applications/files/storage/PhabricatorFileAttachment.php',
+    'PhabricatorFileAttachmentQuery' => 'applications/files/query/PhabricatorFileAttachmentQuery.php',
     'PhabricatorFileBundleLoader' => 'applications/files/query/PhabricatorFileBundleLoader.php',
     'PhabricatorFileChunk' => 'applications/files/storage/PhabricatorFileChunk.php',
     'PhabricatorFileChunkIterator' => 'applications/files/engine/PhabricatorFileChunkIterator.php',
@@ -3451,6 +3467,7 @@ phutil_register_library_map(array(
     'PhabricatorFileDataController' => 'applications/files/controller/PhabricatorFileDataController.php',
     'PhabricatorFileDeleteController' => 'applications/files/controller/PhabricatorFileDeleteController.php',
     'PhabricatorFileDeleteTransaction' => 'applications/files/xaction/PhabricatorFileDeleteTransaction.php',
+    'PhabricatorFileDetachController' => 'applications/files/controller/PhabricatorFileDetachController.php',
     'PhabricatorFileDocumentController' => 'applications/files/controller/PhabricatorFileDocumentController.php',
     'PhabricatorFileDocumentRenderingEngine' => 'applications/files/document/render/PhabricatorFileDocumentRenderingEngine.php',
     'PhabricatorFileDropUploadController' => 'applications/files/controller/PhabricatorFileDropUploadController.php',
@@ -3461,7 +3478,6 @@ phutil_register_library_map(array(
     'PhabricatorFileExternalRequest' => 'applications/files/storage/PhabricatorFileExternalRequest.php',
     'PhabricatorFileExternalRequestGarbageCollector' => 'applications/files/garbagecollector/PhabricatorFileExternalRequestGarbageCollector.php',
     'PhabricatorFileFilePHIDType' => 'applications/files/phid/PhabricatorFileFilePHIDType.php',
-    'PhabricatorFileHasObjectEdgeType' => 'applications/files/edge/PhabricatorFileHasObjectEdgeType.php',
     'PhabricatorFileIconSetSelectController' => 'applications/files/controller/PhabricatorFileIconSetSelectController.php',
     'PhabricatorFileImageMacro' => 'applications/macro/storage/PhabricatorFileImageMacro.php',
     'PhabricatorFileImageProxyController' => 'applications/files/controller/PhabricatorFileImageProxyController.php',
@@ -3496,6 +3512,8 @@ phutil_register_library_map(array(
     'PhabricatorFileTransformController' => 'applications/files/controller/PhabricatorFileTransformController.php',
     'PhabricatorFileTransformListController' => 'applications/files/controller/PhabricatorFileTransformListController.php',
     'PhabricatorFileTransformTestCase' => 'applications/files/transform/__tests__/PhabricatorFileTransformTestCase.php',
+    'PhabricatorFileUICurtainAttachController' => 'applications/files/controller/PhabricatorFileUICurtainAttachController.php',
+    'PhabricatorFileUICurtainListController' => 'applications/files/controller/PhabricatorFileUICurtainListController.php',
     'PhabricatorFileUploadController' => 'applications/files/controller/PhabricatorFileUploadController.php',
     'PhabricatorFileUploadDialogController' => 'applications/files/controller/PhabricatorFileUploadDialogController.php',
     'PhabricatorFileUploadException' => 'applications/files/exception/PhabricatorFileUploadException.php',
@@ -3509,6 +3527,7 @@ phutil_register_library_map(array(
     'PhabricatorFilesComposeAvatarBuiltinFile' => 'applications/files/builtin/PhabricatorFilesComposeAvatarBuiltinFile.php',
     'PhabricatorFilesComposeIconBuiltinFile' => 'applications/files/builtin/PhabricatorFilesComposeIconBuiltinFile.php',
     'PhabricatorFilesConfigOptions' => 'applications/files/config/PhabricatorFilesConfigOptions.php',
+    'PhabricatorFilesCurtainExtension' => 'applications/files/engineextension/PhabricatorFilesCurtainExtension.php',
     'PhabricatorFilesManagementCatWorkflow' => 'applications/files/management/PhabricatorFilesManagementCatWorkflow.php',
     'PhabricatorFilesManagementCompactWorkflow' => 'applications/files/management/PhabricatorFilesManagementCompactWorkflow.php',
     'PhabricatorFilesManagementCycleWorkflow' => 'applications/files/management/PhabricatorFilesManagementCycleWorkflow.php',
@@ -3926,7 +3945,6 @@ phutil_register_library_map(array(
     'PhabricatorObjectHasAsanaTaskEdgeType' => 'applications/doorkeeper/edge/PhabricatorObjectHasAsanaTaskEdgeType.php',
     'PhabricatorObjectHasContributorEdgeType' => 'applications/transactions/edges/PhabricatorObjectHasContributorEdgeType.php',
     'PhabricatorObjectHasDraftEdgeType' => 'applications/transactions/edges/PhabricatorObjectHasDraftEdgeType.php',
-    'PhabricatorObjectHasFileEdgeType' => 'applications/transactions/edges/PhabricatorObjectHasFileEdgeType.php',
     'PhabricatorObjectHasJiraIssueEdgeType' => 'applications/doorkeeper/edge/PhabricatorObjectHasJiraIssueEdgeType.php',
     'PhabricatorObjectHasSubscriberEdgeType' => 'applications/transactions/edges/PhabricatorObjectHasSubscriberEdgeType.php',
     'PhabricatorObjectHasUnsubscriberEdgeType' => 'applications/transactions/edges/PhabricatorObjectHasUnsubscriberEdgeType.php',
@@ -3973,6 +3991,7 @@ phutil_register_library_map(array(
     'PhabricatorOwnersOwner' => 'applications/owners/storage/PhabricatorOwnersOwner.php',
     'PhabricatorOwnersPackage' => 'applications/owners/storage/PhabricatorOwnersPackage.php',
     'PhabricatorOwnersPackageAuditingTransaction' => 'applications/owners/xaction/PhabricatorOwnersPackageAuditingTransaction.php',
+    'PhabricatorOwnersPackageAuthorityTransaction' => 'applications/owners/xaction/PhabricatorOwnersPackageAuthorityTransaction.php',
     'PhabricatorOwnersPackageAutoreviewTransaction' => 'applications/owners/xaction/PhabricatorOwnersPackageAutoreviewTransaction.php',
     'PhabricatorOwnersPackageContextFreeGrammar' => 'applications/owners/lipsum/PhabricatorOwnersPackageContextFreeGrammar.php',
     'PhabricatorOwnersPackageDatasource' => 'applications/owners/typeahead/PhabricatorOwnersPackageDatasource.php',
@@ -4227,7 +4246,6 @@ phutil_register_library_map(array(
     'PhabricatorPhortuneManagementInvoiceWorkflow' => 'applications/phortune/management/PhabricatorPhortuneManagementInvoiceWorkflow.php',
     'PhabricatorPhortuneManagementWorkflow' => 'applications/phortune/management/PhabricatorPhortuneManagementWorkflow.php',
     'PhabricatorPhortuneTestCase' => 'applications/phortune/__tests__/PhabricatorPhortuneTestCase.php',
-    'PhabricatorPhragmentApplication' => 'applications/phragment/application/PhabricatorPhragmentApplication.php',
     'PhabricatorPhrequentApplication' => 'applications/phrequent/application/PhabricatorPhrequentApplication.php',
     'PhabricatorPhrictionApplication' => 'applications/phriction/application/PhabricatorPhrictionApplication.php',
     'PhabricatorPhurlApplication' => 'applications/phurl/application/PhabricatorPhurlApplication.php',
@@ -4549,8 +4567,6 @@ phutil_register_library_map(array(
     'PhabricatorRefreshCSRFController' => 'applications/auth/controller/PhabricatorRefreshCSRFController.php',
     'PhabricatorRegexListConfigType' => 'applications/config/type/PhabricatorRegexListConfigType.php',
     'PhabricatorRegistrationProfile' => 'applications/people/storage/PhabricatorRegistrationProfile.php',
-    'PhabricatorReleephApplication' => 'applications/releeph/application/PhabricatorReleephApplication.php',
-    'PhabricatorReleephApplicationConfigOptions' => 'applications/releeph/config/PhabricatorReleephApplicationConfigOptions.php',
     'PhabricatorRemarkupCachePurger' => 'applications/cache/purger/PhabricatorRemarkupCachePurger.php',
     'PhabricatorRemarkupControl' => 'view/form/control/PhabricatorRemarkupControl.php',
     'PhabricatorRemarkupCowsayBlockInterpreter' => 'infrastructure/markup/interpreter/PhabricatorRemarkupCowsayBlockInterpreter.php',
@@ -4823,7 +4839,6 @@ phutil_register_library_map(array(
     'PhabricatorSlowvoteApplication' => 'applications/slowvote/application/PhabricatorSlowvoteApplication.php',
     'PhabricatorSlowvoteChoice' => 'applications/slowvote/storage/PhabricatorSlowvoteChoice.php',
     'PhabricatorSlowvoteCloseController' => 'applications/slowvote/controller/PhabricatorSlowvoteCloseController.php',
-    'PhabricatorSlowvoteCloseTransaction' => 'applications/slowvote/xaction/PhabricatorSlowvoteCloseTransaction.php',
     'PhabricatorSlowvoteCommentController' => 'applications/slowvote/controller/PhabricatorSlowvoteCommentController.php',
     'PhabricatorSlowvoteController' => 'applications/slowvote/controller/PhabricatorSlowvoteController.php',
     'PhabricatorSlowvoteDAO' => 'applications/slowvote/storage/PhabricatorSlowvoteDAO.php',
@@ -4844,11 +4859,13 @@ phutil_register_library_map(array(
     'PhabricatorSlowvoteSchemaSpec' => 'applications/slowvote/storage/PhabricatorSlowvoteSchemaSpec.php',
     'PhabricatorSlowvoteSearchEngine' => 'applications/slowvote/query/PhabricatorSlowvoteSearchEngine.php',
     'PhabricatorSlowvoteShuffleTransaction' => 'applications/slowvote/xaction/PhabricatorSlowvoteShuffleTransaction.php',
+    'PhabricatorSlowvoteStatusTransaction' => 'applications/slowvote/xaction/PhabricatorSlowvoteStatusTransaction.php',
     'PhabricatorSlowvoteTransaction' => 'applications/slowvote/storage/PhabricatorSlowvoteTransaction.php',
     'PhabricatorSlowvoteTransactionComment' => 'applications/slowvote/storage/PhabricatorSlowvoteTransactionComment.php',
     'PhabricatorSlowvoteTransactionQuery' => 'applications/slowvote/query/PhabricatorSlowvoteTransactionQuery.php',
     'PhabricatorSlowvoteTransactionType' => 'applications/slowvote/xaction/PhabricatorSlowvoteTransactionType.php',
     'PhabricatorSlowvoteVoteController' => 'applications/slowvote/controller/PhabricatorSlowvoteVoteController.php',
+    'PhabricatorSlowvoteVotingMethodTransaction' => 'applications/slowvote/xaction/PhabricatorSlowvoteVotingMethodTransaction.php',
     'PhabricatorSlug' => 'infrastructure/util/PhabricatorSlug.php',
     'PhabricatorSlugTestCase' => 'infrastructure/util/__tests__/PhabricatorSlugTestCase.php',
     'PhabricatorSourceCodeView' => 'view/layout/PhabricatorSourceCodeView.php',
@@ -5269,6 +5286,7 @@ phutil_register_library_map(array(
     'PhameDescriptionView' => 'applications/phame/view/PhameDescriptionView.php',
     'PhameDraftListView' => 'applications/phame/view/PhameDraftListView.php',
     'PhameHomeController' => 'applications/phame/controller/PhameHomeController.php',
+    'PhameInheritBlogPolicyRule' => 'applications/phame/policyrule/PhameInheritBlogPolicyRule.php',
     'PhameLiveController' => 'applications/phame/controller/PhameLiveController.php',
     'PhameNextPostView' => 'applications/phame/view/PhameNextPostView.php',
     'PhamePost' => 'applications/phame/storage/PhamePost.php',
@@ -5279,6 +5297,7 @@ phutil_register_library_map(array(
     'PhamePostEditConduitAPIMethod' => 'applications/phame/conduit/PhamePostEditConduitAPIMethod.php',
     'PhamePostEditController' => 'applications/phame/controller/post/PhamePostEditController.php',
     'PhamePostEditEngine' => 'applications/phame/editor/PhamePostEditEngine.php',
+    'PhamePostEditEngineLock' => 'applications/phame/editor/PhamePostEditEngineLock.php',
     'PhamePostEditor' => 'applications/phame/editor/PhamePostEditor.php',
     'PhamePostFerretEngine' => 'applications/phame/search/PhamePostFerretEngine.php',
     'PhamePostFulltextEngine' => 'applications/phame/search/PhamePostFulltextEngine.php',
@@ -5552,38 +5571,6 @@ phutil_register_library_map(array(
     'PhortuneSubscriptionTransactionType' => 'applications/phortune/xaction/subscription/PhortuneSubscriptionTransactionType.php',
     'PhortuneSubscriptionWorker' => 'applications/phortune/worker/PhortuneSubscriptionWorker.php',
     'PhortuneTestPaymentProvider' => 'applications/phortune/provider/PhortuneTestPaymentProvider.php',
-    'PhragmentBrowseController' => 'applications/phragment/controller/PhragmentBrowseController.php',
-    'PhragmentCanCreateCapability' => 'applications/phragment/capability/PhragmentCanCreateCapability.php',
-    'PhragmentConduitAPIMethod' => 'applications/phragment/conduit/PhragmentConduitAPIMethod.php',
-    'PhragmentController' => 'applications/phragment/controller/PhragmentController.php',
-    'PhragmentCreateController' => 'applications/phragment/controller/PhragmentCreateController.php',
-    'PhragmentDAO' => 'applications/phragment/storage/PhragmentDAO.php',
-    'PhragmentFragment' => 'applications/phragment/storage/PhragmentFragment.php',
-    'PhragmentFragmentPHIDType' => 'applications/phragment/phid/PhragmentFragmentPHIDType.php',
-    'PhragmentFragmentQuery' => 'applications/phragment/query/PhragmentFragmentQuery.php',
-    'PhragmentFragmentVersion' => 'applications/phragment/storage/PhragmentFragmentVersion.php',
-    'PhragmentFragmentVersionPHIDType' => 'applications/phragment/phid/PhragmentFragmentVersionPHIDType.php',
-    'PhragmentFragmentVersionQuery' => 'applications/phragment/query/PhragmentFragmentVersionQuery.php',
-    'PhragmentGetPatchConduitAPIMethod' => 'applications/phragment/conduit/PhragmentGetPatchConduitAPIMethod.php',
-    'PhragmentHistoryController' => 'applications/phragment/controller/PhragmentHistoryController.php',
-    'PhragmentPatchController' => 'applications/phragment/controller/PhragmentPatchController.php',
-    'PhragmentPatchUtil' => 'applications/phragment/util/PhragmentPatchUtil.php',
-    'PhragmentPolicyController' => 'applications/phragment/controller/PhragmentPolicyController.php',
-    'PhragmentQueryFragmentsConduitAPIMethod' => 'applications/phragment/conduit/PhragmentQueryFragmentsConduitAPIMethod.php',
-    'PhragmentRevertController' => 'applications/phragment/controller/PhragmentRevertController.php',
-    'PhragmentSchemaSpec' => 'applications/phragment/storage/PhragmentSchemaSpec.php',
-    'PhragmentSnapshot' => 'applications/phragment/storage/PhragmentSnapshot.php',
-    'PhragmentSnapshotChild' => 'applications/phragment/storage/PhragmentSnapshotChild.php',
-    'PhragmentSnapshotChildQuery' => 'applications/phragment/query/PhragmentSnapshotChildQuery.php',
-    'PhragmentSnapshotCreateController' => 'applications/phragment/controller/PhragmentSnapshotCreateController.php',
-    'PhragmentSnapshotDeleteController' => 'applications/phragment/controller/PhragmentSnapshotDeleteController.php',
-    'PhragmentSnapshotPHIDType' => 'applications/phragment/phid/PhragmentSnapshotPHIDType.php',
-    'PhragmentSnapshotPromoteController' => 'applications/phragment/controller/PhragmentSnapshotPromoteController.php',
-    'PhragmentSnapshotQuery' => 'applications/phragment/query/PhragmentSnapshotQuery.php',
-    'PhragmentSnapshotViewController' => 'applications/phragment/controller/PhragmentSnapshotViewController.php',
-    'PhragmentUpdateController' => 'applications/phragment/controller/PhragmentUpdateController.php',
-    'PhragmentVersionController' => 'applications/phragment/controller/PhragmentVersionController.php',
-    'PhragmentZIPController' => 'applications/phragment/controller/PhragmentZIPController.php',
     'PhrequentConduitAPIMethod' => 'applications/phrequent/conduit/PhrequentConduitAPIMethod.php',
     'PhrequentController' => 'applications/phrequent/controller/PhrequentController.php',
     'PhrequentCurtainExtension' => 'applications/phrequent/engineextension/PhrequentCurtainExtension.php',
@@ -5763,6 +5750,7 @@ phutil_register_library_map(array(
     'PhutilRemarkupEngine' => 'infrastructure/markup/remarkup/PhutilRemarkupEngine.php',
     'PhutilRemarkupEngineTestCase' => 'infrastructure/markup/remarkup/__tests__/PhutilRemarkupEngineTestCase.php',
     'PhutilRemarkupEscapeRemarkupRule' => 'infrastructure/markup/markuprule/PhutilRemarkupEscapeRemarkupRule.php',
+    'PhutilRemarkupEvalRule' => 'infrastructure/markup/markuprule/PhutilRemarkupEvalRule.php',
     'PhutilRemarkupHeaderBlockRule' => 'infrastructure/markup/blockrule/PhutilRemarkupHeaderBlockRule.php',
     'PhutilRemarkupHighlightRule' => 'infrastructure/markup/markuprule/PhutilRemarkupHighlightRule.php',
     'PhutilRemarkupHorizontalRuleBlockRule' => 'infrastructure/markup/blockrule/PhutilRemarkupHorizontalRuleBlockRule.php',
@@ -5883,100 +5871,17 @@ phutil_register_library_map(array(
     'ProjectSearchConduitAPIMethod' => 'applications/project/conduit/ProjectSearchConduitAPIMethod.php',
     'QueryFormattingTestCase' => 'infrastructure/storage/__tests__/QueryFormattingTestCase.php',
     'QueryFuture' => 'infrastructure/storage/future/QueryFuture.php',
-    'ReleephAuthorFieldSpecification' => 'applications/releeph/field/specification/ReleephAuthorFieldSpecification.php',
-    'ReleephBranch' => 'applications/releeph/storage/ReleephBranch.php',
-    'ReleephBranchAccessController' => 'applications/releeph/controller/branch/ReleephBranchAccessController.php',
-    'ReleephBranchCommitFieldSpecification' => 'applications/releeph/field/specification/ReleephBranchCommitFieldSpecification.php',
-    'ReleephBranchController' => 'applications/releeph/controller/branch/ReleephBranchController.php',
-    'ReleephBranchCreateController' => 'applications/releeph/controller/branch/ReleephBranchCreateController.php',
-    'ReleephBranchEditController' => 'applications/releeph/controller/branch/ReleephBranchEditController.php',
-    'ReleephBranchEditor' => 'applications/releeph/editor/ReleephBranchEditor.php',
-    'ReleephBranchHistoryController' => 'applications/releeph/controller/branch/ReleephBranchHistoryController.php',
-    'ReleephBranchNamePreviewController' => 'applications/releeph/controller/branch/ReleephBranchNamePreviewController.php',
-    'ReleephBranchPHIDType' => 'applications/releeph/phid/ReleephBranchPHIDType.php',
-    'ReleephBranchPreviewView' => 'applications/releeph/view/branch/ReleephBranchPreviewView.php',
-    'ReleephBranchQuery' => 'applications/releeph/query/ReleephBranchQuery.php',
-    'ReleephBranchSearchEngine' => 'applications/releeph/query/ReleephBranchSearchEngine.php',
-    'ReleephBranchTemplate' => 'applications/releeph/view/branch/ReleephBranchTemplate.php',
-    'ReleephBranchTransaction' => 'applications/releeph/storage/ReleephBranchTransaction.php',
-    'ReleephBranchTransactionQuery' => 'applications/releeph/query/ReleephBranchTransactionQuery.php',
-    'ReleephBranchViewController' => 'applications/releeph/controller/branch/ReleephBranchViewController.php',
-    'ReleephCommitFinder' => 'applications/releeph/commitfinder/ReleephCommitFinder.php',
-    'ReleephCommitFinderException' => 'applications/releeph/commitfinder/ReleephCommitFinderException.php',
-    'ReleephCommitMessageFieldSpecification' => 'applications/releeph/field/specification/ReleephCommitMessageFieldSpecification.php',
-    'ReleephConduitAPIMethod' => 'applications/releeph/conduit/ReleephConduitAPIMethod.php',
-    'ReleephController' => 'applications/releeph/controller/ReleephController.php',
-    'ReleephDAO' => 'applications/releeph/storage/ReleephDAO.php',
-    'ReleephDefaultFieldSelector' => 'applications/releeph/field/selector/ReleephDefaultFieldSelector.php',
-    'ReleephDependsOnFieldSpecification' => 'applications/releeph/field/specification/ReleephDependsOnFieldSpecification.php',
-    'ReleephDiffChurnFieldSpecification' => 'applications/releeph/field/specification/ReleephDiffChurnFieldSpecification.php',
-    'ReleephDiffMessageFieldSpecification' => 'applications/releeph/field/specification/ReleephDiffMessageFieldSpecification.php',
-    'ReleephDiffSizeFieldSpecification' => 'applications/releeph/field/specification/ReleephDiffSizeFieldSpecification.php',
-    'ReleephFieldParseException' => 'applications/releeph/field/exception/ReleephFieldParseException.php',
-    'ReleephFieldSelector' => 'applications/releeph/field/selector/ReleephFieldSelector.php',
-    'ReleephFieldSpecification' => 'applications/releeph/field/specification/ReleephFieldSpecification.php',
-    'ReleephGetBranchesConduitAPIMethod' => 'applications/releeph/conduit/ReleephGetBranchesConduitAPIMethod.php',
-    'ReleephIntentFieldSpecification' => 'applications/releeph/field/specification/ReleephIntentFieldSpecification.php',
-    'ReleephLevelFieldSpecification' => 'applications/releeph/field/specification/ReleephLevelFieldSpecification.php',
-    'ReleephOriginalCommitFieldSpecification' => 'applications/releeph/field/specification/ReleephOriginalCommitFieldSpecification.php',
-    'ReleephProductActionController' => 'applications/releeph/controller/product/ReleephProductActionController.php',
-    'ReleephProductController' => 'applications/releeph/controller/product/ReleephProductController.php',
-    'ReleephProductCreateController' => 'applications/releeph/controller/product/ReleephProductCreateController.php',
-    'ReleephProductEditController' => 'applications/releeph/controller/product/ReleephProductEditController.php',
-    'ReleephProductEditor' => 'applications/releeph/editor/ReleephProductEditor.php',
-    'ReleephProductHistoryController' => 'applications/releeph/controller/product/ReleephProductHistoryController.php',
-    'ReleephProductListController' => 'applications/releeph/controller/product/ReleephProductListController.php',
-    'ReleephProductPHIDType' => 'applications/releeph/phid/ReleephProductPHIDType.php',
-    'ReleephProductQuery' => 'applications/releeph/query/ReleephProductQuery.php',
-    'ReleephProductSearchEngine' => 'applications/releeph/query/ReleephProductSearchEngine.php',
-    'ReleephProductTransaction' => 'applications/releeph/storage/ReleephProductTransaction.php',
-    'ReleephProductTransactionQuery' => 'applications/releeph/query/ReleephProductTransactionQuery.php',
-    'ReleephProductViewController' => 'applications/releeph/controller/product/ReleephProductViewController.php',
-    'ReleephProject' => 'applications/releeph/storage/ReleephProject.php',
-    'ReleephQueryBranchesConduitAPIMethod' => 'applications/releeph/conduit/ReleephQueryBranchesConduitAPIMethod.php',
-    'ReleephQueryProductsConduitAPIMethod' => 'applications/releeph/conduit/ReleephQueryProductsConduitAPIMethod.php',
-    'ReleephQueryRequestsConduitAPIMethod' => 'applications/releeph/conduit/ReleephQueryRequestsConduitAPIMethod.php',
-    'ReleephReasonFieldSpecification' => 'applications/releeph/field/specification/ReleephReasonFieldSpecification.php',
-    'ReleephRequest' => 'applications/releeph/storage/ReleephRequest.php',
-    'ReleephRequestActionController' => 'applications/releeph/controller/request/ReleephRequestActionController.php',
-    'ReleephRequestCommentController' => 'applications/releeph/controller/request/ReleephRequestCommentController.php',
-    'ReleephRequestConduitAPIMethod' => 'applications/releeph/conduit/ReleephRequestConduitAPIMethod.php',
-    'ReleephRequestController' => 'applications/releeph/controller/request/ReleephRequestController.php',
-    'ReleephRequestDifferentialCreateController' => 'applications/releeph/controller/request/ReleephRequestDifferentialCreateController.php',
-    'ReleephRequestEditController' => 'applications/releeph/controller/request/ReleephRequestEditController.php',
-    'ReleephRequestMailReceiver' => 'applications/releeph/mail/ReleephRequestMailReceiver.php',
-    'ReleephRequestPHIDType' => 'applications/releeph/phid/ReleephRequestPHIDType.php',
-    'ReleephRequestQuery' => 'applications/releeph/query/ReleephRequestQuery.php',
-    'ReleephRequestReplyHandler' => 'applications/releeph/mail/ReleephRequestReplyHandler.php',
-    'ReleephRequestSearchEngine' => 'applications/releeph/query/ReleephRequestSearchEngine.php',
-    'ReleephRequestStatus' => 'applications/releeph/constants/ReleephRequestStatus.php',
-    'ReleephRequestTransaction' => 'applications/releeph/storage/ReleephRequestTransaction.php',
-    'ReleephRequestTransactionComment' => 'applications/releeph/storage/ReleephRequestTransactionComment.php',
-    'ReleephRequestTransactionQuery' => 'applications/releeph/query/ReleephRequestTransactionQuery.php',
-    'ReleephRequestTransactionalEditor' => 'applications/releeph/editor/ReleephRequestTransactionalEditor.php',
-    'ReleephRequestTypeaheadControl' => 'applications/releeph/view/request/ReleephRequestTypeaheadControl.php',
-    'ReleephRequestTypeaheadController' => 'applications/releeph/controller/request/ReleephRequestTypeaheadController.php',
-    'ReleephRequestView' => 'applications/releeph/view/ReleephRequestView.php',
-    'ReleephRequestViewController' => 'applications/releeph/controller/request/ReleephRequestViewController.php',
-    'ReleephRequestorFieldSpecification' => 'applications/releeph/field/specification/ReleephRequestorFieldSpecification.php',
-    'ReleephRevisionFieldSpecification' => 'applications/releeph/field/specification/ReleephRevisionFieldSpecification.php',
-    'ReleephSeverityFieldSpecification' => 'applications/releeph/field/specification/ReleephSeverityFieldSpecification.php',
-    'ReleephSummaryFieldSpecification' => 'applications/releeph/field/specification/ReleephSummaryFieldSpecification.php',
-    'ReleephWorkCanPushConduitAPIMethod' => 'applications/releeph/conduit/work/ReleephWorkCanPushConduitAPIMethod.php',
-    'ReleephWorkGetAuthorInfoConduitAPIMethod' => 'applications/releeph/conduit/work/ReleephWorkGetAuthorInfoConduitAPIMethod.php',
-    'ReleephWorkGetBranchCommitMessageConduitAPIMethod' => 'applications/releeph/conduit/work/ReleephWorkGetBranchCommitMessageConduitAPIMethod.php',
-    'ReleephWorkGetBranchConduitAPIMethod' => 'applications/releeph/conduit/work/ReleephWorkGetBranchConduitAPIMethod.php',
-    'ReleephWorkGetCommitMessageConduitAPIMethod' => 'applications/releeph/conduit/work/ReleephWorkGetCommitMessageConduitAPIMethod.php',
-    'ReleephWorkNextRequestConduitAPIMethod' => 'applications/releeph/conduit/work/ReleephWorkNextRequestConduitAPIMethod.php',
-    'ReleephWorkRecordConduitAPIMethod' => 'applications/releeph/conduit/work/ReleephWorkRecordConduitAPIMethod.php',
-    'ReleephWorkRecordPickStatusConduitAPIMethod' => 'applications/releeph/conduit/work/ReleephWorkRecordPickStatusConduitAPIMethod.php',
     'RemarkupProcessConduitAPIMethod' => 'applications/remarkup/conduit/RemarkupProcessConduitAPIMethod.php',
+    'RemarkupValue' => 'applications/remarkup/RemarkupValue.php',
     'RepositoryConduitAPIMethod' => 'applications/repository/conduit/RepositoryConduitAPIMethod.php',
     'RepositoryQueryConduitAPIMethod' => 'applications/repository/conduit/RepositoryQueryConduitAPIMethod.php',
     'ShellLogView' => 'applications/harbormaster/view/ShellLogView.php',
     'SlowvoteConduitAPIMethod' => 'applications/slowvote/conduit/SlowvoteConduitAPIMethod.php',
     'SlowvoteEmbedView' => 'applications/slowvote/view/SlowvoteEmbedView.php',
     'SlowvoteInfoConduitAPIMethod' => 'applications/slowvote/conduit/SlowvoteInfoConduitAPIMethod.php',
+    'SlowvotePollResponseVisibility' => 'applications/slowvote/constants/SlowvotePollResponseVisibility.php',
+    'SlowvotePollStatus' => 'applications/slowvote/constants/SlowvotePollStatus.php',
+    'SlowvotePollVotingMethod' => 'applications/slowvote/constants/SlowvotePollVotingMethod.php',
     'SlowvoteRemarkupRule' => 'applications/slowvote/remarkup/SlowvoteRemarkupRule.php',
     'SlowvoteSearchConduitAPIMethod' => 'applications/slowvote/conduit/SlowvoteSearchConduitAPIMethod.php',
     'SubscriptionListDialogBuilder' => 'applications/subscriptions/view/SubscriptionListDialogBuilder.php',
@@ -6134,6 +6039,7 @@ phutil_register_library_map(array(
     'AlmanacInterfaceSearchEngine' => 'PhabricatorApplicationSearchEngine',
     'AlmanacInterfaceTableView' => 'AphrontView',
     'AlmanacInterfaceTransaction' => 'AlmanacModularTransaction',
+    'AlmanacInterfaceTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
     'AlmanacInterfaceTransactionType' => 'AlmanacTransactionType',
     'AlmanacKeys' => 'Phobject',
     'AlmanacManageClusterServicesCapability' => 'PhabricatorPolicyCapability',
@@ -6319,6 +6225,7 @@ phutil_register_library_map(array(
     'AphrontIsolatedDatabaseConnection' => 'AphrontDatabaseConnection',
     'AphrontIsolatedDatabaseConnectionTestCase' => 'PhabricatorTestCase',
     'AphrontIsolatedHTTPSink' => 'AphrontHTTPSink',
+    'AphrontJSONHTTPParameterType' => 'AphrontHTTPParameterType',
     'AphrontJSONResponse' => 'AphrontResponse',
     'AphrontJavelinView' => 'AphrontView',
     'AphrontKeyboardShortcutsAvailableView' => 'AphrontView',
@@ -6355,6 +6262,7 @@ phutil_register_library_map(array(
     'AphrontRedirectResponse' => 'AphrontResponse',
     'AphrontRedirectResponseTestCase' => 'PhabricatorTestCase',
     'AphrontReloadResponse' => 'AphrontRedirectResponse',
+    'AphrontRemarkupHTTPParameterType' => 'AphrontHTTPParameterType',
     'AphrontRequest' => 'Phobject',
     'AphrontRequestExceptionHandler' => 'Phobject',
     'AphrontRequestStream' => 'Phobject',
@@ -6424,6 +6332,7 @@ phutil_register_library_map(array(
     'ChatLogConduitAPIMethod' => 'ConduitAPIMethod',
     'ChatLogQueryConduitAPIMethod' => 'ChatLogConduitAPIMethod',
     'ChatLogRecordConduitAPIMethod' => 'ChatLogConduitAPIMethod',
+    'ConduitAPIDocumentationPage' => 'Phobject',
     'ConduitAPIMethod' => array(
       'Phobject',
       'PhabricatorPolicyInterface',
@@ -6701,7 +6610,6 @@ phutil_register_library_map(array(
     'DifferentialQueryConduitAPIMethod' => 'DifferentialConduitAPIMethod',
     'DifferentialQueryDiffsConduitAPIMethod' => 'DifferentialConduitAPIMethod',
     'DifferentialRawDiffRenderer' => 'Phobject',
-    'DifferentialReleephRequestFieldSpecification' => 'Phobject',
     'DifferentialRemarkupRule' => 'PhabricatorObjectRemarkupRule',
     'DifferentialReplyHandler' => 'PhabricatorApplicationTransactionReplyHandler',
     'DifferentialRepositoryField' => 'DifferentialCoreCustomField',
@@ -7047,6 +6955,7 @@ phutil_register_library_map(array(
     'DiffusionLowLevelResolveRefsQuery' => 'DiffusionLowLevelQuery',
     'DiffusionMercurialBlameQuery' => 'DiffusionBlameQuery',
     'DiffusionMercurialCommandEngine' => 'DiffusionCommandEngine',
+    'DiffusionMercurialCommandEngineTests' => 'PhabricatorTestCase',
     'DiffusionMercurialFileContentQuery' => 'DiffusionFileContentQuery',
     'DiffusionMercurialFlagInjectionException' => 'Exception',
     'DiffusionMercurialRawDiffQuery' => 'DiffusionRawDiffQuery',
@@ -7405,6 +7314,8 @@ phutil_register_library_map(array(
     'DrydockLeaseStatus' => 'PhabricatorObjectStatus',
     'DrydockLeaseUpdateWorker' => 'DrydockWorker',
     'DrydockLeaseViewController' => 'DrydockLeaseController',
+    'DrydockLeaseWaitingForActivationLogType' => 'DrydockLogType',
+    'DrydockLeaseWaitingForReclamationLogType' => 'DrydockLogType',
     'DrydockLeaseWaitingForResourcesLogType' => 'DrydockLogType',
     'DrydockLog' => array(
       'DrydockDAO',
@@ -7478,7 +7389,6 @@ phutil_register_library_map(array(
     'DrydockWorkingCopyBlueprintImplementation' => 'DrydockBlueprintImplementation',
     'EdgeSearchConduitAPIMethod' => 'ConduitAPIMethod',
     'FeedConduitAPIMethod' => 'ConduitAPIMethod',
-    'FeedPublishConduitAPIMethod' => 'FeedConduitAPIMethod',
     'FeedPublisherHTTPWorker' => 'FeedPushWorker',
     'FeedPublisherWorker' => 'FeedPushWorker',
     'FeedPushWorker' => 'PhabricatorWorker',
@@ -7601,8 +7511,9 @@ phutil_register_library_map(array(
     'HarbormasterBuildArtifactPHIDType' => 'PhabricatorPHIDType',
     'HarbormasterBuildArtifactQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
     'HarbormasterBuildAutoplan' => 'Phobject',
-    'HarbormasterBuildCommand' => 'HarbormasterDAO',
     'HarbormasterBuildDependencyDatasource' => 'PhabricatorTypeaheadDatasource',
+    'HarbormasterBuildEditAPIMethod' => 'PhabricatorEditEngineAPIMethod',
+    'HarbormasterBuildEditEngine' => 'PhabricatorEditEngine',
     'HarbormasterBuildEngine' => 'Phobject',
     'HarbormasterBuildFailureException' => 'Exception',
     'HarbormasterBuildGraph' => 'AbstractDirectedGraph',
@@ -7631,7 +7542,12 @@ phutil_register_library_map(array(
       'PhabricatorPolicyInterface',
       'PhabricatorDestructibleInterface',
     ),
+    'HarbormasterBuildMessageAbortTransaction' => 'HarbormasterBuildMessageTransaction',
+    'HarbormasterBuildMessagePauseTransaction' => 'HarbormasterBuildMessageTransaction',
     'HarbormasterBuildMessageQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
+    'HarbormasterBuildMessageRestartTransaction' => 'HarbormasterBuildMessageTransaction',
+    'HarbormasterBuildMessageResumeTransaction' => 'HarbormasterBuildMessageTransaction',
+    'HarbormasterBuildMessageTransaction' => 'HarbormasterBuildTransactionType',
     'HarbormasterBuildPHIDType' => 'PhabricatorPHIDType',
     'HarbormasterBuildPlan' => array(
       'HarbormasterDAO',
@@ -7702,9 +7618,10 @@ phutil_register_library_map(array(
     'HarbormasterBuildTargetPHIDType' => 'PhabricatorPHIDType',
     'HarbormasterBuildTargetQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
     'HarbormasterBuildTargetSearchEngine' => 'PhabricatorApplicationSearchEngine',
-    'HarbormasterBuildTransaction' => 'PhabricatorApplicationTransaction',
+    'HarbormasterBuildTransaction' => 'PhabricatorModularTransaction',
     'HarbormasterBuildTransactionEditor' => 'PhabricatorApplicationTransactionEditor',
     'HarbormasterBuildTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
+    'HarbormasterBuildTransactionType' => 'PhabricatorModularTransactionType',
     'HarbormasterBuildUnitMessage' => array(
       'HarbormasterDAO',
       'PhabricatorPolicyInterface',
@@ -7722,16 +7639,20 @@ phutil_register_library_map(array(
       'PhabricatorDestructibleInterface',
     ),
     'HarbormasterBuildableActionController' => 'HarbormasterController',
+    'HarbormasterBuildableEditAPIMethod' => 'PhabricatorEditEngineAPIMethod',
+    'HarbormasterBuildableEditEngine' => 'PhabricatorEditEngine',
     'HarbormasterBuildableEngine' => 'Phobject',
     'HarbormasterBuildableListController' => 'HarbormasterController',
+    'HarbormasterBuildableMessageTransaction' => 'HarbormasterBuildableTransactionType',
     'HarbormasterBuildablePHIDType' => 'PhabricatorPHIDType',
     'HarbormasterBuildableQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
     'HarbormasterBuildableSearchAPIMethod' => 'PhabricatorSearchEngineAPIMethod',
     'HarbormasterBuildableSearchEngine' => 'PhabricatorApplicationSearchEngine',
     'HarbormasterBuildableStatus' => 'Phobject',
-    'HarbormasterBuildableTransaction' => 'PhabricatorApplicationTransaction',
+    'HarbormasterBuildableTransaction' => 'PhabricatorModularTransaction',
     'HarbormasterBuildableTransactionEditor' => 'PhabricatorApplicationTransactionEditor',
     'HarbormasterBuildableTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
+    'HarbormasterBuildableTransactionType' => 'PhabricatorModularTransactionType',
     'HarbormasterBuildableViewController' => 'HarbormasterController',
     'HarbormasterBuildkiteBuildStepImplementation' => 'HarbormasterBuildStepImplementation',
     'HarbormasterBuildkiteHookHandler' => 'HarbormasterHookHandler',
@@ -7766,6 +7687,7 @@ phutil_register_library_map(array(
     'HarbormasterManagementUpdateWorkflow' => 'HarbormasterManagementWorkflow',
     'HarbormasterManagementWorkflow' => 'PhabricatorManagementWorkflow',
     'HarbormasterManagementWriteLogWorkflow' => 'HarbormasterManagementWorkflow',
+    'HarbormasterMessageException' => 'Exception',
     'HarbormasterMessageType' => 'Phobject',
     'HarbormasterObject' => 'HarbormasterDAO',
     'HarbormasterOtherBuildStepGroup' => 'HarbormasterBuildStepGroup',
@@ -7777,13 +7699,11 @@ phutil_register_library_map(array(
     'HarbormasterPlanRunController' => 'HarbormasterPlanController',
     'HarbormasterPlanViewController' => 'HarbormasterPlanController',
     'HarbormasterPrototypeBuildStepGroup' => 'HarbormasterBuildStepGroup',
-    'HarbormasterPublishFragmentBuildStepImplementation' => 'HarbormasterBuildStepImplementation',
     'HarbormasterQueryAutotargetsConduitAPIMethod' => 'HarbormasterConduitAPIMethod',
     'HarbormasterQueryBuildablesConduitAPIMethod' => 'HarbormasterConduitAPIMethod',
     'HarbormasterQueryBuildsConduitAPIMethod' => 'HarbormasterConduitAPIMethod',
     'HarbormasterQueryBuildsSearchEngineAttachment' => 'PhabricatorSearchEngineAttachment',
     'HarbormasterRemarkupRule' => 'PhabricatorObjectRemarkupRule',
-    'HarbormasterRestartException' => 'Exception',
     'HarbormasterRunBuildPlansHeraldAction' => 'HeraldAction',
     'HarbormasterSchemaSpec' => 'PhabricatorConfigSchemaSpec',
     'HarbormasterScratchTable' => 'HarbormasterDAO',
@@ -8345,7 +8265,6 @@ phutil_register_library_map(array(
     'OwnersConduitAPIMethod' => 'ConduitAPIMethod',
     'OwnersEditConduitAPIMethod' => 'PhabricatorEditEngineAPIMethod',
     'OwnersPackageReplyHandler' => 'PhabricatorMailReplyHandler',
-    'OwnersQueryConduitAPIMethod' => 'OwnersConduitAPIMethod',
     'OwnersSearchConduitAPIMethod' => 'PhabricatorSearchEngineAPIMethod',
     'PHIDConduitAPIMethod' => 'ConduitAPIMethod',
     'PHIDInfoConduitAPIMethod' => 'PHIDConduitAPIMethod',
@@ -9993,6 +9912,12 @@ phutil_register_library_map(array(
     ),
     'PhabricatorFileAES256StorageFormat' => 'PhabricatorFileStorageFormat',
     'PhabricatorFileAltTextTransaction' => 'PhabricatorFileTransactionType',
+    'PhabricatorFileAttachment' => array(
+      'PhabricatorFileDAO',
+      'PhabricatorPolicyInterface',
+      'PhabricatorExtendedPolicyInterface',
+    ),
+    'PhabricatorFileAttachmentQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
     'PhabricatorFileBundleLoader' => 'Phobject',
     'PhabricatorFileChunk' => array(
       'PhabricatorFileDAO',
@@ -10010,6 +9935,7 @@ phutil_register_library_map(array(
     'PhabricatorFileDataController' => 'PhabricatorFileController',
     'PhabricatorFileDeleteController' => 'PhabricatorFileController',
     'PhabricatorFileDeleteTransaction' => 'PhabricatorFileTransactionType',
+    'PhabricatorFileDetachController' => 'PhabricatorFileController',
     'PhabricatorFileDocumentController' => 'PhabricatorFileController',
     'PhabricatorFileDocumentRenderingEngine' => 'PhabricatorDocumentRenderingEngine',
     'PhabricatorFileDropUploadController' => 'PhabricatorFileController',
@@ -10023,7 +9949,6 @@ phutil_register_library_map(array(
     ),
     'PhabricatorFileExternalRequestGarbageCollector' => 'PhabricatorGarbageCollector',
     'PhabricatorFileFilePHIDType' => 'PhabricatorPHIDType',
-    'PhabricatorFileHasObjectEdgeType' => 'PhabricatorEdgeType',
     'PhabricatorFileIconSetSelectController' => 'PhabricatorFileController',
     'PhabricatorFileImageMacro' => array(
       'PhabricatorFileDAO',
@@ -10065,6 +9990,8 @@ phutil_register_library_map(array(
     'PhabricatorFileTransformController' => 'PhabricatorFileController',
     'PhabricatorFileTransformListController' => 'PhabricatorFileController',
     'PhabricatorFileTransformTestCase' => 'PhabricatorTestCase',
+    'PhabricatorFileUICurtainAttachController' => 'PhabricatorFileController',
+    'PhabricatorFileUICurtainListController' => 'PhabricatorFileController',
     'PhabricatorFileUploadController' => 'PhabricatorFileController',
     'PhabricatorFileUploadDialogController' => 'PhabricatorFileController',
     'PhabricatorFileUploadException' => 'Exception',
@@ -10078,6 +10005,7 @@ phutil_register_library_map(array(
     'PhabricatorFilesComposeAvatarBuiltinFile' => 'PhabricatorFilesBuiltinFile',
     'PhabricatorFilesComposeIconBuiltinFile' => 'PhabricatorFilesBuiltinFile',
     'PhabricatorFilesConfigOptions' => 'PhabricatorApplicationConfigOptions',
+    'PhabricatorFilesCurtainExtension' => 'PHUICurtainExtension',
     'PhabricatorFilesManagementCatWorkflow' => 'PhabricatorFilesManagementWorkflow',
     'PhabricatorFilesManagementCompactWorkflow' => 'PhabricatorFilesManagementWorkflow',
     'PhabricatorFilesManagementCycleWorkflow' => 'PhabricatorFilesManagementWorkflow',
@@ -10538,7 +10466,6 @@ phutil_register_library_map(array(
     'PhabricatorObjectHasAsanaTaskEdgeType' => 'PhabricatorEdgeType',
     'PhabricatorObjectHasContributorEdgeType' => 'PhabricatorEdgeType',
     'PhabricatorObjectHasDraftEdgeType' => 'PhabricatorEdgeType',
-    'PhabricatorObjectHasFileEdgeType' => 'PhabricatorEdgeType',
     'PhabricatorObjectHasJiraIssueEdgeType' => 'PhabricatorEdgeType',
     'PhabricatorObjectHasSubscriberEdgeType' => 'PhabricatorEdgeType',
     'PhabricatorObjectHasUnsubscriberEdgeType' => 'PhabricatorEdgeType',
@@ -10598,6 +10525,7 @@ phutil_register_library_map(array(
       'PhabricatorNgramsInterface',
     ),
     'PhabricatorOwnersPackageAuditingTransaction' => 'PhabricatorOwnersPackageTransactionType',
+    'PhabricatorOwnersPackageAuthorityTransaction' => 'PhabricatorOwnersPackageTransactionType',
     'PhabricatorOwnersPackageAutoreviewTransaction' => 'PhabricatorOwnersPackageTransactionType',
     'PhabricatorOwnersPackageContextFreeGrammar' => 'PhutilContextFreeGrammar',
     'PhabricatorOwnersPackageDatasource' => 'PhabricatorTypeaheadDatasource',
@@ -10896,7 +10824,6 @@ phutil_register_library_map(array(
     'PhabricatorPhortuneManagementInvoiceWorkflow' => 'PhabricatorPhortuneManagementWorkflow',
     'PhabricatorPhortuneManagementWorkflow' => 'PhabricatorManagementWorkflow',
     'PhabricatorPhortuneTestCase' => 'PhabricatorTestCase',
-    'PhabricatorPhragmentApplication' => 'PhabricatorApplication',
     'PhabricatorPhrequentApplication' => 'PhabricatorApplication',
     'PhabricatorPhrictionApplication' => 'PhabricatorApplication',
     'PhabricatorPhurlApplication' => 'PhabricatorApplication',
@@ -11283,8 +11210,6 @@ phutil_register_library_map(array(
     'PhabricatorRefreshCSRFController' => 'PhabricatorAuthController',
     'PhabricatorRegexListConfigType' => 'PhabricatorTextListConfigType',
     'PhabricatorRegistrationProfile' => 'Phobject',
-    'PhabricatorReleephApplication' => 'PhabricatorApplication',
-    'PhabricatorReleephApplicationConfigOptions' => 'PhabricatorApplicationConfigOptions',
     'PhabricatorRemarkupCachePurger' => 'PhabricatorCachePurger',
     'PhabricatorRemarkupControl' => 'AphrontFormTextAreaControl',
     'PhabricatorRemarkupCowsayBlockInterpreter' => 'PhutilRemarkupBlockInterpreter',
@@ -11628,7 +11553,6 @@ phutil_register_library_map(array(
     'PhabricatorSlowvoteApplication' => 'PhabricatorApplication',
     'PhabricatorSlowvoteChoice' => 'PhabricatorSlowvoteDAO',
     'PhabricatorSlowvoteCloseController' => 'PhabricatorSlowvoteController',
-    'PhabricatorSlowvoteCloseTransaction' => 'PhabricatorSlowvoteTransactionType',
     'PhabricatorSlowvoteCommentController' => 'PhabricatorSlowvoteController',
     'PhabricatorSlowvoteController' => 'PhabricatorController',
     'PhabricatorSlowvoteDAO' => 'PhabricatorLiskDAO',
@@ -11660,11 +11584,13 @@ phutil_register_library_map(array(
     'PhabricatorSlowvoteSchemaSpec' => 'PhabricatorConfigSchemaSpec',
     'PhabricatorSlowvoteSearchEngine' => 'PhabricatorApplicationSearchEngine',
     'PhabricatorSlowvoteShuffleTransaction' => 'PhabricatorSlowvoteTransactionType',
+    'PhabricatorSlowvoteStatusTransaction' => 'PhabricatorSlowvoteTransactionType',
     'PhabricatorSlowvoteTransaction' => 'PhabricatorModularTransaction',
     'PhabricatorSlowvoteTransactionComment' => 'PhabricatorApplicationTransactionComment',
     'PhabricatorSlowvoteTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
     'PhabricatorSlowvoteTransactionType' => 'PhabricatorModularTransactionType',
     'PhabricatorSlowvoteVoteController' => 'PhabricatorSlowvoteController',
+    'PhabricatorSlowvoteVotingMethodTransaction' => 'PhabricatorSlowvoteTransactionType',
     'PhabricatorSlug' => 'Phobject',
     'PhabricatorSlugTestCase' => 'PhabricatorTestCase',
     'PhabricatorSourceCodeView' => 'AphrontView',
@@ -12152,6 +12078,7 @@ phutil_register_library_map(array(
     'PhameDescriptionView' => 'AphrontTagView',
     'PhameDraftListView' => 'AphrontTagView',
     'PhameHomeController' => 'PhamePostController',
+    'PhameInheritBlogPolicyRule' => 'PhabricatorPolicyRule',
     'PhameLiveController' => 'PhameController',
     'PhameNextPostView' => 'AphrontTagView',
     'PhamePost' => array(
@@ -12165,6 +12092,7 @@ phutil_register_library_map(array(
       'PhabricatorDestructibleInterface',
       'PhabricatorTokenReceiverInterface',
       'PhabricatorConduitResultInterface',
+      'PhabricatorEditEngineLockableInterface',
       'PhabricatorFulltextInterface',
       'PhabricatorFerretInterface',
     ),
@@ -12175,6 +12103,7 @@ phutil_register_library_map(array(
     'PhamePostEditConduitAPIMethod' => 'PhabricatorEditEngineAPIMethod',
     'PhamePostEditController' => 'PhamePostController',
     'PhamePostEditEngine' => 'PhabricatorEditEngine',
+    'PhamePostEditEngineLock' => 'PhabricatorEditEngineLock',
     'PhamePostEditor' => 'PhabricatorApplicationTransactionEditor',
     'PhamePostFerretEngine' => 'PhabricatorFerretEngine',
     'PhamePostFulltextEngine' => 'PhabricatorFulltextEngine',
@@ -12515,50 +12444,6 @@ phutil_register_library_map(array(
     'PhortuneSubscriptionTransactionType' => 'PhabricatorModularTransactionType',
     'PhortuneSubscriptionWorker' => 'PhabricatorWorker',
     'PhortuneTestPaymentProvider' => 'PhortunePaymentProvider',
-    'PhragmentBrowseController' => 'PhragmentController',
-    'PhragmentCanCreateCapability' => 'PhabricatorPolicyCapability',
-    'PhragmentConduitAPIMethod' => 'ConduitAPIMethod',
-    'PhragmentController' => 'PhabricatorController',
-    'PhragmentCreateController' => 'PhragmentController',
-    'PhragmentDAO' => 'PhabricatorLiskDAO',
-    'PhragmentFragment' => array(
-      'PhragmentDAO',
-      'PhabricatorPolicyInterface',
-    ),
-    'PhragmentFragmentPHIDType' => 'PhabricatorPHIDType',
-    'PhragmentFragmentQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
-    'PhragmentFragmentVersion' => array(
-      'PhragmentDAO',
-      'PhabricatorPolicyInterface',
-    ),
-    'PhragmentFragmentVersionPHIDType' => 'PhabricatorPHIDType',
-    'PhragmentFragmentVersionQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
-    'PhragmentGetPatchConduitAPIMethod' => 'PhragmentConduitAPIMethod',
-    'PhragmentHistoryController' => 'PhragmentController',
-    'PhragmentPatchController' => 'PhragmentController',
-    'PhragmentPatchUtil' => 'Phobject',
-    'PhragmentPolicyController' => 'PhragmentController',
-    'PhragmentQueryFragmentsConduitAPIMethod' => 'PhragmentConduitAPIMethod',
-    'PhragmentRevertController' => 'PhragmentController',
-    'PhragmentSchemaSpec' => 'PhabricatorConfigSchemaSpec',
-    'PhragmentSnapshot' => array(
-      'PhragmentDAO',
-      'PhabricatorPolicyInterface',
-    ),
-    'PhragmentSnapshotChild' => array(
-      'PhragmentDAO',
-      'PhabricatorPolicyInterface',
-    ),
-    'PhragmentSnapshotChildQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
-    'PhragmentSnapshotCreateController' => 'PhragmentController',
-    'PhragmentSnapshotDeleteController' => 'PhragmentController',
-    'PhragmentSnapshotPHIDType' => 'PhabricatorPHIDType',
-    'PhragmentSnapshotPromoteController' => 'PhragmentController',
-    'PhragmentSnapshotQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
-    'PhragmentSnapshotViewController' => 'PhragmentController',
-    'PhragmentUpdateController' => 'PhragmentController',
-    'PhragmentVersionController' => 'PhragmentController',
-    'PhragmentZIPController' => 'PhragmentController',
     'PhrequentConduitAPIMethod' => 'ConduitAPIMethod',
     'PhrequentController' => 'PhabricatorController',
     'PhrequentCurtainExtension' => 'PHUICurtainExtension',
@@ -12758,6 +12643,7 @@ phutil_register_library_map(array(
     'PhutilRemarkupEngine' => 'PhutilMarkupEngine',
     'PhutilRemarkupEngineTestCase' => 'PhutilTestCase',
     'PhutilRemarkupEscapeRemarkupRule' => 'PhutilRemarkupRule',
+    'PhutilRemarkupEvalRule' => 'PhutilRemarkupRule',
     'PhutilRemarkupHeaderBlockRule' => 'PhutilRemarkupBlockRule',
     'PhutilRemarkupHighlightRule' => 'PhutilRemarkupRule',
     'PhutilRemarkupHorizontalRuleBlockRule' => 'PhutilRemarkupBlockRule',
@@ -12898,116 +12784,17 @@ phutil_register_library_map(array(
     'ProjectSearchConduitAPIMethod' => 'PhabricatorSearchEngineAPIMethod',
     'QueryFormattingTestCase' => 'PhabricatorTestCase',
     'QueryFuture' => 'Future',
-    'ReleephAuthorFieldSpecification' => 'ReleephFieldSpecification',
-    'ReleephBranch' => array(
-      'ReleephDAO',
-      'PhabricatorApplicationTransactionInterface',
-      'PhabricatorPolicyInterface',
-    ),
-    'ReleephBranchAccessController' => 'ReleephBranchController',
-    'ReleephBranchCommitFieldSpecification' => 'ReleephFieldSpecification',
-    'ReleephBranchController' => 'ReleephController',
-    'ReleephBranchCreateController' => 'ReleephProductController',
-    'ReleephBranchEditController' => 'ReleephBranchController',
-    'ReleephBranchEditor' => 'PhabricatorEditor',
-    'ReleephBranchHistoryController' => 'ReleephBranchController',
-    'ReleephBranchNamePreviewController' => 'ReleephController',
-    'ReleephBranchPHIDType' => 'PhabricatorPHIDType',
-    'ReleephBranchPreviewView' => 'AphrontFormControl',
-    'ReleephBranchQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
-    'ReleephBranchSearchEngine' => 'PhabricatorApplicationSearchEngine',
-    'ReleephBranchTemplate' => 'Phobject',
-    'ReleephBranchTransaction' => 'PhabricatorApplicationTransaction',
-    'ReleephBranchTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
-    'ReleephBranchViewController' => 'ReleephBranchController',
-    'ReleephCommitFinder' => 'Phobject',
-    'ReleephCommitFinderException' => 'Exception',
-    'ReleephCommitMessageFieldSpecification' => 'ReleephFieldSpecification',
-    'ReleephConduitAPIMethod' => 'ConduitAPIMethod',
-    'ReleephController' => 'PhabricatorController',
-    'ReleephDAO' => 'PhabricatorLiskDAO',
-    'ReleephDefaultFieldSelector' => 'ReleephFieldSelector',
-    'ReleephDependsOnFieldSpecification' => 'ReleephFieldSpecification',
-    'ReleephDiffChurnFieldSpecification' => 'ReleephFieldSpecification',
-    'ReleephDiffMessageFieldSpecification' => 'ReleephFieldSpecification',
-    'ReleephDiffSizeFieldSpecification' => 'ReleephFieldSpecification',
-    'ReleephFieldParseException' => 'Exception',
-    'ReleephFieldSelector' => 'Phobject',
-    'ReleephFieldSpecification' => array(
-      'PhabricatorCustomField',
-      'PhabricatorMarkupInterface',
-    ),
-    'ReleephGetBranchesConduitAPIMethod' => 'ReleephConduitAPIMethod',
-    'ReleephIntentFieldSpecification' => 'ReleephFieldSpecification',
-    'ReleephLevelFieldSpecification' => 'ReleephFieldSpecification',
-    'ReleephOriginalCommitFieldSpecification' => 'ReleephFieldSpecification',
-    'ReleephProductActionController' => 'ReleephProductController',
-    'ReleephProductController' => 'ReleephController',
-    'ReleephProductCreateController' => 'ReleephProductController',
-    'ReleephProductEditController' => 'ReleephProductController',
-    'ReleephProductEditor' => 'PhabricatorApplicationTransactionEditor',
-    'ReleephProductHistoryController' => 'ReleephProductController',
-    'ReleephProductListController' => 'ReleephController',
-    'ReleephProductPHIDType' => 'PhabricatorPHIDType',
-    'ReleephProductQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
-    'ReleephProductSearchEngine' => 'PhabricatorApplicationSearchEngine',
-    'ReleephProductTransaction' => 'PhabricatorApplicationTransaction',
-    'ReleephProductTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
-    'ReleephProductViewController' => 'ReleephProductController',
-    'ReleephProject' => array(
-      'ReleephDAO',
-      'PhabricatorApplicationTransactionInterface',
-      'PhabricatorPolicyInterface',
-    ),
-    'ReleephQueryBranchesConduitAPIMethod' => 'ReleephConduitAPIMethod',
-    'ReleephQueryProductsConduitAPIMethod' => 'ReleephConduitAPIMethod',
-    'ReleephQueryRequestsConduitAPIMethod' => 'ReleephConduitAPIMethod',
-    'ReleephReasonFieldSpecification' => 'ReleephFieldSpecification',
-    'ReleephRequest' => array(
-      'ReleephDAO',
-      'PhabricatorApplicationTransactionInterface',
-      'PhabricatorPolicyInterface',
-      'PhabricatorCustomFieldInterface',
-    ),
-    'ReleephRequestActionController' => 'ReleephRequestController',
-    'ReleephRequestCommentController' => 'ReleephRequestController',
-    'ReleephRequestConduitAPIMethod' => 'ReleephConduitAPIMethod',
-    'ReleephRequestController' => 'ReleephController',
-    'ReleephRequestDifferentialCreateController' => 'ReleephController',
-    'ReleephRequestEditController' => 'ReleephBranchController',
-    'ReleephRequestMailReceiver' => 'PhabricatorObjectMailReceiver',
-    'ReleephRequestPHIDType' => 'PhabricatorPHIDType',
-    'ReleephRequestQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
-    'ReleephRequestReplyHandler' => 'PhabricatorApplicationTransactionReplyHandler',
-    'ReleephRequestSearchEngine' => 'PhabricatorApplicationSearchEngine',
-    'ReleephRequestStatus' => 'Phobject',
-    'ReleephRequestTransaction' => 'PhabricatorApplicationTransaction',
-    'ReleephRequestTransactionComment' => 'PhabricatorApplicationTransactionComment',
-    'ReleephRequestTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
-    'ReleephRequestTransactionalEditor' => 'PhabricatorApplicationTransactionEditor',
-    'ReleephRequestTypeaheadControl' => 'AphrontFormControl',
-    'ReleephRequestTypeaheadController' => 'PhabricatorTypeaheadDatasourceController',
-    'ReleephRequestView' => 'AphrontView',
-    'ReleephRequestViewController' => 'ReleephBranchController',
-    'ReleephRequestorFieldSpecification' => 'ReleephFieldSpecification',
-    'ReleephRevisionFieldSpecification' => 'ReleephFieldSpecification',
-    'ReleephSeverityFieldSpecification' => 'ReleephLevelFieldSpecification',
-    'ReleephSummaryFieldSpecification' => 'ReleephFieldSpecification',
-    'ReleephWorkCanPushConduitAPIMethod' => 'ReleephConduitAPIMethod',
-    'ReleephWorkGetAuthorInfoConduitAPIMethod' => 'ReleephConduitAPIMethod',
-    'ReleephWorkGetBranchCommitMessageConduitAPIMethod' => 'ReleephConduitAPIMethod',
-    'ReleephWorkGetBranchConduitAPIMethod' => 'ReleephConduitAPIMethod',
-    'ReleephWorkGetCommitMessageConduitAPIMethod' => 'ReleephConduitAPIMethod',
-    'ReleephWorkNextRequestConduitAPIMethod' => 'ReleephConduitAPIMethod',
-    'ReleephWorkRecordConduitAPIMethod' => 'ReleephConduitAPIMethod',
-    'ReleephWorkRecordPickStatusConduitAPIMethod' => 'ReleephConduitAPIMethod',
     'RemarkupProcessConduitAPIMethod' => 'ConduitAPIMethod',
+    'RemarkupValue' => 'Phobject',
     'RepositoryConduitAPIMethod' => 'ConduitAPIMethod',
     'RepositoryQueryConduitAPIMethod' => 'RepositoryConduitAPIMethod',
     'ShellLogView' => 'AphrontView',
     'SlowvoteConduitAPIMethod' => 'ConduitAPIMethod',
     'SlowvoteEmbedView' => 'AphrontView',
     'SlowvoteInfoConduitAPIMethod' => 'SlowvoteConduitAPIMethod',
+    'SlowvotePollResponseVisibility' => 'Phobject',
+    'SlowvotePollStatus' => 'Phobject',
+    'SlowvotePollVotingMethod' => 'Phobject',
     'SlowvoteRemarkupRule' => 'PhabricatorObjectRemarkupRule',
     'SlowvoteSearchConduitAPIMethod' => 'PhabricatorSearchEngineAPIMethod',
     'SubscriptionListDialogBuilder' => 'Phobject',

src/aphront/AphrontRequest.php

@@ -354,9 +354,9 @@ final class AphrontRequest extends Phobject {
       $info = array();
 
       $info[] = pht(
-        'You are trying to save some data to Phabricator, but the request '.
+        'You are trying to save some data to permanent storage, but the '.
-        'your browser made included an incorrect token. Reload the page '.
+        'request your browser made included an incorrect token. Reload the '.
-        'and try again. You may need to clear your cookies.');
+        'page and try again. You may need to clear your cookies.');
 
       if ($this->isAjax()) {
         $info[] = pht('This was an Ajax request.');
@@ -587,11 +587,11 @@ final class AphrontRequest extends Phobject {
       throw new AphrontMalformedRequestException(
         pht('Bad Host Header'),
         pht(
-          'This Phabricator install is configured as "%s", but you are '.
+          'This server is configured as "%s", but you are using the domain '.
-          'using the domain name "%s" to access a page which is trying to '.
+          'name "%s" to access a page which is trying to set a cookie. '.
-          'set a cookie. Access Phabricator on the configured primary '.
+          'Access this service on the configured primary domain or a '.
-          'domain or a configured alternate domain. Phabricator will not '.
+          'configured alternate domain. Cookies will not be set on other '.
-          'set cookies on other domains for security reasons.',
+          'domains for security reasons.',
           $configured_as,
           $accessed_as),
         true);

src/aphront/configuration/AphrontApplicationConfiguration.php

@@ -83,7 +83,7 @@ final class AphrontApplicationConfiguration
    * @phutil-external-symbol class PhabricatorStartup
    */
   public static function runHTTPRequest(AphrontHTTPSink $sink) {
-    if (isset($_SERVER['HTTP_X_PHABRICATOR_SELFCHECK'])) {
+    if (isset($_SERVER['HTTP_X_SETUP_SELFCHECK'])) {
       $response = self::newSelfCheckResponse();
       return self::writeResponse($sink, $response);
     }
@@ -419,9 +419,9 @@ final class AphrontApplicationConfiguration
           throw new AphrontMalformedRequestException(
             pht('No %s', 'SERVER_ADDR'),
             pht(
-              'Phabricator is configured to operate in cluster mode, but '.
+              'This service is configured to operate in cluster mode, but '.
               '%s is not defined in the request context. Your webserver '.
-              'configuration needs to forward %s to PHP so Phabricator can '.
+              'configuration needs to forward %s to PHP so the software can '.
               'reject requests received on external interfaces.',
               'SERVER_ADDR',
               'SERVER_ADDR'));
@@ -431,7 +431,7 @@ final class AphrontApplicationConfiguration
           throw new AphrontMalformedRequestException(
             pht('External Interface'),
             pht(
-              'Phabricator is configured in cluster mode and the address '.
+              'This service is configured in cluster mode and the address '.
               'this request was received on ("%s") is not whitelisted as '.
               'a cluster address.',
               $server_addr));

src/aphront/httpparametertype/AphrontJSONHTTPParameterType.php

@@ -0,0 +1,31 @@
+<?php
+
+final class AphrontJSONHTTPParameterType
+  extends AphrontHTTPParameterType {
+
+  protected function getParameterDefault() {
+    return array();
+  }
+
+  protected function getParameterValue(AphrontRequest $request, $key) {
+    $str = $request->getStr($key);
+    return phutil_json_decode($str);
+  }
+
+  protected function getParameterTypeName() {
+    return 'string (json object)';
+  }
+
+  protected function getParameterFormatDescriptions() {
+    return array(
+      pht('A JSON-encoded object.'),
+    );
+  }
+
+  protected function getParameterExamples() {
+    return array(
+      'v={...}',
+    );
+  }
+
+}

src/aphront/httpparametertype/AphrontRemarkupHTTPParameterType.php

@@ -0,0 +1,50 @@
+<?php
+
+final class AphrontRemarkupHTTPParameterType
+  extends AphrontHTTPParameterType {
+
+  protected function getParameterDefault() {
+    return $this->newRemarkupValue();
+  }
+
+  protected function getParameterValue(AphrontRequest $request, $key) {
+    $corpus_key = $key;
+    $corpus_type = new AphrontStringHTTPParameterType();
+    $corpus_value = $this->getValueWithType(
+      $corpus_type,
+      $request,
+      $corpus_key);
+
+    $metadata_key = $key.'_metadata';
+    $metadata_type = new AphrontJSONHTTPParameterType();
+    $metadata_value = $this->getValueWithType(
+      $metadata_type,
+      $request,
+      $metadata_key);
+
+    return $this->newRemarkupValue()
+      ->setCorpus($corpus_value)
+      ->setMetadata($metadata_value);
+  }
+
+  protected function getParameterTypeName() {
+    return 'string (remarkup)';
+  }
+
+  protected function getParameterFormatDescriptions() {
+    return array(
+      pht('Remarkup text.'),
+    );
+  }
+
+  protected function getParameterExamples() {
+    return array(
+      'v=Lorem...',
+    );
+  }
+
+  private function newRemarkupValue() {
+    return new RemarkupValue();
+  }
+
+}

src/applications/almanac/management/AlmanacManagementRegisterWorkflow.php

@@ -147,10 +147,9 @@ final class AlmanacManagementRegisterWorkflow
     if (!$public_key) {
       throw new PhutilArgumentUsageException(
         pht(
-          'The public key corresponding to the given private key is not '.
+          'The public key corresponding to the given private key is unknown. '.
-          'yet known to Phabricator. Associate the public key with an '.
+          'Associate the public key with an Almanac device in the web '.
-          'Almanac device in the web interface before registering hosts '.
+          'interface before registering hosts with it.'));
-          'with it.'));
     }
 
     if ($public_key->getObjectPHID() !== $device->getPHID()) {

src/applications/almanac/management/AlmanacManagementTrustKeyWorkflow.php

@@ -61,14 +61,14 @@ final class AlmanacManagementTrustKeyWorkflow
       phutil_console_wrap(
         pht(
           'Trusting a public key gives anyone holding the corresponding '.
-          'private key complete, unrestricted access to all data in '.
+          'private key complete, unrestricted access to all data. The '.
-          'Phabricator. The private key will be able to sign requests that '.
+          'private key will be able to sign requests that bypass policy and '.
-          'skip policy and security checks.')),
+          'security checks.')),
       phutil_console_wrap(
         pht(
           'This is an advanced feature which should normally be used only '.
-          'when building a Phabricator cluster. This feature is very '.
+          'when building a cluster. This feature is very dangerous if '.
-          'dangerous if misused.')),
+          'misused.')),
       pht('This key is associated with device "%s".', $handle->getName()));
 
     $prompt = pht(

src/applications/almanac/query/AlmanacBindingQuery.php

@@ -44,10 +44,6 @@ final class AlmanacBindingQuery
     return new AlmanacBinding();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function willFilterPage(array $bindings) {
     $service_phids = mpull($bindings, 'getServicePHID');
     $device_phids = mpull($bindings, 'getDevicePHID');

src/applications/almanac/query/AlmanacDeviceQuery.php

@@ -56,10 +56,6 @@ final class AlmanacDeviceQuery
     return new AlmanacDevice();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
 

src/applications/almanac/query/AlmanacInterfaceQuery.php

@@ -38,10 +38,6 @@ final class AlmanacInterfaceQuery
     return new AlmanacInterface();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function willFilterPage(array $interfaces) {
     $network_phids = mpull($interfaces, 'getNetworkPHID');
     $device_phids = mpull($interfaces, 'getDevicePHID');

src/applications/almanac/query/AlmanacInterfaceTransactionQuery.php

@@ -1,10 +1,10 @@
 <?php
 
-final class ReleephBranchTransactionQuery
+final class AlmanacInterfaceTransactionQuery
   extends PhabricatorApplicationTransactionQuery {
 
   public function getTemplateApplicationTransaction() {
-    return new ReleephBranchTransaction();
+    return new AlmanacInterfaceTransaction();
   }
 
 }

src/applications/almanac/query/AlmanacNamespaceQuery.php

@@ -32,10 +32,6 @@ final class AlmanacNamespaceQuery
     return new AlmanacNamespace();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
 

src/applications/almanac/query/AlmanacNetworkQuery.php

@@ -32,10 +32,6 @@ final class AlmanacNetworkQuery
       $ngrams);
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
 

src/applications/almanac/query/AlmanacPropertyQuery.php

@@ -33,10 +33,6 @@ final class AlmanacPropertyQuery
     return new AlmanacProperty();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function willFilterPage(array $properties) {
     $object_phids = mpull($properties, 'getObjectPHID');
 

src/applications/almanac/query/AlmanacServiceQuery.php

@@ -69,10 +69,6 @@ final class AlmanacServiceQuery
     return new AlmanacService();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function buildJoinClauseParts(AphrontDatabaseConnection $conn) {
     $joins = parent::buildJoinClauseParts($conn);
 

src/applications/almanac/servicetype/AlmanacClusterDatabaseServiceType.php

@@ -10,12 +10,12 @@ final class AlmanacClusterDatabaseServiceType
   }
 
   public function getServiceTypeName() {
-    return pht('Phabricator Cluster: Database');
+    return pht('Cluster: Database');
   }
 
   public function getServiceTypeDescription() {
     return pht(
-      'Defines a database service for use in a Phabricator cluster.');
+      'Defines a database service for use in a cluster.');
   }
 
 }

src/applications/almanac/servicetype/AlmanacClusterRepositoryServiceType.php

@@ -10,12 +10,12 @@ final class AlmanacClusterRepositoryServiceType
   }
 
   public function getServiceTypeName() {
-    return pht('Phabricator Cluster: Repository');
+    return pht('Cluster: Repository');
   }
 
   public function getServiceTypeDescription() {
     return pht(
-      'Defines a repository service for use in a Phabricator cluster.');
+      'Defines a repository service for use in a cluster.');
   }
 
   public function getFieldSpecifications() {

src/applications/almanac/util/__tests__/AlmanacNamesTestCase.php

@@ -30,7 +30,7 @@ final class AlmanacNamesTestCase extends PhabricatorTestCase {
 
       'abc' => true,
       'a.b' => true,
-      'db.phacility.instance' => true,
+      'db.companyname.instance' => true,
       'web002.useast.example.com' => true,
       'master.example-corp.com' => true,
 

src/applications/auth/adapter/PhutilPhabricatorAuthAdapter.php

@@ -89,8 +89,7 @@ final class PhutilPhabricatorAuthAdapter extends PhutilOAuthAuthAdapter {
     } catch (PhutilJSONParserException $ex) {
       throw new Exception(
         pht(
-          'Expected valid JSON response from Phabricator %s request.',
+          'Expected valid JSON response from "user.whoami" request.'),
-          'user.whoami'),
         $ex);
     }
   }

src/applications/auth/controller/PhabricatorAuthConfirmLinkController.php

@@ -54,8 +54,9 @@ final class PhabricatorAuthConfirmLinkController
           ),
           pht(
             'Confirm the link with this %s account. This account will be '.
-            'able to log in to your Phabricator account.',
+            'able to log in to your %s account.',
-            $provider->getProviderName())))
+            $provider->getProviderName(),
+            PlatformSymbols::getPlatformServerName())))
       ->appendChild(
         id(new PhabricatorAuthAccountView())
           ->setUser($viewer)

src/applications/auth/controller/PhabricatorAuthController.php

@@ -254,12 +254,16 @@ abstract class PhabricatorAuthController extends PhabricatorController {
     }
 
     $invite_item = id(new PHUIObjectItemView())
-      ->setHeader(pht('Welcome to Phabricator!'))
+      ->setHeader(
+        pht(
+          'Welcome to %s!',
+          PlatformSymbols::getPlatformServerName()))
       ->setImageURI($invite_author->getProfileImageURI())
       ->addAttribute(
         pht(
-          '%s has invited you to join Phabricator.',
+          '%s has invited you to join %s.',
-          $invite_author->getFullName()));
+          $invite_author->getFullName(),
+          PlatformSymbols::getPlatformServerName()));
 
     $invite_list = id(new PHUIObjectItemListView())
       ->addItem($invite_item)

src/applications/auth/controller/PhabricatorAuthLinkController.php

@@ -56,8 +56,8 @@ final class PhabricatorAuthLinkController
             pht('Account Already Linked'),
             array(
               pht(
-                'Your Phabricator account is already linked to an external '.
+                'Your account is already linked to an external account for '.
-                'account for this provider.'),
+                'this provider.'),
             ));
         }
         break;

src/applications/auth/controller/PhabricatorAuthLoginController.php

@@ -80,9 +80,9 @@ final class PhabricatorAuthLoginController
         } else {
           return $this->renderError(
             pht(
-              'The external account ("%s") you just authenticated with is '.
+              'The external service ("%s") you just authenticated with is '.
-              'not configured to allow logins on this Phabricator install. '.
+              'not configured to allow logins on this server. An '.
-              'An administrator may have recently disabled it.',
+              'administrator may have recently disabled it.',
               $provider->getProviderName()));
         }
       } else if ($viewer->getPHID() == $account->getUserPHID()) {
@@ -94,11 +94,14 @@ final class PhabricatorAuthLoginController
       } else {
         return $this->renderError(
           pht(
-            'The external account ("%s") you just used to log in is already '.
+            'The external service ("%s") you just used to log in is already '.
-            'associated with another Phabricator user account. Log in to the '.
+            'associated with another %s user account. Log in to the '.
-            'other Phabricator account and unlink the external account before '.
+            'other %s account and unlink the external account before '.
-            'linking it to a new Phabricator account.',
+            'linking it to a new %s account.',
-            $provider->getProviderName()));
+            $provider->getProviderName(),
+            PlatformSymbols::getPlatformServerName(),
+            PlatformSymbols::getPlatformServerName(),
+            PlatformSymbols::getPlatformServerName()));
       }
     } else {
       // The account is not yet attached to a Phabricator user, so this is
@@ -109,9 +112,9 @@ final class PhabricatorAuthLoginController
         } else {
           return $this->renderError(
             pht(
-              'The external account ("%s") you just authenticated with is '.
+              'The external service ("%s") you just authenticated with is '.
-              'not configured to allow registration on this Phabricator '.
+              'not configured to allow registration on this server. An '.
-              'install. An administrator may have recently disabled it.',
+              'administrator may have recently disabled it.',
               $provider->getProviderName()));
         }
       } else {
@@ -135,11 +138,12 @@ final class PhabricatorAuthLoginController
         if ($existing_accounts) {
           return $this->renderError(
             pht(
-              'Your Phabricator account is already connected to an external '.
+              'Your %s account is already connected to an external '.
-              'account on this provider ("%s"), but you are currently logged '.
+              'account on this service ("%s"), but you are currently logged '.
-              'in to the provider with a different account. Log out of the '.
+              'in to the service with a different account. Log out of the '.
               'external service, then log back in with the correct account '.
               'before refreshing the account link.',
+              PlatformSymbols::getPlatformServerName(),
               $provider->getProviderName()));
         }
 
@@ -148,9 +152,9 @@ final class PhabricatorAuthLoginController
         } else {
           return $this->renderError(
             pht(
-              'The external account ("%s") you just authenticated with is '.
+              'The external service ("%s") you just authenticated with is '.
-              'not configured to allow account linking on this Phabricator '.
+              'not configured to allow account linking on this server. An '.
-              'install. An administrator may have recently disabled it.',
+              'administrator may have recently disabled it.',
               $provider->getProviderName()));
         }
       }
@@ -169,7 +173,8 @@ final class PhabricatorAuthLoginController
       return $this->renderError(
         pht(
           'The external account you just logged in with is not associated '.
-          'with a valid Phabricator user.'));
+          'with a valid %s user account.',
+          PlatformSymbols::getPlatformServerName()));
     }
 
     return $this->loginUser($user);

src/applications/auth/controller/PhabricatorAuthNeedsMultiFactorController.php

@@ -202,7 +202,7 @@ final class PhabricatorAuthNeedsMultiFactorController
     $messages = array();
 
     $messages[] = pht(
-      'Before you can use Phabricator, you need to add multi-factor '.
+      'Before you can use this software, you need to add multi-factor '.
       'authentication to your account. Multi-factor authentication helps '.
       'secure your account by making it more difficult for attackers to '.
       'gain access or take sensitive actions.');

src/applications/auth/controller/PhabricatorAuthOneTimeLoginController.php

@@ -151,7 +151,9 @@ final class PhabricatorAuthOneTimeLoginController
 
     switch ($link_type) {
       case PhabricatorAuthSessionEngine::ONETIME_WELCOME:
-        $title = pht('Welcome to Phabricator');
+        $title = pht(
+          'Welcome to %s',
+          PlatformSymbols::getPlatformServerName());
         break;
       case PhabricatorAuthSessionEngine::ONETIME_RECOVER:
         $title = pht('Account Recovery');
@@ -159,7 +161,9 @@ final class PhabricatorAuthOneTimeLoginController
       case PhabricatorAuthSessionEngine::ONETIME_USERNAME:
       case PhabricatorAuthSessionEngine::ONETIME_RESET:
       default:
-        $title = pht('Log in to Phabricator');
+        $title = pht(
+          'Log in to %s',
+          PlatformSymbols::getPlatformServerName());
         break;
     }
 

src/applications/auth/controller/PhabricatorAuthRegisterController.php

@@ -83,8 +83,8 @@ final class PhabricatorAuthRegisterController
       if (!PhabricatorUserEmail::isValidAddress($default_email)) {
         $errors[] = pht(
           'The email address associated with this external account ("%s") is '.
-          'not a valid email address and can not be used to register a '.
+          'not a valid email address and can not be used to register an '.
-          'Phabricator account. Choose a different, valid address.',
+          'account. Choose a different, valid address.',
           phutil_tag('strong', array(), $default_email));
         $default_email = null;
       }
@@ -102,8 +102,7 @@ final class PhabricatorAuthRegisterController
         $errors[] = pht(
           'The email address associated with this account ("%s") is '.
           'already in use by an application and can not be used to '.
-          'register a new Phabricator account. Choose a different, valid '.
+          'register a new account. Choose a different, valid address.',
-          'address.',
           phutil_tag('strong', array(), $default_email));
         $default_email = null;
       }
@@ -122,8 +121,8 @@ final class PhabricatorAuthRegisterController
           array(
             pht(
               'The account you are attempting to register with has an invalid '.
-              'email address (%s). This Phabricator install only allows '.
+              'email address (%s). This server only allows registration with '.
-              'registration with specific email addresses:',
+              'specific email addresses:',
               $debug_email),
             phutil_tag('br'),
             phutil_tag('br'),
@@ -157,16 +156,17 @@ final class PhabricatorAuthRegisterController
           ->addHiddenInput('phase', 1)
           ->appendParagraph(
             pht(
-              'You are creating a new Phabricator account linked to an '.
+              'You are creating a new account linked to an existing '.
-              'existing external account from outside Phabricator.'))
+              'external account.'))
           ->appendParagraph(
             pht(
               'The email address ("%s") associated with the external account '.
-              'is already in use by an existing Phabricator account. Multiple '.
+              'is already in use by an existing %s account. Multiple '.
-              'Phabricator accounts may not have the same email address, so '.
+              '%s accounts may not have the same email address, so '.
-              'you can not use this email address to register a new '.
+              'you can not use this email address to register a new account.',
-              'Phabricator account.',
+              phutil_tag('strong', array(), $show_existing),
-              phutil_tag('strong', array(), $show_existing)))
+              PlatformSymbols::getPlatformServerName(),
+              PlatformSymbols::getPlatformServerName()))
           ->appendParagraph(
             pht(
               'If you want to register a new account, continue with this '.
@@ -174,10 +174,11 @@ final class PhabricatorAuthRegisterController
               'for the new account.'))
           ->appendParagraph(
             pht(
-              'If you want to link an existing Phabricator account to this '.
+              'If you want to link an existing %s account to this '.
               'external account, do not continue. Instead: log in to your '.
               'existing account, then go to "Settings" and link the account '.
-              'in the "External Accounts" panel.'))
+              'in the "External Accounts" panel.',
+              PlatformSymbols::getPlatformServerName()))
           ->appendParagraph(
             pht(
               'If you continue, you will create a new account. You will not '.
@@ -187,10 +188,10 @@ final class PhabricatorAuthRegisterController
       } else {
         $errors[] = pht(
           'The external account you are registering with has an email address '.
-          'that is already in use ("%s") by an existing Phabricator account. '.
+          'that is already in use ("%s") by an existing %s account. '.
-          'Choose a new, valid email address to register a new Phabricator '.
+          'Choose a new, valid email address to register a new account.',
-          'account.',
+          phutil_tag('strong', array(), $show_existing),
-          phutil_tag('strong', array(), $show_existing));
+          PlatformSymbols::getPlatformServerName());
       }
     }
 
@@ -595,7 +596,9 @@ final class PhabricatorAuthRegisterController
 
     if ($is_setup) {
       $crumbs->addTextCrumb(pht('Setup Admin Account'));
-        $title = pht('Welcome to Phabricator');
+        $title = pht(
+          'Welcome to %s',
+          PlatformSymbols::getPlatformServerName());
     } else {
       $crumbs->addTextCrumb(pht('Register'));
       $crumbs->addTextCrumb($provider->getProviderName());
@@ -607,7 +610,10 @@ final class PhabricatorAuthRegisterController
     if ($is_setup) {
       $welcome_view = id(new PHUIInfoView())
         ->setSeverity(PHUIInfoView::SEVERITY_NOTICE)
-        ->setTitle(pht('Welcome to Phabricator'))
+        ->setTitle(
+          pht(
+            'Welcome to %s',
+            PlatformSymbols::getPlatformServerName()))
         ->appendChild(
           pht(
             'Installation is complete. Register your administrator account '.
@@ -710,8 +716,9 @@ final class PhabricatorAuthRegisterController
   }
 
   private function sendWaitingForApprovalEmail(PhabricatorUser $user) {
-    $title = '[Phabricator] '.pht(
+    $title = pht(
-      'New User "%s" Awaiting Approval',
+      '[%s] New User "%s" Awaiting Approval',
+      PlatformSymbols::getPlatformServerName(),
       $user->getUsername());
 
     $body = new PhabricatorMetaMTAMailBody();

src/applications/auth/controller/PhabricatorAuthSSHKeyGenerateController.php

@@ -105,7 +105,7 @@ final class PhabricatorAuthSSHKeyGenerateController
             'This workflow will generate a new SSH keypair, add the public '.
             'key, and let you download the private key.'))
         ->appendParagraph(
-          pht('Phabricator will not retain a copy of the private key.'))
+          pht('The private key will not be retained.'))
         ->addSubmitButton(pht('Generate New Keypair'))
         ->addCancelButton($cancel_uri);
     } catch (Exception $ex) {

src/applications/auth/controller/PhabricatorAuthSetExternalController.php

@@ -42,10 +42,11 @@ final class PhabricatorAuthSetExternalController
       PhabricatorAuthLinkMessageType::MESSAGEKEY);
     if (!strlen($text)) {
       $text = pht(
-        'You can link your Phabricator account to an external account to '.
+        'You can link your %s account to an external account to '.
         'allow you to log in more easily in the future. To continue, choose '.
         'an account to link below. If you prefer not to link your account, '.
-        'you can skip this step.');
+        'you can skip this step.',
+        PlatformSymbols::getPlatformServerName());
     }
 
     $remarkup_view = new PHUIRemarkupView($viewer, $text);

src/applications/auth/controller/PhabricatorAuthStartController.php

@@ -90,11 +90,11 @@ final class PhabricatorAuthStartController
 
       return $this->renderError(
         pht(
-          'This Phabricator install is not configured with any enabled '.
+          'This server is not configured with any enabled authentication '.
-          'authentication providers which can be used to log in. If you '.
+          'providers which can be used to log in. If you have accidentally '.
-          'have accidentally locked yourself out by disabling all providers, '.
+          'locked yourself out by disabling all providers, you can use `%s` '.
-          'you can use `%s` to recover access to an account.',
+          'to recover access to an account.',
-          'phabricator/bin/auth recover <username>'));
+          './bin/auth recover <username>'));
     }
 
     $next_uri = $request->getStr('next');
@@ -252,7 +252,7 @@ final class PhabricatorAuthStartController
 
     $message = pht(
       'ERROR: You are making a Conduit API request to "%s", but the correct '.
-      'HTTP request path to use in order to access a COnduit method is "%s" '.
+      'HTTP request path to use in order to access a Conduit method is "%s" '.
       '(for example, "%s"). Check your configuration.',
       $request_path,
       $conduit_path,

src/applications/auth/controller/PhabricatorAuthUnlinkController.php

@@ -86,7 +86,7 @@ final class PhabricatorAuthUnlinkController
       ->appendChild(
         pht(
           'You can not unlink this account because the administrator has '.
-          'configured Phabricator to make links to "%s" accounts permanent.',
+          'configured this server to make links to "%s" accounts permanent.',
           $provider->getProviderName()))
       ->addCancelButton($done_uri);
   }
@@ -123,7 +123,7 @@ final class PhabricatorAuthUnlinkController
     $title = pht('Unlink "%s" Account?', $provider->getProviderName());
     $body = pht(
       'You will no longer be able to use your %s account to '.
-      'log in to Phabricator.',
+      'log in.',
       $provider->getProviderName());
 
     return $this->newDialog()

src/applications/auth/controller/PhabricatorEmailVerificationController.php

@@ -44,7 +44,7 @@ final class PhabricatorEmailVerificationController
       $title = pht('Address Already Verified');
       $content = pht(
         'This email address has already been verified.');
-      $continue = pht('Continue to Phabricator');
+      $continue = pht('Continue');
     } else if ($request->isFormPost()) {
 
       id(new PhabricatorUserEditor())
@@ -55,7 +55,7 @@ final class PhabricatorEmailVerificationController
       $content = pht(
         'The email address %s is now verified.',
         phutil_tag('strong', array(), $email->getAddress()));
-      $continue = pht('Continue to Phabricator');
+      $continue = pht('Continue');
     } else {
       $title = pht('Verify Email Address');
       $content = pht(

src/applications/auth/controller/PhabricatorMustVerifyEmailController.php

@@ -34,8 +34,7 @@ final class PhabricatorMustVerifyEmailController
 
     $must_verify = pht(
       'You must verify your email address to log in. You should have a '.
-      'new email message from Phabricator with verification instructions '.
+      'new email message with verification instructions in your inbox (%s).',
-      'in your inbox (%s).',
       phutil_tag('strong', array(), $email_address));
 
     $send_again = pht(

src/applications/auth/controller/config/PhabricatorAuthDisableController.php

@@ -49,12 +49,12 @@ final class PhabricatorAuthDisableController
       if ($config->getShouldAllowRegistration()) {
         $body = pht(
           'Do you want to enable this provider? Users will be able to use '.
-          'their existing external accounts to register new Phabricator '.
+          'their existing external accounts to register new accounts and '.
-          'accounts and log in using linked accounts.');
+          'log in using linked accounts.');
       } else {
         $body = pht(
           'Do you want to enable this provider? Users will be able to log '.
-          'in to Phabricator using linked accounts.');
+          'in using linked accounts.');
       }
       $button = pht('Enable Provider');
     } else {

src/applications/auth/controller/config/PhabricatorAuthEditController.php

@@ -220,7 +220,7 @@ final class PhabricatorAuthEditController
     } else {
       $registration_warning = pht(
         "NOTE: Any user who can browse to this install's login page will be ".
-        "able to register a Phabricator account. To restrict who can register ".
+        "able to register an account. To restrict who can register ".
         "an account, configure [[ %s | %s ]].",
         $config_href,
         $config_name);
@@ -238,10 +238,9 @@ final class PhabricatorAuthEditController
       phutil_tag('strong', array(), pht('Allow Registration:')),
       ' ',
       pht(
-        'Allow users to register new Phabricator accounts using this '.
+        'Allow users to register new accounts using this provider. If you '.
-        'provider. If you disable registration, users can still use this '.
+        'disable registration, users can still use this provider to log in '.
-        'provider to log in to existing accounts, but will not be able to '.
+        'to existing accounts, but will not be able to create new accounts.'),
-        'create new accounts.'),
     );
 
     $str_link = hsprintf(
@@ -249,29 +248,29 @@ final class PhabricatorAuthEditController
       pht('Allow Linking Accounts'),
       pht(
         'Allow users to link account credentials for this provider to '.
-        'existing Phabricator accounts. There is normally no reason to '.
+        'existing accounts. There is normally no reason to disable this '.
-        'disable this unless you are trying to move away from a provider '.
+        'unless you are trying to move away from a provider and want to '.
-        'and want to stop users from creating new account links.'));
+        'stop users from creating new account links.'));
 
     $str_unlink = hsprintf(
       '<strong>%s:</strong> %s',
       pht('Allow Unlinking Accounts'),
       pht(
         'Allow users to unlink account credentials for this provider from '.
-        'existing Phabricator accounts. If you disable this, Phabricator '.
+        'existing accounts. If you disable this, accounts will be '.
-        'accounts will be permanently bound to provider accounts.'));
+        'permanently bound to provider accounts.'));
 
     $str_trusted_email = hsprintf(
       '<strong>%s:</strong> %s',
       pht('Trust Email Addresses'),
       pht(
-        'Phabricator will skip email verification for accounts registered '.
+        'Skip email verification for accounts registered '.
         'through this provider.'));
     $str_auto_login = hsprintf(
       '<strong>%s:</strong> %s',
       pht('Allow Auto Login'),
       pht(
-        'Phabricator will automatically login with this provider if it is '.
+        'Automatically log in with this provider if it is '.
         'the only available provider.'));
 
     $form = id(new AphrontFormView())

src/applications/auth/controller/config/PhabricatorAuthListController.php

@@ -53,8 +53,7 @@ final class PhabricatorAuthListController
     $list->setNoDataString(
       pht(
         '%s You have not added authentication providers yet. Use "%s" to add '.
-        'a provider, which will let users register new Phabricator accounts '.
+        'a provider, which will let users register new accounts and log in.',
-        'and log in.',
         phutil_tag(
           'strong',
           array(),

src/applications/auth/controller/contact/PhabricatorAuthContactNumberTestController.php

@@ -39,7 +39,7 @@ final class PhabricatorAuthContactNumberTestController
         ->setSensitiveContent(false)
         ->setBody(
           pht(
-            'This is a terse test text message from Phabricator (%s).',
+            'This is a terse test text message (from "%s").',
             $uri->getDomain()))
         ->save();
 

src/applications/auth/factor/PhabricatorDuoAuthFactor.php

@@ -133,7 +133,9 @@ final class PhabricatorDuoAuthFactor
         ->setTransactionType($xaction_usernames)
         ->setOptions(
           array(
-            'username' => pht('Use Phabricator Username'),
+            'username' => pht(
+              'Use %s Username',
+              PlatformSymbols::getPlatformServerName()),
             'email' => pht('Use Primary Email Address'),
           )),
       id(new PhabricatorSelectEditField())
@@ -510,7 +512,7 @@ final class PhabricatorDuoAuthFactor
         ->setIsError(true)
         ->setErrorMessage(
           pht(
-            'This factor has been removed from your device, so Phabricator '.
+            'This factor has been removed from your device, so this server '.
             'can not send you a challenge. To continue, an administrator '.
             'must strip this factor from your account.'));
     }
@@ -547,7 +549,7 @@ final class PhabricatorDuoAuthFactor
     // The Duo push timeout is 60 seconds. Set our challenge to expire slightly
     // more quickly so that we'll re-issue a new challenge before Duo times out.
     // This should keep users away from a dead-end where they can't respond to
-    // Duo but Phabricator won't issue a new challenge yet.
+    // Duo but we won't issue a new challenge yet.
     $ttl_seconds = 55;
 
     return array(

src/applications/auth/factor/PhabricatorSMSAuthFactor.php

@@ -388,7 +388,8 @@ final class PhabricatorSMSAuthFactor
       ->setSensitiveContent(true)
       ->setBody(
         pht(
-          'Phabricator (%s) MFA Code: %s',
+          '%s (%s) MFA Code: %s',
+          PlatformSymbols::getPlatformServerName(),
           $this->getInstallDisplayName(),
           $envelope->openEnvelope()))
       ->save();

src/applications/auth/guidance/PhabricatorAuthProvidersGuidanceEngineExtension.php

@@ -42,7 +42,7 @@ final class PhabricatorAuthProvidersGuidanceEngineExtension
 
     if ($domains_value) {
       $message = pht(
-        'Phabricator is configured with an email domain whitelist (in %s), so '.
+        'This server is configured with an email domain whitelist (in %s), so '.
         'only users with a verified email address at one of these %s '.
         'allowed domain(s) will be able to register an account: %s',
         $domains_link,
@@ -53,7 +53,7 @@ final class PhabricatorAuthProvidersGuidanceEngineExtension
         ->setMessage($message);
     } else {
       $message = pht(
-        'Anyone who can browse to this Phabricator install will be able to '.
+        'Anyone who can browse to this this server will be able to '.
         'register an account. To add email domain restrictions, configure '.
         '%s.',
         $domains_link);

src/applications/auth/management/PhabricatorAuthManagementRecoverWorkflow.php

@@ -9,8 +9,7 @@ final class PhabricatorAuthManagementRecoverWorkflow
       ->setExamples('**recover** __username__')
       ->setSynopsis(
         pht(
-          'Recover access to an account if you have locked yourself out '.
+          'Recover access to an account if you have locked yourself out.'))
-          'of Phabricator.'))
       ->setArguments(
         array(
           array(

src/applications/auth/management/PhabricatorAuthManagementRevokeWorkflow.php

@@ -60,7 +60,7 @@ final class PhabricatorAuthManagementRevokeWorkflow
 
     $type = $args->getArg('type');
     $is_everything = $args->getArg('everything');
-    if (!strlen($type) && !$is_everything) {
+    if ($type === null && !$is_everything) {
       if ($is_list) {
         // By default, "bin/revoke --list" implies "--everything".
         $types = $all_types;
@@ -94,7 +94,7 @@ final class PhabricatorAuthManagementRevokeWorkflow
     $from = $args->getArg('from');
 
     if ($is_list) {
-      if (strlen($from) || $is_everywhere) {
+      if ($from !== null || $is_everywhere) {
         throw new PhutilArgumentUsageException(
           pht(
             'You can not "--list" and revoke credentials (with "--from" or '.

src/applications/auth/management/PhabricatorAuthManagementTrustOAuthClientWorkflow.php

@@ -9,9 +9,9 @@ final class PhabricatorAuthManagementTrustOAuthClientWorkflow
       ->setExamples('**trust-oauth-client** [--id client_id]')
       ->setSynopsis(
         pht(
-          'Set Phabricator to trust an OAuth client. Phabricator '.
+          'Mark an OAuth client as trusted. Trusted OAuth clients may be '.
-          'redirects to trusted OAuth clients that users have authorized '.
+          'reauthorized without requiring users to manually confirm the '.
-          'without user intervention.'))
+          'action.'))
       ->setArguments(
         array(
           array(
@@ -28,8 +28,7 @@ final class PhabricatorAuthManagementTrustOAuthClientWorkflow
     if (!$id) {
       throw new PhutilArgumentUsageException(
         pht(
-          'Specify an OAuth client id with %s.',
+          'Specify an OAuth client id with "--id".'));
-          '--id'));
     }
 
     $client = id(new PhabricatorOAuthServerClientQuery())
@@ -46,7 +45,7 @@ final class PhabricatorAuthManagementTrustOAuthClientWorkflow
     if ($client->getIsTrusted()) {
       throw new PhutilArgumentUsageException(
         pht(
-          'Phabricator already trusts OAuth client "%s".',
+          'OAuth client "%s" is already trusted.',
           $client->getName()));
     }
 
@@ -57,7 +56,7 @@ final class PhabricatorAuthManagementTrustOAuthClientWorkflow
     $console->writeOut(
       "%s\n",
       pht(
-        'Updated; Phabricator trusts OAuth client %s.',
+        'OAuth client "%s" is now trusted.',
         $client->getName()));
   }
 

src/applications/auth/management/PhabricatorAuthManagementUntrustOAuthClientWorkflow.php

@@ -9,9 +9,8 @@ final class PhabricatorAuthManagementUntrustOAuthClientWorkflow
       ->setExamples('**untrust-oauth-client** [--id client_id]')
       ->setSynopsis(
         pht(
-          'Set Phabricator to not trust an OAuth client. Phabricator '.
+          'Remove trust from an OAuth client. Users must manually confirm '.
-          'redirects to trusted OAuth clients that users have authorized '.
+          'reauthorization of untrusted OAuth clients.'))
-          'without user intervention.'))
       ->setArguments(
         array(
           array(
@@ -46,7 +45,7 @@ final class PhabricatorAuthManagementUntrustOAuthClientWorkflow
     if (!$client->getIsTrusted()) {
       throw new PhutilArgumentUsageException(
         pht(
-          'Phabricator already does not trust OAuth client "%s".',
+          'OAuth client "%s" is already untrusted.',
           $client->getName()));
     }
 
@@ -57,7 +56,7 @@ final class PhabricatorAuthManagementUntrustOAuthClientWorkflow
     $console->writeOut(
       "%s\n",
       pht(
-        'Updated; Phabricator does not trust OAuth client %s.',
+        'OAuth client "%s" is now trusted.',
         $client->getName()));
   }
 

src/applications/auth/provider/PhabricatorAmazonAuthProvider.php

@@ -14,7 +14,7 @@ final class PhabricatorAmazonAuthProvider
     $https_note = null;
     if ($uri->getProtocol() !== 'https') {
       $https_note = pht(
-        'NOTE: Amazon **requires** HTTPS, but your Phabricator install does '.
+        'NOTE: Amazon **requires** HTTPS, but this service does '.
         'not use HTTPS. **You will not be able to add Amazon as an '.
         'authentication provider until you configure HTTPS on this install**.');
     }

src/applications/auth/provider/PhabricatorGitHubAuthProvider.php

@@ -19,7 +19,7 @@ final class PhabricatorGitHubAuthProvider
       "You should use these settings in your application:".
       "\n\n".
       "  - **URL:** Set this to your full domain with protocol. For this ".
-      "    Phabricator install, the correct value is: `%s`\n".
+      "    server, the correct value is: `%s`\n".
       "  - **Callback URL**: Set this to: `%s`\n".
       "\n\n".
       "Once you've created an application, copy the **Client ID** and ".

src/applications/auth/provider/PhabricatorJIRAAuthProvider.php

@@ -31,7 +31,7 @@ final class PhabricatorJIRAAuthProvider
         "settings to create an application:\n\n".
         "  - **Server URL**: `%s`\n".
         "  - Then, click **Next**. On the second page:\n".
-        "  - **Application Name**: `Phabricator`\n".
+        "  - **Application Name**: `%s`\n".
         "  - **Application Type**: `Generic Application`\n".
         "  - Then, click **Create**.\n\n".
         "**Configure Your Application**: Find the application you just ".
@@ -41,13 +41,15 @@ final class PhabricatorJIRAAuthProvider
         "settings:\n\n".
         "  - **Consumer Key**: Set this to the \"Consumer Key\" value in the ".
         "form above.\n".
-        "  - **Consumer Name**: `Phabricator`\n".
+        "  - **Consumer Name**: `%s`\n".
         "  - **Public Key**: Set this to the \"Public Key\" value in the ".
         "form above.\n".
         "  - **Consumer Callback URL**: `%s`\n".
         "Click **Save** in JIRA. Authentication should now be configured, ".
         "and this provider should work correctly.",
         PhabricatorEnv::getProductionURI('/'),
+        PlatformSymbols::getPlatformServerName(),
+        PlatformSymbols::getPlatformServerName(),
         $login_uri);
     }
   }
@@ -169,7 +171,7 @@ final class PhabricatorJIRAAuthProvider
           "The PHP 'openssl' extension is not installed. You must install ".
           "this extension in order to add a JIRA authentication provider, ".
           "because JIRA OAuth requests use the RSA-SHA1 signing algorithm. ".
-          "Install the 'openssl' extension, restart Phabricator, and try ".
+          "Install the 'openssl' extension, restart everything, and try ".
           "again."));
     }
 
@@ -198,8 +200,8 @@ final class PhabricatorJIRAAuthProvider
         ->appendRemarkupInstructions(
           pht(
             "**JIRA Instance Name**\n\n".
-            "Choose a permanent name for this instance of JIRA. Phabricator ".
+            "Choose a permanent name for this instance of JIRA. This name is ".
-            "uses this name internally to keep track of this instance of ".
+            "used internally to keep track of this particular instance of ".
             "JIRA, in case the URL changes later.\n\n".
             "Use lowercase letters, digits, and period. For example, ".
             "`jira`, `jira.mycompany` or `jira.engineering` are reasonable ".
@@ -281,8 +283,7 @@ final class PhabricatorJIRAAuthProvider
               new PHUIRemarkupView(
                 $viewer,
                 pht(
-                  '**Post a comment** in the JIRA task, similar to the '.
+                  '**Post a comment** in the JIRA task.')),
-                  'emails Phabricator sends.')),
               $this->shouldCreateJIRAComment()));
     }
 

src/applications/auth/provider/PhabricatorLDAPAuthProvider.php

@@ -11,7 +11,7 @@ final class PhabricatorLDAPAuthProvider extends PhabricatorAuthProvider {
   public function getDescriptionForCreate() {
     return pht(
       'Configure a connection to an LDAP server so that users can use their '.
-      'LDAP credentials to log in to Phabricator.');
+      'LDAP credentials to log in.');
   }
 
   public function getDefaultProviderConfig() {
@@ -312,8 +312,8 @@ final class PhabricatorLDAPAuthProvider extends PhabricatorAuthProvider {
 
     $instructions = array(
       self::KEY_SEARCH_ATTRIBUTES   => pht(
-        "When a user types their LDAP username and password into Phabricator, ".
+        "When a user provides their LDAP username and password, this ".
-        "Phabricator can either bind to LDAP with those credentials directly ".
+        "software can either bind to LDAP with those credentials directly ".
         "(which is simpler, but not as powerful) or bind to LDAP with ".
         "anonymous credentials, then search for record matching the supplied ".
         "credentials (which is more complicated, but more powerful).\n\n".

src/applications/auth/provider/PhabricatorOAuth1AuthProvider.php

@@ -21,7 +21,7 @@ abstract class PhabricatorOAuth1AuthProvider
     $config = $this->getProviderConfig();
     $adapter->setConsumerKey($config->getProperty(self::PROPERTY_CONSUMER_KEY));
     $secret = $config->getProperty(self::PROPERTY_CONSUMER_SECRET);
-    if (strlen($secret)) {
+    if (phutil_nonempty_string($secret)) {
       $adapter->setConsumerSecret(new PhutilOpaqueEnvelope($secret));
     }
     $adapter->setCallbackURI(PhabricatorEnv::getURI($this->getLoginURI()));

src/applications/auth/provider/PhabricatorPhabricatorAuthProvider.php

@@ -7,17 +7,16 @@ final class PhabricatorPhabricatorAuthProvider
   const PROPERTY_PHABRICATOR_URI  = 'oauth2:phabricator:uri';
 
   public function getProviderName() {
-    return pht('Phabricator');
+    return PlatformSymbols::getPlatformServerName();
   }
 
   public function getConfigurationHelp() {
     if ($this->isCreate()) {
       return pht(
-        "**Step 1 of 2 - Name Phabricator OAuth Instance**\n\n".
+        "**Step 1 of 2 - Name Remote Server**\n\n".
-        'Choose a permanent name for the OAuth server instance of '.
+        'Choose a permanent name for the remote server you want to connect '.
-        'Phabricator. //This// instance of Phabricator uses this name '.
+        'to. This name is used internally to keep track of the remote '.
-        'internally to keep track of the OAuth server instance of '.
+        'server, in case the URL changes later.');
-        'Phabricator, in case the URL changes later.');
     }
 
     return parent::getConfigurationHelp();
@@ -29,8 +28,8 @@ final class PhabricatorPhabricatorAuthProvider
     $login_uri = PhabricatorEnv::getURI($this->getLoginURI());
 
     return pht(
-      "**Step 2 of 2 - Configure Phabricator OAuth Instance**\n\n".
+      "**Step 2 of 2 - Configure OAuth Server**\n\n".
-      "To configure Phabricator OAuth, create a new application here:".
+      "To configure OAuth, create a new application here:".
       "\n\n".
       "%s/oauthserver/client/create/".
       "\n\n".
@@ -54,7 +53,7 @@ final class PhabricatorPhabricatorAuthProvider
   }
 
   protected function getLoginIcon() {
-    return 'Phabricator';
+    return PlatformSymbols::getPlatformServerName();
   }
 
   private function isCreate() {
@@ -106,23 +105,23 @@ final class PhabricatorPhabricatorAuthProvider
     $key_uri = self::PROPERTY_PHABRICATOR_URI;
 
     if (!strlen($values[$key_name])) {
-      $errors[] = pht('Phabricator instance name is required.');
+      $errors[] = pht('Server name is required.');
       $issues[$key_name] = pht('Required');
     } else if (!preg_match('/^[a-z0-9.]+\z/', $values[$key_name])) {
       $errors[] = pht(
-        'Phabricator instance name must contain only lowercase letters, '.
+        'Server name must contain only lowercase letters, '.
         'digits, and periods.');
       $issues[$key_name] = pht('Invalid');
     }
 
     if (!strlen($values[$key_uri])) {
-      $errors[] = pht('Phabricator base URI is required.');
+      $errors[] = pht('Base URI is required.');
       $issues[$key_uri] = pht('Required');
     } else {
       $uri = new PhutilURI($values[$key_uri]);
       if (!$uri->getProtocol()) {
         $errors[] = pht(
-          'Phabricator base URI should include protocol (like "%s").',
+          'Base URI should include protocol (like "%s").',
           'https://');
         $issues[$key_uri] = pht('Invalid');
       }
@@ -161,7 +160,7 @@ final class PhabricatorPhabricatorAuthProvider
       $form
        ->appendChild(
           id(new AphrontFormTextControl())
-            ->setLabel(pht('Phabricator Instance Name'))
+            ->setLabel(pht('Server Name'))
             ->setValue($v_name)
             ->setName(self::PROPERTY_PHABRICATOR_NAME)
             ->setError($e_name)
@@ -170,26 +169,25 @@ final class PhabricatorPhabricatorAuthProvider
             phutil_tag(
               'tt',
               array(),
-              '`phabricator.oauthserver`'))));
+              '`example.oauthserver`'))));
     } else {
       $form
         ->appendChild(
           id(new AphrontFormStaticControl())
-            ->setLabel(pht('Phabricator Instance Name'))
+            ->setLabel(pht('Server Name'))
             ->setValue($v_name));
     }
 
     $form
       ->appendChild(
         id(new AphrontFormTextControl())
-          ->setLabel(pht('Phabricator Base URI'))
+          ->setLabel(pht('Base URI'))
           ->setValue($v_uri)
           ->setName(self::PROPERTY_PHABRICATOR_URI)
           ->setCaption(
             pht(
-              'The URI where the OAuth server instance of Phabricator is '.
+              'The URI where the OAuth server is installed. For example: %s',
-              'installed. For example: %s',
+              phutil_tag('tt', array(), 'https://devtools.example.com/')))
-              phutil_tag('tt', array(), 'https://phabricator.mycompany.com/')))
           ->setError($e_uri));
 
     if (!$is_setup) {

src/applications/auth/provider/PhabricatorWordPressAuthProvider.php

@@ -19,7 +19,7 @@ final class PhabricatorWordPressAuthProvider
       "You should use these settings in your application:".
       "\n\n".
       "  - **URL:** Set this to your full domain with protocol. For this ".
-      "    Phabricator install, the correct value is: `%s`\n".
+      "    server, the correct value is: `%s`\n".
       "  - **Redirect URL**: Set this to: `%s`\n".
       "\n\n".
       "Once you've created an application, copy the **Client ID** and ".

src/applications/auth/query/PhabricatorAuthChallengeQuery.php

@@ -40,10 +40,6 @@ final class PhabricatorAuthChallengeQuery
     return new PhabricatorAuthChallenge();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
 

src/applications/auth/query/PhabricatorAuthContactNumberQuery.php

@@ -44,10 +44,6 @@ final class PhabricatorAuthContactNumberQuery
     return new PhabricatorAuthContactNumber();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
 

src/applications/auth/query/PhabricatorAuthFactorConfigQuery.php

@@ -38,10 +38,6 @@ final class PhabricatorAuthFactorConfigQuery
     return new PhabricatorAuthFactorConfig();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
 

src/applications/auth/query/PhabricatorAuthFactorProviderQuery.php

@@ -32,10 +32,6 @@ final class PhabricatorAuthFactorProviderQuery
     return new PhabricatorAuthFactorProvider();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
 

src/applications/auth/query/PhabricatorAuthMessageQuery.php

@@ -26,10 +26,6 @@ final class PhabricatorAuthMessageQuery
     return new PhabricatorAuthMessage();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
 

src/applications/auth/query/PhabricatorAuthPasswordQuery.php

@@ -38,10 +38,6 @@ final class PhabricatorAuthPasswordQuery
     return new PhabricatorAuthPassword();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
 

src/applications/auth/query/PhabricatorAuthProviderConfigQuery.php

@@ -32,10 +32,6 @@ final class PhabricatorAuthProviderConfigQuery
     return new PhabricatorAuthProviderConfig();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
 

src/applications/auth/query/PhabricatorAuthSSHKeyQuery.php

@@ -47,10 +47,6 @@ final class PhabricatorAuthSSHKeyQuery
     return new PhabricatorAuthSSHKey();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function willFilterPage(array $keys) {
     $object_phids = mpull($keys, 'getObjectPHID');
 

src/applications/auth/query/PhabricatorAuthSessionQuery.php

@@ -38,10 +38,6 @@ final class PhabricatorAuthSessionQuery
     return new PhabricatorAuthSession();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function willFilterPage(array $sessions) {
     $identity_phids = mpull($sessions, 'getUserPHID');