From d9ad9753eea759f32e22f95d21d51db00f7907a6 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sat, 2 Jan 2016 17:36:11 +0000
Subject: [PATCH] add release cycle documentation

---
 .../get-involved/guides/dev-guidelines.html   | 46 ++++++++++++++++++-
 1 file changed, 45 insertions(+), 1 deletion(-)

diff --git a/i2p2www/pages/site/get-involved/guides/dev-guidelines.html b/i2p2www/pages/site/get-involved/guides/dev-guidelines.html
index 68712f3e..20cef19d 100644
--- a/i2p2www/pages/site/get-involved/guides/dev-guidelines.html
+++ b/i2p2www/pages/site/get-involved/guides/dev-guidelines.html
@@ -1,6 +1,6 @@
 {% extends "global/layout.html" %}
 {% block title %}{{ _('Developer Guidelines and Coding Style') }}{% endblock %}
-{% block lastupdated %}{% trans %}November 2015{% endtrans %}{% endblock %}
+{% block lastupdated %}{% trans %}January 2016{% endtrans %}{% endblock %}
 {% block content %}
 <p>{% trans newdevs=site_url('get-involved/guides/new-developers') -%}
 Read the <a href="{{ newdevs }}">new developers guide</a> first.
@@ -31,6 +31,50 @@ the checkin deadline for a release.
 {%- endtrans %}</li>
 </ul>
 
+
+<h3>{{ _('Release Cycle') }}</h3>
+<p>{% trans -%}
+Our normal release cycle is 6-10 weeks.
+Following are the approximate deadlines within a typical 8-week cycle.
+Actual deadlines for each release are set by the lead developer.
+{%- endtrans %}</p>
+
+<ul>
+<li>{% trans -%}
+1-2 days after previous release: Checkins to trunk are allowed.
+{%- endtrans %}</li>
+<li>{% trans -%}
+2-3 weeks after previous release: Deadline to propagate major changes from other branches to trunk.
+{%- endtrans %}</li>
+<li>{% trans -%}
+4-5 weeks before release: Deadline to request new home page links.
+{%- endtrans %}</li>
+<li>{% trans -%}
+3-4 weeks before release: Feature freeze. Deadline for major new features.
+{%- endtrans %}</li>
+<li>{% trans -%}
+2-3 weeks before release: Hold project meeting to review new home page link requests, if any.
+{%- endtrans %}</li>
+<li>{% trans -%}
+7-10 days before release: String freeze. No more changes to translated ("tagged") strings.
+Push strings to Transifex, announce translation deadline on Transifex.
+{%- endtrans %}</li>
+<li>{% trans -%}
+7-10 days before release: Feature deadline. Bug fixes only after this time. No more features, refactoring or cleanup.
+{%- endtrans %}</li>
+<li>{% trans -%}
+3-4 days before release: Translation deadline. Pull translations from Transifex and check in.
+{%- endtrans %}</li>
+<li>{% trans -%}
+2-3 days before release: Checkin deadline. No checkins after this time without the permission of the release builder.
+{%- endtrans %}</li>
+<li>{% trans -%}
+Hours before release: Code review deadline.
+{%- endtrans %}</li>
+</ul>
+
+
+
 <h3>Monotone</h3>
 <ul>
 <li>{% trans -%}