diff options
| author | Tom Stellard <tstellar@redhat.com> | 2017-09-19 03:27:26 +0000 |
|---|---|---|
| committer | Tom Stellard <tstellar@redhat.com> | 2017-09-19 03:27:26 +0000 |
| commit | 9b6e3e18215161f7bab344cfd9f1d1d8e9fea345 (patch) | |
| tree | cedb312a792489bd0c671203eb804a5a6dae3455 /docs | |
| parent | c482e16a32e37d1cf7ae56fe7df7038054958ffe (diff) | |
| download | llvm-9b6e3e18215161f7bab344cfd9f1d1d8e9fea345.tar.gz | |
docs: Fix formatting in HowToReleaseLLVM
This is a follow up to r313608.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@313609 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/HowToReleaseLLVM.rst | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/docs/HowToReleaseLLVM.rst b/docs/HowToReleaseLLVM.rst index fdc48cb4ad4..ec3362e97b6 100644 --- a/docs/HowToReleaseLLVM.rst +++ b/docs/HowToReleaseLLVM.rst @@ -263,18 +263,18 @@ You can use any of the following methods to request that a revision from trunk be merged into a release branch: #. Use the ``utils/release/merge-request.sh`` script which will automatically -file a bug_ requesting that the patch be merged. e.g. To request revision -12345 be merged into the branch for the 5.0.1 release: -``llvm.src/utils/release/merge-request.sh -stable-version 5.0 -r 12345 -user bugzilla@example.com`` + file a bug_ requesting that the patch be merged. e.g. To request revision + 12345 be merged into the branch for the 5.0.1 release: + ``llvm.src/utils/release/merge-request.sh -stable-version 5.0 -r 12345 -user bugzilla@example.com`` #. Manually file a bug_ with the subject: "Merge r12345 into the X.Y branch", -enter the commit(s) that you want merged in the "Fixed by Commit(s)" and mark -it as a blocker of the current release bug. Release bugs are given aliases -in the form of release-x.y.z, so to mark a bug as a blocker for the 5.0.1 -release, just enter release-5.0.1 in the "Blocks" field. + enter the commit(s) that you want merged in the "Fixed by Commit(s)" and mark + it as a blocker of the current release bug. Release bugs are given aliases + in the form of release-x.y.z, so to mark a bug as a blocker for the 5.0.1 + release, just enter release-5.0.1 in the "Blocks" field. #. Reply to the commit email on llvm-commits for the revision to merge and cc -the release manager. + the release manager. .. _bug: https://bugs.llvm.org/ |