os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Switch to X.Org by default

Browse source
This commit is contained in:
Denis Peplin 2004-12-20 11:36:28 +00:00
parent 882df99b3a
commit 60a1110f61
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=23291
2 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
en_US.ISO8859-1/books/handbook/l10n/chapter.sgml
View file

@ -597,7 +597,8 @@ keychange="<replaceable>fkey_number sequence</replaceable>"</programlisting>
<para>Although X11 is not part of the FreeBSD Project, we have <para>Although X11 is not part of the FreeBSD Project, we have
included some information here for FreeBSD users. For more included some information here for FreeBSD users. For more
details, refer to the <ulink url="http://www.xfree86.org/">&xfree86; details, refer to the <ulink
url="http://www.x.org/">&xorg;
web site</ulink> or whichever X11 Server you use.</para> web site</ulink> or whichever X11 Server you use.</para>
<para>In <filename>~/.Xresources</filename>, you can additionally <para>In <filename>~/.Xresources</filename>, you can additionally
@ -802,7 +803,7 @@ font8x8="cp866-8x8"</programlisting>
<note> <note>
<para><anchor id="russian-note">The Russian KOI8-R locale <para><anchor id="russian-note">The Russian KOI8-R locale
may not work with old <application>&xfree86;</application> releases (lower than 3.3). may not work with old <application>&xfree86;</application> releases (lower than 3.3).
<application>&xfree86; 4.X</application> is now the default <application>&xorg;</application> is now the default
version of the X Window System on FreeBSD. version of the X Window System on FreeBSD.
This should not be an This should not be an
issue unless you are using an old version of issue unless you are using an old version of
@ -818,7 +819,9 @@ font8x8="cp866-8x8"</programlisting>
<screen>&prompt.root; <userinput>make install</userinput></screen> <screen>&prompt.root; <userinput>make install</userinput></screen>
<para>The above port installs the latest version of the KOI8-R <para>The above port installs the latest version of the KOI8-R
fonts. <application>&xfree86; 3.3</application> already has some KOI8-R fonts, but these fonts. <application>&xorg;</application> (as well as
<application>&xfree86;</application> version 3.3 and
above) already has some KOI8-R fonts, but these
are scaled better.</para> are scaled better.</para>
<para>Check the <literal>"Files"</literal> section <para>Check the <literal>"Files"</literal> section
@ -845,7 +848,8 @@ FontPath "/usr/X11R6/lib/X11/fonts/cyrillic/100dpi"</programlisting>
<programlisting>XkbLayout "ru" <programlisting>XkbLayout "ru"
XkbOptions "grp:caps_toggle"</programlisting> XkbOptions "grp:caps_toggle"</programlisting>
<para>For <application>&xfree86; 4.X</application>:</para> <para>For <application>&xorg;</application> (or
<application>&xfree86; 4.X</application>):</para>
<programlisting>Option "XkbLayout" "ru" <programlisting>Option "XkbLayout" "ru"
Option "XkbOptions" "grp:caps_toggle"</programlisting> Option "XkbOptions" "grp:caps_toggle"</programlisting>
@ -867,7 +871,8 @@ Option "XkbOptions" "grp:caps_toggle"</programlisting>
<programlisting>XkbVariant "winkeys"</programlisting> <programlisting>XkbVariant "winkeys"</programlisting>
<para>For <application>&xfree86; 4.X</application>:</para> <para>For <application>&xorg;</application> (or
<application>&xfree86; 4.X</application>):</para>
<programlisting>Option "XkbVariant" "winkeys"</programlisting> <programlisting>Option "XkbVariant" "winkeys"</programlisting>

7
en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml
View file

@ -493,9 +493,12 @@ disco.example.com 7115-70839-20412</screen>
&prompt.root; <userinput>xset fp+ /usr/X11R6/lib/X11/fonts/MathType1</userinput> &prompt.root; <userinput>xset fp+ /usr/X11R6/lib/X11/fonts/MathType1</userinput>
&prompt.root; <userinput>xset fp rehash</userinput></screen> &prompt.root; <userinput>xset fp rehash</userinput></screen>
<para>If you are using the <application>&xfree86;</application> server, you can have these font <para>If you are using the <application>&xorg;</application> server, you can have these font
directories loaded automatically by adding them to your directories loaded automatically by adding them to your
<filename>XF86Config</filename> file.</para> <filename>xorg.conf</filename> file.</para>
<note><para>For <application>&xfree86;</application> server,
use <filename>XF86Config</filename> file.</para></note>
<indexterm><primary>fonts</primary></indexterm> <indexterm><primary>fonts</primary></indexterm>
<para>If you <emphasis>do not</emphasis> already have a directory <para>If you <emphasis>do not</emphasis> already have a directory