merged

--- a/etc/options	Sat Jan 13 19:50:15 2024 +0000
+++ b/etc/options	Sun Jan 14 13:59:13 2024 +0100
@@ -357,10 +357,10 @@
 
 section "Phabricator"
 
-option phabricator_version_arcanist : string = "4f70fcffa8a5393e210d64f237ffdaa256256d6a"
+option phabricator_version_arcanist : string = "85c953ebe4a6fef332158fd757d97c5a58682d3a"
   -- "repository version for arcanist"
 
-option phabricator_version_phabricator : string = "193798385bd3a7f72dca255e44f8112f4f8fc155"
+option phabricator_version_phabricator : string = "9426765a2c6a149f5b0ed2d9132cd1e4e7ee152d"
   -- "repository version for phabricator"
 
 

--- a/src/Doc/System/Phabricator.thy	Sat Jan 13 19:50:15 2024 +0000
+++ b/src/Doc/System/Phabricator.thy	Sun Jan 14 13:59:13 2024 +0100
@@ -36,12 +36,10 @@
   The following Phabricator instances may serve as examples:
 
     \<^item> Wikimedia development \<^url>\<open>https://phabricator.wikimedia.org\<close>
-    \<^item> Blender development \<^url>\<open>https://developer.blender.org\<close>
-    \<^item> LLVM development \<^url>\<open>https://reviews.llvm.org\<close>
     \<^item> Mozilla development \<^url>\<open>https://phabricator.services.mozilla.com\<close>
     \<^item> Isabelle development \<^url>\<open>https://isabelle-dev.sketis.net\<close>
-    \<^item> Phabricator development (inactive) \<^url>\<open>https://secure.phabricator.com\<close>
-    \<^item> Phorge development (planned successor of Phabricator)
+    \<^item> Phabricator development (mostly inactive after Jun-2021) \<^url>\<open>https://secure.phabricator.com\<close>
+    \<^item> Phorge development (community fork and successor of Phabricator)
       \<^url>\<open>https://we.phorge.it\<close>
 
   \<^medskip>
@@ -74,8 +72,10 @@
   (\secref{sec:phabricator-domain}).
 
   Initial experimentation also works on a local host, e.g.\ via
-  VirtualBox\<^footnote>\<open>\<^url>\<open>https://www.virtualbox.org\<close>\<close>. The Internet domain \<^verbatim>\<open>lvh.me\<close>
-  is used by default: it maps arbitrary subdomains to \<^verbatim>\<open>localhost\<close>.
+  VirtualBox\<^footnote>\<open>\<^url>\<open>https://www.virtualbox.org\<close>\<close>. The proforma domain
+  \<^verbatim>\<open>localhost\<close> is used by default: it maps arbitrary subdomains to the usual
+  \<^verbatim>\<open>localhost\<close> address. This allows to use e.g.
+  \<^verbatim>\<open>http://phabricator-vcs.localhost\<close> for initial setup as described below.
 
   All administrative commands need to be run as \<^verbatim>\<open>root\<close> user (e.g.\ via
   \<^verbatim>\<open>sudo\<close>). Note that Isabelle refers to user-specific configuration in the
@@ -216,9 +216,9 @@
 subsection \<open>Internet domain name and HTTPS configuration \label{sec:phabricator-domain}\<close>
 
 text \<open>
-  So far the Phabricator server has been accessible only on \<^verbatim>\<open>localhost\<close> (via
-  the alias \<^verbatim>\<open>lvh.me\<close>). Proper configuration of a public Internet domain name
-  (with HTTPS certificate from \<^emph>\<open>Let's Encrypt\<close>) works as follows.
+  So far the Phabricator server has been accessible only on \<^verbatim>\<open>localhost\<close>.
+  Proper configuration of a public Internet domain name (with HTTPS
+  certificate from \<^emph>\<open>Let's Encrypt\<close>) works as follows.
 
     \<^item> Register a subdomain (e.g.\ \<^verbatim>\<open>vcs.example.org\<close>) as an alias for the IP
     address of the underlying Linux host. This usually works by some web
@@ -296,7 +296,7 @@
   phabricator/bin/storage renamespace --from phabricator_vcs \
     --to phabricator_xyz --input dump1.sql --output dump2.sql\<close>}
 
-  Them run on the second installation root directory:
+  Then run on the second installation root directory:
   @{verbatim [display] \<open>  phabricator/bin/storage destroy
   phabricator/bin/storage shell < .../dump2.sql\<close>}
 

--- a/src/Pure/Tools/phabricator.scala	Sat Jan 13 19:50:15 2024 +0000
+++ b/src/Pure/Tools/phabricator.scala	Sun Jan 14 13:59:13 2024 +0100
@@ -439,7 +439,7 @@
 
     if (!apache_sites.is_dir) error("Bad Apache sites directory " + apache_sites)
 
-    val server_name = phabricator_name(name = name, ext = "lvh.me")  // alias for "localhost" for testing
+    val server_name = phabricator_name(name = name, ext = "localhost")  // alias for "localhost" for testing
     val server_url = "http://" + server_name
 
     File.write(apache_sites + Path.basic(isabelle_phabricator_name(name = name, ext = "conf")),