X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fvconsole.conf.xml;h=a29075a1612dd5ab12d76e0faf2b0332d314636b;hb=3175fcdec5d748e8db85a3e7fe1cb67f5f6a865d;hp=d6ac579918edb8f5a35f1e3c18d0c5403c2d1b9d;hpb=ee48647271132188e9ecc3507e62b6c7c7a6c9eb;p=elogind.git

diff --git a/man/vconsole.conf.xml b/man/vconsole.conf.xml
index d6ac57991..a29075a16 100644
--- a/man/vconsole.conf.xml
+++ b/man/vconsole.conf.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <?xml-stylesheet type="text/xsl" href="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-        "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
@@ -9,124 +9,132 @@
   Copyright 2010 Lennart Poettering
 
   systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
   (at your option) any later version.
 
   systemd is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
+  Lesser General Public License for more details.
 
-  You should have received a copy of the GNU General Public License
+  You should have received a copy of the GNU Lesser General Public License
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<refentry id="vconsole.conf">
-        <refentryinfo>
-                <title>vconsole.conf</title>
-                <productname>systemd</productname>
-
-                <authorgroup>
-                        <author>
-                                <contrib>Developer</contrib>
-                                <firstname>Lennart</firstname>
-                                <surname>Poettering</surname>
-                                <email>lennart@poettering.net</email>
-                        </author>
-                </authorgroup>
-        </refentryinfo>
-
-        <refmeta>
-                <refentrytitle>vconsole.conf</refentrytitle>
-                <manvolnum>5</manvolnum>
-        </refmeta>
-
-        <refnamediv>
-                <refname>vconsole.conf</refname>
-                <refpurpose>configuration file for the virtual console</refpurpose>
-        </refnamediv>
-
-        <refsynopsisdiv>
-                <para><filename>/etc/vconsole.conf</filename></para>
-        </refsynopsisdiv>
-
-        <refsect1>
-                <title>Description</title>
-
-                <para>The <filename>/etc/vconsole.conf</filename> file
-                configures the virtual console, i.e. keyboard mapping
-                and console font.</para>
-
-                <para>The basic file format of the
-                <filename>vconsole.conf</filename> is a
-                newline-separated list environment-like
-                shell-compatible variable assignments. It is possible
-                to source the configuration from shell scripts,
-                however, beyond mere variable assignments no shell
-                features are supported, allowing applications to read
-                the file without implementing a shell compatible
-                execution engine.</para>
-
-                <para>Note that the kernel command line options
-                <varname>vconsole.keymap=</varname>,
-                <varname>vconsole.keymap.toggle=</varname>,
-                <varname>vconsole.font=</varname>,
-                <varname>vconsole.font.map=</varname>,
-                <varname>vconsole.font.unimap=</varname> may be used
-                to override the console settings at boot.</para>
-
-                <para>Depending on the operating system other
-                configuration files might be checked for configuration
-                of the virtual console as well, however only as
-                fallback.</para>
-        </refsect1>
-
-        <refsect1>
-                <title>Options</title>
-
-                <para>The following options are understood:</para>
-
-                <variablelist>
-
-                        <varlistentry>
-                                <term><varname>KEYMAP=</varname></term>
-                                <term><varname>KEYMAP_TOGGLE=</varname></term>
-
-                                <listitem><para>Configures the key
-                                mapping table of for they
-                                keyboard. <varname>KEYMAP=</varname>
-                                defaults to <literal>us</literal> if
-                                not set. The
-                                <varname>KEYMAP_TOGGLE=</varname> can
-                                be used to configured a second toggle
-                                keymap and is by default
-                                unset.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><varname>FONT=</varname></term>
-                                <term><varname>FONT_MAP=</varname></term>
-                                <term><varname>FONT_UNIMAP=</varname></term>
-
-                                <listitem><para>Configures the console
-                                font, the console map and the unicode
-                                font map. <varname>FONT=</varname>
-                                defaults to
-                                <literal>latarcyrheb-sun16</literal>.</para></listitem>
-                        </varlistentry>
-
-                </variablelist>
-        </refsect1>
-
-        <refsect1>
-                  <title>See Also</title>
-                  <para>
-                          <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                          <citerefentry><refentrytitle>loadkeys</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                          <citerefentry><refentrytitle>setfont</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-                          <citerefentry><refentrytitle>locale.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
-                  </para>
-        </refsect1>
+<refentry id="vconsole.conf" conditional='ENABLE_VCONSOLE'>
+  <refentryinfo>
+    <title>vconsole.conf</title>
+    <productname>systemd</productname>
+
+    <authorgroup>
+      <author>
+        <contrib>Developer</contrib>
+        <firstname>Lennart</firstname>
+        <surname>Poettering</surname>
+        <email>lennart@poettering.net</email>
+      </author>
+    </authorgroup>
+  </refentryinfo>
+
+  <refmeta>
+    <refentrytitle>vconsole.conf</refentrytitle>
+    <manvolnum>5</manvolnum>
+  </refmeta>
+
+  <refnamediv>
+    <refname>vconsole.conf</refname>
+    <refpurpose>Configuration file for the virtual console</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <para><filename>/etc/vconsole.conf</filename></para>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Description</title>
+
+    <para>The <filename>/etc/vconsole.conf</filename> file configures
+    the virtual console, i.e. keyboard mapping and console font. It is
+    applied at boot by
+    <citerefentry><refentrytitle>systemd-vconsole-setup.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
+
+    <para>The basic file format of the
+    <filename>vconsole.conf</filename> is a newline-separated list of
+    environment-like shell-compatible variable assignments. It is
+    possible to source the configuration from shell scripts, however,
+    beyond mere variable assignments no shell features are supported,
+    allowing applications to read the file without implementing a
+    shell compatible execution engine.</para>
+
+    <para>Note that the kernel command line options
+    <varname>vconsole.keymap=</varname>,
+    <varname>vconsole.keymap.toggle=</varname>,
+    <varname>vconsole.font=</varname>,
+    <varname>vconsole.font.map=</varname>,
+    <varname>vconsole.font.unimap=</varname> may be used
+    to override the console settings at boot.</para>
+
+    <para>Depending on the operating system other configuration files
+    might be checked for configuration of the virtual console as well,
+    however only as fallback.</para>
+  </refsect1>
+
+  <refsect1>
+    <title>Options</title>
+
+    <para>The following options are understood:</para>
+
+    <variablelist>
+
+      <varlistentry>
+        <term><varname>KEYMAP=</varname></term>
+        <term><varname>KEYMAP_TOGGLE=</varname></term>
+
+        <listitem><para>Configures the key mapping table for the
+        keyboard. <varname>KEYMAP=</varname> defaults to
+        <literal>us</literal> if not set. The
+        <varname>KEYMAP_TOGGLE=</varname> can be used to configure a
+        second toggle keymap and is by default
+        unset.</para></listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><varname>FONT=</varname></term>
+        <term><varname>FONT_MAP=</varname></term>
+        <term><varname>FONT_UNIMAP=</varname></term>
+
+        <listitem><para>Configures the console font, the console map
+        and the unicode font map.</para></listitem>
+      </varlistentry>
+
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>Example</title>
+
+    <example>
+      <title>German keyboard and console</title>
+
+      <para><filename>/etc/vconsole.conf</filename>:</para>
+
+      <programlisting>KEYMAP=de-latin1
+FONT=eurlatgr</programlisting>
+    </example>
+
+  </refsect1>
+
+  <refsect1>
+      <title>See Also</title>
+      <para>
+        <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+        <citerefentry><refentrytitle>systemd-vconsole-setup.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+        <citerefentry><refentrytitle>loadkeys</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+        <citerefentry><refentrytitle>setfont</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+        <citerefentry><refentrytitle>locale.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+        <citerefentry><refentrytitle>systemd-localed.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+      </para>
+  </refsect1>
 
 </refentry>