From 5baa9cbff53400bc93fe6fd56824b67253103fba Mon Sep 17 00:00:00 2001 From: Steve Sheppard Date: Sat, 11 Sep 2010 14:37:51 -0400 Subject: [PATCH] use where possible; --- 1.6/glossary.xml | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/1.6/glossary.xml b/1.6/glossary.xml index 89fbe8a99d..f2679c1d4b 100644 --- a/1.6/glossary.xml +++ b/1.6/glossary.xml @@ -52,7 +52,9 @@ ejabberd - An open-source Jabber/XMPP instant messaging server that runs under popular operating systems (e.g., Mac OSX, GNU/Linux, and Microsoft Windows). One popular use is to provide XMPP messaging services for a Jabber domain across an extendable cluster of cheap, easily-replaced machine nodes. See "XMPP" and "Jabber". More information is available at http://www.ejabberd.im. + An open-source Jabber/XMPP instant messaging server that runs under popular operating systems (e.g., Mac OSX, GNU/Linux, and Microsoft Windows). One popular use is to provide XMPP messaging services for a Jabber domain across an extendable cluster of cheap, easily-replaced machine nodes. More information is available at http://www.ejabberd.im. + + @@ -74,10 +76,11 @@ J - + Jabber - Now known as XMPP (eXtensible Messaging and Presence Protocol), it was originally named "Jabber". See "XMPP". + Now known as XMPP (eXtensible Messaging and Presence Protocol), it was originally named "Jabber". + @@ -186,13 +189,14 @@ Ubuntu - A popular open-source operating system using the Linux kernel that was originally based on the Debian GNU/Linux operating system. More information is available at www.ubuntu.com. Also see "Debian". + A popular open-source operating system using the Linux kernel that was originally based on the Debian GNU/Linux operating system. More information is available at www.ubuntu.com. + V - + Virtualization A method of executing software in a special environment that is partitioned or separated from the real underlying hardware and software resources. In typical usage, it allows a "host" operating system to encapsulate or emulate another operating system environment in such a way that the emulated environment is completely unaware of the hosting environment. For instance, it allows a Linux application to execute within a Windows environment. @@ -201,19 +205,22 @@ VirtualBox - A popular commercial package of virtualization software that emulates the x86 microprocessor architecture. It can be installed on Linux, Mac OS X, Windows or Solaris "host" operating systems and allows other "guest" (typically including Linux and Windows) operating systems to be loaded and executed. Also see "virtualization". + A popular commercial package of virtualization software that emulates the x86 microprocessor architecture. It can be installed on Linux, Mac OS X, Windows or Solaris "host" operating systems and allows other "guest" (typically including Linux and Windows) operating systems to be loaded and executed. + Virtual PC - A popular commercial package of virtualization software that emulates the x86 microprocessor architecture. It is installed on a Windows "host" operating system and allows other "guest" (typically including Linux and Windows) operating systems to be loaded and executed. Also see "virtualization". + A popular commercial package of virtualization software that emulates the x86 microprocessor architecture. It is installed on a Windows "host" operating system and allows other "guest" (typically including Linux and Windows) operating systems to be loaded and executed. + VMware - A popular commercial package of virtualization software that emulates the x86 microprocessor architecture. It can be installed on Linux, Mac OS X, Windows or Solaris "host" operating systems and allows other "guest" (typically including Linux and Windows) operating systems to be loaded and executed. Also see "virtualization". + A popular commercial package of virtualization software that emulates the x86 microprocessor architecture. It can be installed on Linux, Mac OS X, Windows or Solaris "host" operating systems and allows other "guest" (typically including Linux and Windows) operating systems to be loaded and executed. + @@ -234,10 +241,11 @@ The eXtensible Markup Language, a subset of SGML; a set of rules for encoding information in a way that is both human- and machine-readable. It is primarily used to define documents but can also be used to define arbitrary data structures. It was originally defined by the World Wide Web Consortium (W3C). - + XMPP - An open-standard communications protocol, based on XML, used in message-oriented middleware. It supports the concept of a consistent "domain" of message types that flow between software applications, possibly on different operating systems and architectures. More information is available at xmpp.org. Also see "Jabber". + An open-standard communications protocol, based on XML, used in message-oriented middleware. It supports the concept of a consistent "domain" of message types that flow between software applications, possibly on different operating systems and architectures. More information is available at xmpp.org. + @@ -255,7 +263,8 @@ xulrunner - A specialized run-time application environment that provides support for installing, upgrading and uninstalling XUL applications (See "XUL"). It operates with Mozilla-based applications such as the Firefox browser. More information is available at https://developer.mozilla.org/en/XULRunner. + A specialized run-time application environment that provides support for installing, upgrading and uninstalling XUL applications. It operates with Mozilla-based applications such as the Firefox browser. More information is available at https://developer.mozilla.org/en/XULRunner. + -- 2.11.0