Skip to content

Commit 52aa592

Browse files
committed
Merge pull request #70 from loadsys/f/readme-update
Clarify what branches and release series are meant for which Cake versions.
2 parents 9bdf903 + 81c4dca commit 52aa592

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44

55
This collection of scripts is intended to provide consistency and shortcuts for common project tasks. Key tools are highlighted and described below.
66

7-
* The 1.x branch is tuned for projects that primarily use git submodules for dependency management.
8-
* The 2.x branch is meant for projects that use composer (although submodules are still supported).
7+
* The master branch and 3.x.x release series is intended for use with Cake 3.x projects and is the only branch that is actively maintained.
8+
* The cake-2.x branch and 2.x.x release series is meant for CakePHP 2.x projects that use composer.
9+
* The 1.x release series is tuned for CakePHP 1.3 projects that primarily use git submodules for dependency management.
910
* Most scripts listed below can take a `-h` option as their first argument to output usage information.
1011
* Most are designed to run with few or no arguments; they try to guess sensible defaults whenever possible.
1112
* Most are designed to fail gracefully. For example, if `pear` is available and your project defines a pear config file, then those dependencies will be installed by `deps-install`, otherwise pear will be silently ignored. This provides maximum flexibility without having to customize the scripts per-project.

0 commit comments

Comments
 (0)