From cc8a8dbb3836552099a00b47e9770e8844795269 Mon Sep 17 00:00:00 2001
From: rekjuh <juho@gispo.fi>
Date: Fri, 27 Sep 2024 14:32:55 +0300
Subject: [PATCH 1/3] Minor fixes/edits to Functionalities, Contribute and
 Download pages

Minor edits to aforementioned pages
---
 app/contribute/page.tsx               | 16 ++++++++--------
 app/discover/functionalities/page.tsx |  2 +-
 app/download/page.tsx                 | 13 ++++++-------
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/app/contribute/page.tsx b/app/contribute/page.tsx
index 77bd9736..ff66f5af 100644
--- a/app/contribute/page.tsx
+++ b/app/contribute/page.tsx
@@ -13,8 +13,8 @@ export default function ContributePage() {
     <Layout heroSmall heroTitle='Contribute'>
       <div>
         <Text>
-          Oskari is an open source software, which means that its source code is
-          open to anyone for modifying and enhancing. Oskari stays up-to-date
+          Oskari is an open source software. Its source code is
+          open to anyone to view, use and enhance. Oskari stays up-to-date
           and is constantly developed by an active community.
         </Text>
         <Text>
@@ -32,13 +32,13 @@ export default function ContributePage() {
             title='Report a bug'
             content={
               <div>
-                If you encounter a problem while using Oskari, please{' '}
+                If you encounter a problem while using Oskari, please report it to us - {' '}
                 <a
                   href='https://github.com/oskariorg/oskari-docs/issues'
                   target='_blank'
                   rel='noopener noreferrer'
                 >
-                  report it to us
+                  open a GitHub issue!
                 </a>
                 .
               </div>
@@ -57,7 +57,7 @@ export default function ContributePage() {
                 >
                   creating a pull request
                 </a>{' '}
-                you can propose and collaborate on changes to a repository.
+                you can propose and collaborate on changes to Oskari repository.
               </div>
             }
           />
@@ -82,17 +82,17 @@ export default function ContributePage() {
             title='Write in our blog'
             content={
               <div>
-                Would you like to share your findings or{' '}
+                Would you like to share your findings, give your view on Oskari or{' '}
                 <a href='mailto:info@oskari.org'>
                   tell how your organization uses Oskari?
                 </a>{' '}
-                Oskari&apos;s blog is the platform for your ideas.
+                <Link href='/blog'>Oskari&apos;s blog</Link>{' '} is the platform for your ideas.
               </div>
             }
           />
           <IconCard
             className='!min-w-[24rem]'
-            title='Join community groups'
+            title='Join the Oskari community'
             content={
               <div>
                 Join the regular <Link href='/community'>Oskari community</Link>{' '}
diff --git a/app/discover/functionalities/page.tsx b/app/discover/functionalities/page.tsx
index 198ac13d..b5ffe4f7 100644
--- a/app/discover/functionalities/page.tsx
+++ b/app/discover/functionalities/page.tsx
@@ -64,7 +64,7 @@ export default function DiscoverPage() {
         >
           <h3 style={{ fontSize: '1.625rem' }}>Give it a try!</h3>
           <p style={{ textAlign: 'center', fontSize: '1.125rem' }}>
-            How to view and visualize maps with Oskari? Try the demo!
+            How to view and visualise maps with Oskari? Try the demo!
           </p>
           <Button
             variant='dark'
diff --git a/app/download/page.tsx b/app/download/page.tsx
index f98a58c1..e0463e05 100644
--- a/app/download/page.tsx
+++ b/app/download/page.tsx
@@ -15,13 +15,13 @@ export default function DownloadPage() {
         <IconCard
           className='!bg-[var(--color-accent)]'
           title='Latest version'
-          subtitle='2.12.1'
+          subtitle='2.13.2'
           content={
             <>
               <div className='mb-8'>
-                The UI has seen a number of improvements for users with small
-                screens. There has also been improvements in map layer
-                management.
+                2.13.2 fixes various issues and enables semi-transparent fill
+                for polygons. The previously released 2.13.0 had numerous
+                improvements for end-users with small screens and better admin functionalities.
               </div>
               <div className='flex justify-center'>
                 <Button
@@ -36,12 +36,11 @@ export default function DownloadPage() {
         />
         <IconCard
           className='!bg-[var(--color-accent)]'
-          title='Other versions'
+          title='Release notes'
           content={
             <>
               <div className='mb-8'>
-                Have a look of the release notes of the previous Oskari
-                versions.
+                See what updates, fixes and new features have been added in previous versions.
               </div>
               <div className='flex justify-center'>
                 <Button

From c6d6e09686c73f04a273f05466614cfbd56313f1 Mon Sep 17 00:00:00 2001
From: rekjuh <juho@gispo.fi>
Date: Fri, 27 Sep 2024 14:33:32 +0300
Subject: [PATCH 2/3] Add URL's to Getting Started

To be double-checked one more time with a feeling
---
 app/discover/gettingstarted/page.tsx | 41 ++++++++++------------------
 1 file changed, 15 insertions(+), 26 deletions(-)

diff --git a/app/discover/gettingstarted/page.tsx b/app/discover/gettingstarted/page.tsx
index 34539ec6..a0f70d5d 100644
--- a/app/discover/gettingstarted/page.tsx
+++ b/app/discover/gettingstarted/page.tsx
@@ -16,67 +16,56 @@ export default function GettingStartedPage() {
           This site contains all the relevant links for finding the information you need about Oskari. The material has been divided under different user groups and customed to their needs.
         </Text>
       </div>
-      <div>
-        <h2>Contents</h2>
-        <ul>
-          <li><a href="#owners-procurers">Getting Started for Admins, Owners & Procurers</a></li>
-          <li><a href="#developers">Getting Started for Developers</a></li>
-          <li><a href="#commercial-partners">Getting Started for Commercial partners</a></li>
-          <li><a href="#end-users">Getting Started for End-users</a></li>
-        </ul>
-      </div>
       <div>
         <h2 id="owners-procurers">Getting Started for Admins, Owners & Procurers</h2>
         <Text>
-          If you are thinking about procuring Oskari, see Instructions for Procurement. There you will get help for procuring new Oskari instance, updating an old Oskari instance or configuring an Oskari instance.
         <div>
           If you need help with the admin tools, see our FAQ for Oskari admins.
         </div>
-        {"If you want to understand Oskari's infrastructure, see Oskari architechture."}
+        {"If you want to understand Oskari's infrastructure, see Oskari framework."}
         </Text>
       </div>
       <div>
       <h2 id="developers">Getting Started for Developers</h2>
         <Text>
-          Starting an Oskari instance
+        <Link href='/documentation/docs/latest/3-Setup-instructions#Setup-instructions'>Setting up an Oskari instance</Link>
           <div>
-          Updating an old Oskari instance.
+          <a href='https://github.com/oskariorg/oskari-server/blob/master/MigrationGuide.md'>Updating an old Oskari instance (Migration Guide)</a>
           </div>
-          Configuring Oskari.
+          <Link href='/documentation/docs/latest/9-Configuration-instructions#Configuration-instructions'>Configuring Oskari</Link>
           <div>
-          See the Oskari architechture.
+          <Link href='/documentation/docs/latest/2-Application-environment#Framework'>See an example of Oskari framework</Link>
           </div>
-          Developing Oskari.
+          <Link href='/documentation/docs/latest/8-Developing-instructions#Developing-instructions'>Developing Oskari-based applications</Link>
           <div>
-          Open the demo and try out Oskari yourself!
+          <a href='https://demo.oskari.org'>Open the demo and try out Oskari yourself!</a>
           </div>
-          Try out the RPC and its features.
+          <Link href='/examples/rpc-api'>Try out the RPC and its features</Link>
         </Text>
       </div>
       <div>
       <h2 id="commercial-partners">Getting Started for Commercial partners</h2>
         <Text>
-          Understanding Oskari: what skills do you need?
+        <Link href='/documentation/docs/latest/1-Introduction#Technical-overview'>What skills do you need to develop Oskari?</Link>
           <div>
-          See the Oskari architechture.
+          <Link href='/documentation/docs/latest/2-Application-environment#Framework'>An example of Oskari framework</Link>
           </div>
-          Why to join Oskari Joint Development Forum (JDF)?
         </Text>
       </div>
       <div>
       <h2 id="end-users">Getting Started for End-users</h2>
         <Text>
-          What is Oskari?
+          <Link href='/discover'> What is Oskari?</Link>
           <div>
-          How to report bugs in Oskari?
+          <Link href='/documentation/faq#for-developers'>How to report bugs in Oskari?</Link>
           </div>
-          How to contact Oskari Joint Development Forum?
+          To contact Oskari Joint Development Forum, <Link href='mailto:info@oskari.fi'>send us an e-mail</Link>
           <div>
           Tutorials:
           </div>
-            Embedding maps
+          <Link href='/documentation/faq#for-endusers'>Embedding maps</Link>
           <div>
-            Various other tutorials
+          <Link href='/documentation/faq#for-endusers'>Various other tutorials</Link>
           </div>
         </Text>
       </div>

From 88d6b6fa034877e1113aa73d15b74645ecb56a30 Mon Sep 17 00:00:00 2001
From: rekjuh <juho@gispo.fi>
Date: Mon, 30 Sep 2024 11:58:47 +0300
Subject: [PATCH 3/3] Revise FAQ, add import Link to Getting Started

Revise FAQ, add import Link to Getting Started
---
 _content/faq/faq-admins.md           | 84 ++++++++++++++++------------
 _content/faq/faq-developers.md       | 27 ++++-----
 _content/faq/faq-users.md            | 18 +++---
 app/discover/gettingstarted/page.tsx |  4 +-
 app/documentation/faq/page.tsx       |  4 +-
 5 files changed, 73 insertions(+), 64 deletions(-)

diff --git a/_content/faq/faq-admins.md b/_content/faq/faq-admins.md
index 1ead0bbb..6f0a6293 100644
--- a/_content/faq/faq-admins.md
+++ b/_content/faq/faq-admins.md
@@ -1,79 +1,89 @@
-# Adding map layers manually
+# Adding and deleting data providers
 
-Before adding any map layers there must be at least one dataprovider and one theme. Look at Dataprovider and Theme for information.
+Before you can add any map layers to the service, you must have at least one data provider and theme.
 
-Open map layers, press + -symbol and choose Add a new map layer. Choose the type for the map layer.
+Add data provider from **Map Layers**. Click the **+** symbol and **Add data provider**. Give the data provider a name in all the desired languages and a description if needed. Then click **Add**.
 
-Input the map layer’s interface URL and if necessary username and password. Choose the interface version. Later, it’s told which version is used for which interface.
+Data providers can be edited when map layers are sorted by Data Provider. Click the pen icon on the right and do the necessary changes. Remember to **Save** the changes.
 
-Fill in the unique name of the map layer, which comes from the interface. Give the map layer a name and optionally a description for every desired language.
+Click the **Delete** button if you want to remove a data provider. There must not be any map layers in the data provider's group for it to be able to be deleted.
 
-Choose a dataprovider and theme from Select groups for the map layer.
+# Adding and deleting themes
 
-Opacity and scale are changed in the Visualization tab. Different map layer types have differences in visualization that are expanded on later. 
+Before you can add any map layers to the service, you must have at least one theme and data provider.
 
-Metadata input is in the Additional tab if the map layer has any.
+Add theme from **Map Layers**. Click **+** and **Add theme**. Give the theme a name in all the desired languages and a description if needed. Finally click the **Add** button.
 
-Permissions are given to roles that are given to users and not to the users directly. Always give the admin role at least viewing permission and other roles the desired permissions. These are view, view in embedded map, publish and download.
+Theme can be edited when map layers are sorted by theme. Click the pen icon on the right and do the necessary changes. Remember to **Save** the changes.
 
-When done with configuration, press the Add-button at the bottom of the window. If the Close-button or X-button are pressed, the window will close and not save anything. Sometimes there might be some error popups, but they are not always problems that hinder the adding or viewing of the map, but it’s recommended to read its content and do the necessary adjustments.
+If you want to remove a theme, click **Delete**. There must not be any map layers in the theme for it to be able to be deleted.
 
-# Editing and deleting of map layers
+# Adding map layers
 
-Map layers can be edited by pressing the pen icon before its name.
+Before adding any map layers there must be at least one data provider and one theme. Look at **Data provider** and **Theme** for information.
 
-Edit the map layer as you like and press the save button at the bottom. If you don’t want to keep the changes, you can press the close button at the bottom or the x at the top right corner.
+Open map layers, click the **+** symbol and choose **Add a new map layer**. Choose a type for the map layer.
 
-If you want to completely delete a map layer, press the Delete button. Sometimes it's only necessary to remove permissions from map layers from roles other than admin. Before deleting a map layer it’s good to think if someone is using the map layer in a published map or will it be needed later.
+Add the map layer’s API URL and, if necessary, an username and password Choose the version of the interface. For vector data the common version is 1.1.0.
 
-Pressing the Add a new layer from the same service button opens a list of all the map layers of that same interface where it is easier to add map layers. Check that all of the information is correct before adding the map layer.
+Fill in the unique name of the map layer which comes from the interface. You can add a description in every desired language.
 
-# Different map layer types
+Choose a data provider and theme from **Select groups for the map layer**.
 
-WFS/OAPIF layers are vector type layers. Their common version is 1.1.0. Vector type layers can be defined to have a style made in the editor or added with JSON code. The style can be modified for point, line and area depending on the map layer.
+Clicking the **Add a new layer** from the same service button opens a list of all the map layers of that same interface. Check that all of the information is correct before adding the map layer.
 
-# Data provider
+# Changing visualisation of a map layer
 
-Add data provider from Map Layers and pressing + symbol and Add dataprovider. Give the data provider a name with all the desired languages and a description if needed. Lastly press the Add button.
+Opacity and scale are changed in the **Visualization tab**. Different map layer types have differences in visualization.
 
-Data providers can be edited when map layers are sorted by Data Provider. Press the pen icon on the right and do the necessary changes. Lastly press the Save button.
+Vector type layers can be defined to have a style made in the editor or added with JSON code. The style can be modified for point, line and polygon (area) depending on the map layer. Vector type layers include WFS / OAPIF layers.
 
-Press the Delete button if you want to remove the data provider. There must not be any map layers in the data provider for it to be able to be deleted.
+Raster type layers include WMS layers. They come from the API usually "as is", meaning that their visualisation cannot usually be changed.
 
-# Theme
+# Adding metadata to the map layer 
 
-Add theme from Map Layers and pressing + symbol and Add theme. Give the theme a name with all the desired languages and a description if needed. Lastly press the Add button
+Metadata input can be found in the **Additional tab**. Oskari displays metadata from a separate metadata page.
 
-Theme can be edited when map layers are sorted by Theme. Press the pen icon on the right and do the necessary changes. Lastly press the Save button.
+# Editing and deleting of map layers
 
-Press the Delete button if you want to remove the theme. There must not be any map layers in the theme for it to be able to be deleted.
+A map layer can be edited by clicking the pen icon before its name.
 
-# Announcements
+Edit the map layer as you like and finally click **Save** at the bottom of the window. If you don’t want to keep the changes just close the window by clicking **Close** at the bottom of the window or **X** at the top right corner of the window.
 
-Announcements show current, upcoming and outdated announcements together with making new ones.
+If you want to completely delete a map layer, click the **Delete** button. Sometimes deleting isn't necessary, and you can just remove viewing permissions to the desired map layer from roles other than admin. 
 
-There are two types of announcements: banner and pop-up. When adding a new announcement, you must specify the time and what type of announcement it is. The types are Title only, Title and contents, and Title and external link. Add a title and alternatively contents or an external link if needed for every language.
+Note that someone might be using the map layer in an embedded map. By deleting the layer it will also become unavailable in the embedded map.
 
-You can preview, edit or delete announcements from the icons at the right of the window. Remember to press the Save button when you have done the desired changes.
+# Users
 
-# Layer rights
+In the **Users** tab you can see a list of all users. This is where you can search for users, modify their information or delete them. When editing the data, you can change the user's nickname, first and last name and email, but these should not be touched without the user's permission/knowledge. This is where roles are added to the users.
 
-In layer rights, you can update the rights of the roles for each layer. If there are several pages of different layers, it is possible to search for the layer for which you want to update the rights.
+## Roles
 
-# Users
+Users are given **roles** and different roles can be given different **permissions** to the map layers. The same role can be given to various users, making it possible to have user groups with the same permissions.
 
-In the Users tab, you can see a list of all users. This is where you can search for users, modify their information or delete them. When editing the data, you can change the user's nickname, first and last name, and email, but these should not be touched without the user's permission/knowledge. This is where roles are added to the users.
+The permissions that can be granted to map layers are view, view in an embedded map, publish and download.
 
-In the Roles tab, you can add new roles and edit the names of old ones, as well as delete roles. Among the users of the role, you can see a list of users who own a certain role. By default, the roles have an admin-level role and a user-level role.
+In the **Roles** tab you can create new roles, edit the names of old ones, as well as delete roles. By default, the roles have an admin role or an user role.
 
-Users by role tab show which users has a specific role
+**Users by role** tab show which users has a specific role.
 
-# Administration
+When you have configured a new role click the **Add** button at the bottom of the window. The changes will not be saved if you click the **Close** or **X** buttons. Should there be any pop up windows warning of an error, act accordingly to resolve the issues.
 
-In administration, you can set different views and the default view.(?)
+# Layer rights
+
+In layer rights, you can update the rights of the roles for each layer. If there are several pages of different layers, it is possible to search for the layer for which you want to update the rights.
 
 # Layer monitoring
 
 In layer monitoring, you can see a list of all levels and their information about ID, name, data provider, type, total screens and incorrect screens. By clicking on the name of the information, you can arrange the information in descending/ascending order. Here you can also edit the level or delete it.
 
 By clicking on the name of the map layer, you can see more detailed information about its openings. Here you can see the number of successful and failed openings, at what time interval these have occurred and the map layer on the map where the error occurred.
+
+# Announcements
+
+**Announcements** tab shows current, upcoming and outdated announcements together with making new ones.
+
+There are two types of announcements: banner and pop-up. When adding a new announcement, you must specify the time for the announcement and what type of announcement it is. The types are Title only, Title and contents, and Title and external link. Add a title and possible other contents for every language your map service uses.
+
+You can preview, edit or delete announcements from the icons at the right of the window. Remember to click the **Save** button when you have done the desired changes.
\ No newline at end of file
diff --git a/_content/faq/faq-developers.md b/_content/faq/faq-developers.md
index 7156519e..17995185 100644
--- a/_content/faq/faq-developers.md
+++ b/_content/faq/faq-developers.md
@@ -1,33 +1,28 @@
 # There is a bug, what to do?
 
-You found a bug? Can you repeat it? Yes: File a bug report at GitHub issues.
+You found a bug? Can you repeat it? Yes: file a bug report at GitHub issues.
 
-- Go to: [GitHub](https://github.org/oskariorg)
+- Go to: [Oskari's GitHub page](https://github.org/oskariorg)
 - Sign up
-- Press New issue-button
-- Include helpful information: Oskari version, browser, steps to reproduce the error
-- Press Submit new issue-button
+- Click **New issue** button
+- Include helpful information: what Oskari version you used, with what browser and what are the steps to reproduce the error
+- Click **Submit new issue**
 
 # Where can I find help with my Oskari issues?
 
 You can ask Oskari related issues by sending a query to Oskari user mailing list or [chat in Oskari Gitter](https://app.gitter.im/#/room/#oskariorg_chat:gitter.im).
 
-# What skills do I need to use Oskari?
+# What skills do I need to setup/develop Oskari?
 
-Oskari is not a software you can set up by just pushing a execute button. It is a comprehensive setup that requires understanding about server side and different software libraries. The setup is also depending on the operating system and server environment. First go to documentation and get familiar with the components. Then ask if you need assistance!
+The techinical requirements have been listed [in the documentation.](https://oskari.org/documentation/docs/latest/1-Introduction#Requirements-for-developing-Oskari)
 
-Requirements:
+We recommend that you see the first two sections of Oskari's documentation (Introduction and Application environment). Then ask if you need assistance!
 
-- Version management: Git
-- Frontend: JavaScript, HTML, CSS, OpenLayers 3+
-- Backend: Java, PostgreSQL, PostGIS, GeoServer, GeoTools
-- Build infrastructure & tests: Maven/JUnit for server, Webpack/Jest for frontend.
-- Understanding about the following software: GeoServer, PostGIS, Jetty, Redis, Nginx
-- Understanding OGC standards: WMS, WMTS, WFS, WPS, WCS
+Oskari is not a software you can set up by just pushing a execute button. It is a comprehensive setup that requires understanding about server side and different software libraries. The setup is also dependant on the operating system and server environment. 
 
 # How to develop Oskari?
 
-If you want to provide improvements to Oskari, here are some steps to do it:
+If you want to provide improvements to Oskari, here are some steps to do it. See also [the documentation.](https://oskari.org/documentation/docs/latest/8-Developing-instructions#Developing-instructions)
 
 - Open the Oskari source code in your project. Remember to follow the guidelines and How-to. Share your plans also openly through Oskari Roadmap in GitHub, so other developers know what to you are up to.
 - Test and report bugs.
@@ -35,7 +30,7 @@ If you want to provide improvements to Oskari, here are some steps to do it:
 - Remember that adding new features to Oskari main development line are discussed and decided by Oskarin PSC. If the developed feature is not suitable for the main development line, it can be added as a Community Plugin.
 - Remember to update your plugins and take care that they are compatible with the versioning of the main development line.
   Optional: Join Joint Development Forum for Oskari and let's activate a joint development project. You'll receive support from the group and National Land Survey of Finland, were the technical support team is ready to tackle your questions and check your source code.
-- Optional: Join Joint Development Forum for Oskari and let's activate a joint development project. You'll receive support from the group and National Land Survey of Finland, were the technical support team is ready to tackle your questions and check your source code.
+- We also recommend that you join Joint Development Forum for Oskari and we'll activate a joint development project. You'll receive support from the group and National Land Survey of Finland, were the technical support team is ready to tackle your questions and check your source code.
 
 # How can I build Oskari with a new version tag?
 
diff --git a/_content/faq/faq-users.md b/_content/faq/faq-users.md
index 49be53b6..e6cceba1 100644
--- a/_content/faq/faq-users.md
+++ b/_content/faq/faq-users.md
@@ -1,19 +1,23 @@
-# How do I get the license for Oskari?
+# How much does Oskari cost?
 
-The source code for Oskari is open source. It is being kept flexible in order to broaden it with new components, use it with different service platforms and for changing the software libraries if needed. The UI supports multilingualism and there are already multiple languages translated. All source code is being published with [MIT/EUPL licenses](https://github.com/oskariorg/oskari-docs/blob/master/documents/LICENSE-MIT.txt).
+The open source code is available free of charge.
 
-# How much does Oskari cost?
+# How do I get the license for Oskari?
+
+The source code for Oskari is open source. It is being kept flexible in order to broaden it with new components, use it with different service platforms and for changing the software libraries if needed. 
 
-The open source code is available free of charge! Oskari saves time and money.
+The UI has multilingual support and there are already multiple languages translated. All source code is being published with [MIT/EUPL licenses](https://github.com/oskariorg/oskari-docs/blob/master/documents/LICENSE-MIT.txt).
 
 # How do I create embedded maps from Oskari?
 
-If you don’t want to set up Oskari installation, don’t worry you can still enjoy the ride. You can build fancy & tailored map views based on Published maps functionality in Oskari. This requires an Oskari installation that has enabled the Published map functionality. If you are registered to the Oskari site you want to use, add the map layers you need to the map and click Published maps. Follow the instructions and embedd the iframe code you get in the end to your website.
+If you don’t want to set up your own Oskari installation, you can build map views with the **Published maps** functionality in Oskari. This requires an Oskari installation that has enabled the Published map functionality.
+
+If you are registered to the Oskari site you want to use, add the map layers you need to the map and click **Published maps**. Follow the instructions. You will get and iframe code that you can embed to your web site.
 
 # Why are there no layers in an embedded map?
 
-Check access rights. It might be that users with guest-role (most of the people looking at embedded maps) don't have permission to see layers included in the embedded map. [See Oskari permissions](/documentation/docs)
+Check access rights. It might be that users with guest role (most of the people looking at embedded maps) don't have permission to see layers included in the embedded map.
 
 # How do I tailor my embedded maps?
 
-Embedded maps can be tweaked to be in contact with your web site and provide more information to users using code snippets called RPC (Remote Process Call). So you can get the map to talk with your site. See the RPC example codes or follow the workshop example.
+Embedded maps can be tweaked to be in contact with your web site and provide more information to users using code snippets called RPC (Remote Process Call). See [the RPC example codes.](https://oskari.org/examples/rpc-api/)
diff --git a/app/discover/gettingstarted/page.tsx b/app/discover/gettingstarted/page.tsx
index a0f70d5d..6ae84c72 100644
--- a/app/discover/gettingstarted/page.tsx
+++ b/app/discover/gettingstarted/page.tsx
@@ -3,7 +3,7 @@ import Text from '@/components/Text'
 import { Metadata } from 'next'
 import HighlightBox from '@/components/HighlightBox'
 import Button from '@/components/Button'
-
+import Link from 'next/link'
 export const metadata: Metadata = {
   title: 'Getting Started',
 }
@@ -20,7 +20,7 @@ export default function GettingStartedPage() {
         <h2 id="owners-procurers">Getting Started for Admins, Owners & Procurers</h2>
         <Text>
         <div>
-          If you need help with the admin tools, see our FAQ for Oskari admins.
+          If you need help with the admin tools, see our <Link href='/documentation/faq#for-admins'>FAQ for Oskari admins.</Link>
         </div>
         {"If you want to understand Oskari's infrastructure, see Oskari framework."}
         </Text>
diff --git a/app/documentation/faq/page.tsx b/app/documentation/faq/page.tsx
index 8ee7dd3d..a3b8a6aa 100644
--- a/app/documentation/faq/page.tsx
+++ b/app/documentation/faq/page.tsx
@@ -107,8 +107,8 @@ export default function FaqPage() {
           <h3 style={{ fontSize: '1.625rem' }}>Got a question?</h3>
           <Button
             variant='primary'
-            title='Ask in GIS Stack Exchange'
-            href='https://gis.stackexchange.com/'
+            title='Ask us about Oskari in Gitter'
+            href='https://app.gitter.im/#/room/#oskariorg_chat:gitter.im'
             external
             newWindow
           />