diff --git a/_build_system/Rakefile b/_build_system/Rakefile index f6648b9c09f3..3b540a15309e 100644 --- a/_build_system/Rakefile +++ b/_build_system/Rakefile @@ -123,14 +123,14 @@ task :build do if not File.exists?(tgt_group_path) Dir.mkdir(tgt_group_path) end - if File.exists?(File.join(src_group_path,'images')) - system("cp -r #{src_group_path}/images #{tgt_group_path}") - end + #if File.exists?(File.join(src_group_path,'images')) + # system("cp -r #{src_group_path}/images #{tgt_group_path}") + #end topic_group['Topics'].each do |topic| src_file_path = File.join(src_group_path,"#{topic['File']}.adoc") tgt_file_path = File.join(tgt_group_path,"#{topic['File']}.adoc") system('cp', src_file_path, tgt_file_path) - Asciidoctor.render_file tgt_file_path, :in_place => true, :safe => :unsafe, :template_dir => builder_template_dir, :attributes => ['source-highlighter=coderay','coderay-css=style',"stylesdir=#{preview_dir}/stylesheets","imagesdir=./images",'stylesheet=origin.css','linkcss!','icons=font','idprefix=','idseparator=-','sectanchors'] + Asciidoctor.render_file tgt_file_path, :in_place => true, :safe => :unsafe, :template_dir => builder_template_dir, :attributes => ['source-highlighter=coderay','coderay-css=style',"stylesdir=#{preview_dir}/stylesheets","imagesdir=#{src_group_path}/images",'stylesheet=origin.css','linkcss!','icons=font','idprefix=','idseparator=-','sectanchors'] system('rm', tgt_file_path) end end diff --git a/client_tools_install_guide/configuring_client_tools.adoc b/client_tools_install_guide/configuring_client_tools.adoc index b7cfcf98d57a..dc7b9022e46d 100644 --- a/client_tools_install_guide/configuring_client_tools.adoc +++ b/client_tools_install_guide/configuring_client_tools.adoc @@ -1,5 +1,8 @@ -[[Configuring_Client_Tools]] = Configuring Client Tools +OpenShift Documentation Project +DOC_BRANCH_VERSION +:data-uri: +:icons: After the client tools are installed, they must be configured. The easiest method of configuring the client tools is to use the interactive setup wizard, which walks you through the configuration steps by asking several questions. @@ -9,7 +12,7 @@ After the client tools are installed, they must be configured. The easiest metho You must run the interactive setup wizard after installing the client tools so that your workstation is correctly configured to communicate with the remote OpenShift server. ==== -The following is a sample walk through of the setup wizard, and some general information to assist you with the initial configuration. It assumes you have installed the latest version of the client tools. Use +rhc --version+ to verify the installed version, or link:Updating_Client_Tools.html[update the client tools]. +The following is a sample walk through of the setup wizard, and some general information to assist you with the initial configuration. It assumes you have installed the latest version of the client tools. Use +rhc --version+ to verify the installed version, or link:updating_client_tools.html[update the client tools]. [NOTE] @@ -21,6 +24,7 @@ The following setup wizard example was run on Windows 7. Screen outputs may vary *Starting the Setup Wizard* Launch the setup wizard: + ---- $ rhc setup OpenShift Client Tools (RHC) Setup Wizard @@ -31,6 +35,7 @@ This wizard will help you upload your SSH keys, set your application namespace, *Login Information* The setup wizard next prompts you for the login credentials that were used to sign up for an OpenShift account. Alternatively, you can also use your Red Hat login credentials. + ---- Login to openshift.redhat.com: user@example.com Password: password @@ -40,8 +45,6 @@ Password: password You are then prompted to generate an authorization token. Answering _++yes++_ will store a token in your home directory to be used on subsequent requests. When it expires, you are prompted for your password again. - - ---- OpenShift can create and store a token on disk which allows to you to access the server without using your password. The key is stored in your home directory and should be kept secret. You can delete the key at any time by running 'rhc logout'. Generate a token now? (yes|no) yes @@ -50,28 +53,23 @@ Generating an authorization token for this client ... lasts about 1 day *Configuration File* -With your login credentials, the setup wizard creates the *express.conf* configuration file in your home directory. In the following example, the *express.conf* file is created in the *C:\Users\User1\.openshift* directory. ----- +With your login credentials, the setup wizard creates the *express.conf* configuration file in your home directory. In the following example, the *express.conf* file is created in the *C:\Users\User1\.openshift* directory. +---- Saving configuration to C:\Users\User1\.openshift\express.conf ... done - ---- - - - - *SSH Keys* -Next, the setup wizard configures the SSH keys so that your system can authenticate with the remote server. Because this is the initial configuration, it is assumed no existing SSH keys are found on your system. Therefore, the setup wizard generates a new pair of SSH keys, named *id_rsa* and *id_rsa.pub*, and saves them in your home directory. In the following example the SSH keys are generated and saved in the *C:\Users\User1\.ssh* directory. ----- +Next, the setup wizard configures the SSH keys so that your system can authenticate with the remote server. Because this is the initial configuration, it is assumed no existing SSH keys are found on your system. Therefore, the setup wizard generates a new pair of SSH keys, named *id_rsa* and *id_rsa.pub*, and saves them in your home directory. In the following example the SSH keys are generated and saved in the *C:\Users\User1\.ssh* directory. +---- No SSH keys were found. We will generate a pair of keys for you. Created: C:\Users\User1\.ssh\id_rsa.pub - ---- After the new SSH keys are generated, the public key, *id_rsa.pub*, must be uploaded to the OpenShift server to authenticate your system to the remote server. Enter a name to use for your key, or leave it blank to use the default name. In the following example the default name is used. + ---- Your public ssh key must be uploaded to the OpenShift server to access code. Upload now? (yes|no) yes @@ -81,38 +79,28 @@ Since you do not have any keys associated with your OpenShift account, your new Uploading key 'default' from C:\Users\User1\.ssh\id_rsa.pub ... done ---- - - - - *Installed Software* -The setup wizard verifies if Git version control software is installed on your system. Git is required to create and deploy applications to the OpenShift cloud environment. It is assumed that all the required software for your operating system is already installed as described in the earlier sections of this document. In the example below, the setup wizard verifies that Git for Windows is installed correctly. ----- +The setup wizard verifies if Git version control software is installed on your system. Git is required to create and deploy applications to the OpenShift cloud environment. It is assumed that all the required software for your operating system is already installed as described in the earlier sections of this document. In the example below, the setup wizard verifies that Git for Windows is installed correctly. +---- In order to fully interact with OpenShift you will need to install and configure a git client if you have not already done so. Documentation for installing other tools you will need for OpenShift can be found at https://openshift.redhat.com/community/developers/install-the-client-tools We recommend these free applications: - * Git for Windows - a basic git command line and GUI client https://github.com /msysgit/msysgit/wiki/InstallMSysGit - + * TortoiseGit - git client that integrates into the file explorer http://code. google.com/p/tortoisegit/ - ---- - - - - *Domain* The setup wizard next verifies whether a domain already exists for your cloud environment. The example below assumes that a domain does not exist, and one must be created. If you did create a domain when you signed up for an OpenShift account, it is displayed here. To create a domain at this time, enter the desired name when prompted. Alternatively, you can create a domain using the OpenShift Management Console, or with the +rhc domain create+ command later. The domain named _MyDomain_ is created in the following example. ----- +---- Checking for a domain ... none Your domain is unique to your account and is the suffix of the public URLs we assign to your applications. You may configure your domain here or leave it blank and use 'rhc domain create' to create a domain later. You will not be able to create applications without first creating a domain. @@ -121,26 +109,13 @@ Please enter a domain (letters and numbers only) ||: MyDomain Your domain name 'MyDomain' has been successfully created ---- - - - - - -[IMPORTANT] -==== -A domain must be created before you can create OpenShift applications. - - -==== - +IMPORTANT: A domain must be created before you can create OpenShift applications. *Applications* +Finally, the setup wizard verifies whether any applications exist under your domain. Any applications created with the Management Console are displayed here. In the example below, no applications have been created. In this case the setup wizard shows the types of applications that can be created with the associated commands. The setup wizard then completes by displaying the current gear consumption along with the gear sizes available to the given user. - -Finally, the setup wizard verifies whether any applications exist under your domain. Any applications created with the Management Console are displayed here. In the example below, no applications have been created. In this case the setup wizard shows the types of applications that can be created with the associated commands. The setup wizard then completes by displaying the current gear consumption along with the gear sizes available to the given user. ---- - Checking for applications ... none Run 'rhc app create' to create your first application. @@ -166,7 +141,6 @@ Run 'rhc app create' to create your first application. The following gear sizes are available to you: small Your client tools are now configured. - ---- -The OpenShift client tools are now configured on your system. \ No newline at end of file +The OpenShift client tools are now configured on your system. diff --git a/client_tools_install_guide/installing_client_tools_on_fedora.adoc b/client_tools_install_guide/installing_client_tools_on_fedora.adoc index 4f48695c22a7..010489526fee 100644 --- a/client_tools_install_guide/installing_client_tools_on_fedora.adoc +++ b/client_tools_install_guide/installing_client_tools_on_fedora.adoc @@ -1,5 +1,8 @@ -[[Installing_Client_Tools_on_Fedora]] = Installing Client Tools on Fedora +OpenShift Documentation Project +DOC_BRANCH_VERSION +:data-uri: +:icons: The OpenShift client tools are supported on Fedora 16 or later and require sudoer or root access. @@ -16,11 +19,10 @@ You can install the client tools on Fedora operating systems by installing the R The RPM version of the client tools is not updated as frequently as the gem maintained by the OpenShift development team. ==== - - *Install with YUM Package Manager* From the terminal, install the client tools and all other required dependencies: + ---- $ sudo yum install rubygem-rhc ---- @@ -44,6 +46,7 @@ $ sudo gem install rhc *Automatic Completion Using the Tab Key* The client tools for Fedora support the automatic completion feature of the bash shell. Run the following command and follow the instructions to enable automatic completion: + ---- $ rhc setup --autocomplete ---- @@ -51,8 +54,9 @@ $ rhc setup --autocomplete You may have to close your current terminal session, and open a new session to automatically source the bash completion script. If the automatic completion feature is not persistent when you open a new terminal session, the automatic completion script for the client tools must be sourced in the *_.bashrc_* file in your home directory. Do this by adding the following line to to your *_.bashrc_* file: + ---- source /etc/bash_completion.d/rhc ---- -//When the installation completes, proceed to <> to configure the client tools using the interactive setup wizard. \ No newline at end of file +//When the installation completes, proceed to <> to configure the client tools using the interactive setup wizard. diff --git a/client_tools_install_guide/installing_client_tools_on_macosx.adoc b/client_tools_install_guide/installing_client_tools_on_macosx.adoc index 0653e3d60fd3..95c90b638234 100644 --- a/client_tools_install_guide/installing_client_tools_on_macosx.adoc +++ b/client_tools_install_guide/installing_client_tools_on_macosx.adoc @@ -1,6 +1,7 @@ -[[Installing_Client_Tools_on_Mac_OS_X]] = Installing Client Tools on Mac OS X - +OpenShift Documentation Project +DOC_BRANCH_VERSION +:data-uri: :icons: The OpenShift client tools are supported on Mac OS X 10.5 or later and require sudo access. @@ -16,22 +17,18 @@ Installing the client tools on a Mac OS X operating system comprises three steps == Install Ruby -Mac OS X Lion ships with Ruby 1.8.7 preinstalled. Previous versions of OS X included Ruby as part of the link:$$https://developer.apple.com/xcode/$$[Xcode] integrated development environment. If you are installing the client tools on a version of OS X that did not ship with Ruby preinstalled, you can install it one of two ways: +Mac OS X Lion ships with Ruby 1.8.7 preinstalled. Previous versions of OS X included Ruby as part of the https://developer.apple.com/xcode/[Xcode] integrated development environment. If you are installing the client tools on a version of OS X that did not ship with Ruby preinstalled, you can install it one of two ways: * Use the OS X installation CD - - -* Download and install the link:$$https://developer.apple.com/xcode/$$[Xcode] integrated development environment from the Apple website +* Download and install the https://developer.apple.com/xcode/[Xcode] integrated development environment from the Apple website Alternatively, if you are experienced with Mac OS software development, you can also: - -* Download and install Ruby from the link:$$http://macruby.org/$$[MacRuby] website, or - - -* Visit link:$$http://www.ruby-lang.org/en/downloads/$$[] for help installing Ruby with homebrew +* Download and install Ruby from the http://macruby.org/[MacRuby] website, or +* Visit http://www.ruby-lang.org/en/downloads/ for help installing Ruby with homebrew After Ruby is installed, run the following command to verify that it has installed correctly: + ---- $ ruby -e 'puts "Welcome to Ruby"' Welcome to Ruby @@ -39,19 +36,22 @@ Welcome to Ruby == Install Git Version Control -Although there are a number of options available to install Git version control on Mac OS X, Red Hat recommends to download and install the latest version from here: link:$$http://code.google.com/p/git-osx-installer/$$[]. +Although there are a number of options available to install Git version control on Mac OS X, Red Hat recommends to download and install the latest version from here: http://code.google.com/p/git-osx-installer/ When the installation completes,, run the following command to verify that Git has installed correctly: + ---- $ git --version ---- -This command returns the Git version number that was installed. +This command returns the Git version number that was installed. == Install the Client Tools When Ruby and Git have been successfully installed, run the following command to install the client tools: + ---- $ sudo gem install rhc ---- + //When the installation completes, proceed to <> to configure the client tools using the interactive setup wizard. diff --git a/client_tools_install_guide/installing_client_tools_on_opensuse.adoc b/client_tools_install_guide/installing_client_tools_on_opensuse.adoc index 28cafefdaac1..c1c4792708db 100644 --- a/client_tools_install_guide/installing_client_tools_on_opensuse.adoc +++ b/client_tools_install_guide/installing_client_tools_on_opensuse.adoc @@ -1,23 +1,16 @@ -[[Installing_Client_Tools_on_openSUSE]] = Installing Client Tools on openSUSE - +OpenShift Documentation Project +DOC_BRANCH_VERSION +:data-uri: :icons: Installing the client tools on openSUSE requires sudoer or root access and comprises three steps: -*Step 1*: Install *_Ruby_* - - -*Step 2*: Install *_RubyGems_* - - -*Step 3*: Install *_Git_* - +*Step 1*: Install *_Ruby_* + +*Step 2*: Install *_RubyGems_* + +*Step 3*: Install *_Git_* + *Step 4*: Install the client tools - - - [NOTE] ==== The +sudo+ command only works if the particular user is listed in the _sudoers_ file. As an alternative to sudo access, you can activate a root terminal with the +su+ command and the root password. If you activate a root terminal, omit +sudo+ from the commands shown in the examples. Be sure to close the root terminal after the installation completes. @@ -26,22 +19,22 @@ The +sudo+ command only works if the particular user is listed in the _sudoers_ == Install Ruby From terminal, run the following command to install Ruby: + ---- $ sudo zypper install ruby ---- Run the following command to verify that Ruby has installed correctly: + ---- $ ruby -e 'puts "Welcome to Ruby"' Welcome to Ruby ---- - - - == Install RubyGems Run the following command to install RubyGems: + ---- $ sudo zypper install rubygems ---- @@ -49,11 +42,13 @@ $ sudo zypper install rubygems == Install Git Run the following command to install Git version control: + ---- $ sudo zypper install git-core ---- After installation completes, run the following command to verify that Git has installed correctly: + ---- $ git --version git version 1.7.11.1 @@ -65,8 +60,9 @@ This command returns the Git version number that was installed. == Install the Client Tools When the required software has been successfully installed, run the following command to install the client tools: + ---- $ sudo gem install rhc ---- -//When the installation completes, proceed to <> to configure the client tools using the interactive setup wizard. \ No newline at end of file +//When the installation completes, proceed to <> to configure the client tools using the interactive setup wizard. diff --git a/client_tools_install_guide/installing_client_tools_on_rhel.adoc b/client_tools_install_guide/installing_client_tools_on_rhel.adoc index e8fdcd3eb125..e596884a2023 100644 --- a/client_tools_install_guide/installing_client_tools_on_rhel.adoc +++ b/client_tools_install_guide/installing_client_tools_on_rhel.adoc @@ -1,58 +1,55 @@ -[[Installing_Client_Tools_on_RHEL]] = Installing Client Tools on Red Hat Enterprise Linux +OpenShift Documentation Project +DOC_BRANCH_VERSION +:data-uri: +:icons: You must have the following to successfully install the client tools: - + * Red Hat Enterprise Linux 6 or later * Sudoer or root access * Ruby and RubyGems installed (including rubygem-json and rubygem-parseconfig) - [NOTE] ==== The +sudo+ command only works if the particular user is listed in the *_sudoers_* file. As an alternative to sudo access, you can activate a root terminal with the +su+ command and the root password. If you activate a root terminal, omit +sudo+ from the commands shown in the examples. Be sure to close the root terminal after the installation completes. ==== -=== Installing RubyGems +== Installing RubyGems If the RubyGems package is not already installed, you must enable the Red Hat Enterprise Linux optional repository channel. The RubyGems package dependencies are then automatically resolved when the client tools are installed. If you are using the Certificate-Based Red Hat Network (RHN) tooling, use the following command to enable the optional channel: + ---- $ sudo yum-config-manager --enable [architecture][operating_system]-optional-6 ---- - - If you are using the classic RHN subscription, use the following command to enable the optional channel: + ---- $ sudo rhn-channel --add --channel=[architecture]-[operating_system]-optional-6 ---- - -* _++architecture++_: your system architecture. Enter either _i386_ or *x86_64*. - - -* _++operating system++_: type of operating system installed. Enter either _workstation_ or _server_. - - +* _++architecture++_: your system architecture. Enter either _i386_ or *x86_64* +* _++operating system++_: type of operating system installed. Enter either _workstation_ or _server_. For example, if you have Red Hat Enterprise Linux Workstation 6 or later installed on a 64-bit x86 computer, and you are using the classic Red Hat Network subscription, run the following command to enable the optional repository: + ---- $ sudo rhn-channel --add --channel=rhel-x86_64-workstation-optional-6 ---- -=== Installing Client Tools +== Installing Client Tools -Ensure that the RubyGems software package is installed on your system. Otherwise, the optional repository channel must be enabled on systems that are registered on RHN. +Ensure that the RubyGems software package is installed on your system. Otherwise, the optional repository channel must be enabled on systems that are registered on RHN. Run the following command to install the client tools: + ---- $ sudo gem install rhc ---- - - Update client tools to the latest version: ---- @@ -62,9 +59,7 @@ $ sudo gem update rhc The following example shows a typical installation on a Red Hat Enterprise Linux operating system. Some information has been removed for clarification purposes. .Installation Process on Red Hat Operating System -==== ---- -Installation Process on Red Hat Operating System $ sudo gem install rhc Freeing read locks for locker 0x1: 2360/140216412567296 ........ @@ -74,14 +69,13 @@ Resolving Dependencies Complete! ---- -==== - -=== Installation Issues and Tips +== Installation Issues and Tips *Automatic Completion Using the Tab Key* The OpenShift client tools for Red Hat Enterprise Linux support the automatic completion feature of the bash shell. Run the following command and follow the instructions to enable automatic completion: + ---- $ rhc setup --autocomplete ---- @@ -89,8 +83,9 @@ $ rhc setup --autocomplete You may have to close your current terminal session, and open a new session to automatically source the bash completion script. If the automatic completion feature is not persistent when you open a new terminal session, the automatic completion script for the client tools must be sourced in the *_.bashrc_* file in your home directory. Do this by adding the following line to to your *_.bashrc_* file: + ---- source /etc/bash_completion.d/rhc ---- -//When the installation completes, proceed to <> to configure the client tools using the interactive setup wizard. \ No newline at end of file +//When the installation completes, proceed to <> to configure the client tools using the interactive setup wizard. diff --git a/client_tools_install_guide/installing_client_tools_on_ubuntu_debian.adoc b/client_tools_install_guide/installing_client_tools_on_ubuntu_debian.adoc index c8b02902670d..e79aa71be580 100644 --- a/client_tools_install_guide/installing_client_tools_on_ubuntu_debian.adoc +++ b/client_tools_install_guide/installing_client_tools_on_ubuntu_debian.adoc @@ -1,6 +1,7 @@ -[[Installing_Client_Tools_on_Ubuntu_and_Debian]] = Installing Client Tools on Ubuntu and Debian - +OpenShift Documentation Project +DOC_BRANCH_VERSION +:data-uri: :icons: Installing the client tools on Ubuntu or Debian requires sudoer or root access and comprises four steps: @@ -27,16 +28,16 @@ $ sudo apt-get install ruby-full ---- Run the following command to verify that Ruby has installed correctly: + ---- $ ruby -e 'puts "Welcome to Ruby"' ----- Welcome to Ruby - - +---- == Installing RubyGems Run the following command to install RubyGems: + ---- $ sudo apt-get install rubygems ---- @@ -44,11 +45,13 @@ $ sudo apt-get install rubygems == Installing Git Run the following command to install Git version control: + ---- $ sudo apt-get install git-core ---- After installation completes, run the following command to verify that Git has installed correctly: + ---- $ git --version ---- @@ -57,8 +60,8 @@ This command returns the Git version number that was installed. == Installing Client Tools - When the required software has been successfully installed, run the following command to install the client tools: + ---- $ sudo gem install rhc ---- @@ -67,13 +70,14 @@ $ sudo gem install rhc *Executing Client Tool Commands from Any Directory* -On Ubuntu and other Debian based distributions, the client tools by default are stored in the */var/lib/gems/1.8/bin* directory. Therefore, all client tool commands must be executed from this directory, and you must append *./* to each command. - +On Ubuntu and other Debian based distributions, the client tools by default are stored in the `/var/lib/gems/1.8/bin` directory. Therefore, all client tool commands must be executed from this directory, and you must prepend `./` to each command. However, this behavior can be changed by adding the client tools to the PATH environment variable so that you can run client tool commands from any directory. Run the following command to add the client tools to the PATH environment variable, and make it persistent for an entire terminal session: + ---- $ sudo export PATH=/var/lib/gems/1.8/bin:$PATH ---- + Now you can run client tool commands from any directory in the current Terminal session. Note that you must do this each time you close the current Terminal session and start a new one. For a more permanent solution, add the *export PATH=/var/lib/gems/1.8/bin:$PATH* command to your *_.bashrc_* file. Therefore, each time a new Terminal session is started, the client tools are automatically added to the PATH environment variable. You can then run all client tool commands from any directory in Terminal. @@ -82,6 +86,7 @@ For a more permanent solution, add the *export PATH=/var/lib/gems/1.8/bin:$PATH* *Making Client Tools Available to All Users* Initially the OpenShift Online client tools are only available to the user installed them. Run the following command to make the client tools available for all users on an Ubuntu system: + ---- $ sudo ln -s /var/lib/gems/1.8/bin/rhc* /usr/bin/ ---- diff --git a/client_tools_install_guide/installing_client_tools_on_windows.adoc b/client_tools_install_guide/installing_client_tools_on_windows.adoc index 2a8787570e56..22b018f9201f 100644 --- a/client_tools_install_guide/installing_client_tools_on_windows.adoc +++ b/client_tools_install_guide/installing_client_tools_on_windows.adoc @@ -1,6 +1,7 @@ -[[Installing_Client_Tools_on_Windows]] = Installing Client Tools on Windows - +OpenShift Documentation Project +DOC_BRANCH_VERSION +:data-uri: :icons: The OpenShift Client Tools are supported on the following Windows operating systems: @@ -15,7 +16,7 @@ The OpenShift Client Tools are supported on the following Windows operating syst Sufficient privileges are required to install software on Windows systems. Depending on specific user permissions, disabling the User Account Control (UAC) on Windows Vista or Windows 7 operating systems may be necessary. ==== -//=== Before you begin +== Before you begin Installing the client tools on Windows operating system comprises three steps: @@ -30,35 +31,35 @@ Before you can install the client tools, you must download and install *_RubyIns === Install RubyInstaller -1. From link:$$http://rubyinstaller.org/$$[rubyinstaller.org], download and save the latest RubyInstaller package for Windows to your desired directory. +1. From http://rubyinstaller.org/[rubyinstaller.org], download and save the latest RubyInstaller package for Windows to your desired directory. //+ //[[img-rubyinstaller]] -//image::/home/Bilhar/Documents/AsciiDoc_Migration/Client_Tools_Install_Guide/images/2830.png[] +//image:2830.png[image] 2. Double-click the executable RubyInstaller file downloaded in the previos step to launch the RubyInstaller installation wizard. Accept the _Ruby License Agreement_ and click btn:[OK]. 3. Select the _Add Ruby executables to your PATH_ check box, and click btn:[Install] to begin the installation. + .Select PATH -image::/home/Bilhar/Documents/AsciiDoc_Migration/Client_Tools_Install_Guide/images/2829.png[] +image:2829.png[image] + Click *Finish* when the install completes. === Install Git Version Control -1. From link:$$http://msysgit.github.com/$$[http://msysgit.github.com/], download and save the latest version of Git for Windows to your desired directory. +1. From http://msysgit.github.com/[http://msysgit.github.com/], download and save the latest version of Git for Windows to your desired directory. 2. Double-click the executable Git file downloaded in the previous step to launch the Git installation wizard. Click btn:[Next] until you are prompted to adjust the PATH environment. 3. Select the *Run Git and included UNIX tools from the Windows Command Prompt* check box and click btn:[Next]. This is so that you can use the default Windows command prompt for Git and SSH operations. + .Select Git PATH -image::/home/Bilhar/Documents/AsciiDoc_Migration/Client_Tools_Install_Guide/images/3265.png[] +image:3265.png[image] 4. Select the Checkout Windows-style, commit Unix-style line endings check box, and click btn:[Next]. + .Select Line Editing -image::/home/Bilhar/Documents/AsciiDoc_Migration/Client_Tools_Install_Guide/images/2828.png[] +image:2828.png[image] + Click btn:[Finish] when the install completes. @@ -74,4 +75,4 @@ a. Click btn:[Start], type *cmd* in the *Start Search* text box, and then click $ gem install rhc ---- -//When the installation completes, proceed to <> to configure the client tools using the interactive setup wizard. \ No newline at end of file +//When the installation completes, proceed to <> to configure the client tools using the interactive setup wizard. diff --git a/client_tools_install_guide/updating_client_tools.adoc b/client_tools_install_guide/updating_client_tools.adoc index 92924861e889..e6d0254a8bf4 100644 --- a/client_tools_install_guide/updating_client_tools.adoc +++ b/client_tools_install_guide/updating_client_tools.adoc @@ -1,5 +1,8 @@ -[[Updating_Client_Tools]] = Updating Client Tools +OpenShift Documentation Project +DOC_BRANCH_VERSION +:data-uri: +:icons: If you installed the client tools gem, run the following command to update the client tools: @@ -8,7 +11,7 @@ $ gem update rhc ---- Alternatively, if you installed the the client tools with +yum+, run the following command to update the client tools, and replace _packagename_ with rubygem-rhc for Fedora or rhc for Red Hat Enterprise Linux: ----- +---- $ yum update packagename ----- \ No newline at end of file +----