protocol names, trademark and acronyms should be upcase

5 files changed, 15 insertions, 15 deletions

diff --git a/perl-install/standalone/drakTermServ b/perl-install/standalone/drakTermServ
index 4bb77b562..cc696b0fd 100755
--- a/perl-install/standalone/drakTermServ
+++ b/perl-install/standalone/drakTermServ
@@ -322,7 +322,7 @@ sub start_wizard() {
     text_view(N("
  This wizard routine will:
  	1) Ask you to select either 'thin' or 'fat' clients.
-	2) Setup dhcp.
+	2) Setup DHCP.
 	
 After doing these steps, the wizard will:
 	
@@ -520,11 +520,11 @@ N("        While you can use a pool of IP addresses, rather than setup a specifi
         of client-specific configuration files that ClusterNFS provides.
 			
         Note: The '#type' entry is only used by drakTermServ.  Clients can either be 'thin'
-        or 'fat'.  Thin clients run most software on the server via xdmcp, while fat clients run 
+        or 'fat'.  Thin clients run most software on the server via XDMCP, while fat clients run 
         most software on the client machine. A special inittab, %s is
         written for thin clients. System config files xdm-config, kdmrc, and gdm.conf are 
-        modified if thin clients are used, to enable xdmcp. Since there are security issues in 
-        using xdmcp, hosts.deny and hosts.allow are modified to limit access to the local
+        modified if thin clients are used, to enable XDMCP. Since there are security issues in 
+        using XDMCP, hosts.deny and hosts.allow are modified to limit access to the local
         subnet.
 			
         Note: The '#hdw_config' entry is also only used by drakTermServ.  Clients can either 
@@ -570,7 +570,7 @@ N("        - /etc/xinetd.d/tftp:
         	by mkinitrd-net, and the entries in /etc/dhcpd.conf, to serve up the boot image to 
         	each diskless client.
 
-        	A typical tftp configuration file looks like:
+        	A typical TFTP configuration file looks like:
         		
         	service tftp
 			{
@@ -1078,7 +1078,7 @@ sub client_X_keyboard() {
 sub client_set {
 	my ($default) = @_;
 	# we need to change some system files to allow the thin clients
-	# to access the server - enabling xdmcp and modify hosts.deny/hosts.allow for some security
+	# to access the server - enabling XDMCP and modify hosts.deny/hosts.allow for some security
 	# we also need to set runlevel to 5 and restart the display manager
 	if ($conf{ALLOW_THIN} == 1) {
 		if (-f "/etc/sysconfig/autologin") {
@@ -1091,10 +1091,10 @@ sub client_set {
 		substInFile { s/id:3:initdefault:/id:5:initdefault:/ } "/etc/inittab";
 		substInFile { s/! DisplayManager.requestPort:/DisplayManager.requestPort:/ } "/etc/X11/xdm/xdm-config";
 		substInFile { s/Enable=false/Enable=true/ } "/usr/share/config/kdm/kdmrc";
-		# This file had 2 "Enable=" entries, one for xdmcp and one for debug
+		# This file had 2 "Enable=" entries, one for XDMCP and one for debug
 		change_gdm_xdmcp("true");
 		log::explanations("Modified files /etc/inittab, /etc/X11/xdm/xdm-config, /usr/share/config/kdm/kdmrc, /etc/X11/gdm/gdm.conf");
-		# just xdmcp in hosts.allow is enough for xdm & kdm, but gdm doesn't work - x11 doesn't help either
+		# just XDMCP in hosts.allow is enough for xdm & kdm, but gdm doesn't work - x11 doesn't help either
 		update_hosts_allow("enable");
 		if ($default eq "all") {
 			my $inittab = '/etc/initab$$CLIENT$$';
diff --git a/perl-install/standalone/drakbackup b/perl-install/standalone/drakbackup
index eddb685bd..77bd6af30 100755
--- a/perl-install/standalone/drakbackup
+++ b/perl-install/standalone/drakbackup
@@ -150,7 +150,7 @@ foreach (@ARGV) {
 
 sub setup_tooltips() {
 	%help = (
-		'use_expect' => N("Expect is an extension to the Tcl scripting language that allows interactive sessions without user intervention."),
+		'use_expect' => N("Expect is an extension to the TCL scripting language that allows interactive sessions without user intervention."),
 		'remember_pass' => N("Store the password for this system in drakbackup configuration."),
 		'erase_cdrw' => N("For a multisession CD, only the first session will erase the cdrw. Otherwise the cdrw is erased before each backup."),	
 		'use_incr_decr' => N("This option will save files that have changed.  Exact behavior depends on whether incremental or differential mode is used."), 
diff --git a/perl-install/standalone/drakconnect b/perl-install/standalone/drakconnect
index c1488c893..6017a11aa 100755
--- a/perl-install/standalone/drakconnect
+++ b/perl-install/standalone/drakconnect
@@ -692,7 +692,7 @@ sub get_intf_ip {
     my ($ip, $state, $mask);
     if (-x "/sbin/ifconfig") {
 	local $_ = `LC_ALL=C LANGUAGE=C /sbin/ifconfig $interface`;
-	$ip = /inet addr:(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/mso ? $1 : N("No Ip");
+	$ip = /inet addr:(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/mso ? $1 : N("No IP");
 	$mask = /Mask:(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/mso ? $1 : N("No Mask");
 	$state = /inet/ ? N("up") : N("down");
     } else {
diff --git a/perl-install/standalone/drakpxe b/perl-install/standalone/drakpxe
index 1d2ca35ce..5e374faff 100755
--- a/perl-install/standalone/drakpxe
+++ b/perl-install/standalone/drakpxe
@@ -364,7 +364,7 @@ class "Etherboot" {
 match if substring (option vendor-class-identifier, 0, 9) = "Etherboot";
 
 # filename define the file retrieve by the client, there nbgrub
-# our tftp is chrooted so is just the path to the file
+# our TFTP is chrooted so is just the path to the file
 filename "/etherboot/nbgrub";
 
 #Used by etherboot to detect a valid pxe dhcp server
@@ -388,7 +388,7 @@ class "PXE" {
 match if substring(option vendor-class-identifier, 0, 9) = "PXEClient";
   
 # filename define the file retrieve by the client, there pxelinux.0
-# our tftp is chrooted so is just the path to the file
+# our TFTP is chrooted so is just the path to the file
 # If you prefer use grub, use pxegrub compiled for your ethernet card.
 #filename "/PXEClient/pxegrub";
 filename "/PXEClient/pxelinux.0";
diff --git a/perl-install/standalone/drakvpn b/perl-install/standalone/drakvpn
index 7cabd07c7..08de64e3e 100644
--- a/perl-install/standalone/drakvpn
+++ b/perl-install/standalone/drakvpn
@@ -1092,7 +1092,7 @@ server.") },
 some reason, set this to off.  The default is on.") },
                      { label => N("My identifier"), val => \$main_remote_section->{8}[1], type => 'entry',
 	help => N("specifies the identifier sent to the remote host and the
-type to use in the phase 1 negotiation.  address, fqdn,
+type to use in the phase 1 negotiation.  address, FQDN,
 user_fqdn, keyid and asn1dn can be used as an idtype.
 they are used like:
 	my_identifier address [address];
@@ -1101,7 +1101,7 @@ they are used like:
 	my_identifier user_fqdn string;
 		the type is a USER_FQDN (user fully-qualified
 		domain name).
-	my_identifier fqdn string;
+	my_identifier FQDN string;
 		the type is a FQDN (fully-qualified domain name).
 	my_identifier keyid file;
 		the type is a KEY_ID.
@@ -1118,7 +1118,7 @@ my_identifier user_fqdn \"myemail\@mydomain.com\"") },
 phase 1 negotiation. This directive must be defined. 
 algorithm is one of following: 
 
-des, 3des, blowfish, cast128 for oakley.
+DES, 3DES, blowfish, cast128 for oakley.
 
 For other transforms, this statement should not be used.") },
                      { label => N("Hash algorithm"), val => \$proposal_remote_section->{3}[1], type => 'entry' },