From 2b82ff20b1e72c28fa152a6651b35d827b6dbb03 Mon Sep 17 00:00:00 2001
From: Zach Loafman <zml@google.com>
Date: Tue, 14 Jun 2016 09:01:53 -0700
Subject: Revert "Redo v1.4.0-alpha.0"

This reverts commit c7f1485e1b3491e98f102c30e7e342cb53dda818, reversing
changes made to 939ad4115a2a96f1e18758ec45b7d312bec65aa7.
---
 workflow.md | 50 ++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 36 insertions(+), 14 deletions(-)

(limited to 'workflow.md')

diff --git a/workflow.md b/workflow.md
index 068f0fe8..ca91793f 100644
--- a/workflow.md
+++ b/workflow.md
@@ -1,5 +1,34 @@
 <!-- BEGIN MUNGE: UNVERSIONED_WARNING -->
 
+<!-- BEGIN STRIP_FOR_RELEASE -->
+
+<img src="http://kubernetes.io/img/warning.png" alt="WARNING"
+     width="25" height="25">
+<img src="http://kubernetes.io/img/warning.png" alt="WARNING"
+     width="25" height="25">
+<img src="http://kubernetes.io/img/warning.png" alt="WARNING"
+     width="25" height="25">
+<img src="http://kubernetes.io/img/warning.png" alt="WARNING"
+     width="25" height="25">
+<img src="http://kubernetes.io/img/warning.png" alt="WARNING"
+     width="25" height="25">
+
+<h2>PLEASE NOTE: This document applies to the HEAD of the source tree</h2>
+
+If you are using a released version of Kubernetes, you should
+refer to the docs that go with that version.
+
+<!-- TAG RELEASE_LINK, added by the munger automatically -->
+<strong>
+The latest release of this document can be found
+[here](http://releases.k8s.io/release-1.2/docs/proposals/workflow.md).
+
+Documentation for other releases can be found at
+[releases.k8s.io](http://releases.k8s.io).
+</strong>
+--
+
+<!-- END STRIP_FOR_RELEASE -->
 
 <!-- END MUNGE: UNVERSIONED_WARNING -->
 
@@ -55,13 +84,13 @@ type Workflow struct {
   unversioned.TypeMeta `json:",inline"`
 
   // Standard object's metadata.
-  // More info: http://releases.k8s.io/v1.4.0-alpha.0/docs/devel/api-conventions.md#metadata.
+  // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata.
   api.ObjectMeta `json:"metadata,omitempty"`
 
-  // Spec defines the expected behavior of a Workflow. More info: http://releases.k8s.io/v1.4.0-alpha.0/docs/devel/api-conventions.md#spec-and-status.
+  // Spec defines the expected behavior of a Workflow. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status.
   Spec WorkflowSpec `json:"spec,omitempty"`
 
-  // Status represents the current status of the Workflow. More info: http://releases.k8s.io/v1.4.0-alpha.0/docs/devel/api-conventions.md#spec-and-status.
+  // Status represents the current status of the Workflow. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status.
   Status WorkflowStatus `json:"status,omitempty"`
 }
 
@@ -70,7 +99,7 @@ type WorkflowList struct {
   unversioned.TypeMeta `json:",inline"`
 
   // Standard list metadata
-  // More info: http://releases.k8s.io/v1.4.0-alpha.0/docs/devel/api-conventions.md#metadata
+  // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
   unversioned.ListMeta `json:"metadata,omitempty"`
 
   // Items is the list of Workflow
@@ -80,7 +109,7 @@ type WorkflowList struct {
 // WorkflowSpec contains Workflow specification
 type WorkflowSpec struct {
   // Standard object's metadata.
-  // More info: http://releases.k8s.io/v1.4.0-alpha.0/docs/devel/api-conventions.md#metadata
+  // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
   api.ObjectMeta `json:"metadata,omitempty"`
 
   //ActiveDealineSeconds contains
@@ -174,11 +203,11 @@ Reported for readability:
 ```go
 type JobTemplateSpec struct {
   // Standard object's metadata.
-  // More info: http://releases.k8s.io/v1.4.0-alpha.0/docs/devel/api-conventions.md#metadata
+  // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
   api.ObjectMeta
 
   // Spec is a structure defining the expected behavior of a job.
-  // More info: http://releases.k8s.io/v1.4.0-alpha.0/docs/devel/api-conventions.md#spec-and-status
+  // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status
   Spec JobSpec
 }
 ```
@@ -266,13 +295,6 @@ another whole `Workflow`) we have chosen the more generic word `Step`.
 <sup>2</sup>A very common feature in industrial strength workflow tools.
 
 
-
-
-<!-- BEGIN MUNGE: IS_VERSIONED -->
-<!-- TAG IS_VERSIONED -->
-<!-- END MUNGE: IS_VERSIONED -->
-
-
 <!-- BEGIN MUNGE: GENERATED_ANALYTICS -->
 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/proposals/workflow.md?pixel)]()
 <!-- END MUNGE: GENERATED_ANALYTICS -->
-- 
cgit v1.2.3