summaryrefslogtreecommitdiff
path: root/ReleaseInstructions
diff options
context:
space:
mode:
authorStefan Bodewig <bodewig@apache.org>2018-03-24 13:54:46 +0100
committerStefan Bodewig <bodewig@apache.org>2018-03-24 13:54:46 +0100
commit813da2ad3e50beafd0defebe24cf0b9b1f3c4d0d (patch)
tree447a05450aecb07ebe352e8ff8806ec2ceef6d5e /ReleaseInstructions
parente0ab351aa2a7462fd923338d1f658bc0f4971b3e (diff)
parent3f1cec6f033959549a2e9c8ea847d7074b1d186a (diff)
downloadant-813da2ad3e50beafd0defebe24cf0b9b1f3c4d0d.tar.gz
Merge branch '1.9.x'
Diffstat (limited to 'ReleaseInstructions')
-rw-r--r--ReleaseInstructions4
1 files changed, 2 insertions, 2 deletions
diff --git a/ReleaseInstructions b/ReleaseInstructions
index 615640f83..f9f1c19b6 100644
--- a/ReleaseInstructions
+++ b/ReleaseInstructions
@@ -22,7 +22,7 @@ Note: This document was adapted from the one created in the context of
release and wait for a few days whether anybody objects.
We haven't created extra branches for releases in a long time and
- with out new 1.9.x LTS policy there is a permanent branch for
+ with our new 1.9.x LTS policy there is a permanent branch for
Java5 compatible releases anyway. So no extra branch for the
releases is needed.
@@ -38,7 +38,7 @@ Note: This document was adapted from the one created in the context of
the build with -verbose option and scan for lines beginning with
"Unable to load...".
-3. We don't want tags for failed votes to end up on out branches so
+3. We don't want tags for failed votes to end up on our branches so
the release is first created from a detached head.
Checkout the HEAD of the master branch as a detached head: