Add some terms.

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 17ba22de3ac107a3c4d623b4bdada95fa4259118..31492cde077212244376e3235c3d4602c1d181b2 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,5 +1,7 @@
 2004-10-11  Matthias Clasen  <matthias@localhost.localdomain>
 
+       * gtk/glossary.xml: Add some terms.
+
        * gtk/tmpl/*.sgml: Make the short descriptions a bit more
        consistent.
 

diff --git a/docs/reference/gtk/glossary.xml b/docs/reference/gtk/glossary.xml
index 3c2e54099b5d00b4ca415ce75075e1ad8b207730..0035f94830db1a10a5899fabd754afb831892a41 100644 (file)
--- a/docs/reference/gtk/glossary.xml
+++ b/docs/reference/gtk/glossary.xml
@@ -83,7 +83,14 @@
     <glossterm>display</glossterm>
     <glossdef>
       <para>
-       FIXME
+        GDK inherited the concept of display from the X window system,
+        which considers a display to be the combination
+        of a keyboard, a pointing device and one or more 
+        <glossterm linkend="screen">screens</glossterm>. 
+        Applications open a display to show <glossterm 
+        linkend="window">windows</glossterm> and interact with the user.
+        In GDK, a display is represented by a 
+        <link linkend="GdkDisplay">GdkDisplay</link>.
       </para>
     </glossdef>
   </glossentry>
@@ -228,8 +235,15 @@
     <glossterm>screen</glossterm>
     <glossdef>
       <para>
-       FIXME
-      </para>
+       GDK inherited the concept of screen from the X window system, 
+        which considers a screen to be a rectangular area, on which 
+        applications may place their windows. Each screen has a 
+        <glossterm linkend="rootwindow">root window</glossterm> which
+        defines the area of the screen. Screens under X may have quite
+        dissimilar <glossterm linkend="visual">visuals</visuals>.
+        Each screen can stretch across multiple physical monitors.
+        In GDK, screens are represented by 
+        <link linkend="GdkScreen">GdkScreen</link> objects.
     </glossdef>
   </glossentry>