Merge pull request juju#5767 from Eeemil/update-urls

Updated urls: juju.ubuntu.com -> jujucharms.com You probably want to update the URL in the repository description here on GitHub too.
addyess · Aug 18, 2016 · c75aa0d · c75aa0d
2 parents 05d8eab + ce7f416
commit c75aa0d
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -16,12 +16,12 @@ Quick links
 * code review: http://reviews.vapour.ws/
 
 Documentation:
-* https://juju.ubuntu.com/docs/
+* https://jujucharms.com/docs/
 * overview: http://blog.labix.org/2013/06/25/the-heart-of-juju
 * [other docs](doc/)
 
 Community:
-* https://juju.ubuntu.com/community/
+* https://jujucharms.com/community/
 * juju: https://lists.ubuntu.com/mailman/listinfo/juju
 * juju-dev: https://lists.ubuntu.com/mailman/listinfo/juju-dev
 * [#juju on freenode](http://webchat.freenode.net/?channels=juju)
@@ -408,7 +408,7 @@ interacting beyond the workflow and the
 
 Take a look at the community page:
 
- https://juju.ubuntu.com/community/
+ https://jujucharms.com/community/
 
 juju has two channels on IRC (freenode.net):
 

diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@ juju
 
 juju is devops distilled.
 
-Juju enables you to use [Charms](http://juju.ubuntu.com/charms) to deploy your application architectures to EC2, OpenStack,
+Juju enables you to use [Charms](http://jujucharms.com/charms) to deploy your application architectures to EC2, OpenStack,
 Azure, HP your data center and even your own Ubuntu based laptop.
 Moving between models is simple giving you the flexibility to switch hosts
 whenever you want — for free.

diff --git a/cmd/juju/commands/main.go b/cmd/juju/commands/main.go
@@ -61,7 +61,7 @@ juju provides easy, intelligent application orchestration on top of cloud
 infrastructure providers such as Amazon EC2, HP Cloud, MaaS, OpenStack, Windows
 Azure, or your local machine.
 
-https://juju.ubuntu.com/
+https://jujucharms.com/
 `
 
 const juju1xCmdName = "juju-1"

diff --git a/cmd/jujud/main.go b/cmd/jujud/main.go
@@ -44,7 +44,7 @@ var jujudDoc = `
 juju provides easy, intelligent service orchestration on top of models
 such as OpenStack, Amazon AWS, or bare metal. jujud is a component of juju.
 
-https://juju.ubuntu.com/
+https://jujucharms.com/
 
 The jujud command can also forward invocations over RPC for execution by the
 juju unit agent. When used in this way, it expects to be called via a symlink

diff --git a/scripts/win-installer/README.txt b/scripts/win-installer/README.txt
@@ -18,7 +18,7 @@ To generate an initial config file, you simply need to run:
 
 This causes the file to be written to your %LOCALAPPDATA%\Juju directory if an environments.yaml file does not already exist. It will also create the %LOCALAPPDATA%\Juju directory if that does not exist.
 
-This file will contain sample profiles for different types of cloud services, but you will need to edit the files to provide specific information for your cloud provider. Sections are created for Amazon (AWS) services, HPCloud and a generic OpenStack instance. For more specifics on what needs to be changed, see https://juju.ubuntu.com/docs/getting-started.html
+This file will contain sample profiles for different types of cloud services, but you will need to edit the files to provide specific information for your cloud provider. Sections are created for Amazon (AWS) services, HPCloud and a generic OpenStack instance. For more specifics on what needs to be changed, see https://jujucharms.com/docs/getting-started.html
 
 Testing your setup
 
@@ -33,7 +33,7 @@ Note: If you have multiple models configured, you can choose which one to addres
 
 You may have to wait a few moments for this command to return, as it needs to perform various tasks and contact your cloud provider.
 
-Assuming it returns successfully (otherwise see common error messages and what to do about them - https://juju.ubuntu.com/docs/getting-started.html#errors), we can now deploy some services and explore the basic operations of Juju.
+Assuming it returns successfully (otherwise see common error messages and what to do about them - https://jujucharms.com/docs/getting-started.html#errors), we can now deploy some services and explore the basic operations of Juju.
 
 To start with, we will deploy Wordpress, by running this command:
 
@@ -53,7 +53,7 @@ Although we have deployed Wordpress and a MySQL database, they are not linked to
 
 > juju add-relation wordpress mysql
 
-This command uses information provided by the relevant charms to associate these services with each other in whatever way makes sense. There is much more to be said about linking services together which is covered in the juju command documentation, but for the moment, we just need to know that it will link these services together.  Juju command documentation: https://juju.ubuntu.com/docs/getting-started.html#add-relation
+This command uses information provided by the relevant charms to associate these services with each other in whatever way makes sense. There is much more to be said about linking services together which is covered in the juju command documentation, but for the moment, we just need to know that it will link these services together.  Juju command documentation: https://jujucharms.com/docs/getting-started.html#add-relation
 
 In order to make our Wordpress public, we now need to expose this service:
 
@@ -130,4 +130,4 @@ To remove all current deployments and clear up everything in your cloud, you can
 
 This will remove everything, including the bootstrap node.
 
-To learn more about charms, including configuring options and managing running systems, you should continue to read the charm documentation here: https://juju.ubuntu.com/docs/charms.html
+To learn more about charms, including configuring options and managing running systems, you should continue to read the charm documentation here: https://jujucharms.com/docs/charms.html
diff --git a/scripts/win-installer/setup.iss b/scripts/win-installer/setup.iss
@@ -4,7 +4,7 @@
 #define MyAppName "Juju"
 #define MyAppVersion "2.0-beta16"
 #define MyAppPublisher "Canonical, Ltd"
-#define MyAppURL "http://juju.ubuntu.com/"
+#define MyAppURL "http://jujucharms.com/"
 #define MyAppExeName "juju.exe"
 
 [Setup]

diff --git a/worker/uniter/runner/debug/server.go b/worker/uniter/runner/debug/server.go
@@ -99,7 +99,7 @@ This is a Juju debug-hooks tmux session. Remember:
 3. CTRL+a is tmux prefix.
 
 More help and info is available in the online documentation:
-https://juju.ubuntu.com/docs/authors-hook-debug.html
+https://jujucharms.com/docs/authors-hook-debug.html
 
 END