Nominal updates to gamma help handbook, update docbook doctype declarations, update TQLabel in Monitor Gamma module.

3 files changed, 24 insertions, 58 deletions

diff --git a/doc/kdvi/index.docbook b/doc/kdvi/index.docbook
index 8cf71005..7db82ecf 100644
--- a/doc/kdvi/index.docbook
+++ b/doc/kdvi/index.docbook
@@ -1,6 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN"
- "dtd/kdex.dtd" [
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
   <!ENTITY kappname "&kdvi;">
   <!ENTITY package "tdegraphics">
   <!ENTITY % addindex "IGNORE">
diff --git a/doc/kgamma/index.docbook b/doc/kgamma/index.docbook
index 4609b4be..64129c09 100644
--- a/doc/kgamma/index.docbook
+++ b/doc/kgamma/index.docbook
@@ -1,6 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN"
- "dtd/kdex.dtd" [
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
   <!ENTITY kgamma '<application>KGamma</application>'>
   <!ENTITY kappname "&kgamma;">
   <!ENTITY package "tdegraphics">
@@ -12,17 +11,15 @@
 
 <!-- The language must NOT be changed here. -->
 <book lang="&language;">
-<title>The KGamma Handbook</title>
+<title>The Monitor Gamma Handbook</title>
 
 <bookinfo>
 <authorgroup>
 <author>
 <firstname>Michael</firstname>
 <surname>v.Ostheim</surname>
-<affiliation>
-<address><email>[email protected]</email></address>
-</affiliation>
 </author>
+<author>&tde-authors;</author>
 </authorgroup>
 
 <!-- TRANS:ROLES_OF_TRANSLATORS -->
@@ -30,6 +27,10 @@
 <year>2001, 2002, 2003</year>
 <holder>Michael v.Ostheim</holder>
 </copyright>
+<copyright>
+<year>&tde-copyright-date;</year>
+<holder>&tde-team;</holder>
+</copyright>
 <!-- Translators: put here the copyright notice of the translation -->
 
 <legalnotice>&FDLNotice;</legalnotice>
@@ -42,7 +43,7 @@
 </abstract>
 
 <keywordset>
-<keyword>KDE</keyword>
+<keyword>TDE</keyword>
 <keyword>KGamma</keyword>
 <keyword>Monitor</keyword>
 <keyword>Calibration</keyword>
@@ -54,36 +55,35 @@
 <chapter id="introduction">
 <title>Introduction</title>
 
-<para>This document describes &kgamma; version 1.0.2 (KDE 3.2)</para>
-<para>&kgamma; is a tool for monitor gamma correction.  With proper gamma
-settings, your display (websites, images, etc.) will look the same on your
+<para>This document describes how to correct display monitor gamma.</para>
+<para>With proper gamma settings, your display (websites, images, etc.) will look the same on your
 monitor as on other monitors.</para>
-<para>&kgamma; allows you to alter the monitor's gamma correction of
-XFree86. But that's not all to do. For good results you have to set the
+<para>This tool allows you to alter the monitor's gamma correction of.
+But that's not all to do. For good results you have to set the
 correct brightness, contrast and color balance of your monitor. This
 may be difficult and you have to repeat every step several times.
 For perfect results you need really good (and expensive) hardware.</para>
-<para>This are system settings, please do not use &kgamma; to manipulate your
+<para>These are system settings, please do not use this tool to manipulate your
 image files.</para>
 </chapter>
 
 <chapter id="using-kgamma">
-<title>Using KGamma</title>
+<title>Using the Test Images</title>
 <sect1 id="Setting-Gamma">
 <title>Setting Gamma Correction</title>
 <para>Use the four sliders to define the gamma correction either as a single
-value, or separately for the red, green and blue components. The XFree86
+value, or separately for the red, green and blue components. The X-Server
 default setting for gamma is 1.00 (Mac 1.80, WinXX 2.20). The test images help
 you to find proper settings.</para>
 <para>To store the gamma settings system wide, enable the option 'Store
-settings to XF86Config'. The system settings will be restored at next XFree86
+settings to XF86Config'. The system settings will be restored at next X-Server
 startup. You need root access to use this option. Use this if you want to
 correct the gamma settings for all users and graphical environments on this
 machine.</para>
-<para>To store the gamma settings to your personal KDE configuration, do not
-enable that option. The user settings will be restored at next KDE startup and
+<para>To store the gamma settings to your personal &tde; configuration, do not
+enable that option. The user settings will be restored at next &tde; startup and
 replace temporary the system gamma settings. The system settings are not removed by
-that and will be restored at next XFree86 startup.</para>
+that and will be restored at next X-Server startup.</para>
 <para>On multi head systems, select the screen you want to alter with the combo
 box. This will also work with xinerama enabled. If you want to set all screens
 to the same gamma values, enable the 'Sync screens' option. On systems with only
@@ -109,11 +109,11 @@ one screen this option will take no effect.</para>
 </listitem>
 </itemizedlist>
 
-<para>If you can't see all of the 20 sections, use your monitors contrast settings
-or the "Gamma" slider of &kgamma; to correct this. If black is not pure black,
+<para>If you don't see all of the 20 sections, use your monitor's contrast settings
+or the "Gamma" slider to correct this. If black is not pure black,
 try to darken the monitor, if white is not pure white, try to lighten
 it. If you see any colors in the gray tones alter the color balance settings of
-your monitor or the "Red", "Green" and "Blue" slider of &kgamma;.</para>
+your monitor or the "Red", "Green" and "Blue" slider.</para>
 </sect1>
 
 <sect1 id="RGB-Scale">
@@ -198,37 +198,4 @@ Documentation copyright 2001, 2002, 2003 Michael v.Ostheim <email>ostheimm@users
 &underGPL;        	 <!-- GPL License -->
 </chapter>
 
-<appendix id="installation">
-<title>Installation</title>
-
-<para>&kgamma;'s home site is
-<ulink url="http://kgamma.berlios.de/index2.php">http://kgamma.berlios.de/index2.php</ulink>
-</para>
-
-<sect1 id="compilation">
-<title>Compilation and Installation</title>
-
-<para>
-In order to compile and install &kgamma; on your system, type the following in the base
-folder of the &kgamma; distribution:
-<screen>
-<prompt>%</prompt> <userinput><command>./configure</command></userinput>
-<prompt>%</prompt> <userinput><command>make</command></userinput>
-<prompt>%</prompt> <userinput><command>make install</command></userinput>
-</screen>
-</para>
-
-</sect1>
-</appendix>
-
-&documentation.index;
 </book>
-<!--
-Local Variables:
-mode: sgml
-sgml-minimize-attributes:nil
-sgml-general-insert-case:lower
-sgml-indent-step:0
-sgml-indent-data:nil
-End:
--->
diff --git a/kgamma/kcmkgamma/kgamma.cpp b/kgamma/kcmkgamma/kgamma.cpp
index 2d77e1f6..ecbb8fe4 100644
--- a/kgamma/kcmkgamma/kgamma.cpp
+++ b/kgamma/kcmkgamma/kgamma.cpp
@@ -255,7 +255,7 @@ void KGamma::setupUI() {
     //Options
     TQHBox *options = new TQHBox(this);
 
-    xf86cfgbox = new TQCheckBox( i18n("Save settings to XF86Config"), options );
+    xf86cfgbox = new TQCheckBox( i18n("Save settings to X-Server Config"), options );
     connect(xf86cfgbox, TQT_SIGNAL(clicked()), TQT_SLOT(changeConfig()));
 
     syncbox = new TQCheckBox( i18n("Sync screens"), options );