summaryrefslogtreecommitdiffstats
path: root/gnome2-system-admin-guide/C
diff options
context:
space:
mode:
Diffstat (limited to 'gnome2-system-admin-guide/C')
-rw-r--r--gnome2-system-admin-guide/C/ChangeLog6
-rw-r--r--gnome2-system-admin-guide/C/glossary.xml64
2 files changed, 68 insertions, 2 deletions
diff --git a/gnome2-system-admin-guide/C/ChangeLog b/gnome2-system-admin-guide/C/ChangeLog
index 849aec5..bcad5ec 100644
--- a/gnome2-system-admin-guide/C/ChangeLog
+++ b/gnome2-system-admin-guide/C/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-09 Brent Smith <gnome@nextreality.net>
+
+ * glossary.xml:
+ Added anchors for obsolete glossary entries and added some new ones to
+ replace the outdated ones. Fixes #333785 and #333783
+
2006-03-09 Luca Ferretti <elle.uca@libero.it>
* glossary.xml: removed obsolete glossentries for old MIME and menu
diff --git a/gnome2-system-admin-guide/C/glossary.xml b/gnome2-system-admin-guide/C/glossary.xml
index e7930de..e6e7d52 100644
--- a/gnome2-system-admin-guide/C/glossary.xml
+++ b/gnome2-system-admin-guide/C/glossary.xml
@@ -1,5 +1,23 @@
<glossary id="glossary-1">
<title>Glossary</title>
+ <!-- these anchors are to maintain backwards compatibility for
+ obsolete glossary entries -->
+
+ <!-- file content sniffer -->
+ <anchor id="glossary-23"/>
+ <!-- MIME information file -->
+ <anchor id="glossary-20"/>
+ <!-- MIME keys file -->
+ <anchor id="glossary-21"/>
+ <!-- MIME type registry -->
+ <anchor id="glossary-22"/>
+ <!-- pattern mask -->
+ <anchor id="glossary-25"/>
+ <!-- vfolder -->
+ <anchor id="glossary-9"/>
+ <!-- vfolder information file -->
+ <anchor id="glossary-10"/>
+
<glossentry id="glossary-13">
<glossterm><filename>.desktop</filename> file</glossterm>
<glosssee otherterm="glossary-11"/>
@@ -15,9 +33,9 @@
<glossentry id="glossary-18">
<glossterm>application registry</glossterm>
<glossdef>
- <para>The application registry is a location that contains text
+ <para>The application registry is a collection of desktop entry
files which register applications. The location of the application registry
-for the GNOME Desktop is <filename>/usr/share/gnome/application-registry</filename>.</para>
+for the GNOME Desktop is <filename>$XDG_DATA_DIRS:$XDG_DATA_HOME/applications/</filename>.</para>
</glossdef>
</glossentry>
<glossentry id="glossary-11">
@@ -91,6 +109,15 @@ about a preference key. The schema object contains information such as a default
value for the preference key, and documentation on the preference key. </para>
</glossdef>
</glossentry>
+ <glossentry id="glossary-glob-pattern">
+ <glossterm>glob pattern</glossterm>
+ <glossdef>
+ <para>A glob pattern is used to match a file name by using special
+characters such as <literal>*</literal> and <literal>?</literal>. The MIME
+system uses glob patterns to assign MIME types based upon filenames and often,
+file extensions.</para>
+ </glossdef>
+ </glossentry>
<glossentry id="glossary-26">
<glossterm>Interoperable Object Reference</glossterm>
<glossdef>
@@ -100,12 +127,36 @@ be sent to control the object. The IOR also contains an object key to identify
the object.</para>
</glossdef>
</glossentry>
+ <glossentry id="glossary-magic-rule">
+ <glossterm>magic rule</glossterm>
+ <glossdef>
+ <para>A magic rule defines a file's MIME type by specifying
+text or binary data to search for at the beginning of the file. Offsets to look for
+this data are defined in a magic rule.</para>
+ </glossdef>
+ </glossentry>
+ <glossentry id="glossary-menu-def">
+ <glossterm>Menu definition files</glossterm>
+ <glossdef>
+ <para>Menu definition files define the hierarchy of menus that are used in the
+GNOME menu bar.</para>
+ </glossdef>
+ </glossentry>
<glossentry id="glossary-27">
<glossterm>MIME</glossterm>
<glossdef>
<para>Multipurpose Internet Mail Extension.</para>
</glossdef>
</glossentry>
+ <glossentry id="glossary-mime-source-xml">
+ <glossterm>MIME source XML file</glossterm>
+ <glossdef>
+ <para>A MIME source XML file defines how MIME types are resolved for different kinds
+of files. There are three ways in which this can be done: using file extensions (glob patterns),
+using magic rules and using XML namespaces. MIME source XML files are located
+in the <filename>$XDG_DATA_DIRS:$XDG_DATA_HOME/mime/packages</filename> directory.</para>
+ </glossdef>
+ </glossentry>
<glossentry id="glossary-16">
<glossterm>MIME type</glossterm>
<glossdef>
@@ -115,6 +166,15 @@ use the <literal>image/png</literal> MIME type to detect that a Portable Network
Graphic (PNG) file is attached to an email. </para>
</glossdef>
</glossentry>
+ <glossentry id="glossary-mime-type-database">
+ <glossterm>MIME type database</glossterm>
+ <glossdef>
+ <para>The MIME type database is a collection of files
+which register MIME types for the desktop environment. The location of
+the MIME type database is the directory <filename>$XDG_DATA_DIRS:$XDG_DATA_HOME/mime</filename>.
+</para>
+ </glossdef>
+ </glossentry>
<glossentry id="glossary-31">
<glossterm>OMF file</glossterm>
<glossdef>