backend/logrotate/spacewalk-backend-app | 2
backend/logrotate/spacewalk-backend-applet | 2
backend/logrotate/spacewalk-backend-config-files | 2
backend/logrotate/spacewalk-backend-config-files-tool | 2
backend/logrotate/spacewalk-backend-iss-export | 2
backend/logrotate/spacewalk-backend-package-push-server | 2
client/rhel/rhn-client-tools/man/en/rhn-profile-sync.8 | 6 +-
client/rhel/rhn-client-tools/man/en/rhn_check.8 | 11 +---
client/rhel/rhn-client-tools/man/en/rhn_register.8 | 14 ++---
client/rhel/rhn-client-tools/man/en/rhnreg_ks.8 | 26
+++-------
client/rhel/rhn-client-tools/man/en/spacewalk-channel.8 | 7 --
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 2
java/conf/logrotate/rhn_web_api | 2
13 files changed, 34 insertions(+), 46 deletions(-)
New commits:
commit 45e17b9d8325cb245b4cceab5e00cd121f594a72
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Wed May 22 14:19:27 2013 +0200
man pages branding cleanup + misc branding fixes
rebranding manual pages and changing Spacewalk to Spacewalk Server where it makes
sense
diff --git a/backend/logrotate/spacewalk-backend-app
b/backend/logrotate/spacewalk-backend-app
index 8abae70..e38d949 100644
--- a/backend/logrotate/spacewalk-backend-app
+++ b/backend/logrotate/spacewalk-backend-app
@@ -1,4 +1,4 @@
-# logrotation file for Spacewalk
+# logrotation file for Spacewalk server
#
# $Id$
diff --git a/backend/logrotate/spacewalk-backend-applet
b/backend/logrotate/spacewalk-backend-applet
index 35e02ca..16c5e6d 100644
--- a/backend/logrotate/spacewalk-backend-applet
+++ b/backend/logrotate/spacewalk-backend-applet
@@ -1,4 +1,4 @@
-# logrotation file for Spacewalk
+# logrotation file for Spacewalk Server
#
# $Id$
diff --git a/backend/logrotate/spacewalk-backend-config-files
b/backend/logrotate/spacewalk-backend-config-files
index 027e35f..8fd91d2 100644
--- a/backend/logrotate/spacewalk-backend-config-files
+++ b/backend/logrotate/spacewalk-backend-config-files
@@ -1,4 +1,4 @@
-# logrotation file for Spacewalk
+# logrotation file for Spacewalk Server
#
# $Id$
diff --git a/backend/logrotate/spacewalk-backend-config-files-tool
b/backend/logrotate/spacewalk-backend-config-files-tool
index 4a8105a..ac90b0a 100644
--- a/backend/logrotate/spacewalk-backend-config-files-tool
+++ b/backend/logrotate/spacewalk-backend-config-files-tool
@@ -1,4 +1,4 @@
-# logrotation file for Spacewalk
+# logrotation file for Spacewalk Server
#
# $Id$
diff --git a/backend/logrotate/spacewalk-backend-iss-export
b/backend/logrotate/spacewalk-backend-iss-export
index 2446402..498ac64 100644
--- a/backend/logrotate/spacewalk-backend-iss-export
+++ b/backend/logrotate/spacewalk-backend-iss-export
@@ -1,4 +1,4 @@
-# logrotation file for Spacewalk package uploader
+# logrotation file for Spacewalk Server package uploader
#
/var/log/rhn/rhn_sat_export_internal.log {
diff --git a/backend/logrotate/spacewalk-backend-package-push-server
b/backend/logrotate/spacewalk-backend-package-push-server
index 4daf50f..9ec9571 100644
--- a/backend/logrotate/spacewalk-backend-package-push-server
+++ b/backend/logrotate/spacewalk-backend-package-push-server
@@ -1,4 +1,4 @@
-# logrotation file for Spacewalk package uploader
+# logrotation file for Spacewalk Server package uploader
#
# $Id$
diff --git a/client/rhel/rhn-client-tools/man/en/rhn-profile-sync.8
b/client/rhel/rhn-client-tools/man/en/rhn-profile-sync.8
index 59049d2..da503f4 100644
--- a/client/rhel/rhn-client-tools/man/en/rhn-profile-sync.8
+++ b/client/rhel/rhn-client-tools/man/en/rhn-profile-sync.8
@@ -25,9 +25,9 @@ rhn-profile-sync [\fIoptions\fP]
.SH DESCRIPTION
.PP
-\fBrhn-profile-sync\fP is a client program that connects to
-.B Red Hat Network Classic
-(or a Spacewalk) and refreshes the data stored for this system.
+\fBrhn-profile-sync\fP is a client program that connects to
+"\fBSpacewalk Server\fP", "\fBRed Hat Satellite\fP" or "\fBRed
Hat Network Classic\fP"
+and refreshes the data stored for this system.
.PP
\fBrhn-profile-sync\fP updates data about installed packages, machine hardware, and
virtual guest instances (if virtualization is enabled).
diff --git a/client/rhel/rhn-client-tools/man/en/rhn_check.8
b/client/rhel/rhn-client-tools/man/en/rhn_check.8
index 1cede73..4b0a578 100644
--- a/client/rhel/rhn-client-tools/man/en/rhn_check.8
+++ b/client/rhel/rhn-client-tools/man/en/rhn_check.8
@@ -25,10 +25,9 @@ rhn_check [\fIoptions\fP]
.SH DESCRIPTION
.PP
-\fBrhn_check\fP is a client program that connects to
-.B Red Hat Network Classic
-(or a Spacewalk) and receives queued actions for this
-particular system.
+\fBrhn_check\fP is a client program that connects to
+"\fBSpacewalk Server\fP", "\fBRed Hat Satellite\fP" or
+"\fBRed Hat Network Classic\fP" and receives queued actions for this particular
system.
After receiving the actions, \fBrhn_check\fP will then process them, and
return the results to Spacewalk.
@@ -58,7 +57,7 @@ Show a help message and exit.
.IP \fI/etc/sysconfig/rhn/systemid\fP
The digital server ID for this machine if the system has been registered onto
-.B Spacewalk.
+"\fBSpacewalk Server\fP", "\fBRed Hat Satellite\fP" or "\fBRed
Hat Network Classic\fP".
This file does not exist otherwise.
.br
.IP \fI/etc/sysconfig/rhn/up2date\fP
@@ -85,5 +84,5 @@ Report bugs to <
http://bugzilla.redhat.com>.
Copyright \(co 1999\-2010 Red Hat, Inc.
.PP
-This is free software; see the source for copying conditions. There is
+This is free software; see the source for copying conditions. There is
NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/client/rhel/rhn-client-tools/man/en/rhn_register.8
b/client/rhel/rhn-client-tools/man/en/rhn_register.8
index 6f50193..ea349ad 100644
--- a/client/rhel/rhn-client-tools/man/en/rhn_register.8
+++ b/client/rhel/rhn-client-tools/man/en/rhn_register.8
@@ -15,7 +15,7 @@
.\"
.TH RHN_REGISTER 8 "2011 February 4" "Linux" "Red Hat,
Inc."
.SH NAME
-rhn_register \- Connect to RHN Satellite or Red Hat Network Classic.
+rhn_register \- Connect to Spacewalk Server, Red Hat Satellite or Red Hat Network
Classic.
.SH SYNOPSIS
rhn_register [\fIoptions\fP]
@@ -23,9 +23,9 @@ rhn_register [\fIoptions\fP]
.SH DESCRIPTION
.PP
-\fBrhn_register\fP is a client program that registers your system with
-.B Red Hat Network Classic
-(or a RHN Satellite). After registering, your system can receive
+\fBrhn_register\fP is a client program that registers your system with
+"\fBSpacewalk Server\fP", "\fBRed Hat Satellite\fP" or
+"\fBRed Hat Network Classic\fP". After registering, your system can receive
software updates, install new software, and remotely manage your system.
It can run both in graphical and text modes.
@@ -58,13 +58,11 @@ Show a help message and exit.
.IP \fI/etc/sysconfig/rhn/systemid\fP
The digital server ID for this machine if the system has been registered onto
-.B RHN Satellite
-or
-.B Red Hat Network Classic.
+"\fBSpacewalk Server\fP" or "\fBRed Hat Satellite\fP" or "\fBRed
Hat Network Classic\fP".
This file does not exist otherwise.
.br
.IP \fI/etc/sysconfig/rhn/up2date\fP
-The common configuration file used by RHN client programs.
+The common configuration file used by Red Hat client programs.
.SH "SEE ALSO"
diff --git a/client/rhel/rhn-client-tools/man/en/rhnreg_ks.8
b/client/rhel/rhn-client-tools/man/en/rhnreg_ks.8
index 854bf9a..79e2ed0 100644
--- a/client/rhel/rhn-client-tools/man/en/rhnreg_ks.8
+++ b/client/rhel/rhn-client-tools/man/en/rhnreg_ks.8
@@ -16,8 +16,7 @@
.TH RHNREG_KS 8 "2011 February 4" "Linux" "Red Hat, Inc."
.SH NAME
-rhnreg_ks \- A program for non interactively registering systems to Spacewalk
-or Red Hat Network Classic.
+rhnreg_ks \- A program for non interactively registering systems to Spacewalk Server, Red
Hat Satellite or Red Hat Network Classic.
.SH SYNOPSIS
@@ -25,20 +24,18 @@ rhnreg_ks [\fIoptions\fP]
.SH DESCRIPTION
.PP
-\fVrhnreg_ks\fR is a utility for registering a system with the RHN Satellite or Red Hat
-Network Classic. It is designed to be used in a non-interactive environment
-(a kickstart style install, for example). All the information can
-be specified on the command line or stdin.
+\fVrhnreg_ks\fR is a utility for registering a system with the "\fVSpacewalk
Server\fP", "\fBRed Hat Satellite\fP" or "\fBRed Hat Network
Classic\fP". It is designed to be used in
+a non-interactive environment (a kickstart style install, for example).
+All the information can be specified on the command line or stdin.
.SH OPTIONS
.IP "\fB--profilename\fP"
Specify the profile name that should be used as an identifier for
-the system in Spacewalk, Red Hat Network Classic
+the system in Spacewalk Server, Red Hat Satellite or Red Hat Network Classic
.br
.IP "\fB--username\fP"
-The username to register the system with under Spacewalk or Red Hat Network Classic.
This
-can be an existing Spacewalk or Red Hat Network Classic username, or a new username.
+The username to register the system with under Spacewalk Server, Red Hat Satellite or Red
Hat Network Classic. This can be an existing Spacewalk, Red Hat Satellite or Red Hat
Network Classic username, or a new username.
.br
.IP "\fB--password\fP"
The password associated with the username specified with the \fB--username\fR
@@ -55,7 +52,7 @@ This option has been deprecated. Please login to the server
web user interface and update your contactinfo.
.br
.IP "\fB--nohardware\fP"
-Do not probe or upload any hardware information.
+Do not probe or upload any hardware information.
.br
.IP "\fB--nopackages\fP"
Do not profile or upload any package information.
@@ -76,7 +73,7 @@ Show the version of rhnreg_ks.
Specify a HTTP proxy to use.
.br
.IP "\fB--proxyUser\fP"
-Specify a username to use with an authenticated
+Specify a username to use with an authenticated
HTTP proxy.
.br
.IP "\fB--proxyPassword\fP"
@@ -96,9 +93,7 @@ Show a help message and exit.
.IP \fI/etc/sysconfig/rhn/systemid\fP
The digital server ID for this machine if the system has been registered onto
-.B RHN Satellite
-or
-.B Red Hat Network Classic.
+"\fBSpacewalk Server\fP", "\fBRed Hat Satellite\fP" or "\fBRed
Hat Network Classic\fP".
This file does not exist otherwise.
.br
.IP \fI/etc/sysconfig/rhn/up2date\fP
@@ -154,5 +149,4 @@ Report bugs to <
http://bugzilla.redhat.com>.
Copyright \(co 1999\-2011 Red Hat, Inc.
.PP
-This is free software; see the source for copying conditions. There is
-NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+This is free software; see the source for copying conditions. There is NO warranty; not
even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/client/rhel/rhn-client-tools/man/en/spacewalk-channel.8
b/client/rhel/rhn-client-tools/man/en/spacewalk-channel.8
index 7517dda..3bac732 100644
--- a/client/rhel/rhn-client-tools/man/en/spacewalk-channel.8
+++ b/client/rhel/rhn-client-tools/man/en/spacewalk-channel.8
@@ -24,9 +24,7 @@ spacewalk-channel [\fIoptions\fP]
.SH DESCRIPTION
.PP
-\fVspacewalk-channel\fR allows you to subscribe to and unsubscribe from
-specified channels via the command line. A visit to the Red Hat Network Classic
-(or Spacewalk) website isn't required.
+\fVspacewalk-channel\fR allows you to subscribe to and unsubscribe from specified
channels via the command line. A visit to the "\fBSpacewalk Server\fP",
"\fBRed Hat Satellite\fP" or "\fBRed Hat Network Classic\fP" website
isn't required.
.SH OPTIONS
@@ -55,8 +53,7 @@ option. This is an unencrypted password.
If you do not enter this option and it is required, you will be prompted.
.br
.IP "\fB-c, --channel\fP"
-Label of channel you want to subscribe to or unsubscribe from. Can be specified multiple
-times.
+Label of channel you want to subscribe to or unsubscribe from. Can be specified multiple
times.
.br
.IP "\fB-v, --verbose\fP"
Print out successfull action.
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
index f8cb2d2..9fa7e91 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
@@ -19636,7 +19636,7 @@ given channel.</source>
</context-group>
</trans-unit>
<trans-unit id="unknown.package.msg">
- <source>Unfortunately, you have requested information about a package we do
not have in our database. Most likely, this is a custom package you have installed by
hand, or is from a distribution not supported by Spacewalk.</source>
+ <source>Unfortunately, you have requested information about a package we do
not have in our database. Most likely, this is a custom package you have installed by
hand, or is from a distribution not supported by @@PRODUCT_NAME@@.</source>
<context-group name="ctx">
<context
context-type="sourcefile">/rhn/channels/manage/errata/ErrataList.do</context>
</context-group>
diff --git a/java/conf/logrotate/rhn_web_api b/java/conf/logrotate/rhn_web_api
index 5530cf4..4a7808a 100644
--- a/java/conf/logrotate/rhn_web_api
+++ b/java/conf/logrotate/rhn_web_api
@@ -1,4 +1,4 @@
-# logrotation file for Spacewalk
+# logrotation file for Spacewalk Server
#
# $Id$