Remove 2.2 news and notes, and add add 2.1.7.

svn path=/main/branches/2.1.7/; revision=14547

diff --git a/NEWS b/NEWS
index fed816beefa6b1cfdb03ffcd1e6b0fd5d568c79a..fe000d10de8ca01b96fee0ec6aca64faf3befd0e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,12 +1,9 @@
 News (mainly features/major bug fixes)
 
-portage-2.2
+portage-2.1.7
 -------------
 
-* Add link level dependency awareness to emerge --depclean and --prune actions
-  in order to protect against uninstallation of required libraries.
 * Add license visibility filtering (GLEP 23)
-* Add support for generic package sets (also see RELEASE-NOTES)
 * Add --accept-properties option for emerge which allows you to use
   --accept-properties=-interactive in order to temporarily exclude
   interactive updates.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 0265af1c1453848adb9adee746286d6b5b6e84d9..ec78be60555b2d3aa06728a0a91cbddae3ecfc1b 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,26 +1,6 @@
 Release Notes; upgrade information mainly.
 Features/major bugfixes are listed in NEWS
 
-portage-2.2
-==================================
-
-* Portage now warns if an ebuild repository does not have a name, as several
-  new features in 2.2 make use of or require named repositories. The repository
-  name is stored in profiles/repo_name in each repository.
-* Package set support: There are several important notes regarding package
-  sets:
-  - setnames have to be prefixed with @ (exceptions: 'world' and 'system' can
-    be used without the prefix)
-  - they may currently only include simple and versioned atoms or other sets,
-    use conditionals or any-of constructs aren't possible yet
-  - sets can be referenced either in other file-based sets or as argument to
-    emerge, but not in ebuilds, config files or other tools at this time.
-  - packages won't be unmerged if they are referenced by an installed package
-    set (with the exception of the world set, and installed being determined
-    by the world_sets file).
-* "world" no longer includes "system" unconditionally, but you can add
-  "@system" to the world_sets file to restore the old state.
-
 portage-2.1.6.12
 ==================================
 * If you want overlay eclasses to override eclasses from other repos then see