From 5c58ddb46985f19f7ae1c60110ffb81e2aefd53e Mon Sep 17 00:00:00 2001 From: Dan McPherson Date: Tue, 8 May 2012 10:27:00 -0400 Subject: [PATCH] Bug 819739 --- express/Rakefile | 4 ++-- express/bin/rhc-create-domain | 4 ++-- express/lib/rhc-common.rb | 2 +- express/man/express.conf.5 | 4 ++-- express/man/rhc-app.1 | 2 +- express/man/rhc-chk.1 | 2 +- express/man/rhc-create-domain.1 | 4 ++-- express/man/rhc-ctl-app.1 | 2 +- express/man/rhc-ctl-domain.1 | 2 +- express/man/rhc-domain-info.1 | 2 +- express/man/rhc-domain.1 | 2 +- express/man/rhc-port-forward.1 | 2 +- express/man/rhc-snapshot.1 | 2 +- express/man/rhc-sshkey.1 | 2 +- express/man/rhc-tail-files.1 | 2 +- express/man/rhc.1 | 2 +- 16 files changed, 20 insertions(+), 20 deletions(-) diff --git a/express/Rakefile b/express/Rakefile index 52db447d5..48346c19a 100644 --- a/express/Rakefile +++ b/express/Rakefile @@ -21,9 +21,9 @@ spec = Gem::Specification.new do |s| s.version = /(Version: )(.*)/.match(File.read("client.spec"))[2] s.author = "Red Hat" s.email = %q{openshift@redhat.com} - s.summary = %q{OpenShift Express Client Tools} + s.summary = %q{OpenShift Client Tools} s.homepage = %q{https://openshift.redhat.com/app/express} - s.description = %q{The client tools for the OpenShift Express platform that allow for application management.} + s.description = %q{The client tools for the OpenShift platform that allow for application management.} s.files = FileList['lib/**/*.rb', 'lib/rhc', 'bin/*', 'conf/*'].to_a s.files += %w(LICENSE COPYRIGHT README.md Rakefile) s.executables = ['rhc', 'rhc-domain', 'rhc-app', 'rhc-sshkey', 'rhc-chk', 'rhc-create-app', 'rhc-create-domain', 'rhc-ctl-domain', 'rhc-ctl-app', 'rhc-snapshot', 'rhc-domain-info', 'rhc-user-info', 'rhc-tail-files', 'rhc-port-forward'] diff --git a/express/bin/rhc-create-domain b/express/bin/rhc-create-domain index 3a47c944d..924a1ed0a 100755 --- a/express/bin/rhc-create-domain +++ b/express/bin/rhc-create-domain @@ -187,9 +187,9 @@ end # if File.readable?(ssh_key_file_path) - puts "OpenShift Express key found at #{ssh_key_file_path}. Reusing..." + puts "OpenShift key found at #{ssh_key_file_path}. Reusing..." else - puts "Generating OpenShift Express ssh key to #{ssh_key_file_path}" + puts "Generating OpenShift ssh key to #{ssh_key_file_path}" # Use system for interaction system("ssh-keygen -t rsa -f '#{ssh_key_file_path}'") end diff --git a/express/lib/rhc-common.rb b/express/lib/rhc-common.rb index ccc52ec4f..48141dba6 100644 --- a/express/lib/rhc-common.rb +++ b/express/lib/rhc-common.rb @@ -668,7 +668,7 @@ def self.check_app_available(net_http, app_name, fqdn, health_check_path, result git clone #{git_url} LOOKSGOOD - puts "Then run 'git push' to update your OpenShift Express space." + puts "Then run 'git push' to update your OpenShift space." end end if result && !result.empty? diff --git a/express/man/express.conf.5 b/express/man/express.conf.5 index 4a41705b8..ae4b29ac1 100644 --- a/express/man/express.conf.5 +++ b/express/man/express.conf.5 @@ -3,7 +3,7 @@ .\" .TH "express.conf" "5" "JANUARY 2011" "Linux" "User Manuals" .SH "NAME" -express.conf \- configuration file for OpenShift Express +express.conf \- configuration file for OpenShift .SH "SYNOPSIS" Search order (on a per variable basis): @@ -64,7 +64,7 @@ for more information. .RE .I ~/.ssh/libra_id_rsa .RS -SSH key created by rhc\-create\-domain to interact with OpenShift Express services +SSH key created by rhc\-create\-domain to interact with OpenShift services see .BR ssh\-keygen (1) for more information diff --git a/express/man/rhc-app.1 b/express/man/rhc-app.1 index 61477cda5..67b437ba3 100644 --- a/express/man/rhc-app.1 +++ b/express/man/rhc-app.1 @@ -74,7 +74,7 @@ Reloads embedded application configuration .SH "OPTIONS" .IP "\-l|\-\-rhlogin login" -Red Hat login (RHN or OpenShift login with OpenShift Express access) +Red Hat login (RHN or OpenShift login with OpenShift access) .IP "\-p|\-\-password password" RHLogin password .IP "\-a|\-\-app application_name" diff --git a/express/man/rhc-chk.1 b/express/man/rhc-chk.1 index 610338d7f..2b143132f 100644 --- a/express/man/rhc-chk.1 +++ b/express/man/rhc-chk.1 @@ -22,7 +22,7 @@ rhc\-chk \- Diagnoses the connection between this client and the OpenShift serve diagnoses the connection between this client and the OpenShift servers. .SH "OPTIONS" .IP "\-l|\-\-rhlogin login" -Red Hat login (RHN or OpenShift login with OpenShift Express access) +Red Hat login (RHN or OpenShift login with OpenShift access) .IP "\-p|\-\-password password" RHLogin password .IP \-d|\-\-debug diff --git a/express/man/rhc-create-domain.1 b/express/man/rhc-create-domain.1 index bfaa34977..515983565 100644 --- a/express/man/rhc-create-domain.1 +++ b/express/man/rhc-create-domain.1 @@ -3,7 +3,7 @@ .\" .TH "RHC_CREATE_DOMAIN" "1" "JANUARY 2011" "Linux" "User Manuals" .SH "NAME" -rhc\-create\-domain \- creates a new OpenShift Express domain namespace with a user +rhc\-create\-domain \- creates a new OpenShift domain namespace with a user .SH "SYNOPSIS" .B rhc\-create\-domain [\-p .I password @@ -39,7 +39,7 @@ to control created applications. .IP "\-n|\-\-namespace namespace" Namespace for your application(s). Applications will be created as \-.rhcloud.com (alphanumeric \- max 16 chars) .IP "\-l|\-\-rhlogin login" -Red Hat login (RHN or OpenShift login with OpenShift Express access) +Red Hat login (RHN or OpenShift login with OpenShift access) .IP "\-p|\-\-password password" RHLogin password .IP "\-a|\-\-alter" diff --git a/express/man/rhc-ctl-app.1 b/express/man/rhc-ctl-app.1 index 732154962..3d58e3f6b 100755 --- a/express/man/rhc-ctl-app.1 +++ b/express/man/rhc-ctl-app.1 @@ -45,7 +45,7 @@ local changes are made. .SH "OPTIONS" .IP "\-l|\-\-rhlogin login" -Red Hat login (RHN or OpenShift login with OpenShift Express access) +Red Hat login (RHN or OpenShift login with OpenShift access) .IP "\-p|\-\-password password" RHLogin password .IP "\-a|\-\-app application_name" diff --git a/express/man/rhc-ctl-domain.1 b/express/man/rhc-ctl-domain.1 index 8f138d590..ed2f9e682 100644 --- a/express/man/rhc-ctl-domain.1 +++ b/express/man/rhc-ctl-domain.1 @@ -33,7 +33,7 @@ the SSH keys use the .BR rhc-domain-info (1) command. .SH "OPTIONS" .IP "-l|--rhlogin login" -Red Hat login (RHN or OpenShift login with OpenShift Express access) +Red Hat login (RHN or OpenShift login with OpenShift access) .IP "-p|--password password" RHLogin password .IP "-n|--namespace namespace" diff --git a/express/man/rhc-domain-info.1 b/express/man/rhc-domain-info.1 index d67861437..4846128c1 100644 --- a/express/man/rhc-domain-info.1 +++ b/express/man/rhc-domain-info.1 @@ -16,7 +16,7 @@ rhc-domain-info \- Displays information about a domain on in rhcloud.com displays information about a domain on the rhcloud.com system. .SH OPTIONS .IP "-l|--rhlogin login" -Red Hat login (RHN or OpenShift login with OpenShift Express access) +Red Hat login (RHN or OpenShift login with OpenShift access) .IP "-p|--password password" RHLogin password .IP "-a|--apps" diff --git a/express/man/rhc-domain.1 b/express/man/rhc-domain.1 index 73287ad74..5cb579089 100644 --- a/express/man/rhc-domain.1 +++ b/express/man/rhc-domain.1 @@ -25,7 +25,7 @@ Destroys the domain and any added ssh keys .SH "OPTIONS" .IP "\-l|\-\-rhlogin login" -Red Hat login (RHN or OpenShift login with OpenShift Express access) +Red Hat login (RHN or OpenShift login with OpenShift access) .IP "\-p|\-\-password password" RHLogin password .IP "\-n|\-\-namespace namespace" diff --git a/express/man/rhc-port-forward.1 b/express/man/rhc-port-forward.1 index 87005bd53..41eabf112 100644 --- a/express/man/rhc-port-forward.1 +++ b/express/man/rhc-port-forward.1 @@ -48,7 +48,7 @@ Note that the service will be forwarded locally on the same port number it is running on the remove server. .SH "OPTIONS" .IP "\-l|\-\-rhlogin login" -Red Hat login (RHN or OpenShift login with OpenShift Express access) +Red Hat login (RHN or OpenShift login with OpenShift access) .IP "\-p|\-\-password password" RHLogin password .IP "\-a|\-\-app application_name" diff --git a/express/man/rhc-snapshot.1 b/express/man/rhc-snapshot.1 index cc0afef78..994c4c840 100644 --- a/express/man/rhc-snapshot.1 +++ b/express/man/rhc-snapshot.1 @@ -31,7 +31,7 @@ an application use the command. .SH "OPTIONS" .IP "\-l|\-\-rhlogin login" -Red Hat login (RHN or OpenShift login with OpenShift Express access) +Red Hat login (RHN or OpenShift login with OpenShift access) .IP "\-p|\-\-password password" RHLogin password .IP "\-a|\-\-app application_name" diff --git a/express/man/rhc-sshkey.1 b/express/man/rhc-sshkey.1 index 39283279a..2dff7d583 100644 --- a/express/man/rhc-sshkey.1 +++ b/express/man/rhc-sshkey.1 @@ -23,7 +23,7 @@ Remove SSH key from the user account .SH "OPTIONS" .IP "\-l|\-\-rhlogin login" -Red Hat login (RHN or OpenShift login with OpenShift Express access) +Red Hat login (RHN or OpenShift login with OpenShift access) .IP "\-p|\-\-password password" RHLogin password diff --git a/express/man/rhc-tail-files.1 b/express/man/rhc-tail-files.1 index cd42df3a5..727cc3b81 100644 --- a/express/man/rhc-tail-files.1 +++ b/express/man/rhc-tail-files.1 @@ -29,7 +29,7 @@ connects to a remote running application and tail's files in real\-time. This is very useful for watching logs. .SH "OPTIONS" .IP "\-l|\-\-rhlogin login" -Red Hat login (RHN or OpenShift login with OpenShift Express access) +Red Hat login (RHN or OpenShift login with OpenShift access) .IP "\-p|\-\-password password" RHLogin password .IP "\-a|\-\-app application_name" diff --git a/express/man/rhc.1 b/express/man/rhc.1 index 09705e726..111482d1e 100644 --- a/express/man/rhc.1 +++ b/express/man/rhc.1 @@ -15,7 +15,7 @@ Command line tool for performing operations related to your rhcloud account. .IP domain Manage a domain in rhcloud for a registered rhcloud user .IP app -Create and manage an OpenShift Express application +Create and manage an OpenShift application .IP sshkey Manage multiple keys for the registered rhcloud user .IP port-forward