Changes between Version 13 and Version 14 of QtWebKitReleases

Timestamp:

Oct 20, 2010 11:11:43 AM (14 years ago)

Author:

Ademar Reis

Comment:

--

QtWebKitReleases

@@ -11 +11 @@
 
  * Tracker bug for critical fixes: https://bugs.webkit.org/show_bug.cgi?id=35784
+ * [http://trac.webkit.org/wiki/QtWebKitTableOfFeatures20 Internal Release Notes]
 
 === QtWebKit 2.1 ===
@@ -18 +19 @@
  * Tracker bug for critical fixes: https://bugs.webkit.org/show_bug.cgi?id=39121
  * Tracker bug for candidate fixes: https://bugs.webkit.org/show_bug.cgi?id=44677
+ * [http://trac.webkit.org/wiki/QtWebKitFeatures21 Internal Release Notes]
 
 == Release branch creation ==
@@ -27 +29 @@
 == Getting changes into a release branch ==
 
-After the release branch has been created there are two ways to integrate changes:
+If you'd like to include a patch in the release branch, please consider only fixes that:
+
+  * Fix data corruption
+  * Fix crashes
+  * Fix a previously broken build
+  * Regression from the last minor release
+  * Documentation changes
+  * Crucial usability issue (after discussion in the mailing list)
+
+There are two ways to integrate changes into a release branch:
 
   * The commit is landed in the trunk and then it is cherry-picked into the release branch.
@@ -45 +56 @@
 
 After the release we have to make a concentrated effort in reducing the number of exceptional patches, by reviewing the changes in the bugs that the tracker bug (32653) depends on.
-
-== Cherry-picking changes into the release branch ==
-
-If you'd like to include a patch in the release branch, please consider only fixes that
-
-    * fix data corruption
-    * fix crashes
-    * fixes a previously broken build
-    * regression from the last minor release
-    * documentation changes
-    * crucial usability issue (after discussion the mailing list)
-
-The separate [wiki:"QtWebKitBackportingFixes" Backporting Fixes] page tracks the changes to include, both changes from the trunk as well as exceptional patches.
 
 == Proposal for release testing ==