Branding changes

2014-07-15 13:11:50 -04:00 · 2014-07-15 13:11:50 -04:00 · 8c6ffd5f4a
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@ -10,7 +10,7 @@
 * Added winrm_http_port and winrm_https_port to get_virtual_machine method to allow the users to configure custom ports for winrm-http and winrm-https
 * Checks if any ports are in use before adding a role in the existing cloud service
 * Auto generate public port for add role.
-* Fix issue https://github.com/WindowsAzure/azure-sdk-for-ruby/issues/130
+* Fix issue https://github.com/Azure/azure-sdk-for-ruby/issues/130

 2014.03.15 - version 0.6.2
 * Restart Virtual Machine
--- a/README.md
+++ b/README.md
@ -1,7 +1,7 @@
-# Windows Azure SDK for Ruby [![Build Status](https://travis-ci.org/WindowsAzure/azure-sdk-for-ruby.png?branch=dev)](https://travis-ci.org/WindowsAzure/azure-sdk-for-ruby)
+# Microsoft Azure SDK for Ruby [![Build Status](https://travis-ci.org/Azure/azure-sdk-for-ruby.png?branch=dev)](https://travis-ci.org/Azure/azure-sdk-for-ruby)


-This project provides a Ruby package that makes it easy to access and manage Windows Azure Services like Storage, Service Bus and Virtual Machines.
+This project provides a Ruby package that makes it easy to access and manage Microsoft Azure Services like Storage, Service Bus and Virtual Machines.

 # Library Features
 * Storage
@ -68,7 +68,7 @@ gem install azure
 To get the source code of the SDK via **git** just type:

 ```bash
-git clone https://github.com/WindowsAzure/azure-sdk-for-ruby.git
+git clone https://github.com/Azure/azure-sdk-for-ruby.git
 cd ./azure-sdk-for-ruby
 ```
 Then, run bundler to install all the gem dependencies:
@ -83,7 +83,7 @@ Running the command ``rdoc`` will generate the API documentation in the `./doc`

 ## Setup Connection

-You can use this SDK against the Windows Azure Services in the cloud, or against the local Storage Emulator if you are on Windows. Service Bus and Windows Azure Service Management emulation are not supported. Of course, to use the Windows Azure Services in the cloud, you need to first [create a Windows Azure account](http://www.windowsazure.com/en-us/pricing/free-trial/). After that, you can get the information you need to configure Storage and Service Bus from the [Windows Azure Portal](https://manage.windowsazure.com).
+You can use this SDK against the Microsoft Azure Services in the cloud, or against the local Storage Emulator if you are on Windows. Service Bus and Microsoft Azure Service Management emulation are not supported. Of course, to use the Microsoft Azure Services in the cloud, you need to first [create a Microsoft Azure account](http://www.azure.com/en-us/pricing/free-trial/). After that, you can get the information you need to configure Storage and Service Bus from the [Microsoft Azure Portal](https://manage.azure.com).

 There are two ways you can set up the connections:

@ -91,7 +91,7 @@ There are two ways you can set up the connections:
 2. [via environment variables](#via-environment-variables)

 ### Via Code
-* Against Windows Azure Services in the cloud
+* Against Microsoft Azure Services in the cloud

  ```ruby
  require "azure"
@ -130,7 +130,7 @@ There are two ways you can set up the connections:
  end
  ```
 ### Via Environment Variables
-* Against Windows Azure Services in the cloud
+* Against Microsoft Azure Services in the cloud
  * Storage

    ```bash
@ -149,7 +149,7 @@ There are two ways you can set up the connections:
    ```bash
    AZURE_MANAGEMENT_CERTIFICATE = <path to *.pem or *.pfx>
    AZURE_SUBSCRIPTION_ID = <your subscription ID>
-    AZURE_MANAGEMENT_ENDPOINT = <The endpoint URL of Windows Azure management service>
+    AZURE_MANAGEMENT_ENDPOINT = <The endpoint URL of Microsoft Azure management service>
    AZURE_SQL_DATABASE_MANAGEMENT_ENDPOINT = <SQL Database Management Endpoint>
    AZURE_SQL_DATABASE_AUTHENTICATION_MODE = <:management_certificate or :sql_server>
    ```
@ -171,7 +171,7 @@ You can use the following commands to run:
 * a specific suite of tests: ``rake test:integration:blob``
 * one particular test file: ``ruby -I"lib:test" "<path of the test file>"``
 # Usage
-**For more examples, please see the [Windows Azure Ruby Developer Center](http://www.windowsazure.com/en-us/develop/ruby)**
+**For more examples, please see the [Microsoft Azure Ruby Developer Center](http://www.azure.com/en-us/develop/ruby)**
 ## Storage

 ### Blobs
@ -524,7 +524,7 @@ ip_range = {:start_ip_address => "0.0.0.1", :end_ip_address => "0.0.0.5"}
 sql_db_service.set_sql_server_firewall_rule("server-name", "rule-name", ip_range)

 # If ip_range was not specified in the above api then the IP of the machine from where the api is being called would be set as the rule.
-# To toggle between the option to allow windows azure services to access db server similar to azure portal just set the fire wall rule
+# To toggle between the option to allow microsoft azure services to access db server similar to azure portal just set the fire wall rule
 # with iprange to be 0.0.0.0 as start and end.Remove the rule to unset this option.
 ```
 ## Virtual Network Management
@ -575,15 +575,15 @@ Currently the sdk supports *.pem or *.pfx (passwordless pfx) for service managem

 # Need Help?

-Be sure to check out the Windows Azure [Developer Forums on Stack Overflow and MSDN](http://go.microsoft.com/fwlink/?LinkId=234489) if you have trouble with the provided code.
+Be sure to check out the Microsoft Azure [Developer Forums on Stack Overflow and MSDN](http://go.microsoft.com/fwlink/?LinkId=234489) if you have trouble with the provided code.

 # Contribute Code or Provide Feedback

-If you would like to become an active contributor to this project please follow the instructions provided in [Windows Azure Projects Contribution Guidelines](http://windowsazure.github.com/guidelines.html).
-If you encounter any bugs with the library please file an issue in the [Issues](https://github.com/WindowsAzure/azure-sdk-for-ruby/issues) section of the project.
+If you would like to become an active contributor to this project please follow the instructions provided in [Microsoft Azure Projects Contribution Guidelines](http://azure.github.com/guidelines.html).
+If you encounter any bugs with the library please file an issue in the [Issues](https://github.com/Azure/azure-sdk-for-ruby/issues) section of the project.

 # Learn More

-For documentation on how to host Ruby applications on Windows Azure, please see the [Windows Azure Ruby Developer Center](http://www.windowsazure.com/en-us/develop/ruby/).
-For documentation on Azure PowerShell CLI tool for Windows, please see our readme [here](http://github.com/windowsazure/azure-sdk-tools).
-For documentation on the Azure cross platform CLI tool for Windows, Mac and Linux, please see our readme [here](http://github.com/windowsazure/azure-sdk-tools-xplat).
+For documentation on how to host Ruby applications on Microsoft Azure, please see the [Microsoft Azure Ruby Developer Center](http://www.azure.com/en-us/develop/ruby/).
+For documentation on Azure PowerShell CLI tool for Windows, please see our readme [here](http://github.com/azure/azure-sdk-tools).
+For documentation on the Azure cross platform CLI tool for Windows, Mac and Linux, please see our readme [here](http://github.com/azure/azure-sdk-tools-xplat).
--- a/azure.gemspec
+++ b/azure.gemspec
@ -22,9 +22,9 @@ Gem::Specification.new do |s|

  s.authors     = ["Microsoft Corporation", "AppFog"]
  s.email       = "azureruby@microsoft.com"
-  s.description = "Windows Azure Client Library for Ruby"
-  s.summary     = "Official ruby client library to consume Windows Azure services."
-  s.homepage    = "http://github.com/WindowsAzure/azure-sdk-for-ruby"
+  s.description = "Microsoft Azure Client Library for Ruby"
+  s.summary     = "Official ruby client library to consume Microsoft Azure services."
+  s.homepage    = "http://github.com/Azure/azure-sdk-for-ruby"
  s.license     = 'Apache License, Version 2.0'
  s.files       = `git ls-files`.split("\n")

--- a/lib/azure/base_management/base_management_service.rb
+++ b/lib/azure/base_management/base_management_service.rb
@ -84,7 +84,7 @@ module Azure
      # Public: Gets a lists the affinity groups associated with
      # the specified subscription.
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/ee460797.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/ee460797.aspx
      #
      # Returns an array of Azure::BaseManagement::AffinityGroup objects
      def list_affinity_groups
@ -110,7 +110,7 @@ module Azure
      # * +:description+   - String. A description for the affinity group.
      # (optional)
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/gg715317.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/gg715317.aspx
      #
      # Returns:  None
      def create_affinity_group(name, location, label, options = {})
@ -151,7 +151,7 @@ module Azure
      # * +:description+   - String. A description for the affinity group.
      # (optional)
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/gg715316.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/gg715316.aspx
      #
      # Returns:  None
      def update_affinity_group(name, label, options = {})
@ -171,7 +171,7 @@ module Azure
      #
      # * +name+       - String. Affinity Group name.
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/gg715314.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/gg715314.aspx
      #
      # Returns:  None
      def delete_affinity_group(name)
@ -190,7 +190,7 @@ module Azure
      #
      # * +name+       - String. Affinity Group name.
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/ee460789.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/ee460789.aspx
      #
      # Returns:  Azure::BaseManagement::AffinityGroup object
      def get_affinity_group(name)
--- a/lib/azure/base_management/management_http_request.rb
+++ b/lib/azure/base_management/management_http_request.rb
@ -94,7 +94,7 @@ module Azure
      #
      # * +request_id+       - String.  x-ms-request-id response header of request
      #
-      # See: http://msdn.microsoft.com/en-us/library/windowsazure/ee460783.aspx
+      # See: http://msdn.microsoft.com/en-us/library/azure/ee460783.aspx
      #
      # Print Error or Success of Operation.
      def check_completion(request_id)
--- a/lib/azure/blob/blob_service.rb
+++ b/lib/azure/blob/blob_service.rb
@ -97,7 +97,7 @@ module Azure
      # * +:public_access_level+ - String. One of "container" or "blob" (optional)
      # * +:timeout+             - Integer. A timeout in seconds.
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179468.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179468.aspx
      #
      # Returns a Container
      def create_container(name, options={})
@ -132,7 +132,7 @@ module Azure
      # Accepted key/value pairs in options parameter are:
      # * +:timeout+   - Integer. A timeout in seconds.
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179408.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179408.aspx
      #
      # Returns nil on success
      def delete_container(name, options={})
@ -155,7 +155,7 @@ module Azure
      # Accepted key/value pairs in options parameter are:
      # * +:timeout+   - Integer. A timeout in seconds.
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179370.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179370.aspx
      #
      # Returns a Container
      def get_container_properties(name, options={})
@ -181,7 +181,7 @@ module Azure
      # Accepted key/value pairs in options parameter are:
      # * +:timeout+   - Integer. A timeout in seconds.
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/ee691976.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/ee691976.aspx
      #
      # Returns a Container
      def get_container_metadata(name, options={})
@ -208,7 +208,7 @@ module Azure
      # Accepted key/value pairs in options parameter are:
      # * +:timeout+   - Integer. A timeout in seconds.
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179469.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179469.aspx
      #
      # Returns a tuple of (container, signed_identifiers)
      #   container           - A Azure::Entity::Blob::Container instance
@ -242,7 +242,7 @@ module Azure
      # * +:signed_identifiers+          - Array. A list of Azure::Entity::SignedIdentifier instances (optional) 
      # * +:timeout+                     - Integer. A timeout in seconds.
      # 
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179391.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179391.aspx
      #
      # Returns a tuple of (container, signed_identifiers)
      # * +container+           - A Azure::Entity::Blob::Container instance
@ -285,7 +285,7 @@ module Azure
      # Accepted key/value pairs in options parameter are:
      # * +:timeout+  - Integer. A timeout in seconds.
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179362.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179362.aspx
      #
      # Returns nil on success
      def set_container_metadata(name, metadata, options={})
@ -345,7 +345,7 @@ module Azure
      # service. Beginning with that version, all metadata names must adhere to the naming 
      # conventions for C# identifiers.
      #
-      # See: http://msdn.microsoft.com/en-us/library/windowsazure/dd135734.aspx
+      # See: http://msdn.microsoft.com/en-us/library/azure/dd135734.aspx
      #
      # Any metadata with invalid names which were previously stored, will be returned with the 
      # key "x-ms-invalid-name" in the metadata hash. This may contain multiple values and be an
@ -401,7 +401,7 @@ module Azure
      # * +:sequence_number+       - Integer. The sequence number is a user-controlled value that you can use to track requests. The value of the sequence number must be between 0 and 2^63 - 1.The default value is 0.
      # * +:timeout+               - Integer. A timeout in seconds.
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179451.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179451.aspx
      #
      # Returns a Blob
      def create_page_blob(container, blob, length, options={})
@ -469,7 +469,7 @@ module Azure
      # * +:if_none_match+          - An ETag value. Specify an ETag value for this conditional header to write the page only if the blob's ETag value does not match the value specified. If the values are identical, the Blob service returns status code 412 (Precondition Failed).
      # * +:timeout+                - Integer. A timeout in seconds.
      # 
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/ee691975.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/ee691975.aspx
      #
      # Returns Blob
      def create_blob_pages(container, blob, start_range, end_range, content, options={})
@ -518,7 +518,7 @@ module Azure
      # Accepted key/value pairs in options parameter are:
      # * +:timeout+     - Integer. A timeout in seconds.
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/ee691975.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/ee691975.aspx
      #
      # Returns Blob
      def clear_blob_pages(container, blob, start_range, end_range, options={})
@ -575,7 +575,7 @@ module Azure
      # * +:metadata+              - Hash. Custom metadata values to store with the blob.
      # * +:timeout+               - Integer. A timeout in seconds.
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179451.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179451.aspx
      #
      # Returns a Blob
      def create_block_blob(container, blob, content, options={})
@ -629,7 +629,7 @@ module Azure
      # * +:content_md5+           - String. Content MD5 for the request contents.
      # * +:timeout+               - Integer. A timeout in seconds.
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd135726.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/dd135726.aspx
      #
      # Returns the MD5 of the uploaded block (as calculated by the server)
      def create_blob_block(container, blob, block_id, content, options={})
@ -682,7 +682,7 @@ module Azure
      # * +:metadata+              - Hash. Custom metadata values to store with the blob.
      # * +:timeout+               - Integer. A timeout in seconds.
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179467.aspx 
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179467.aspx 
      # 
      # Returns nil on success
      def commit_blob_blocks(container, blob, block_list, options={})
@ -715,7 +715,7 @@ module Azure
      #    committed to a given blob with commitBlobBlocks.
      # 2) Uncommitted Block List: The list of blocks that have been uploaded for a 
      #    blob using Put Block (REST API), but that have not yet been committed. 
-      #    These blocks are stored in Windows Azure in association with a blob, but do
+      #    These blocks are stored in Microsoft Azure in association with a blob, but do
      #    not yet form part of the blob.
      #
      # ==== Attributes
@ -732,7 +732,7 @@ module Azure
      #   retrieve information from. (optional)
      # * +:timeout+        - Integer. A timeout in seconds.
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179400.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179400.aspx
      #
      # Returns a list of Azure::Entity::Blob::Block instances
      def list_blob_blocks(container, blob, options={})
@ -766,7 +766,7 @@ module Azure
      #   retrieve information from.
      # * +:timeout+       - Integer. A timeout in seconds.
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179394.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179394.aspx
      #
      # Returns a Blob
      def get_blob_properties(container, blob, options={})
@ -801,7 +801,7 @@ module Azure
      #   retrieve information from.
      # * +:timeout+       - Integer. A timeout in seconds.
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179350.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179350.aspx
      #
      # Returns a Blob
      def get_blob_metadata(container, blob, options={})
@ -839,7 +839,7 @@ module Azure
      #   retrieve information from. (optional)
      # * +:timeout+        - Integer. A timeout in seconds.
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/ee691973.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/ee691973.aspx
      #
      # Returns a list of page ranges in the format [ [start, end], [start, end], ... ]
      #
@ -937,7 +937,7 @@ module Azure
      #     * :content_encoding
      #     * :content_language
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/ee691966.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/ee691966.aspx
      #
      # Returns nil on success.
      def set_blob_properties(container, blob, options={})
@ -976,7 +976,7 @@ module Azure
      # Accepted key/value pairs in options parameter are:
      # * +:timeout+       - Integer. A timeout in seconds.
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179414.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179414.aspx
      #
      # Returns nil on success.
      def set_blob_metadata(container, blob, metadata, options={})
@ -1011,7 +1011,7 @@ module Azure
      #   start_range and end_range are specified. (optional)
      # * +:timeout+         - Integer. A timeout in seconds.
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179440.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179440.aspx
      #
      # Returns a blob and the blob body
      def get_blob(container, blob, options={})
@ -1055,7 +1055,7 @@ module Azure
      #   * +:include+  - Deletes the blob and all of the snapshots for the blob
      # * +:timeout+           - Integer. A timeout in seconds.
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179440.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179440.aspx
      #
      # Returns nil on success
      def delete_blob(container, blob, options={})
@ -1100,7 +1100,7 @@ module Azure
      #   service returns status code 412 (Precondition Failed).
      # * +:timeout+                  - Integer. A timeout in seconds.
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/ee691971.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/ee691971.aspx
      # 
      # Returns the snapshot DateTime value
      def create_blob_snapshot(container, blob, options={})
@ -1168,7 +1168,7 @@ module Azure
      #   identical, the Blob service returns status code 412 (Precondition Failed).
      # * +:timeout+                    - Integer. A timeout in seconds.
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd894037.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/dd894037.aspx
      #
      # Returns a tuple of (copy_id, copy_status). 
      #
@ -1221,7 +1221,7 @@ module Azure
      #   if the proposed lease ID is not in the correct format. (optional)
      # * +:timeout+           - Integer. A timeout in seconds.
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/ee691972.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/ee691972.aspx
      #
      # Returns a String of the new unique lease id. While the lease is active, you must include the lease ID with any request 
      # to write to the blob, or to renew, change, or release the lease. A successful renew operation also returns the lease id
@ -1262,7 +1262,7 @@ module Azure
      # Accepted key/value pairs in options parameter are: 
      # * +:timeout+          - Integer. A timeout in seconds.
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/ee691972.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/ee691972.aspx
      #
      # Returns the renewed lease id
      def renew_lease(container, blob, lease, options={})
@ -1295,7 +1295,7 @@ module Azure
      # Accepted key/value pairs in options parameter are: 
      # * +:timeout+          - Integer. A timeout in seconds.
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/ee691972.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/ee691972.aspx
      #
      # Returns nil on success
      def release_lease(container, blob, lease, options={})
@ -1340,7 +1340,7 @@ module Azure
      #   period elapses, and an infinite lease breaks immediately.
      # * +:timeout+          - Integer. A timeout in seconds.
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/ee691972.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/ee691972.aspx
      #
      # Returns an Integer of the remaining lease time. This value is the approximate time remaining in the lease 
      # period, in seconds. This header is returned only for a successful request to break the lease. If the break 
--- a/lib/azure/cloud_service_management/cloud_service_management_service.rb
+++ b/lib/azure/cloud_service_management/cloud_service_management_service.rb
@ -21,7 +21,7 @@ module Azure
        super()
      end

-      # Public: Creates a new cloud service in Windows Azure.
+      # Public: Creates a new cloud service in Microsoft Azure.
      #
      # ==== Attributes
      #
@ -43,7 +43,7 @@ module Azure
      # properties to add to the cloud service. The key is used as the
      # property name and the value as its value. (optional)
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/gg441304.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/gg441304.aspx
      #
      # Returns None
      def create_cloud_service(name, options = {})
@ -97,7 +97,7 @@ module Azure
        Serialization.cloud_services_from_xml(response).first
      end

-      # Public: Deletes the specified cloud service of given subscription id from Windows Azure.
+      # Public: Deletes the specified cloud service of given subscription id from Microsoft Azure.
      #
      # ==== Attributes
      #
@ -117,7 +117,7 @@ module Azure
      #
      # * +cloud_service_name+  - String. Cloud service name.
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/ee460815.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/ee460815.aspx
      #
      # Returns NONE
      def delete_cloud_service_deployment(cloud_service_name)
--- a/lib/azure/core/http/http_error.rb
+++ b/lib/azure/core/http/http_error.rb
@ -29,7 +29,7 @@ module Azure

        # Public: The type of error
        #
-        # http://msdn.microsoft.com/en-us/library/windowsazure/dd179357
+        # http://msdn.microsoft.com/en-us/library/azure/dd179357
        #
        # Returns a String
        attr :type
--- a/lib/azure/queue/queue_service.rb
+++ b/lib/azure/queue/queue_service.rb
@ -55,7 +55,7 @@ module Azure
      # service. Beginning with that version, all metadata names must adhere to the naming 
      # conventions for C# identifiers.
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179466 
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179466 
      #
      # Any metadata with invalid names which were previously stored, will be returned with the 
      # key "x-ms-invalid-name" in the metadata hash. This may contain multiple values and be an
@ -95,7 +95,7 @@ module Azure
      # Accepted key/value pairs in options parameter are:
      # * +:timeout+   - Integer. A timeout in seconds.
      # 
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179454
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179454
      # 
      # Returns nil on success
      def clear_messages(queue_name, options={})
@ -119,7 +119,7 @@ module Azure
      # * +:metadata+      - Hash. A hash of user defined metadata.
      # * +:timeout+       - Integer. A timeout in seconds.
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179342
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179342
      #
      # Returns nil on success
      def create_queue(queue_name, options={})
@ -147,7 +147,7 @@ module Azure
      # Accepted key/value pairs in options parameter are:
      # * +:timeout+       - Integer. A timeout in seconds.
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179436
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179436
      #
      # Returns nil on success
      def delete_queue(queue_name, options={})
@ -172,7 +172,7 @@ module Azure
      # Accepted key/value pairs in options parameter are:
      # * +:timeout+       - Integer. A timeout in seconds.
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179384
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179384
      #
      # Returns a tuple of (approximate_message_count, metadata)
      # * approximate_messages_count  - Integer. The approximate number of messages in the queue. This number is not
@ -207,7 +207,7 @@ module Azure
      # Accepted key/value pairs in options parameter are:
      # * +:timeout+       - Integer. A timeout in seconds.
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179348
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179348
      #
      # Returns nil on success
      def set_queue_metadata(queue_name, metadata, options={})
@ -235,7 +235,7 @@ module Azure
      # Accepted key/value pairs in options parameter are:
      # * +:timeout+       - Integer. A timeout in seconds.
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/jj159101
+      # See http://msdn.microsoft.com/en-us/library/azure/jj159101
      #
      # Returns a list of Azure::Entity::SignedIdentifier instances
      def get_queue_acl(queue_name, options={})
@ -262,7 +262,7 @@ module Azure
      # * +:signed_identifiers+  - Array. A list of Azure::Entity::SignedIdentifier instances 
      # * +:timeout+             - Integer. A timeout in seconds.
      # 
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/jj159099
+      # See http://msdn.microsoft.com/en-us/library/azure/jj159099
      #
      # Returns nil on success
      def set_queue_acl(queue_name, options={})
@ -298,7 +298,7 @@ module Azure
      # * +:encode+                 - Boolean. If set to true, the message will be base64 encoded.
      # * +:timeout+                - Integer. A timeout in seconds.
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179346
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179346
      #
      # Returns nil on success
      def create_message(queue_name, message_text, options={})
@ -332,7 +332,7 @@ module Azure
      # Accepted key/value pairs in options parameter are:
      # * +:timeout+     - Integer. A timeout in seconds.
      # 
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179347
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179347
      #
      # Returns nil on success
      #
@ -397,7 +397,7 @@ module Azure
      # * +:decode+             - Boolean. Boolean value indicating if the message should be base64 decoded.
      # * +:timeout+            - Integer. A timeout in seconds.
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179472
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179472
      #
      # Returns a list of Azure::Entity::Queue::Message instances
      def peek_messages(queue_name, options={})
@ -429,7 +429,7 @@ module Azure
      # * +:timeout+            - Integer. A timeout in seconds.
      # * +:decode+             - Boolean. Boolean value indicating if the message should be base64 decoded.
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179474
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179474
      #
      # Returns a list of Azure::Entity::Queue::Message instances
      def list_messages(queue_name, visibility_timeout, options={})
@ -465,7 +465,7 @@ module Azure
      # * +:encode+                 - Boolean. If set to true, the message will be base64 encoded.
      # * +:timeout+           - Integer. A timeout in seconds.
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/hh452234
+      # See http://msdn.microsoft.com/en-us/library/azure/hh452234
      #
      # Returns a tuple of (pop_receipt, time_next_visible)
      # * pop_receipt        - String. The pop receipt of the queue message.
--- a/lib/azure/service/storage_service.rb
+++ b/lib/azure/service/storage_service.rb
@ -29,8 +29,8 @@ module Azure

      # Public: Get Storage Service properties
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/hh452239
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/hh452243
+      # See http://msdn.microsoft.com/en-us/library/azure/hh452239
+      # See http://msdn.microsoft.com/en-us/library/azure/hh452243
      #
      # Returns a Hash with the service properties or nil if the operation failed
      def get_service_properties
@ -43,8 +43,8 @@ module Azure
      #
      # service_properties - An instance of Azure::Entity::Service::StorageServiceProperties
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/hh452235
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/hh452232
+      # See http://msdn.microsoft.com/en-us/library/azure/hh452235
+      # See http://msdn.microsoft.com/en-us/library/azure/hh452232
      #
      # Returns boolean indicating success.
      def set_service_properties(service_properties)
--- a/lib/azure/service_bus/brokered_message.rb
+++ b/lib/azure/service_bus/brokered_message.rb
@ -16,7 +16,7 @@ module Azure
  module ServiceBus
    class BrokeredMessage

-      # Please read http://msdn.microsoft.com/en-us/library/windowsazure/hh780742
+      # Please read http://msdn.microsoft.com/en-us/library/azure/hh780742
      # for more information on brokered message properties

      # Public: Get/Set the ContentType of the message
--- a/lib/azure/sql_database_management/sql_database_management_service.rb
+++ b/lib/azure/sql_database_management/sql_database_management_service.rb
@ -25,7 +25,7 @@ module Azure
      # Public: Gets a list of database servers available under the
      # current subscription.
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/gg715269.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/gg715269.aspx
      #
      # Returns an array of Azure::SqlDatabaseManagement::SqlDatabase objects
      def list_servers
@ -35,7 +35,7 @@ module Azure
        Serialization.databases_from_xml(response)
      end

-      # Public: Create a new database server in Windows Azure.
+      # Public: Create a new database server in Microsoft Azure.
      #
      # ==== Attributes
      #
@ -43,7 +43,7 @@ module Azure
      # * +password+       - String. The administrator login password.
      # * +:location+      - String. The location where the database server will be created.
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/gg715274.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/gg715274.aspx
      #
      # Returns Azure::SqlDatabaseManagement::SqlDatabase object
      def create_server(login, password, location)
@ -57,13 +57,13 @@ module Azure
      end

      # Public: Deletes the specified database server of given
-      # subscription id from Windows Azure.
+      # subscription id from Microsoft Azure.
      #
      # ==== Attributes
      #
      # * +name+       - String. Database server name.
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/gg715285.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/gg715285.aspx
      #
      # Returns:  None
      def delete_server(name)
@ -83,7 +83,7 @@ module Azure
      # * +name+           - String. Database server name.
      # * +password+       - String. Database server new password.
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/gg715272.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/gg715272.aspx
      #
      # Returns:  None
      def reset_password(name, password)
@ -111,7 +111,7 @@ module Azure
      # * +:start_ip_address+     - String. Start of the IP Range
      # * +:end_ip_address+       - String. End of the IP Range
      # 
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/gg715280.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/gg715280.aspx
      #
      # Returns:  None
      def set_sql_server_firewall_rule(server_name, rule_name, options = {})
@ -145,7 +145,7 @@ module Azure
      #
      # * +server_name+    - String. Database server name.
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/gg715278.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/gg715278.aspx
      #
      # Returns an array of firewall
      def list_sql_server_firewall_rules(server_name)
@ -164,7 +164,7 @@ module Azure
      # * +name+            - String. SQL database server name.
      # * +rule_name+       - String. SQL database server firewall rule name.
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/gg715277.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/gg715277.aspx
      #
      # Returns:  None
      def delete_sql_server_firewall_rule(server_name, rule_name)
--- a/lib/azure/storage_management/storage_account.rb
+++ b/lib/azure/storage_management/storage_account.rb
@ -14,7 +14,7 @@
 #--------------------------------------------------------------------------
 module Azure
  module StorageManagement
-    # Represents a Windows Azure storage account
+    # Represents a Microsoft Azure storage account
    class StorageAccount
      def initialize
        yield self if block_given?
--- a/lib/azure/storage_management/storage_management_service.rb
+++ b/lib/azure/storage_management/storage_management_service.rb
@ -60,7 +60,7 @@ module Azure
      #
      # * +name+  - String. The name of the storage account. Required.
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/ee460802.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/ee460802.aspx
      #
      # Returns the storage account
      def get_storage_account_properties(name)
@ -70,7 +70,7 @@ module Azure
        Serialization.storage_services_from_xml(response).first
      end

-      # Public: Create a new storage account in Windows Azure.
+      # Public: Create a new storage account in Microsoft Azure.
      #
      # ==== Attributes
      #
@ -109,7 +109,7 @@ module Azure
        end
      end

-      # Public: Updates an existing storage account in Windows Azure
+      # Public: Updates an existing storage account in Microsoft Azure
      #
      # ==== Attributes
      #
@ -146,7 +146,7 @@ module Azure
      end

      # Public: Deletes the specified storage account of given subscription id
-      # from Windows Azure.
+      # from Microsoft Azure.
      #
      # ==== Attributes
      #
--- a/lib/azure/table/batch.rb
+++ b/lib/azure/table/batch.rb
@ -201,7 +201,7 @@ module Azure
      # * +row_key+       - String. The row key
      # * +entity_values+ - Hash. A hash of the name/value pairs for the entity. 
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179433
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179433
      public
      def insert(row_key, entity_values)
        check_entity_key(row_key)
@ -231,7 +231,7 @@ module Azure
      # * :create_if_not_exists  - Boolean. If true, and partition_key and row_key do not reference and existing entity, 
      #   that entity will be inserted. If false, the operation will fail. (optional, Default=false)
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179427
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179427
      public
      def update(row_key, entity_values, options={})
        check_entity_key(row_key)
@ -263,7 +263,7 @@ module Azure
      # * +create_if_not_exists+  - Boolean. If true, and partition_key and row_key do not reference and existing entity, 
      #   that entity will be inserted. If false, the operation will fail. (optional, Default=false)
      # 
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179392
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179392
      public
      def merge(row_key, entity_values, options={})
        check_entity_key(row_key)
@ -286,7 +286,7 @@ module Azure
      # * +row_key+               - String. The row key
      # * +entity_values+         - Hash. A hash of the name/value pairs for the entity.
      # 
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/hh452241
+      # See http://msdn.microsoft.com/en-us/library/azure/hh452241
      public
      def insert_or_merge(row_key, entity_values)
        merge(row_key, entity_values, { :create_if_not_exists => true })
@ -300,7 +300,7 @@ module Azure
      # * +row_key+               - String. The row key
      # * +entity_values+         - Hash. A hash of the name/value pairs for the entity. 
      # 
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/hh452242
+      # See http://msdn.microsoft.com/en-us/library/azure/hh452242
      public
      def insert_or_replace(row_key, entity_values)
        update(row_key, entity_values, { :create_if_not_exists => true })
@ -319,7 +319,7 @@ module Azure
      # Accepted key/value pairs in options parameter are:
      # * +if_match+      - String. A matching condition which is required for update (optional, Default="*")
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd135727
+      # See http://msdn.microsoft.com/en-us/library/azure/dd135727
      public
      def delete(row_key, options={})
        add_operation(:delete, @table_service.entities_uri(table, partition, row_key), nil, {"If-Match"=> options[:if_match] || "*"})
--- a/lib/azure/table/table_service.rb
+++ b/lib/azure/table/table_service.rb
@ -41,7 +41,7 @@ module Azure
      #
      # * +:timeout+   - Integer. A timeout in seconds.
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd135729
+      # See http://msdn.microsoft.com/en-us/library/azure/dd135729
      #
      # Returns nil on success
      def create_table(table_name, options={})
@ -65,7 +65,7 @@ module Azure
      # Accepted key/value pairs in options parameter are:
      # * +:timeout+   - Integer. A timeout in seconds.
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179387
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179387
      #
      # Returns nil on success
      def delete_table(table_name, options={})
@ -111,7 +111,7 @@ module Azure
      #   larger than a single operation can return at once. (optional)
      # * +:timeout+            - Integer. A timeout in seconds.
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179405
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179405
      #
      # Returns an array with an extra continuation_token property on success
      def query_tables(options={})
@ -141,7 +141,7 @@ module Azure
      # Accepted key/value pairs in options parameter are:
      # * +:timeout+   - Integer. A timeout in seconds.
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/jj159100
+      # See http://msdn.microsoft.com/en-us/library/azure/jj159100
      #
      # Returns a list of Azure::Entity::SignedIdentifier instances
      def get_table_acl(table_name, options={})
@ -168,7 +168,7 @@ module Azure
      # * +:signed_identifiers+  - Array. A list of Azure::Entity::SignedIdentifier instances
      # * +:timeout+             - Integer. A timeout in seconds.
      # 
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/jj159102
+      # See http://msdn.microsoft.com/en-us/library/azure/jj159102
      #
      # Returns nil on success
      def set_table_acl(table_name, options={})
@ -197,7 +197,7 @@ module Azure
      # Accepted key/value pairs in options parameter are:
      # * +:timeout+      - Integer. A timeout in seconds.
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179433
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179433
      #
      # Returns a Azure::Entity::Table::Entity
      def insert_entity(table_name, entity_values, options={})
@ -236,7 +236,7 @@ module Azure
      # * +:continuation_token+ - Hash. The continuation token.
      # * +:timeout+            - Integer. A timeout in seconds.
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179421
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179421
      #
      # Returns an array with an extra continuation_token property on success
      def query_entities(table_name, options={})
@ -291,7 +291,7 @@ module Azure
      #   that entity will be inserted. If false, the operation will fail. (optional, Default=false)
      # * +:timeout+               - Integer. A timeout in seconds.
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179427
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179427
      #
      # Returns the ETag for the entity on success 
      def update_entity(table_name, entity_values, options={})
@ -329,7 +329,7 @@ module Azure
      #   that entity will be inserted. If false, the operation will fail. (optional, Default=false)
      # * +:timeout+               - Integer. A timeout in seconds.
      # 
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179392
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179392
      # 
      # Returns the ETag for the entity on success 
      def merge_entity(table_name, entity_values, options={})
@ -363,7 +363,7 @@ module Azure
      # Accepted key/value pairs in options parameter are:
      # * +:timeout+      - Integer. A timeout in seconds.
      # 
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/hh452241
+      # See http://msdn.microsoft.com/en-us/library/azure/hh452241
      # 
      # Returns the ETag for the entity on success 
      def insert_or_merge_entity(table_name, entity_values, options={})
@ -384,7 +384,7 @@ module Azure
      # Accepted key/value pairs in options parameter are:
      # * +:timeout+      - Integer. A timeout in seconds.
      # 
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/hh452242
+      # See http://msdn.microsoft.com/en-us/library/azure/hh452242
      #
      # Returns the ETag for the entity on success 
      def insert_or_replace_entity(table_name, entity_values, options={})
@ -407,7 +407,7 @@ module Azure
      # * +:if_match+     - String. A matching condition which is required for update (optional, Default="*")
      # * +:timeout+      - Integer. A timeout in seconds.
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd135727
+      # See http://msdn.microsoft.com/en-us/library/azure/dd135727
      #
      # Returns nil on success
      def delete_entity(table_name, partition_key, row_key, options={})
@ -433,7 +433,7 @@ module Azure
      # Accepted key/value pairs in options parameter are:
      # * +:timeout+      - Integer. A timeout in seconds.
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd894038
+      # See http://msdn.microsoft.com/en-us/library/azure/dd894038
      #
      # Returns an array of results, one for each operation in the batch
      def execute_batch(batch, options={})
--- a/lib/azure/virtual_machine_management/virtual_machine_management_service.rb
+++ b/lib/azure/virtual_machine_management/virtual_machine_management_service.rb
@ -101,8 +101,8 @@ module Azure
      # Returns Azure::VirtualMachineManagement::VirtualMachine objects of newly created instance.
      #
      # See:
-      # http://msdn.microsoft.com/en-us/library/windowsazure/jj157194.aspx
-      # http://msdn.microsoft.com/en-us/library/windowsazure/jj157186.aspx
+      # http://msdn.microsoft.com/en-us/library/azure/jj157194.aspx
+      # http://msdn.microsoft.com/en-us/library/azure/jj157186.aspx
      def create_virtual_machine(params, options = {})
        options[:os_type] = get_os_type(params[:image])
        validate_deployment_params(params, options)
@ -171,7 +171,7 @@ module Azure
      # Returns Azure::VirtualMachineManagement::VirtualMachine objects of newly created instance.
      #
      # See:
-      # http://msdn.microsoft.com/en-us/library/windowsazure/jj157186.aspx
+      # http://msdn.microsoft.com/en-us/library/azure/jj157186.aspx
      def add_role(params, options = {})
        options[:os_type] = get_os_type(params[:image])
        validate_deployment_params(params, options, true)
@ -210,8 +210,8 @@ module Azure
      # * +vm_name+  - String. Virtual machine name.
      # * +cloud_service_name+  - String. Cloud service name.
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/gg441305.aspx
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/jj157179.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/gg441305.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/jj157179.aspx
      #
      # Returns NONE
      def delete_virtual_machine(vm_name, cloud_service_name)
@ -260,7 +260,7 @@ module Azure
      # * +name+                - String. Virtual machine name.
      # * +cloud_service_name+  - String. Cloud service name.
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/jj157195.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/jj157195.aspx
      #
      # Returns NONE
      def shutdown_virtual_machine(vm_name, cloud_service_name)
@ -289,7 +289,7 @@ module Azure
      # * +name+                - String. Virtual machine name.
      # * +cloud_service_name+  - String. Cloud service name.
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/jj157189.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/jj157189.aspx
      #
      # Returns NONE
      def start_virtual_machine(vm_name, cloud_service_name)
@ -316,7 +316,7 @@ module Azure
      # * +name+                - String. Virtual machine name.
      # * +cloud_service_name+  - String. Cloud service name.
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/jj157197.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/jj157197.aspx
      #
      # Returns NONE
      def restart_virtual_machine(vm_name, cloud_service_name)
@ -372,7 +372,7 @@ module Azure
      # * +:path+      - String. Specifies the relative path to inspect to
      #   determine the availability status of the Virtual Machine. (optional)
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/jj157187.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/jj157187.aspx
      #
      # Returns NONE
      def update_endpoints(vm_name, cloud_service_name, *input_endpoints)
@ -402,7 +402,7 @@ module Azure
      # * +cloud_service_name+  - String. Cloud service name.
      # * +endpoint_name+       - String. Name of endpoint.
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/jj157187.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/jj157187.aspx
      #
      # Returns NONE
      def delete_endpoint(vm_name, cloud_service_name, endpoint_name)
@ -440,7 +440,7 @@ module Azure
      # * +:disk_label+    - String. Specifies the description of the data disk.
      # * +:disk_size+     - String. Specifies the size of disk in GB
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/jj157199.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/jj157199.aspx
      #
      # Returns None
      def add_data_disk(vm_name, cloud_service_name, options = {})
--- a/lib/azure/virtual_network_management/virtual_network_management_service.rb
+++ b/lib/azure/virtual_network_management/virtual_network_management_service.rb
@ -25,7 +25,7 @@ module Azure
      # Public: Gets a list of virtual network services available under the
      # current subscription.
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/jj157185.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/jj157185.aspx
      #
      # Returns an array of
      # Azure::VirtualNetworkServiceManagement::VirtualNetwork objects
@ -69,7 +69,7 @@ module Azure
      # * +dns_servers+         - Array. A hash of the name/value pairs.
      #   Contains the name and IPv4 address of the DNS server. (optional)
      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/jj157181.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/jj157181.aspx
      #
      # Returns None
      def set_virtual_network(vnet,
--- a/test/fixtures/list_images.xml
+++ b/test/fixtures/list_images.xml
@ -59,7 +59,7 @@
    <Name>b39f27a8b8c64d52b05eac6a62ebad85__Ubuntu-12_04_2-LTS-amd64-server-20130325-en-us-30GB</Name>
    <OS>Linux</OS>
    <Eula>http://www.ubuntu.com/project/about-ubuntu/licensing;http://www.ubuntu.com/aboutus/privacypolicy;http://www.ubuntu.com/aboutus/privacypolicy</Eula>
-    <Description>Ubuntu Server 12.04.2 LTS (amd64 20130325) for Windows Azure. Ubuntu Server is the world's most popular Linux for cloud environments. Updates and patches for Ubuntu 12.04.2 LTS will be available until 2017-04-26.  Ubuntu Server is the perfect platform for all workloads from web applications to NoSQL databases and Hadoop. More information can be found at:
+    <Description>Ubuntu Server 12.04.2 LTS (amd64 20130325) for Microsoft Azure. Ubuntu Server is the world's most popular Linux for cloud environments. Updates and patches for Ubuntu 12.04.2 LTS will be available until 2017-04-26.  Ubuntu Server is the perfect platform for all workloads from web applications to NoSQL databases and Hadoop. More information can be found at:
 http://www.ubuntu.com/business/server</Description>
  </OSImage> 
  <OSImage>
--- a/test/integration/cloud_service/Cloud_Create_test.rb
+++ b/test/integration/cloud_service/Cloud_Create_test.rb
@ -34,7 +34,7 @@ describe Azure::CloudServiceManagementService do
      subject.create_cloud_service(@cloud_name, options)
    end

-    it 'Creates a new cloud service in Windows Azure.' do
+    it 'Creates a new cloud service in Microsoft Azure.' do
      cloud_service = subject.get_cloud_service_properties(@cloud_name)
      assert cloud_service.name, @cloud_name
      assert cloud_service.location, options[:location]
--- a/test/integration/cloud_service/Cloud_Delete_test.rb
+++ b/test/integration/cloud_service/Cloud_Delete_test.rb
@ -35,7 +35,7 @@ describe Azure::CloudServiceManagementService do
      subject.create_cloud_service(@cloud_name, options)
    end

-    it 'Deletes the cloud service in Windows Azure.' do
+    it 'Deletes the cloud service in Microsoft Azure.' do
      subject.delete_cloud_service(@cloud_name)
      present = subject.get_cloud_service(@cloud_name)
      assert_equal present, false