diff --git a/governing-documents/project-lifecycle.gv b/governing-documents/project-lifecycle.gv
index d0ae761e..f0d07cbd 100644
--- a/governing-documents/project-lifecycle.gv
+++ b/governing-documents/project-lifecycle.gv
@@ -1,16 +1,14 @@
digraph lifecycle {
node [shape=box]
- EndOfLife [label="End of Life"]
- //rank=same; Proposal; Incubation; Graduated; Dormant; Deprecated; EndOfLife;
- Proposal -> Incubation
Incubation [color=purple];
- Incubation -> Graduated [color = purple];
+ Incubation -> Graduated [color=purple, weight=1];
+ Incubation -> Dormant [color=purple, weight=0];
Graduated [color=blue];
- Graduated -> Dormant [color = blue];
- Dormant [color=red];
- Dormant -> Deprecated [color = red];
- Deprecated -> EndOfLife;
- Incubation -> { Dormant Deprecated EndOfLife } [color = purple];
- Graduated -> { Deprecated EndOfLife } [color = blue];
- Dormant -> { Incubation EndOfLife } [color = red];
+ Graduated -> Incubation [color=blue, weight=0];
+ Graduated -> Dormant [color=blue, weight=1];
+ Dormant [color=black];
+ Dormant:e -> Incubation [weight=0];
+ Dormant -> Archived
+ Archived [color=green]
+ Archived:e -> Incubation:e [weight=0, color=green];
}
diff --git a/governing-documents/project-lifecycle.md b/governing-documents/project-lifecycle.md
index 4da81e1e..028468c5 100644
--- a/governing-documents/project-lifecycle.md
+++ b/governing-documents/project-lifecycle.md
@@ -31,14 +31,12 @@ follows:
.
-Projects are in one of six possible states:
+Projects are in one of four possible states:
-- [*Proposal*](#proposal)
- [*Incubation*](#incubation)
- [*Graduated*](#graduated)
- [*Dormant*](#dormant)
-- [*Deprecated*](#deprecated)
-- [*End of Life*](#end-of-life)
+- [*Archived*](#archived)
Projects may not necessarily move through those states in a linear way
and may go through several iterations.
@@ -92,29 +90,38 @@ the criteria defined in the
Projects that have successfully exited the *Incubation* phase
are in the *Graduated* phase.
+The TOC may decide to move a *Graduated* project that no longer meets
+the [Incubation Exit Criteria](./project-incubation-exit.md) back to
+the *Incubation* state until it meets the criteria again.
+
# Dormant
+(Covers the state formerly known as 'Deprecated')
+
Projects enter the *Dormant* state when the normal functions are
-suspended or slowed down for a period of time. The TOC decides to move a project to or from the *Dormant* state upon request.
+suspended, slowed down for a period of time, or the project is being
+deprecated.
+
+When possible, the maintainers of the project shall vote on such a change
+of state and if it passes, make that recommendation to the TOC, but
+anyone may propose that a project be moved to *Dormant* state. Members
+of the community who disagree with the request can make their case
+before the TOC. The TOC will consider all points of view and render a
+final decision.
+
If *Dormant* projects are re-activated, they re-enter the *Incubation*
state even if they entered the *Dormant* state from the *Graduated* state.
-# Deprecated
-Anyone may propose that a project be *Deprecated* by submitting a
-rationale and identifying a substitute project or component, if any. The
-maintainers of the project shall vote on such a request and if it
-passes, make that recommendation to the TOC. Members of the community
-that disagree with the request can make their case before the TOC. The
-TOC will consider all points of view and render a final decision
-whether to deprecate.
+# Archived
+
+(Formerly called 'End of Life')
-A *Deprecated* project will be maintained for a six month
-period by its community, after which it will be removed from any
-subsequent formal releases. Notice will be given to the public of the
-project deprecation. After the six-month deprecation
-period, the project will be labeled *End of Life*.
+Projects that have been in the *Dormant* state for a period of 6 months
+will be automatically archived.
-# End of Life
+If anyone wants to resume work on an *Archived* project they may
+submit a proposal to the TOC for consideration.
-A project that is no longer actively developed or maintained.
+If an *Archived* project is re-activated, it re-enters the *Incubation*
+state independent of its prior history.
diff --git a/governing-documents/project-lifecycle.svg b/governing-documents/project-lifecycle.svg
index 994a1e87..07a751b8 100644
--- a/governing-documents/project-lifecycle.svg
+++ b/governing-documents/project-lifecycle.svg
@@ -1,121 +1,79 @@
-
-