Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Sign in
Toggle navigation
S
Silex
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
common
Silex
Commits
b99a10e5
Commit
b99a10e5
authored
May 07, 2013
by
Dave Marshall
Committed by
Fabien Potencier
May 07, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add target branch notes
parent
a0b5f746
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
1 deletion
+17
-1
doc/contributing.rst
doc/contributing.rst
+17
-1
No files found.
doc/contributing.rst
View file @
b99a10e5
...
@@ -14,7 +14,7 @@ steps.
...
@@ -14,7 +14,7 @@ steps.
* Optionally, add some technical documentation.
* Optionally, add some technical documentation.
* Send a pull request. Bonus points for topic branches.
* Send a pull request
, to the correct `target branch`_
. Bonus points for topic branches.
If you have a big change or would like to discuss something,
If you have a big change or would like to discuss something,
please join us on the `mailing list
please join us on the `mailing list
...
@@ -25,6 +25,22 @@ please join us on the `mailing list
...
@@ -25,6 +25,22 @@ please join us on the `mailing list
Any code you contribute must be licensed under the MIT
Any code you contribute must be licensed under the MIT
License.
License.
Target branch
=============
Before you create a pull request for Silex, you need to determine which branch
to submit it to. Read this section carefully first.
Silex has two active branches: `1.0` and `master` (`1.1`).
* **1.0**: Bugfixes and documentation fixes go into the 1.0 branch. 1.0 is
periodically merged into master. The 1.0 branch targets versions 2.1, 2.2 and
2.3 of Symfony2.
* **1.1**: All new features go into the 1.1 branch. Changes cannot break
backward compatibility. The 1.1 branch targets the 2.3 version of Symfony2.
Writing Documentation
Writing Documentation
=====================
=====================
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment