Skip to content

Commit

Permalink
Update branch reality.
Browse files Browse the repository at this point in the history
  • Loading branch information
yunosh committed Aug 15, 2017
1 parent 416859f commit ed40526
Showing 1 changed file with 18 additions and 12 deletions.
30 changes: 18 additions & 12 deletions app/views/Development/modules.html.php
Expand Up @@ -20,7 +20,7 @@
<th>Module</th>
<th>Release</th>
<th>Description</th>
<th><a href="#status">Status</a></th>
<th>Status</th>
</tr>
</thead>
<tbody>
Expand Down Expand Up @@ -133,29 +133,35 @@
</tbody>
</table>

<h3 id="status">A note on stability</h3>
<h3>A note on stability</h3>

<p>The <a href="#t_develop">develop</a> branch of a module will almost
<p>The master branch of an <em>application</em> module will almost
always be development code, and may be unstable. The stability listed
for each module is the general state of that module. However, just
because that IMP and Horde are listed as Production quality software,
doesn't mean that &quot;develop&quot; will always work, be documented,
doesn't mean that &quot;master&quot; will always work, be documented,
compile, or not cause frogs to dive-bomb you from tall trees. You've
been warned. ;)</p>

<h3 id="branches">A note on branches</h3>
<h3>A note on branches</h3>

<p>The tags generally take one of these formats:</p>
<p>The branch names for <em>applications</em> generally take one of
these formats:</p>

<ol>
<li><strong>master</strong> -- This is always the current stable
branch that contains bug fixes for the next release</li>
<li id="t_develop"><strong>develop</strong> -- This is always the
<li><strong>master</strong> -- This is always the
current development branch, and may be unstable and undocumented.</li>
<li>FRAMEWORK_* -- These branches are created for major stable
releases that have gone into security fix mode. Modules within a
FRAMEWORK_* branch are compatible with each other.</li>
<li><strong>FRAMEWORK_*</strong> -- These are always the current
stable branches that contains bug fixes for the next release. Modules
within the same FRAMEWORK_* branch are compatible with each
other.</li>
</ol>

<p><em>Framework library</em> modules usually only contains a
single <strong>master</strong> branch that may either contain bug fixes
for the next stable release, or new features for the next feature
release. Only if there are backward compatibility breaks, there may be
additional maitenance branches for earlier major releases.</p>
</div>
</div>
<div class="rightcol" style="background: none;"><?php echo $this->render('sponsors'); ?></div>
Expand Down

0 comments on commit ed40526

Please sign in to comment.