Code style fix from Duncan P. N. Exon Smith.

[oota-llvm.git] / docs / Phabricator.rst

diff --git a/docs/Phabricator.rst b/docs/Phabricator.rst
index 0c6990e13612bf254b80e36f7cb118836a358f0f..ec1991e3322526142e20695197edc18b1d42e468 100644 (file)
--- a/docs/Phabricator.rst
+++ b/docs/Phabricator.rst
@@ -12,13 +12,6 @@ you can now submit your patches for Clang and LLVM at
 Sign up
 -------
 
-There are two options to get an account on Phabricator. You can sign up
-immediately with one of the supported OAuth account types if you're comfortable
-with OAuth, but you can also email chandlerc@gmail.com to request an account to
-be created manually without using OAuth. We're working to get support in
-Phabricator to directly create new accounts, but currently this is a manual
-process.
-
 Note that if you use your Subversion user name as Phabricator user name,
 Phabricator will automatically connect your submits to your Phabricator user in
 the `Code Repository Browser`_.
@@ -68,7 +61,7 @@ To upload a new patch:
 To submit an updated patch:
 
 * Click *Differential*.
-* Click *Create Revision*.
+* Click *Create Diff*.
 * Paste the updated diff.
 * Select the review you want to from the *Attach To* dropdown and click
   *Continue*.
@@ -94,13 +87,33 @@ when a review changes state, for example by clicking "Accept Revision" in
 the web interface. Thus, please type LGTM into the comment box to accept
 a change from Phabricator.
 
+Committing a change
+-------------------
+
+When committing an LLVM change that has been reviewed using
+Phabricator, the convention is for the commit message to end with the
+line:
+
+::
+
+  Differential Revision: <URL>
+
+where ``<URL>`` is the URL for the code review, starting with
+``http://reviews.llvm.org/``.
+
+Note that Arcanist will add this automatically.
+
+This allows people reading the version history to see the review for
+context.  This also allows Phabricator to detect the commit, close the
+review, and add a link from the review to the commit.
+
 Status
 ------
 
 Currently, we're testing Phabricator for use with Clang/LLVM. Please let us
 know whether you like it and what could be improved!
 
-.. _LLVM's Phabricator: http://llvm-reviews.chandlerc.com
-.. _Code Repository Browser: http://llvm-reviews.chandlerc.com/diffusion/
+.. _LLVM's Phabricator: http://reviews.llvm.org
+.. _Code Repository Browser: http://reviews.llvm.org/diffusion/
 .. _Arcanist Quick Start: http://www.phabricator.com/docs/phabricator/article/Arcanist_Quick_Start.html
 .. _Arcanist User Guide: http://www.phabricator.com/docs/phabricator/article/Arcanist_User_Guide.html