View | Details | Raw Unified | Return to bug 71862
Collapse All | Expand All

(-)new.book.sgml (-12 / +13 lines)
Lines 7169-7176 Link Here
7169
7169
7170
          <para>The X Window System is the most widely available windowing system
7170
          <para>The X Window System is the most widely available windowing system
7171
	    capable of running on &unix; or &unix; like systems, including
7171
	    capable of running on &unix; or &unix; like systems, including
7172
	    &os;.  <ulink url= "http://www.x.org">X.org</ulink> administers
7172
	    &os;.  <ulink url= "http://www.x.org">The X.Org
7173
	    the <ulink url="http://www.x.org/X11_protocol.html">X protocol
7173
	    Foundation</ulink> administers the <ulink
7174
            url="http://www.x.org/X11_protocol.html">X protocol
7174
	    standards</ulink>.  The current release of the specification
7175
	    standards</ulink>.  The current release of the specification
7175
	    is 11.6, so you will often see references shortened to
7176
	    is 11.6, so you will often see references shortened to
7176
	    <literal>X11R6</literal> or even just <literal>X11</literal>.
7177
	    <literal>X11R6</literal> or even just <literal>X11</literal>.
Lines 7196-7202 Link Here
7196
	    &xfree86; which is maintained by
7197
	    &xfree86; which is maintained by
7197
	    <ulink url="http://www.xfree86.org">The XFree86 Project,
7198
	    <ulink url="http://www.xfree86.org">The XFree86 Project,
7198
	    Inc.</ulink>  This software was installed by default on
7199
	    Inc.</ulink>  This software was installed by default on
7199
	    &os; versions up until 4.10 and 5.2.  Although X.org
7200
	    &os; versions up until 4.10 and 5.2.  Although &xorg;
7200
	    itself maintained an implementation during that time
7201
	    itself maintained an implementation during that time
7201
	    period, it was basically only provided as a reference
7202
	    period, it was basically only provided as a reference
7202
	    platform, as it had suffered greatly from bitrot over
7203
	    platform, as it had suffered greatly from bitrot over
Lines 7206-7212 Link Here
7206
	    that project
7207
	    that project
7207
	    over issues including the pace of code changes, future
7208
	    over issues including the pace of code changes, future
7208
	    directions, and interpersonal conflicts, and are now contributing
7209
	    directions, and interpersonal conflicts, and are now contributing
7209
	    code directly to X.org instead.  At that time, X.org updated its
7210
	    code directly to &xorg; instead.  At that time, &xorg; updated its
7210
	    source tree to the last &xfree86; release before its subsequent
7211
	    source tree to the last &xfree86; release before its subsequent
7211
	    licensing change (<application>XFree86 version 4.3.99.903</application>), incorporated
7212
	    licensing change (<application>XFree86 version 4.3.99.903</application>), incorporated
7212
	    many changes that had previously been maintained separately,
7213
	    many changes that had previously been maintained separately,
Lines 7217-7227 Link Here
7217
	    offload more work onto the graphics cards (with the goal of
7218
	    offload more work onto the graphics cards (with the goal of
7218
	    increased performance) and make it more modular
7219
	    increased performance) and make it more modular
7219
	    (with the goal of increased maintainability, and thus faster
7220
	    (with the goal of increased maintainability, and thus faster
7220
	    releases as well as easier configuration).  X.org intends to
7221
	    releases as well as easier configuration).  &xorg; intends to
7221
	    incorporate the freedesktop.org changes in its future releases.</para>
7222
	    incorporate the freedesktop.org changes in its future releases.</para>
7222
7223
7223
	  <para>As of July 2004, in &os.current;,
7224
	  <para>As of July 2004, in &os.current;,
7224
	    &xfree86; has been replaced with X.org as the default
7225
	    &xfree86; has been replaced with &xorg; as the default
7225
	    implementation.  The &xfree86; ports
7226
	    implementation.  The &xfree86; ports
7226
	    (<filename role="package">x11/XFree86-4</filename> and
7227
	    (<filename role="package">x11/XFree86-4</filename> and
7227
	    subports) remain in the ports collection and are still
7228
	    subports) remain in the ports collection and are still
Lines 7243-7250 Link Here
7243
	  <note>
7244
	  <note>
7244
	    <para>The following paragraphs refer to the
7245
	    <para>The following paragraphs refer to the
7245
	      &xfree86; implementation, but most should also be applicable
7246
	      &xfree86; implementation, but most should also be applicable
7246
	      to the X.org implementation as well.  While the default
7247
	      to the &xorg; implementation as well.  While the default
7247
	      configuration filename for the X.org implementation is
7248
	      configuration filename for the &xorg; implementation is
7248
	      <filename>xorg.conf</filename>, it will search for
7249
	      <filename>xorg.conf</filename>, it will search for
7249
	      <filename>XF86Config</filename> if it cannot find it.</para>
7250
	      <filename>XF86Config</filename> if it cannot find it.</para>
7250
	  </note>
7251
	  </note>
Lines 7253-7263 Link Here
7253
7254
7254
      <qandaentry>
7255
      <qandaentry>
7255
        <question id="xorg-compatibility">
7256
        <question id="xorg-compatibility">
7256
          <para>Will my existing applications run with the X.org suite?</para>
7257
          <para>Will my existing applications run with the &xorg; suite?</para>
7257
        </question>
7258
        </question>
7258
7259
7259
        <answer>
7260
        <answer>
7260
	  <para>The X.org software is written to the same X11R6 specification
7261
	  <para>The &xorg; software is written to the same X11R6 specification
7261
	    that &xfree86; is, so basic applications should work
7262
	    that &xfree86; is, so basic applications should work
7262
	    unchanged.  A few lesser-used protocols have been deprecated
7263
	    unchanged.  A few lesser-used protocols have been deprecated
7263
	    (<literal>XIE</literal>, <literal>PEX</literal>, and
7264
	    (<literal>XIE</literal>, <literal>PEX</literal>, and
Lines 7283-7293 Link Here
7283
7284
7284
      <qandaentry>
7285
      <qandaentry>
7285
        <question id="why-choose-xorg">
7286
        <question id="why-choose-xorg">
7286
          <para>Why did &os; choose to go with the X.org ports by default?</para>
7287
          <para>Why did &os; choose to go with the &xorg; ports by default?</para>
7287
        </question>
7288
        </question>
7288
7289
7289
        <answer>
7290
        <answer>
7290
	  <para>The X.org developers claim that their goal is to release
7291
	  <para>The &xorg; developers claim that their goal is to release
7291
	  more often and incorporate new features more quickly.  If they
7292
	  more often and incorporate new features more quickly.  If they
7292
	  are able to do so, this will be very attractive.  Also, their
7293
	  are able to do so, this will be very attractive.  Also, their
7293
	  software still uses the traditional X license, while &xfree86;
7294
	  software still uses the traditional X license, while &xfree86;

Return to bug 71862