svn merge ^/branches/released .

1 files changed, 48 insertions, 45 deletions

diff --git a/xorg-server/xkeyboard-config/NEWS b/xorg-server/xkeyboard-config/NEWS
index c6411f6f0..a8e3e940e 100644
--- a/xorg-server/xkeyboard-config/NEWS
+++ b/xorg-server/xkeyboard-config/NEWS
@@ -1,45 +1,48 @@
-2.1	Bugfixes (13). Updated/new translations. Some new layouts and models.
-2.0	Bugfixes (17). Updated/new translations. Some new layouts and models.
-1.9	Bugfixes (27). Updated/new translations. Some new layouts and models.
-	The evdev model is gone, use pc105 instead.
-	Some fixes for the build process
-1.8	Bugfixes (10). Updated/new translations. Some new layouts and models. 
-1.7	Bugfixes (30). Updated/new translations. Some new layouts and models. 
-1.6	Bugfixes (36). Updated/new translations. Some new layouts and models. 
-	Added terminate:* group
-	Dropped locale-specific models
-	Improved compat rules
-1.5	Bugfixes (45). Updated/new translations. Some new layouts and models. Serious cleanup in symbols/inet.
-1.4	Bugfixes (31). Updated/new translations. Some new layouts and models. Added evdev ruleset.
-1.3	Bugfixes (35). Updated/new translations. Some new layouts and models. A lot of country and language-related information put into base.xml. Dropped unsupported rulesets sgi and sun.
-1.2	Bugfixes (36). Updated/new translations, renewed relations with TP. Some new layouts and models. A lot of changes from OLPC project. Changed base.xml merging schema (.gmo files are installed and used explicitly)
-1.1	First time-based release. Bugfixes (27). Updated/new translations, renewed relations with TP. Renamed (for clarity) types. Some new layouts and models.
-1.0	Maintenance release. Bugfixes (72). Updated/new translations. Updated/new layouts and models.
-0.9	Maintenance release. Bugfixes (76). Updated/new translations. Updated/new layouts.
-0.8	Maintenance release. Bugfixes. Updated/new translations. Updated/new layouts.
-	Massive patch from Sun Microsystems incorporated.
-0.7	New layouts and keyboard models (mostly media keyboards)
-	Massive reorganization of the symbols/inet file (huge credits to Frederic Boiteux)
-	Improved RAlt handling (for grp:alts_toggle and lvl3:ralt_switch)
-	A lot of bugs fixed (from fd.o bugzilla)
-	Added more translations.
-0.5	More bugs from freedesktop.org bugzilla fixed.
-	The group names now are matching the descriptions - and the validating
-	scripts are implemented.
-	Some layouts, variants, models are added/fixed.
-	Some translations are updated (though the overall translation activity 
-	is disappointinly low).
-0.4	A lot of fixes and polishing (introduced own CVS keyword).
-	Highlights:
-	More universal EURO-related options added.
-	Improved reorganized indicator handling.
-	More logical level3 handling
-0.3	HEAVILY restructured layout names
-	Compatibility rules are introduced
-	intltool problem resolved (sorry, with warnings)
-0.2	Now automatically create symlink for xkbcomp (XFree/XOrg servers need it).
-	Added HOWTO.transition.
-        Added Maori layout.
-	Fixed bug 515.
-0.1	First public release. 
-	XKB configuration only. Restructured layouts tree. Only additive layouts are included. No compatibility rules.
+2.1.99	Prerelease for 2.2. Major changes in descriptions: for GNOME3 release

+	Some new layouts and models. Translations are not updated.

+	Checking runtime dependencies at build time

+2.1	Bugfixes (13). Updated/new translations. Some new layouts and models.

+2.0	Bugfixes (17). Updated/new translations. Some new layouts and models.

+1.9	Bugfixes (27). Updated/new translations. Some new layouts and models.

+	The evdev model is gone, use pc105 instead.

+	Some fixes for the build process

+1.8	Bugfixes (10). Updated/new translations. Some new layouts and models. 

+1.7	Bugfixes (30). Updated/new translations. Some new layouts and models. 

+1.6	Bugfixes (36). Updated/new translations. Some new layouts and models. 

+	Added terminate:* group

+	Dropped locale-specific models

+	Improved compat rules

+1.5	Bugfixes (45). Updated/new translations. Some new layouts and models. Serious cleanup in symbols/inet.

+1.4	Bugfixes (31). Updated/new translations. Some new layouts and models. Added evdev ruleset.

+1.3	Bugfixes (35). Updated/new translations. Some new layouts and models. A lot of country and language-related information put into base.xml. Dropped unsupported rulesets sgi and sun.

+1.2	Bugfixes (36). Updated/new translations, renewed relations with TP. Some new layouts and models. A lot of changes from OLPC project. Changed base.xml merging schema (.gmo files are installed and used explicitly)

+1.1	First time-based release. Bugfixes (27). Updated/new translations, renewed relations with TP. Renamed (for clarity) types. Some new layouts and models.

+1.0	Maintenance release. Bugfixes (72). Updated/new translations. Updated/new layouts and models.

+0.9	Maintenance release. Bugfixes (76). Updated/new translations. Updated/new layouts.

+0.8	Maintenance release. Bugfixes. Updated/new translations. Updated/new layouts.

+	Massive patch from Sun Microsystems incorporated.

+0.7	New layouts and keyboard models (mostly media keyboards)

+	Massive reorganization of the symbols/inet file (huge credits to Frederic Boiteux)

+	Improved RAlt handling (for grp:alts_toggle and lvl3:ralt_switch)

+	A lot of bugs fixed (from fd.o bugzilla)

+	Added more translations.

+0.5	More bugs from freedesktop.org bugzilla fixed.

+	The group names now are matching the descriptions - and the validating

+	scripts are implemented.

+	Some layouts, variants, models are added/fixed.

+	Some translations are updated (though the overall translation activity 

+	is disappointinly low).

+0.4	A lot of fixes and polishing (introduced own CVS keyword).

+	Highlights:

+	More universal EURO-related options added.

+	Improved reorganized indicator handling.

+	More logical level3 handling

+0.3	HEAVILY restructured layout names

+	Compatibility rules are introduced

+	intltool problem resolved (sorry, with warnings)

+0.2	Now automatically create symlink for xkbcomp (XFree/XOrg servers need it).

+	Added HOWTO.transition.

+        Added Maori layout.

+	Fixed bug 515.

+0.1	First public release. 

+	XKB configuration only. Restructured layouts tree. Only additive layouts are included. No compatibility rules.