[releng] Merge API, UI and Feature Freeze into 'The Freeze'

[Andre Klapper <aklapper src gnome org>]

commit 0b462227d4e303ff1a74ece8970f0f2970b3795b
Author: Andre Klapper <a9016009 gmx de>
Date:   Thu Jan 12 20:57:44 2012 +0100

    Merge API, UI and Feature Freeze into 'The Freeze'

 tools/schedule/libschedule.py |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)
---
diff --git a/tools/schedule/libschedule.py b/tools/schedule/libschedule.py
index e994b8e..ad41b44 100755
--- a/tools/schedule/libschedule.py
+++ b/tools/schedule/libschedule.py
@@ -36,16 +36,23 @@ class GnomeReleaseEvent:
                 },
                 'release': 'GNOME $version $detail release',
                 'freeze': {
+                    'feature': '[[ReleasePlanning/Freezes|Feature and Module Freeze]]: new system-wide functionality and modules are chosen now.',
+                    'the-freeze': 'The Freeze: [[ReleasePlanning/Freezes|UI Freeze]]: No UI changes may be made without approval from the [[http://mail.gnome.org/mailman/listinfo/release-team|release-team]] and notification to [[http://mail.gnome.org/mailman/listinfo/gnome-doc-list|gnome-doc-list ]]; [[ReleasePlanning/Freezes|Feature Freeze]]: new functionality is implemented now; [[ReleasePlanning/Freezes|API/ABI Freeze]] for $unstable.x: Developer APIs should be frozen at this point; String Change Announcement Period: All string changes must be announced to both [[http://mail.gnome.org/mailman/listinfo/gnome-i18n|gnome-i18n ]] and [[http://mail.gnome.org/mailman/listinfo/gnome-doc-list|gnome-doc-list ]] ',
+                    'string': '[[ReleasePlanning/Freezes|String Freeze]]: no string changes may be made without confirmation from the l10n team ([[http://mail.gnome.org/mailman/listinfo/gnome-i18n|gnome-i18n ]]) and notification to both the release team and the GDP ([[http://mail.gnome.org/mailman/listinfo/gnome-doc-list|gnome-doc-list ]]).',
+                    'hard-code': '[[ReleasePlanning/Freezes|Hard Code Freeze]]: no source code changes can be made without approval from the [[http://mail.gnome.org/mailman/listinfo/release-team|release-team]]. Translation and documentation can continue.',
+                    'hard-code-end': 'Hard Code Freeze ends, but other freezes remain in effect for the stable branch.',
+                    # 'string-announcement' merged into 'the-freeze' for 3.3
                     'string-announcement': 'String Change Announcement Period: All string changes must be announced to both [[http://mail.gnome.org/mailman/listinfo/gnome-i18n|gnome-i18n ]] and [[http://mail.gnome.org/mailman/listinfo/gnome-doc-list|gnome-doc-list ]] ',
+                    # 'ui-announcement' not used anymore since 3.3
                     'ui-announcement': 'UI Change Announcement Period: All user interface changes must be announced to [[http://mail.gnome.org/mailman/listinfo/gnome-doc-list|gnome-doc-list ]] ',
+                    # 'api' merged into 'the-freeze' for 3.3
                     'api': '[[ReleasePlanning/Freezes|API/ABI Freeze]] for $unstable.x: developer APIs should be frozen at this point.',
+                    # 'module' not used anymore since 3.1, replaced by 'feature'
                     'module': '[[ReleasePlanning/Freezes|Module Freeze]]: new modules are chosen now.',
-                    'feature': '[[ReleasePlanning/Freezes|Feature and Module Freeze]]: new system-wide functionality and modules are chosen now.',
+                    # 'feature2' merged into 'the-freeze' for 3.3
                     'feature2': '[[ReleasePlanning/Freezes|Feature Freeze]]: new functionality is implemented now.',
-                    'ui': '[[ReleasePlanning/Freezes|UI Freeze]]: No UI changes may be made without approval from the [[http://mail.gnome.org/mailman/listinfo/release-team|release-team]] and notification to the GDP ([[http://mail.gnome.org/mailman/listinfo/gnome-doc-list|gnome-doc-list ]])',
-                    'string': '[[ReleasePlanning/Freezes|String Freeze]]: no string changes may be made without confirmation from the l10n team ([[http://mail.gnome.org/mailman/listinfo/gnome-i18n|gnome-i18n ]]) and notification to both the release team and the GDP ([[http://mail.gnome.org/mailman/listinfo/gnome-doc-list|gnome-doc-list ]]).',
-                    'hard-code': '[[ReleasePlanning/Freezes|Hard Code Freeze]]: no source code changes can be made without approval from the [[http://mail.gnome.org/mailman/listinfo/release-team|release-team]]. Translation and documentation can continue.',
-                    'hard-code-end': 'Hard Code Freeze ends, but other freezes remain in effect for the stable branch.'
+                    # 'ui' merged into 'the-freeze' for 3.3
+                    'ui': '[[ReleasePlanning/Freezes|UI Freeze]]: No UI changes may be made without approval from the [[http://mail.gnome.org/mailman/listinfo/release-team|release-team]] and notification to the GDP ([[http://mail.gnome.org/mailman/listinfo/gnome-doc-list|gnome-doc-list ]])'
                 },
                 'task': {
                     'api-doc': '[[http://live.gnome.org/ReleasePlanning/ModuleRequirements/Platform#head-2a21facd40d5bf2d73f088cd355aa98b6a2458df|New APIs must be fully documented]]',