Skip to content

Commit 08152d5

Browse files
committed
Update docs to change 'master' to 'main'.
1 parent 9ad015d commit 08152d5

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

CONTRIBUTING-TO-ESAPI.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ Overview:
3131
We are following the branching model described in
3232
https://nvie.com/posts/a-successful-git-branching-model
3333
If you are unfamiliar with it, you would be advised to give it a
34-
quick perusal. The major point is that the 'master' branch is reserved for
35-
official releases (which will be tagged), the 'develop' branch is used for
36-
ongoing development work and is the default branch, and we generally work
34+
quick perusal. The major point is that the 'main' (formerly 'master') branch
35+
is reserved for official releases (which will be tagged), the 'develop' branch is
36+
used for ongoing development work and is the default branch, and we generally work
3737
off 'issue' branches named 'issue-#' where # is the GitHub issue number.
3838
(The last is not an absolute requirement, but rather a suggested
3939
approach.)
@@ -74,7 +74,7 @@ Steps to work with ESAPI:
7474

7575
But the basic high level steps are:
7676
1. Fork https://github.com/ESAPI/esapi-java-legacy to your own GitHub
77-
repository.
77+
repository using the GitHub web site.
7878
2. On your local laptop, clone your own GitHub ESAPI repo (i.e, the
7979
forked repo created in previous step)
8080
3. Create a new branch to work on an issue. I usually name the branch

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ You can find the OWASP ESAPI wiki pages at [https://owasp.org/www-project-enterp
2222
You will find that GitHub repository at [https://github.com/ESAPI/esapi-java-legacy](https://github.com/ESAPI/esapi-java-legacy).
2323

2424
<b>IMPORTANT NOTES:</b>
25-
The default branch for ESAPI legacy is now the 'develop' branch (rather than the 'master' branch), where future development, bug fixes, etc. will now be done. The 'master' branch is now marked as "protected"; it reflects the latest stable ESAPI release (2.1.0.1 as of this date). Note that this change of making the 'develop' branch the default may affect any pull requests that you were intending to make.
25+
The default branch for ESAPI legacy is now the 'develop' branch (rather than the 'main' (formerly 'master') branch), where future development, bug fixes, etc. will now be done. The 'main' branch is now marked as "protected"; it reflects the latest stable ESAPI release (2.1.0.1 as of this date). Note that this change of making the 'develop' branch the default may affect any pull requests that you were intending to make.
2626

2727
Also, the <i>minimal</i> baseline Java version to use ESAPI is Java 7. (This was changed from Java 6 during the 2.2.0.0 release.)
2828

2.3 KB
Binary file not shown.
-25 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)