Merge pull request #12961 from liangxia/enterprise-3.3

[enterprise-3.3] Update some urls

Author: bmcelvee

admin_solutions/master_node_config.adoc

@@ -58,7 +58,7 @@ method using Ansible, then make your configuration changes
 xref:../admin_solutions/master_node_config.adoc#master-node-config-ansible[in the Ansible playbook].
 - xref:../install_config/install/quick_install.adoc#install-config-install-quick-install[Quick installation]
 ifdef::openshift-origin[]
-or link:https://docs.openshift.org/latest/getting_started/administrators.html[Manual installation]
+or link:https://docs.okd.io/latest/getting_started/administrators.html[Manual installation]
 endif::openshift-origin[]
 method, then make your changes
 xref:../admin_solutions/master_node_config.adoc#master-node-config-manual[manually in the configuration files] themselves.

creating_images/guidelines.adoc

@@ -260,7 +260,7 @@ S2I is a framework which makes it easy to write images that take application
 source code as an input and produce a new image that runs the assembled
 application as output.
 
-For example, this https://github.com/openshift/sti-python[Python image]
+For example, this https://github.com/sclorg/s2i-python-container[Python image]
 defines S2I scripts for building various versions of Python applications.
 
 For more details about how to write S2I scripts for your image, see the

creating_images/s2i_testing.adoc

@@ -171,7 +171,7 @@ spec:
   source:
     type: "Git"
     git:
-      uri: "git://github.com/openshift/sti-ruby.git"
+      uri: "git://github.com/sclorg/s2i-ruby-container.git"
   strategy:
     type: "Custom"
     customStrategy:

dev_guide/app_tutorials/quickstarts.adoc

@@ -40,16 +40,16 @@ These quickstarts provide a basic application of the indicated framework and lan
 
 * CakePHP: a PHP web framework (includes a MySQL database)
 ** link:https://github.com/openshift/origin/tree/master/examples/quickstarts/cakephp-mysql.json[Template definition]
-** link:https://github.com/openshift/cakephp-ex[Source repository]
+** link:https://github.com/sclorg/cakephp-ex[Source repository]
 * Dancer: a Perl web framework (includes a MySQL database)
 ** link:https://github.com/openshift/origin/tree/master/examples/quickstarts/dancer-mysql.json[Template definition]
-** link:https://github.com/openshift/dancer-ex[Source repository]
+** link:https://github.com/sclorg/dancer-ex[Source repository]
 * Django: a Python web framework (includes a PostgreSQL database)
 ** link:https://github.com/openshift/origin/tree/master/examples/quickstarts/django-postgresql.json[Template definition]
-** link:https://github.com/openshift/django-ex[Source repository]
+** link:https://github.com/sclorg/django-ex[Source repository]
 * NodeJS: a NodeJS web application (includes a MongoDB database)
 ** link:https://github.com/openshift/origin/tree/master/examples/quickstarts/nodejs-mongodb.json[Template definition]
-** link:https://github.com/openshift/nodejs-ex[Source repository]
+** link:https://github.com/sclorg/nodejs-ex[Source repository]
 * Rails: a Ruby web framework (includes a PostgreSQL database)
 ** link:https://github.com/openshift/origin/tree/master/examples/quickstarts/rails-postgresql.json[Template definition]
-** link:https://github.com/openshift/rails-ex[Source repository]
+** link:https://github.com/sclorg/rails-ex[Source repository]

dev_guide/app_tutorials/ruby_on_rails.adoc

@@ -12,7 +12,7 @@ toc::[]
 
 == Overview
 
-Ruby on Rails is a popular web framework written in https://github.com/openshift/mysql/tree/master/5.5[Ruby].
+Ruby on Rails is a popular web framework written in https://github.com/sclorg/mysql-container/tree/master/5.5[Ruby].
 This guide covers using Rails 4 on {product-title}.
 
 [WARNING]
@@ -194,7 +194,7 @@ default: &default
   database: <%= ENV["POSTGRESQL_DATABASE"] %>
 ----
 
-For an example of how the final file should look, see link:https://github.com/openshift/rails-ex[Ruby on Rails example application] link:https://github.com/openshift/rails-ex/blob/master/config/database.yml[config/database.yml].
+For an example of how the final file should look, see link:https://github.com/sclorg/rails-ex[Ruby on Rails example application] link:https://github.com/sclorg/rails-ex/blob/master/config/database.yml[config/database.yml].
 
 === Storing Your Application in Git
 
@@ -365,7 +365,7 @@ Run the migration from inside the container:
 
 If you are running your Rails application in a `development` or `test` environment you don't have to specify the `RAILS_ENV` environment variable.
 
-* By adding pre-deployment xref:../../dev_guide/deployments/deployment_strategies.adoc#lifecycle-hooks[lifecycle hooks] in your template. For example check the link:https://github.com/openshift/rails-ex/blob/master/openshift/templates/rails-postgresql.json#L122-L130[hooks example] in our link:https://github.com/openshift/rails-ex[Rails example] application.
+* By adding pre-deployment xref:../../dev_guide/deployments/deployment_strategies.adoc#lifecycle-hooks[lifecycle hooks] in your template. For example check the link:https://github.com/sclorg/rails-ex/blob/master/openshift/templates/rails-postgresql.json#L122-L130[hooks example] in our link:https://github.com/sclorg/rails-ex[Rails example] application.
 
 === Creating a Route for Your Application
 

dev_guide/application_lifecycle/new_app.adoc

@@ -45,7 +45,7 @@ You can use a subdirectory of your source code repository by specifying a
 `--context-dir` flag. To create an application using a remote Git repository and a context subdirectory:
 
 ----
-$ oc new-app https://github.com/openshift/sti-ruby.git \
+$ oc new-app https://github.com/sclorg/s2i-ruby-container.git \
     --context-dir=2.0/test/puma-test-app
 ----
 

dev_guide/builds.adoc

@@ -1279,7 +1279,7 @@ encoded content of the *_~/.npmrc_* file.
 ----
 source:
   git:
-    uri: https://github.com/openshift/nodejs-ex.git
+    uri: https://github.com/sclorg/nodejs-ex.git
   secrets:
     - secret:
         name: secret-npmrc
@@ -1291,7 +1291,7 @@ To include the secrets in a new build configuration, run the following command:
 +
 ====
 ----
-$ oc new-build openshift/nodejs-010-centos7~https://github.com/openshift/nodejs-ex.git --build-secret secret-npmrc
+$ oc new-build openshift/nodejs-010-centos7~https://github.com/sclorg/nodejs-ex.git --build-secret secret-npmrc
 ----
 ====
 +
@@ -1306,7 +1306,7 @@ in the Dockerfile. If you want to specify another directory, add a
 ----
 source:
   git:
-    uri: https://github.com/openshift/nodejs-ex.git
+    uri: https://github.com/sclorg/nodejs-ex.git
   secrets:
     - secret:
         name: secret-npmrc
@@ -1320,7 +1320,7 @@ configuration:
 +
 ====
 ----
-$ oc new-build openshift/nodejs-010-centos7~https://github.com/openshift/nodejs-ex.git --build-secret “secret-npmrc:/etc”
+$ oc new-build openshift/nodejs-010-centos7~https://github.com/sclorg/nodejs-ex.git --build-secret “secret-npmrc:/etc”
 ----
 ====
 +

dev_guide/managing_images.adoc

@@ -806,7 +806,7 @@ spec:
           see
           https://github.com/sclorg/s2i-ruby-container/tree/master/2.0/README.md.
         iconClass: icon-ruby <5>
-        sampleRepo: 'https://github.com/openshift/ruby-ex.git' <6>
+        sampleRepo: 'https://github.com/sclorg/ruby-ex.git' <6>
         tags: 'builder,ruby' <7>
         supports: 'ruby' <8>
         version: '2.0' <9>

dev_guide/migrating_applications/quickstart_examples.adoc

@@ -22,19 +22,19 @@ following to instantiate the linked application and database at once, from your
 GitHub repository containing your source code. You can list all available
 templates with `oc get templates -n openshift`:
 
-* CakePHP MySQL https://github.com/openshift/cakephp-ex
+* CakePHP MySQL https://github.com/sclorg/cakephp-ex
 ** template: cakephp-mysql-example
 
-* Node.js MongoDB https://github.com/openshift/nodejs-ex
+* Node.js MongoDB https://github.com/sclorg/nodejs-ex
 ** template: nodejs-mongodb-example
 
-* Django PosgreSQL https://github.com/openshift/django-ex
+* Django PosgreSQL https://github.com/sclorg/django-ex
 ** template: django-psql-example
 
-* Dancer MySQL https://github.com/openshift/dancer-ex
+* Dancer MySQL https://github.com/sclorg/dancer-ex
 ** template: dancer-mysql-example
 
-* Rails PostgreSQL https://github.com/openshift/rails-ex
+* Rails PostgreSQL https://github.com/sclorg/rails-ex
 ** template: rails-postgresql-example
 
 [[migrating-applications-quickstart-workflow]]

dev_guide/migrating_applications/web_framework_applications.adoc

@@ -79,7 +79,7 @@ $ git push -u <remote-name> master
 this Gemfile into the root of your source:
 +
 ----
-https://github.com/openshift/ruby-ex/blob/master/Gemfile
+https://github.com/sclorg/ruby-ex/blob/master/Gemfile
 ----
 +
 [NOTE]

dev_guide/templates.adoc

@@ -139,7 +139,7 @@ of the Quickstart templates in the default *openshift* project:
 ----
 $ oc process --parameters -n openshift rails-postgresql-example
 NAME                         DESCRIPTION                                                                                              GENERATOR           VALUE
-SOURCE_REPOSITORY_URL        The URL of the repository with your application source code                                                                  https://github.com/openshift/rails-ex.git
+SOURCE_REPOSITORY_URL        The URL of the repository with your application source code                                                                  https://github.com/sclorg/rails-ex.git
 SOURCE_REPOSITORY_REF        Set this to a branch name, tag or other ref of your repository if you are not using the default branch
 CONTEXT_DIR                  Set this to the relative path to your project if it is not in the root of your repository
 APPLICATION_DOMAIN           The exposed hostname that will route to the Rails service                                                                    rails-postgresql-example.openshiftapps.com
@@ -371,7 +371,7 @@ objects:
 parameters:
   - name: SOURCE_REPOSITORY_URL <2>
     description: The URL of the repository with your application source code <3>
-    value: https://github.com/openshift/cakephp-ex.git <4>
+    value: https://github.com/sclorg/cakephp-ex.git <4>
     required: true <5>
   - name: GITHUB_WEBHOOK_SECRET
     description: A secret string used to configure the GitHub webhook

getting_started/administrators.adoc

@@ -290,7 +290,7 @@ $ oc project test
 example source code to create a new deployable Node.js image:
 +
 ----
-$ oc new-app openshift/nodejs-010-centos7~https://github.com/openshift/nodejs-ex.git
+$ oc new-app openshift/nodejs-010-centos7~https://github.com/sclorg/nodejs-ex.git
 ----
 +
 A build will be triggered automatically using the provided image and the latest

getting_started/basic_walkthrough.adoc

@@ -32,7 +32,7 @@ on GitHub and clone the repository to your local machine so that you can deploy
 and edit the application.
 
 . On GitHub, navigate to the
-https://github.com/openshift/nodejs-ex[*openshift/nodejs-ex*] repository. In the
+https://github.com/sclorg/nodejs-ex[*openshift/nodejs-ex*] repository. In the
 top-right corner of the page, click *Fork*:
 +
 image::gs-fork.png[Fork the project]

getting_started/beyond_the_basics.adoc

@@ -48,13 +48,13 @@ and edit the application.
 [NOTE]
 ====
 You can skip this step if you already forked the
-https://github.com/openshift/nodejs-ex[*openshift/nodejs-ex*] repository when
+https://github.com/sclorg/nodejs-ex[*openshift/nodejs-ex*] repository when
 following the xref:../getting_started/basic_walkthrough.adoc#getting-started-basic-walkthrough[Basic Walkthrough]
 topic.
 ====
 
 . On GitHub, navigate to the
-https://github.com/openshift/nodejs-ex[*openshift/nodejs-ex*] repository. In the
+https://github.com/sclorg/nodejs-ex[*openshift/nodejs-ex*] repository. In the
 top-right corner of the page, click *Fork*:
 +
 image::gs-fork.png[Fork the project]
@@ -388,29 +388,29 @@ and try out Quickstart templates for the following languages:
 |Language|Implementations and Tutorials
 
 .^|xref:../using_images/s2i_images/ruby.adoc#using-images-s2i-images-ruby[Ruby]
-|https://github.com/openshift/rails-ex[Rails]
+|https://github.com/sclorg/rails-ex[Rails]
 
 .^|xref:../using_images/s2i_images/python.adoc#using-images-s2i-images-python[Python]
-|https://github.com/openshift/django-ex[Django]
+|https://github.com/sclorg/django-ex[Django]
 
 .^|xref:../using_images/s2i_images/nodejs.adoc#using-images-s2i-images-nodejs[Node.js]
-|https://github.com/openshift/nodejs-ex[Node.js]
+|https://github.com/sclorg/nodejs-ex[Node.js]
 
 .^|xref:../using_images/s2i_images/php.adoc#using-images-s2i-images-php[PHP]
-|https://github.com/openshift/cakephp-ex[CakePHP]
+|https://github.com/sclorg/cakephp-ex[CakePHP]
 
 .^|xref:../using_images/s2i_images/perl.adoc#using-images-s2i-images-perl[Perl]
-|https://github.com/openshift/dancer-ex[Dancer]
+|https://github.com/sclorg/dancer-ex[Dancer]
 
 |===
 
 Other images provided by {product-title} include:
 
-* https://github.com/openshift/mysql[MySQL]
+* https://github.com/sclorg/mysql-container[MySQL]
 
-* https://github.com/openshift/mongodb[MongoDB]
+* https://github.com/sclorg/mongodb-container[MongoDB]
 
-* https://github.com/openshift/postgresql[PostgreSQL]
+* https://github.com/sclorg/postgresql-container[PostgreSQL]
 
 * https://github.com/openshift/jenkins[Jenkins]
 

getting_started/developers_cli.adoc

@@ -58,19 +58,19 @@ turn leverage xref:../using_images/s2i_images/index.adoc#using-images-s2i-images
 |Language|Implementations and Tutorials
 
 .^|Ruby
-|https://github.com/openshift/rails-ex[Rails]
+|https://github.com/sclorg/rails-ex[Rails]
 
 .^|Python
-|https://github.com/openshift/django-ex[Django]
+|https://github.com/sclorg/django-ex[Django]
 
 .^|Node.js
-|https://github.com/openshift/nodejs-ex[Node.js]
+|https://github.com/sclorg/nodejs-ex[Node.js]
 
 .^|PHP
-|https://github.com/openshift/cakephp-ex[CakePHP]
+|https://github.com/sclorg/cakephp-ex[CakePHP]
 
 .^|Perl
-|https://github.com/openshift/dancer-ex[Dancer]
+|https://github.com/sclorg/dancer-ex[Dancer]
 
 .^|Java
 a|
@@ -82,11 +82,11 @@ endif::[]
 
 Other images provided by {product-title} include:
 
-* https://github.com/openshift/mysql[MySQL]
+* https://github.com/sclorg/mysql-container[MySQL]
 
-* https://github.com/openshift/mongodb[MongoDB]
+* https://github.com/sclorg/mongodb-container[MongoDB]
 
-* https://github.com/openshift/postgresql[PostgreSQL]
+* https://github.com/sclorg/postgresql-container[PostgreSQL]
 
 * https://github.com/openshift/jenkins[Jenkins]
 
@@ -174,7 +174,7 @@ image::dev-cli-video-thumb.png[CLI Getting Started Experience, 579, 246, link="h
 
 == Forking the Sample Repository
 
-. Visit the https://github.com/openshift/ruby-ex[Ruby example] page while you are logged in to GitHub.
+. Visit the https://github.com/sclorg/ruby-ex[Ruby example] page while you are logged in to GitHub.
 +
 [NOTE]
 ====

getting_started/developers_console.adoc

@@ -98,7 +98,7 @@ To view your new application:
 == Configuring Automated Builds
 
 You forked the source code for this application from the
-https://github.com/openshift/ruby-ex[{product-title} GitHub repository]. Therefore,
+https://github.com/sclorg/ruby-ex[{product-title} GitHub repository]. Therefore,
 you can use a webhook to automatically trigger a rebuild of your application
 whenever you push code changes to your forked repository.
 

install_config/build_defaults_overrides.adoc

@@ -71,7 +71,7 @@ xref:../install_config/install/advanced_install.adoc#advanced-install-configurin
 # environment variables into Builds. These values will default to the global proxy
 # config values. You only need to set these if they differ from the global settings
 # above. See BuildDefaults
-# documentation at https://docs.openshift.org/latest/admin_guide/build_defaults_overrides.html
+# documentation at https://docs.okd.io/latest/admin_guide/build_defaults_overrides.html
 #openshift_builddefaults_http_proxy=http://USER:PASSWORD@HOST:PORT
 openshift_builddefaults_https_proxy=https://USER:PASSWORD@HOST:PORT
 openshift_builddefaults_no_proxy=build_defaults

install_config/install/docker_registry.adoc

@@ -1288,7 +1288,7 @@ first have xref:deploy_router.adoc#install-config-install-deploy-router[deployed
 . xref:deploy_router.adoc#install-config-install-deploy-router[Deploy a router].
 +
 . Create a
-link:https://docs.openshift.org/latest/architecture/core_concepts/routes.html#secured-routes[passthrough]
+link:https://docs.okd.io/latest/architecture/core_concepts/routes.html#secured-routes[passthrough]
 route via the `oc create route passthrough` command,
 specifying the registry as the route's service.
 By default, the name of the created route is the same as the service name.

using_images/db_images/mongodb.adoc

@@ -18,9 +18,9 @@ settings provided via configuration.
 
 == Versions
 Currently, {product-title} provides versions
-https://github.com/openshift/mongodb/tree/master/2.4[2.4],
-https://github.com/openshift/mongodb/tree/master/2.6[2.6], and
-https://github.com/openshift/mongodb/tree/master/3.2[3.2] of MongoDB.
+https://github.com/sclorg/mongodb-container/tree/master/2.4[2.4],
+https://github.com/sclorg/mongodb-container/tree/master/2.6[2.6], and
+https://github.com/sclorg/mongodb-container/tree/master/3.2[3.2] of MongoDB.
 
 == Images
 
@@ -377,7 +377,7 @@ endif::[]
 Red Hat provides a proof-of-concept
 xref:../../architecture/core_concepts/templates.adoc#architecture-core-concepts-templates[template] for MongoDB
 replication (clustering); you can obtain the
-https://github.com/openshift/mongodb/tree/master/2.4/examples/replica[example
+https://github.com/sclorg/mongodb-container/tree/master/2.4/examples/replica[example
 template from GitHub].
 
 For example, to upload the example template into the current project's template

using_images/db_images/mysql.adoc

@@ -18,9 +18,9 @@ settings provided via configuration.
 
 == Versions
 Currently, {product-title} provides versions
-link:https://github.com/openshift/mysql/tree/master/5.5[5.5],
-link:https://github.com/openshift/mysql/tree/master/5.6[5.6], and
-link:https://github.com/openshift/mysql/tree/master/5.7[5.7] of MySQL.
+link:https://github.com/sclorg/mysql-container/tree/master/5.5[5.5],
+link:https://github.com/sclorg/mysql-container/tree/master/5.6[5.6], and
+link:https://github.com/sclorg/mysql-container/tree/master/5.7[5.7] of MySQL.
 
 == Images
 
@@ -474,7 +474,7 @@ endif::[]
 Red Hat provides a proof-of-concept
 xref:../../architecture/core_concepts/templates.adoc#architecture-core-concepts-templates[template] for MySQL
 master-slave replication (clustering); you can obtain the
-https://github.com/openshift/mysql/tree/master/5.5/examples/replica[example
+https://github.com/sclorg/mysql-container/tree/master/5.5/examples/replica[example
 template from GitHub].
 
 To upload the example template into the current project's template library:

using_images/db_images/postgresql.adoc

@@ -18,9 +18,9 @@ settings provided via configuration.
 
 == Versions
 Currently, {product-title} supports versions
-https://github.com/openshift/postgresql/tree/master/9.2[9.2],
-https://github.com/openshift/postgresql/tree/master/9.4[9.4], and
-https://github.com/openshift/postgresql/tree/master/9.5[9.5] of PostgreSQL.
+https://github.com/sclorg/postgresql-container/tree/master/9.2[9.2],
+https://github.com/sclorg/postgresql-container/tree/master/9.4[9.4], and
+https://github.com/sclorg/postgresql-container/tree/master/9.5[9.5] of PostgreSQL.
 
 == Images