Merge pull request #10 from brandones/master

Improve documentation

3 files changed, 46 insertions, 23 deletions

diff --git a/README.md b/README.md
index ec61a65..15e8030 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 Bitbucket Pull Request Builder Plugin
-================================
+=====================================
 
 This Jenkins plugin builds pull requests from Bitbucket.org and will report the test results.
 
@@ -7,25 +7,23 @@ This Jenkins plugin builds pull requests from Bitbucket.org and will report the
 
 
 Prerequisites
-================================
+-------------
 
 - Jenkins 1.509.4 or higher.
 - https://wiki.jenkins-ci.org/display/JENKINS/Git+Plugin
 
 
 Creating a Job
-=================================
+-------------
 
 - Create a new job
-- Select Git SCM
-- Add Repository URL as bellow
-  - git@bitbucket.org:${repositoryOwner}/${repositoryName}.git
-- In Branch Specifier, type as bellow
-  - */${sourceBranch}
+- Select and configure Git SCM
+	- Add Repository URL, `git@bitbucket.org:${repositoryOwner}/${repositoryName}.git`
+	- In Branch Specifier, type `*/${sourceBranch}`
 - Under Build Triggers, check Bitbucket Pull Request Builder
 - In Cron, enter crontab for this job.
-  - ex: * * * * *
-- In Bitbucket BasicAuth Username, write your bitbucket username like jenkins@densan-labs.net
+  - e.g. `* * * * *` will check for new pull requests every minute
+- In Bitbucket BasicAuth Username, write your bitbucket username, like `jenkins@densan-labs.net`
 - In Bitbucket BasicAuth Password, write your password
 - In CI Identifier, enter an unique identifier among your Jenkins jobs related to the repo
 - In CI Name, enter a human readable name for your Jenkins server
@@ -33,30 +31,46 @@ Creating a Job
 - Write RepositoryName
 - Save to preserve your changes
 
+
 Merge the Pull Request's Source Branch into the Target Branch Before Building
-==============================================================================
-You may want Jenkins to attempt to merge your PR before doing the build -- this way it will find conflicts for you automatically.
+-----------------------------------------------------------------------------
+
+You may want Jenkins to attempt to merge your PR before building.
+This may help expose inconsistencies between the source branch and target branch.
+Note that if the merge cannot be completed, the build will fail immediately.
+
 - Follow the steps above in "Creating a Job"
 - In the "Source Code Management" > "Git" > "Additional Behaviors" section, click "Add" > "Merge Before Building"
-- In "Name of Repository" put "origin" (or, if not using default name, use your remote repository's name. Note: unlike in the main part of the Git Repository config, you cannot leave this item blank for "default".)
+- In "Name of Repository" put "origin" (or, if not using default name, use your remote repository's name. Note: unlike in the main part of the Git Repository config, you cannot leave this item blank for "default").
 - In "Branch to merge to" put "${targetBranch}" 
 - Note that as long as you don't push these changes to your remote repository, the merge only happens in your local repository.
 
-
 If you are merging into your target branch, you might want Jenkins to do a new build of the Pull Request when the target branch changes.
 - There is a checkbox that says, "Rebuild if destination branch changes?" which enables this check.
 
 
-Rerun test builds
-====================
+Rerun a Build
+-------------
+
+If you want to rerun a pull request build, write a comment on your pull request reading “test this please”.
 
-If you want to rerun pull request test, write “test this please” comment to your pull request.
 
+Environment Variables Provided
+------------------------------
 
+- `sourceBranch`
+- `targetBranch`
+- `repositoryOwner`
+- `repositoryName`
+- `pullRequestId`
+- `destinationRepositoryOwner`
+- `destinationRepositoryName`
+- `pullRequestTitle`
+- `pullRequestAuthor`
 
 
 Contributing to Bitbucket Pull Request Builder Plugin
-================================================
+-----------------------------------------------------
 
 - Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
 
@@ -70,13 +84,13 @@ Contributing to Bitbucket Pull Request Builder Plugin
 
 
 Copyright
-=============================
+---------
 
 Copyright © 2014 S.nishio. 
 
 
 License
-=============================
+-------
 
 - BSD License
 - See COPYING file
diff --git a/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/help-branchesFilterBySCMIncludes.html b/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/help-branchesFilterBySCMIncludes.html
index 3f24419..cc9d47c 100644
--- a/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/help-branchesFilterBySCMIncludes.html
+++ b/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/help-branchesFilterBySCMIncludes.html
@@ -1,3 +1,7 @@
-It is sugar-option for synchronize option "BranchesFilter" to Git SCM option "Branches to build" without manual editing.
-Check this option suppose than your "BranchesFilter" field has logick equal value with Git SCM "Branches to build" option (original value from "BranchesFilter" field will e ignored).
-If "Branches to build" option has values "*/master */feature-master */build-with-jenkins", then "BranchesFilter" field will have value "d:master d:feature-master d:build-with-jenkins".
+Uses the Git SCM option "Branches to build" option as the value for
+"BranchesFilter". If the "BranchesFilter" field itself has any content,
+it will be ignored.
+<br>
+If the "Branches to build" option has values
+"*/master */feature-master */build-with-jenkins", then "BranchesFilter"
+field will have value "d:master d:feature-master d:build-with-jenkins".
diff --git a/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/help-ciSkipPhrases.html b/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/help-ciSkipPhrases.html
new file mode 100644
index 0000000..f30f306
--- /dev/null
+++ b/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/help-ciSkipPhrases.html
@@ -0,0 +1,5 @@
+A comma-separated list of strings to search the pull request title for. 
+<br>
+e.g. If set to "trivial,[skiptest]", any PRs containing either "trivial" or
+"[skiptest]" (case-insensitive) will not be built.
+