Update documentation for config file migration for i18n/l10n and hostname settings. (#881923)

Also, remove obsolete setsysfont.

2 files changed, 5 insertions, 49 deletions

diff --git a/setsysfont b/setsysfont
deleted file mode 100755
index 8ee9920b..00000000
--- a/setsysfont
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-
-PATH=/bin:/usr/bin
-
-if [ -f /etc/sysconfig/i18n ]; then
-  . /etc/sysconfig/i18n
-fi
-
-case ${LC_ALL:-${LC_CTYPE-$LANG}} in
-    *.utf8|*.UTF-8)
-         if [ -x /bin/unicode_start ] && /sbin/consoletype fg ; then
-		exec unicode_start $SYSFONT $UNIMAP
-	 fi
-	 ;;
-    *)
-	if /sbin/consoletype fg ; then
-		# no exec, unicode_stop does not set a font
-	        unicode_stop
-	fi
-	;;
-esac
-
-if [ -x /bin/setfont ]; then
-  if [ -n "$UNIMAP" ]; then
-    ARGS="-u $UNIMAP"
-  fi
-  if [ -n "$SYSFONTACM" ]; then
-    if [ ! -f /lib/kbd/consoletrans/${SYSFONTACM}_to_uni.trans ]; then
-        SYSFONTACM=$(echo $SYSFONTACM | sed "s|iso0|8859-|g;s|iso|8859-|g")
-    fi
-    ARGS="$ARGS -m $SYSFONTACM"
-  fi
-  if [ -n "$SYSFONT" ]; then
-    /bin/setfont $SYSFONT $ARGS
-#  else
-#    /bin/setfont
-    echo -ne "\033(K" 2>/dev/null > /proc/$$/fd/0
-  fi
-fi
-
-exit 0
diff --git a/sysconfig.txt b/sysconfig.txt
index 8163e437..7746671c 100644
--- a/sysconfig.txt
+++ b/sysconfig.txt
@@ -174,8 +174,6 @@ Generic options:
 /etc/sysconfig/network:
 
   NETWORKING=yes|no
-  HOSTNAME=<fqdn by default, but whatever hostname you want>
-   Note that this can be overriden by /etc/hostname.
   GATEWAY=<gateway IP>
   GATEWAYDEV=<gateway device to use, when multiple devices have GATEWAY=> (e.g. eth0)
   NISDOMAIN=<nis domain name>
@@ -272,6 +270,9 @@ Generic options:
       To do this properly, disable IPv6 in the module itself.
       This can be done by booting the kernel with "ipv6.disable_ipv6=1".
 
+    HOSTNAME=<fqdn by default, but whatever hostname you want>
+      This is now configured in /etc/hostname.
+
 /etc/sysconfig/static-routes-ipv6:
   Contains lines of the form:
 
@@ -427,11 +428,8 @@ Generic options:
 
   The above variables are used in /etc/profile.d/lang.sh.
 
-  This data will be also be read from the legacy /etc/sysconfig/i18n
-  location, but /etc/locale.conf takes precedence.
-
   If ~/.i18n exists, it is used in addition to /etc/locale.conf and
-  /etc/sysconfig/i18n for per-user customization of the locales.
+  for per-user customization of the locales.
 
 /etc/vconsole.conf:
 
@@ -445,8 +443,7 @@ Generic options:
   and are found in /lib/kbd/consoletrans.
  
   The above are used to set up the keyboard at boot time. For more
-  information, see vconsole.conf(5). If this file does not exist,
-  values will be read from /etc/sysconfig/i18n.
+  information, see vconsole.conf(5).
 
 Files in /etc/sysconfig/network-scripts/
 ========================================