From 4f8dd4447bae7b7c96a7e7e023d87c10e55c5eac Mon Sep 17 00:00:00 2001
From: mickadoo <michaeldevery@gmail.com>
Date: Fri, 23 Jun 2017 22:10:35 +0100
Subject: [PATCH] Add info for buildkit patch argument, remove duplicate
section
---
docs/tools/buildkit.md | 16 ++++++++++++++++
docs/tools/phpstorm.md | 8 --------
2 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/docs/tools/buildkit.md b/docs/tools/buildkit.md
index 61678c1d..fbfa73db 100644
--- a/docs/tools/buildkit.md
+++ b/docs/tools/buildkit.md
@@ -79,6 +79,22 @@ npm update
npm install fs-extra
```
+## Applying a patch
+
+Using buildkit, you can create a CiviCRM environment with the PR applied.
+
+For Example:
+
+```bash
+civibuild create dmaster \
+ --url http://localhost:8001 \
+ --patch https://github.com/civicrm/civicrm-core/pull/8494 \
+ --admin-pass s3cr3t
+```
+
+This will create a test environment with the Drupal, CiviCRM master branch
+and the patch in PR 8494. More detailed information is in the
+[Civibuild documentation](https://github.com/civicrm/civicrm-buildkit/blob/master/doc/civibuild.md)
## Configuring buildkit after installation {:#configuring}
diff --git a/docs/tools/phpstorm.md b/docs/tools/phpstorm.md
index 6f3bf442..00e91708 100644
--- a/docs/tools/phpstorm.md
+++ b/docs/tools/phpstorm.md
@@ -23,14 +23,6 @@ Create the 'CiviCRM' code styling preference:
That's it. You can now use this code style on all future CiviCRM-related projects. If you are only developing for CiviCRM, you can also copy this style to the 'Default' style.
-
-## Running CiviCRM's automated tests from within PhpStorm
-
-TODO: write this section, drawing on some content here:
-
-https://wiki.civicrm.org/confluence/display/CRMDOC/Tests+in+phpstorm
-
-
## XDebug integration
TODO
--
GitLab