Merge pull request #1373 from RonanSynnottArm/successkits1124

Update success kit content

Author: jasonrandrews

content/install-guides/ambaviz.md

@@ -37,9 +37,9 @@ A detailed overview of functionality is described in [Introduction to AMBA Viz](
 
 AMBA Viz is a component of [Arm Hardware Success Kits](https://www.arm.com/products/development-tools/success-kits).
 
-It is available to download at the [Arm Product Download Hub](https://developer.arm.com/downloads/view/HWSKT-KS-0002).
+It is available to download at the [Arm Product Download Hub](https://developer.arm.com/downloads/).
 
-You can download AMBA Viz as an individual standalone component, or you can download the complete Success Kits.
+You can download AMBA Viz as an individual component, or you can download complete Success Kits.
 
 For more information on the Download Hub, refer to the [Arm Product Download Hub install guide](/install-guides/pdh/).
 

content/install-guides/armclang.md

@@ -44,16 +44,13 @@ Arm Compiler for Embedded FuSa must also be [downloaded separately](#download).
 
 Individual compiler packages for all supported host platforms can be downloaded from the [Arm Product Download Hub](#pdh) or the [Arm Tools Artifactory](#artifactory).
 
-Individual compiler packages for all supported host platforms can be downloaded from the [Arm Product Download Hub](https://developer.arm.com/downloads) or the [Arm Tools Artifactory](https://www.keil.arm.com/artifacts/).
-
 ### Product Download Hub {#pdh}
 
-All compiler packages can be downloaded from the [Arm Product Download Hub](https://developer.arm.com/downloads) (requires login):
+All compiler packages can be downloaded from the [Arm Product Download Hub](https://developer.arm.com/downloads) (requires login).
 
-- [Arm Compiler for Embedded](https://developer.arm.com/downloads/view/ACOMPE)
-- [Arm Compiler for Embedded FuSa](https://developer.arm.com/downloads/view/ACOMP616)
+Download links to all available versions are given in the [Arm Compiler downloads index](https://developer.arm.com/documentation/ka005198).
 
-These can either be used standalone or [integrated](#armds) into your Arm Development Studio installation.
+All compiler versions can be used standalone or [integrated](#armds) into your Arm Development Studio installation.
 
 See also: [What should I do if I want to download a legacy release of Arm Compiler?](https://developer.arm.com/documentation/ka005184)
 
@@ -121,7 +118,9 @@ export AC6_TOOLCHAIN_6_22_0=/home/$USER/ArmCompilerforEmbedded6.22/bin
 
 ## Set up the product license
 
-Arm Compiler for Embedded and Arm Compiler for Embedded FuSa are license managed. License setup instructions are available in the [Arm Licensing install guide](/install-guides/license/).
+`Arm Compiler for Embedded` and `Arm Compiler for Embedded FuSa` are license managed.
+
+License setup instructions are available in the [Arm Licensing install guide](/install-guides/license/).
 
 ## Verify installation
 

content/install-guides/license/_index.md

@@ -16,11 +16,9 @@ multitool_install_part: false   # Set to true if a sub-page of a multi-page arti
 layout: installtoolsall         # DO NOT MODIFY. Always true for tool install articles
 ---
 
-Most Arm commercial tools are license managed. Arm is migrating to user-based licensing (UBL) which greatly simplifies license configuration. It is available for [Arm Success Kits](/install-guides/successkits/) as well as [Arm Development Studio](/install-guides/armds).
+Most Arm commercial tools are license managed. Arm is migrating to user-based licensing (UBL) which greatly simplifies license configuration.
 
-Success kits are available as `Hardware Success Kits` (`HSK`) or `Software Success Kits` (`SSK`). See the table below for tooling provided. SSK is a subset of HSK.
-
-With UBL, you have unlimited access to all components in the success kit you have enabled. The license is cached locally for up to 7 days, enabling remote or traveling users to access tools without connecting to their license server.
+A user-based license is cached locally for up to 7 days, enabling remote or traveling users to access tools without connecting to their license server.
 
 Starting any UBL enabled tool when the server is available will renew the license for 7 more days. This renewal attempt is performed once per 24 hours.
 
@@ -52,10 +50,4 @@ Legacy product versions do not support UBL licensing and use FlexLM [floating li
 
 ## User-based Licensing Video Tutorials
 
-In addition to the set up and install instructions below, a collection of video tutorials are available on the Arm Developer website:
-
-* [Accessing the Arm License Portal](https://developer.arm.com/Additional%20Resources/Video%20Tutorials/User-based%20Licensing%20-%20Accessing%20the%20Arm%20License%20Portal)
-* [Cloud-based Licenses and Activation Codes](https://developer.arm.com/Additional%20Resources/Video%20Tutorials/User-based%20Licensing%20-%20Cloud-based%20Licenses%20and%20Activation%20Codes)
-* [Local License Server Setup](https://developer.arm.com/Additional%20Resources/Video%20Tutorials/User-based%20Licensing%20-%20Local%20License%20Server%20Setup)
-* [End-user Setup](https://developer.arm.com/Additional%20Resources/Video%20Tutorials/User-based%20Licensing%20-%20End%20User%20Setup)
-* [Removal of Licenses and Decommissioning Server](https://developer.arm.com/Additional%20Resources/Video%20Tutorials/User-based%20Licensing%20-%20License%20Removal%20and%20Decommissioning%20Server)
+In addition to the set up and install instructions below, a collection of video tutorials are available on [Arm Developer](https://developer.arm.com//Tools%20and%20Software/User-based%20Licensing).

content/install-guides/license/ubl_license_enduser.md

@@ -15,23 +15,17 @@ layout: installtoolsall         # DO NOT MODIFY. Always true for tool install ar
 
 A [Local License Server (LLS)](/install-guides/license/ubl_license_admin/) must first be set up by your license administration team.
 
-{{% notice Notice%}}
-A Software Success Kit is a subset of a Hardware Success Kit.
-
-You should confirm which type of license is appropriate for your needs.
-{{% /notice %}}
-
 ## Activate license on end user machine
 
-The UBL license can be activated on the end user machine in different ways. Select the most appropriate for your needs.
+The user-based license can be activated on the end user machine in different ways. Select the most appropriate for your needs.
 
 * [Activate via environment variable](#envvar)
 * [Activate within tools IDE](#ide)
 * [Activate manually](#manual)
 
 ## Activate via environment variable {#envvar}
 
-Create `ARMLM_ONDEMAND_ACTIVATION` environment variable referencing the Success Kit product code and your internal UBL license server. Contact your internal license administrators for information on your internal server.
+Create `ARMLM_ONDEMAND_ACTIVATION` environment variable referencing the product code and your internal license server. Contact your internal license administrators for information on your internal server.
 
 ### HSK
 ```console
@@ -42,7 +36,7 @@ export ARMLM_ONDEMAND_ACTIVATION=HWSKT-STD0@https://internal.ubl.server
 export ARMLM_ONDEMAND_ACTIVATION=SWSKT-STD0@https://internal.ubl.server
 ```
 
-A license will be automatically checked out whenever a UBL enabled tool is run, for example:
+A license will be automatically checked out whenever a user-based licensing enabled tool is run, for example:
 ```command
 armclang --version
 ```
@@ -58,17 +52,12 @@ Select `Activate with` > `License Server`, and enter the appropriate license ser
 
 ## Activate manually {#manual}
 
-Open a command prompt, and navigate to the bin directory of any UBL enabled product.
+Open a command prompt, and navigate to the bin directory of any user-based licensing enabled product.
 
-Activate an appropriate success kit license with `armlm`:
-### HSK
+Activate your user-based license with `armlm`:
 ```console
 armlm activate --server https://internal.ubl.server --product HWSKT-STD0
 ```
-### SSK
-```
-armlm activate --server https://internal.ubl.server --product SWSKT-STD0
-```
 
 ## Confirm license check-out {#confirm}
 
@@ -84,7 +73,7 @@ You should see an output similar to:
 Hardware Success Kit
     Product code: HWSKT-STD0
     Order Id: xxxxxxxx
-    License valid until: 2023-12-31
+    License valid until: 2025-12-31
     Local cache expires in: 6 days and 23 hours
     License server: https://internal.ubl.server
 ```
@@ -93,7 +82,7 @@ Hardware Success Kit
 
 Your license is cached on your local machine, and is valid for 7 days.
 
-There will be an automatic attempt to refresh this timer on the first usage of a UBL enabled tool in a day. If that fails (for example, if tools are run whilst not connected to your network) the tools can still be used provided there is still time on the locally cached license.
+There will be an automatic attempt to refresh this license once per day. If that fails (for example, if tools are run whilst not connected to your network) the tools can still be used provided there is still time on the locally cached license.
 
 To manually refresh the license, you can deactivate and reactivate your license (when connected to your network). For example:
 ```command

content/install-guides/socrates.md

@@ -35,9 +35,9 @@ layout: installtoolsall         # DO NOT MODIFY. Always true for tool install ar
 
 Socrates is a component of [Arm Hardware Success Kits](https://www.arm.com/products/development-tools/success-kits).
 
-It is available to download via the [Arm Product Download Hub](https://developer.arm.com/downloads/view/HWSKT-KS-0002).
+It is available to download via the [Arm Product Download Hub](https://developer.arm.com/downloads/).
 
-You can download Socrates as an individual standalone component, or you can download the complete success kits.
+You can download Socrates as an individual component, or you can download the complete success kits.
 
 For more information on the Download Hub, refer to the [Arm Product Download Hub install guide](/install-guides/pdh/).
 

content/install-guides/successkits.md

@@ -28,16 +28,12 @@ multi_install: false            # Set to true if first page of multi-page articl
 multitool_install_part: false   # Set to true if a sub-page of a multi-page article, else false
 layout: installtoolsall         # DO NOT MODIFY. Always true for tool install articles
 ---
-Arm Development tools are packaged as [Arm Success Kits](https://www.arm.com/products/development-tools/success-kits). These come in two forms:
+Arm Development tools are packaged as [Arm Success Kits](https://www.arm.com/products/development-tools/success-kits).
 
-- Software Success Kits (SSK)
-- Hardware Success Kits (HSK)
-
-SSKs contain all of the software development tools provided by Arm.
-
-HSKs include SSK as well as additional tools for IP configuration and evaluation.
-
-Arm Success Kits are a component of [Arm Flexible Access](https://www.arm.com/en/products/flexible-access).
+Arm Success Kits are a component of:
+* [Arm Total Access](https://www.arm.com/products/licensing/arm-total-access)
+* [Arm Flexible Access](https://www.arm.com/en/products/flexible-access)
+* [Arm Academic Access](https://www.arm.com/resources/research/enablement/academic-access)
 
 ## Downloading Success Kit components