- merge descriptions from AC-branch

Changed files:
    X11-driver-nvidia.spec -> 1.94

diff --git a/X11-driver-nvidia.spec b/X11-driver-nvidia.spec
index 9935e34eacf369a39b91a29212d040d87d79eee3..7093a21bdf2c199e163cc67bb09fb0b68506f836 100644 (file)
--- a/X11-driver-nvidia.spec
+++ b/X11-driver-nvidia.spec
@@ -89,31 +89,28 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %endif
 
 %description
-This driver set adds improved 2D functionality to the Xorg/XFree86 X
-server as well as high performance OpenGL acceleration, AGP support,
-support for most flat panels, and 2D multiple monitor support.
-
-Supported hardware: new NVIDIA GeForce (from GeForce2 MX) and Quadro
-(Quadro4 and up) based graphics accelerators.
+This driver set adds improved 2D functionality to the Xorg X server as
+well as high performance OpenGL acceleration, AGP support, support for
+most flat panels, and 2D multiple monitor support. Supported hardware:
+modern NVIDIA GeForce (from GeForce2 MX) and Quadro (Quadro4 and up)
+based graphics accelerators.
 
 The older graphics chips are unsupported:
-- NV1 and RIVA 128/128ZX chips are supported in the base Xorg
-  install (nv driver)
-- TNT/TNT2/GeForce 256/GeForce2 Ultra/Quadro2 are suported by
-  X11-driver-nvidia-legacy drivers.
+- NV1 and RIVA 128/128ZX chips are supported in the base Xorg install
+  (nv driver)
+- TNT/TNT2/GeForce 256/GeForce2 Ultra/Quadro2 are suported by -legacy
+  drivers.
 
 %description -l pl
-Usprawnione sterowniki dla kart graficznych nVidia do serwera
-Xorg/XFree86, daj±ce wysokowydajn± akceleracjê OpenGL, obs³ugê AGP 
-i wielu monitorów 2D.
-
-Obs³uguj± w miarê nowe karty NVIDIA GeForce (od wersji GeForce2 MX)
-oraz Quadro (od wersji Quadro4).
+Usprawnione sterowniki dla kart graficznych NVIDIA do serwera Xorg,
+daj±ce wysokowydajn± akceleracjê OpenGL, obs³ugê AGP i wielu monitorów
+2D. Obs³uguj± w miarê nowe karty NVIDIA GeForce (od wersji GeForce2
+MX) oraz Quadro (od wersji Quadro4) do serwera Xorg/XFree86.
 
 Starsze uk³ady graficzne NVIDIA nie s± obs³ugiwane przez ten pakiet:
 - NV1 i Riva 128/128ZX s± obs³ugiwane przez sterownik nv z Xorg.
 - TNT/TNT2/GeForce 256/GeForce2 Ultra/Quadro2 obs³ugiwane s± przez
-  sterownik NVIDIA z pakietu X11-driver-nvidia-legacy.
+  sterownik NVIDIA w wersji -legacy.
 
 %package devel
 Summary:       OpenGL for X11R6 development (only gl?.h)