Remove Fluorine and Neon columns

Also, correct the grammar of the opening paragraph

Change-Id: I6cd3ee10e848dfdbdaee73be856dffdb1e8ce330
Signed-off-by: dbaugher <dbaugher@luminanetworks.com>
Correct whitespaces in opening paragraph

Change-Id: I736d61e7987a6c85ead6abbd735908603527da59
Signed-off-by: dbaugher <dbaugher@luminanetworks.com>

diff --git a/docs/release-process/release-schedule.rst b/docs/release-process/release-schedule.rst
index 5e692c0c46a5bf2c2066de035e9dfdb70eb6c979..08213b52f798cb5951d297ef666643f479846a58 100644 (file)
--- a/docs/release-process/release-schedule.rst
+++ b/docs/release-process/release-schedule.rst
@@ -2,34 +2,26 @@
 Release Schedule
 ================
 
-OpenDaylight releases twice per year.The six-month aspect of the cadence was designed to synchronize OpenDaylight
-releases with OpenStack and OPNFV releases. As of today, these dates have been adjusted to match the current resource availability and requirement from current OpenDaylight users. Based on that, we have decided to produce three service releases from now on, so no more SR4 .
-Dates may be manually adjusted if they conflict with holidays, overlap or are otherwise problematic. These dates include the release of both managed and self-managed projects.
+OpenDaylight releases twice per year. The six-month cadence is designed to synchronize OpenDaylight releases with OpenStack and OPNFV releases. Dates are adjusted to match current resources and requirements from the current OpenDaylight users. Dates are also adjusted when they conflict with holidays, overlap with other releases or are otherwise problematic. Dates include the release of both managed and self-managed projects.
 
 .. list-table::
-   :widths: 20 20 20 20 20 20 40
+   :widths: 20 20 20 20 40
    :header-rows: 1
    :stub-columns: 1
 
    * - **Event**
-     - **Fluorine Date**
-     - **Neon Date**
      - **Sodium Date Tentative**
      - **Relative Date**
      - **Start-Relative Date**
      - **Description**
 
    * - Release Start
-     - 2018-03-07
-     - 2018-09-06
      - 2019-03-07
      - Start Date
      - Start Date +0
      - Declare Intention: Submit **Project_Plan** Jira item in TSC project
 
    * - Initial Checkpoint
-     - 2018-03-22
-     - 2018-09-20
      - 2019-03-21
      - Start Date + 2 weeks
      - Start Date +2 weeks
@@ -37,8 +29,6 @@ Dates may be manually adjusted if they conflict with holidays, overlap or are ot
        **Project_Plan** Jira items in TSC project.
 
    * - Release Integrated Deadline
-     - 2018-04-07
-     - 2018-10-04
      - 2019-04-11
      - Initial Checkpoint + 2 weeks
      - Start Date +4 weeks
@@ -48,8 +38,6 @@ Dates may be manually adjusted if they conflict with holidays, overlap or are ot
        For Sodium, this is +1 more week to resolve conflict with ONS NA 2019.
 
    * - Version Bump
-     - 2018-04-08
-     - 2018-10-05
      - 2019-04-12
      - Release Integrated Deadline + 1 day
      - Start Date +4 weeks 1 day
@@ -58,8 +46,6 @@ Dates may be manually adjusted if they conflict with holidays, overlap or are ot
        distribution.
 
    * - Version Bump Checkpoint
-     - 2018-04-21
-     - 2018-10-18
      - 2019-04-25
      - Release Integrated Deadline + 2 weeks
      - Start Date +6 weeks
@@ -67,8 +53,6 @@ Dates may be manually adjusted if they conflict with holidays, overlap or are ot
        healthy distribution. Revert the MRI deliverables if deemed necessary.
 
    * - CSIT Checkpoint
-     - 2018-05-07
-     - 2018-11-01
      - 2019-05-09
      - Version Bump Checkpoint + 2 weeks
      - Start Date +8 weeks
@@ -77,8 +61,6 @@ Dates may be manually adjusted if they conflict with holidays, overlap or are ot
        opportunity to revert the MRI deliverables if deemed necessary.
 
    * - Middle Checkpoint
-     - 2018-07-05
-     - 2019-01-10
      - 2019-07-04
      - CSIT Checkpoint + 8 weeks (sometimes +2 weeks to avoid December holidays)
      - Start Date +16 weeks (sometimes +2 weeks to avoid December holidays)
@@ -86,8 +68,6 @@ Dates may be manually adjusted if they conflict with holidays, overlap or are ot
        Integrated Projects.
 
    * - Code Freeze
-     - 2018-08-07
-     - 2019-01-24
      - 2019-08-01
      - Middle Checkpoint + 4 weeks
      - Start Date +20 weeks
@@ -95,56 +75,42 @@ Dates may be manually adjusted if they conflict with holidays, overlap or are ot
        allow blocker bugfixes in release branch.
 
    * - Final Checkpoint
-     - 2018-08-23
-     - 2019-02-07
      - 2019-08-15
      - Code Freeze + 2 weeks
      - Start Date +22 weeks
      - Final Checkpoint for all Managed Projects.
 
    * - Formal Release
-     - 2018-09-07
-     - 2019-03-25
      - 2019-09-05
      - 6 months after Start Date
      - Start Date +6 months
      - Formal release
 
    * - Service Release 1
-     - 2018-11-25
-     - 2019-05-16
      - 2019-10-17
      - 1.5 month after Formal Release
      - Start Date +7.5 months
      - Service Release 1 (SR1)
 
    * - Service Release 2
-     - 2019-02-07
-     - 2019-08-08
      - 2020-01-16
      - 3 months after SR1
      - Start Date +10.5 months
      - Service Release 2 (SR2)
 
    * - Service Release 3
-     - 2019-06-21
-     - 2019-12-05
      - 2020-05-07
      - 4 months after SR2
      - Start Date +14 months
      - Service Release 3 (SR3) - Final Service Release
 
    * - Service Release 4
-     - N/A
-     - N/A
      - N/A
      - Not Available Anymore
      - Not Available Anymore
      - Service Release 4 (SR4) - N/A
 
    * - Release End of Life
-     - 2019-09-07
-     - 2020-03-25
      - 2020-09-05
      - 4 months after SR3
      - Start Date +18 months