From 45b137441b9540de9c940c6a5905b619745c2f4d Mon Sep 17 00:00:00 2001
From: Kylli Ek <kylli.ek@csc.fi>
Date: Fri, 17 Jan 2025 16:18:07 +0200
Subject: [PATCH 1/7] ArcGIS 2025 updates

---
 docs/apps/arcgis.md | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/docs/apps/arcgis.md b/docs/apps/arcgis.md
index 79d4e422e0..d463f0e025 100644
--- a/docs/apps/arcgis.md
+++ b/docs/apps/arcgis.md
@@ -13,12 +13,15 @@ CSC organizes ArcGIS software consortium for Finnish universities and
 universities of applied sciences. The members of current consortium are
 listed at the end of this page. 
 
+!!! note
+    CSC ArcGIS software consortium will end 31.12.2025. 
+
 To the members of ArcGIS software consortium these products are available (for details see the license agreement Appendix A):
 
 -   ArcGIS Online
--   ArcGIS Pro and Desktop.
+-   ArcGIS Pro and Desktop
 -   ArcGIS Enterprise 
--   ArcGIS Drone2map, NEW 2022
+-   ArcGIS Drone2map
 -   Esri CityEngine
 -   ArcGIS Monitor
 -   ArcGIS Hub Premium
@@ -35,6 +38,9 @@ Software may be installed to the computers of the consortium member university a
 and students and may be used at home or during field work according to the user terms. The more detailed terms of
 use can be found from [ArcGIS site license agreement](../img/ArcGIS_education_Institution_terms_and_conditions_2020-2022.pdf).
 
+From 1.2.2025 following ArcGIS Desktop extensions will not be available: Data Interoperability, Aviation Airports, Aviation Charting, Bathymetry, Data Reviewer, Defense Mapping, LocateXT, Maritime,
+Production Mapping, Tracking Analyst, Workflow Manager, Location Referencing Desktop (Pipeline) and Location Referencing Desktop (Roads&Hwy).
+
 ------------------------------------------------------------------------
 
 ## ArcGIS  Desktop and ArcGIS Pro
@@ -48,15 +54,13 @@ All old ArcGIS Desktop users are encouraged to [move to ArcGIS Pro](https://supp
 ### License
 ArcGIS products need to be authorized. Licensing options for consortium members:
 
--   **Named users**, main option for ArcGIS Pro, not available for ArcGIS desktop. The user must have home university's ArcGIS Online 
+-   **Named users**, main option for ArcGIS Pro, not available for ArcGIS Desktop. The user must have home university's ArcGIS Online 
 account with personal ArcGIS Pro license. Ask this from your home university ArcGIS Online administrator.  
--   **Concurrent licenses** from CSC license server, main option ArcGIS for Desktop, but also available for ArcGIS Pro. 
+-   **Concurrent licenses** from CSC license server, main option ArcGIS Desktop. ArcGIS Pro concurrent licenses are available only until 31.3.2025. 
 Ask your home university's ArcGIS contact person for address of the license server and the port numbers to be opened. 
 Help: [ArcGIS Pro](http://pro.arcgis.com/en/pro-app/get-started/start-arcgis-pro-with-a-concurrent-use-license.htm) 
 and [ArcGIS Desktop](https://desktop.arcgis.com/en/arcmap/latest/get-started/installation-guide/authorization-wizard.htm).
--   **Single use license**s, for ArcGIS Pro and ArcGIS for Desktop, only for university personnel. Single Use license does not 
-need internet connection, so useful for example during field work. Single Use licenses are always valid until end of the calendar year. 
-Single Use licenses are available from University's contact persons.
+-   **Single use license**, for ArcGIS Pro and ArcGIS Desktop. Not available for 2025. 
 
   
 !!! note
@@ -68,12 +72,12 @@ Single Use licenses are available from University's contact persons.
 #### Borrowing concurrent licenses
 
 ArcGIS Educational site license includes also possibility to borrow
-licenses for 100 days. With a borrowed license it is possible to work
+licenses for 20 days. With a borrowed license it is possible to work
 without Internet connection or outside of FUNET network.
 
 License is borrowed with [ArcGIS Administrator](http://desktop.arcgis.com/en/arcmap/latest/get-started/administer/borrowing-and-returning-licenses.htm) or [ArcGIS Pro](https://pro.arcgis.com/en/pro-app/get-started/start-arcgis-pro-with-a-concurrent-use-license.htm#ESRI_SECTION1_9E03C2B7A83C4FE4A41408EE7E0498CB):
 
--   Always borrow the base product ArcGIS Desktop or ArcGIS Pro, only Advanced level is available.
+-   Always borrow the base product ArcGIS Desktop or ArcGIS Pro.
 -   All extensions need to be borrowed separately, you are free to
     choose which ones you need. Especially with ArcGIS Pro make sure you borrow all the extensions you need. It is not possible to add extensions to already borrowed base product.
 -   Licenses borrowed at the end of year are always returned on 31th of December, because annual license renewal.

From e1c6747bdfe4275fb9842c55071da07692d7241d Mon Sep 17 00:00:00 2001
From: Kylli Ek <kylli.ek@csc.fi>
Date: Fri, 17 Jan 2025 16:25:51 +0200
Subject: [PATCH 2/7] Add Desktop end dates

---
 docs/apps/arcgis.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/apps/arcgis.md b/docs/apps/arcgis.md
index d463f0e025..49af6b1be0 100644
--- a/docs/apps/arcgis.md
+++ b/docs/apps/arcgis.md
@@ -43,8 +43,8 @@ Production Mapping, Tracking Analyst, Workflow Manager, Location Referencing Des
 
 ------------------------------------------------------------------------
 
-## ArcGIS  Desktop and ArcGIS Pro
-All old ArcGIS Desktop users are encouraged to [move to ArcGIS Pro](https://support.esri.com/en/arcmap-esri-plan), because active development of ArcGIS Desktop has stopped.
+!!! note 
+Development of ArcGIS Desktop has stopped and it will be officially retired on 1.3.2026 and licencies are likely unavailable from 1.1.2026. ArcGIS Desktop users are encouraged to [move to ArcGIS Pro](https://support.esri.com/en/arcmap-esri-plan) during 2025. 
 
 ### Installation
 -   [Installation guidelines for ArcGIS Pro](https://pro.arcgis.com/en/pro-app/latest/get-started/install-and-sign-in-to-arcgis-pro.htm) and [ArcGIS Desktop](https://desktop.arcgis.com/en/arcmap/latest/get-started/installation-guide/introduction.htm).

From d202e01f3a8eed220f561a7196783648dbe4d78a Mon Sep 17 00:00:00 2001
From: Kylli Ek <kylli.ek@csc.fi>
Date: Fri, 17 Jan 2025 16:27:27 +0200
Subject: [PATCH 3/7] style fix

---
 docs/apps/arcgis.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/apps/arcgis.md b/docs/apps/arcgis.md
index 49af6b1be0..5bca820889 100644
--- a/docs/apps/arcgis.md
+++ b/docs/apps/arcgis.md
@@ -44,7 +44,7 @@ Production Mapping, Tracking Analyst, Workflow Manager, Location Referencing Des
 ------------------------------------------------------------------------
 
 !!! note 
-Development of ArcGIS Desktop has stopped and it will be officially retired on 1.3.2026 and licencies are likely unavailable from 1.1.2026. ArcGIS Desktop users are encouraged to [move to ArcGIS Pro](https://support.esri.com/en/arcmap-esri-plan) during 2025. 
+  Development of ArcGIS Desktop has stopped and it will be officially retired on 1.3.2026 and licencies are likely unavailable from 1.1.2026. ArcGIS Desktop users are encouraged to [move to ArcGIS Pro](https://support.esri.com/en/arcmap-esri-plan) during 2025. 
 
 ### Installation
 -   [Installation guidelines for ArcGIS Pro](https://pro.arcgis.com/en/pro-app/latest/get-started/install-and-sign-in-to-arcgis-pro.htm) and [ArcGIS Desktop](https://desktop.arcgis.com/en/arcmap/latest/get-started/installation-guide/introduction.htm).

From ea96d25b98fc28de53e21faa0f593991b8624587 Mon Sep 17 00:00:00 2001
From: Kylli Ek <kylli.ek@csc.fi>
Date: Fri, 17 Jan 2025 16:32:14 +0200
Subject: [PATCH 4/7] styling fix

---
 docs/apps/arcgis.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/apps/arcgis.md b/docs/apps/arcgis.md
index 5bca820889..e32c138951 100644
--- a/docs/apps/arcgis.md
+++ b/docs/apps/arcgis.md
@@ -44,7 +44,7 @@ Production Mapping, Tracking Analyst, Workflow Manager, Location Referencing Des
 ------------------------------------------------------------------------
 
 !!! note 
-  Development of ArcGIS Desktop has stopped and it will be officially retired on 1.3.2026 and licencies are likely unavailable from 1.1.2026. ArcGIS Desktop users are encouraged to [move to ArcGIS Pro](https://support.esri.com/en/arcmap-esri-plan) during 2025. 
+    Development of ArcGIS Desktop has stopped and it will be officially retired on 1.3.2026 and licencies are likely unavailable from 1.1.2026. ArcGIS Desktop users are encouraged to [move to ArcGIS Pro](https://support.esri.com/en/arcmap-esri-plan) during 2025. 
 
 ### Installation
 -   [Installation guidelines for ArcGIS Pro](https://pro.arcgis.com/en/pro-app/latest/get-started/install-and-sign-in-to-arcgis-pro.htm) and [ArcGIS Desktop](https://desktop.arcgis.com/en/arcmap/latest/get-started/installation-guide/introduction.htm).

From 7518d79315f5dfd756045aa8bd2d86bda438fb4b Mon Sep 17 00:00:00 2001
From: Kylli Ek <kylli.ek@csc.fi>
Date: Fri, 17 Jan 2025 16:34:06 +0200
Subject: [PATCH 5/7] Update arcgis.md

---
 docs/apps/arcgis.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/apps/arcgis.md b/docs/apps/arcgis.md
index e32c138951..e28966fd14 100644
--- a/docs/apps/arcgis.md
+++ b/docs/apps/arcgis.md
@@ -38,7 +38,7 @@ Software may be installed to the computers of the consortium member university a
 and students and may be used at home or during field work according to the user terms. The more detailed terms of
 use can be found from [ArcGIS site license agreement](../img/ArcGIS_education_Institution_terms_and_conditions_2020-2022.pdf).
 
-From 1.2.2025 following ArcGIS Desktop extensions will not be available: Data Interoperability, Aviation Airports, Aviation Charting, Bathymetry, Data Reviewer, Defense Mapping, LocateXT, Maritime,
+From 1.1.2025 following ArcGIS Desktop extensions are not available: Data Interoperability, Aviation Airports, Aviation Charting, Bathymetry, Data Reviewer, Defense Mapping, LocateXT, Maritime,
 Production Mapping, Tracking Analyst, Workflow Manager, Location Referencing Desktop (Pipeline) and Location Referencing Desktop (Roads&Hwy).
 
 ------------------------------------------------------------------------

From 2515199beb2c05dedc4967d714fe322df5f0e01a Mon Sep 17 00:00:00 2001
From: Kylli Ek <kylli.ek@csc.fi>
Date: Mon, 20 Jan 2025 12:48:44 +0200
Subject: [PATCH 6/7] Update docs/apps/arcgis.md

Co-authored-by: EetuHuuskoCSC <116141296+EetuHuuskoCSC@users.noreply.github.com>
---
 docs/apps/arcgis.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/apps/arcgis.md b/docs/apps/arcgis.md
index e28966fd14..4ad3b5cb89 100644
--- a/docs/apps/arcgis.md
+++ b/docs/apps/arcgis.md
@@ -38,7 +38,7 @@ Software may be installed to the computers of the consortium member university a
 and students and may be used at home or during field work according to the user terms. The more detailed terms of
 use can be found from [ArcGIS site license agreement](../img/ArcGIS_education_Institution_terms_and_conditions_2020-2022.pdf).
 
-From 1.1.2025 following ArcGIS Desktop extensions are not available: Data Interoperability, Aviation Airports, Aviation Charting, Bathymetry, Data Reviewer, Defense Mapping, LocateXT, Maritime,
+From 1.1.2025 onward the following ArcGIS Desktop extensions are not available: Data Interoperability, Aviation Airports, Aviation Charting, Bathymetry, Data Reviewer, Defense Mapping, LocateXT, Maritime,
 Production Mapping, Tracking Analyst, Workflow Manager, Location Referencing Desktop (Pipeline) and Location Referencing Desktop (Roads&Hwy).
 
 ------------------------------------------------------------------------

From 2d4ae5b6aa78d43662d6dc5d72debacfbca58c41 Mon Sep 17 00:00:00 2001
From: Kylli Ek <kylli.ek@csc.fi>
Date: Mon, 20 Jan 2025 12:49:27 +0200
Subject: [PATCH 7/7] Update docs/apps/arcgis.md

Co-authored-by: EetuHuuskoCSC <116141296+EetuHuuskoCSC@users.noreply.github.com>
---
 docs/apps/arcgis.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/apps/arcgis.md b/docs/apps/arcgis.md
index 4ad3b5cb89..6109574f73 100644
--- a/docs/apps/arcgis.md
+++ b/docs/apps/arcgis.md
@@ -44,7 +44,7 @@ Production Mapping, Tracking Analyst, Workflow Manager, Location Referencing Des
 ------------------------------------------------------------------------
 
 !!! note 
-    Development of ArcGIS Desktop has stopped and it will be officially retired on 1.3.2026 and licencies are likely unavailable from 1.1.2026. ArcGIS Desktop users are encouraged to [move to ArcGIS Pro](https://support.esri.com/en/arcmap-esri-plan) during 2025. 
+    Development of ArcGIS Desktop has stopped and it will be officially retired on 1.3.2026 and licenses will likely be unavailable from 1.1.2026 onward. ArcGIS Desktop users are encouraged to [move to ArcGIS Pro](https://support.esri.com/en/arcmap-esri-plan) during 2025. 
 
 ### Installation
 -   [Installation guidelines for ArcGIS Pro](https://pro.arcgis.com/en/pro-app/latest/get-started/install-and-sign-in-to-arcgis-pro.htm) and [ArcGIS Desktop](https://desktop.arcgis.com/en/arcmap/latest/get-started/installation-guide/introduction.htm).