Merge pull request #82 from AxisCommunications/sync-20221212-1

Sync 20221212 1

docs/axis-devices-and-compatibility.md

@@ -121,7 +121,7 @@ If you want an ACAP to be compatible with older firmware, you need to choose an
 SDK for an older firmware.
 
 To support firmware older than AXIS OS 10.7, build your ACAP application with
-[ACAP 3](https://help.axis.com/acap-3-developer-guide).
+[ACAP version 3](https://help.axis.com/acap-3-developer-guide).
 
 # Camera loan tool
 

docs/develop/build-install-run.md

@@ -160,7 +160,7 @@ The applications are built using the Docker framework which means that building
 
 ### Install and run
 
-> Installing and running ACAP4 applications requires the [Docker
+> Installing and running container based ACAP applications requires the [Docker
 > ACAP](https://github.com/AxisCommunications/docker-acap) to be installed on
 > the camera. Note that the Docker ACAP is set to use TLS authentication by
 > default, which means that you are required to add certificates to the camera

docs/develop/web-server-via-reverse-proxy.md

@@ -9,13 +9,13 @@ nav_order: 5
 
 [Reverse Proxy configuration](https://httpd.apache.org/docs/2.4/howto/reverse_proxy.html) provides a flexible way for an ACAP application to expose an external API through the Apache Server in AXIS OS system and internally route the requests to a small Web Server running in the ACAP application.
 
-Web Server via Reverse Proxy is a technique that can be used for exposing many types of network APIs and can e.g. cover same cgi use cases as axHttp API from ACAP 3 SDK.
+Web Server via Reverse Proxy is a technique that can be used for exposing many types of network APIs and can e.g. cover same cgi use cases as axHttp API from ACAP version 3 SDK.
 
 The Web Server running in the ACAP application can also be exposed directly to the network by allowing external access to the port in the network configuration for the device. There are some disadvantages with exposing Web Server directly to the network such as non standard ports and no reuse of authentication, TLS and other features that comes with Apache Server.
 
 ## Examples
 
 - [Native Web Server](https://github.com/AxisCommunications/acap-native-sdk-examples/tree/master/web-server)
-  - An example of an ACAP4 native application using [Monkey web server](https://github.com/monkey/monkey) which exposes an external API with Reverse Proxy configuration in Apache Server.
+  - An example of an ACAP version 4 native application using [Monkey web server](https://github.com/monkey/monkey) which exposes an external API with Reverse Proxy configuration in Apache Server.
 - [Computer Vision Web Server](https://github.com/AxisCommunications/acap-computer-vision-sdk-examples/tree/main/web-server)
-  - An example of an ACAP4 container based application using [Monkey web server](https://github.com/monkey/monkey) which exposes an external API with Reverse Proxy configuration in Apache Server.
+  - An example of an ACAP version 4 container based application using [Monkey web server](https://github.com/monkey/monkey) which exposes an external API with Reverse Proxy configuration in Apache Server.

docs/introduction/acap-sdk-overview.md

@@ -11,7 +11,7 @@ AXIS Camera Application Platform (ACAP) version 4 is capable of building edge-ba
 
 ## ACAP Native SDK
 
-The ACAP Native SDK is targeted towards users that want to develop plug-in style, event generating applications that fit well into a VMS centric system. This SDK offers high performance by integrating closely with AXIS OS and hardware. Already existing ACAP users should feel at home using this SDK and migrating from previous version ACAP 3 to this SDK should be straightforward.
+The ACAP Native SDK is targeted towards users that want to develop plug-in style, event generating applications that fit well into a VMS centric system. This SDK offers high performance by integrating closely with AXIS OS and hardware. Already existing ACAP users should feel at home using this SDK and migrating from previous version ACAP version 3 to this SDK should be straightforward.
 
 ### Main use cases
 

docs/introduction/acap4-vs-acap3.md

@@ -1,33 +1,33 @@
 ---
 layout: page
 parent: Introduction
-title: ACAP 4 vs ACAP 3
+title: ACAP version 4 vs version 3
 nav_order: 3
 ---
 
-# ACAP version 4 vs ACAP version 3
+# ACAP version 4 vs version 3
 
 There are both similarities and differences between the two generations.
 
-## What's new in ACAP 4?
+## What's new in ACAP version 4?
 
 * A new SDK tailored to computer vision applications.
 * The descendant of ACAP SDK, called ACAP Native SDK, replaces many of the
   older APIs.
 * Introduction of native ACAP applications with containers.
 
-## What are the differences between ACAP 3 SDK and ACAP 4 Native SDK?
+## What are the differences between ACAP version 3 SDK and ACAP version 4 Native SDK?
 
-At the time of the ACAP 4 launch, the two SDKs are very similar but as we will
-actively develop the ACAP 4 Native SDK and keep ACAP 3 SDK in maintenance mode,
+At the time of the ACAP version 4 launch, the two SDKs are very similar but as we will
+actively develop the ACAP version 4 Native SDK and keep ACAP version 3 SDK in maintenance mode,
 the differences are expected to increase.
 
 ### APIs
 
-ACAP 4 Native SDK does not include all APIs from ACAP 3. Instead, it aims to
-replace many of the APIs from ACAP 3.
+ACAP version 4 Native SDK does not include all APIs from ACAP version 3. Instead, it aims to
+replace many of the APIs from ACAP version 3.
 
-| API | Future in ACAP 4? |
+| API | Future in ACAP version 4? |
 | :-- | :-- |
 | **axHTTP** | Replaced by the web-server [example](https://github.com/AxisCommunications/acap-native-sdk-examples/tree/master/web-server) which describes how to achieve the same functionality. |
 | **axParameter**<br>**axAudio** | Will get a new API in a later release. |
@@ -40,15 +40,15 @@ The complete list of APIs included in the Native SDK is found
 
 ### Container ACAP applications
 
-In ACAP 4 the possibility to build native ACAP applications (`.eap`-files) that
+In ACAP version 4 the possibility to build native ACAP applications (`.eap`-files) that
 make use of containers inside has been added. This way, a container application
-can be installed the same way as any other ACAP 3 application. See the
+can be installed the same way as any other ACAP version 3 application. See the
 [container
 example](https://github.com/AxisCommunications/acap-native-sdk-examples/tree/master/container-example)
 on GitHub.
 
-## Which products are supported for applications built with ACAP 4?
+## Which products are supported for applications built with ACAP version 4?
 
-Compatibility depends on many things but one minimum requirement for ACAP 4 is
+Compatibility depends on many things but one minimum requirement for ACAP version 4 is
 AXIS OS firmware 10.7. The web page [Axis devices and
 compatibility](../axis-devices-and-compatibility) explains compatibility in more depth.

docs/introduction/version-history.md

@@ -14,6 +14,6 @@ AXIS Camera Application Platform (ACAP) was introduced already in 2009 and is th
 | Version | Release year | Support | Details |
 | ------- | ------------ | ------- | ------- |
 | 4 | 2021 | Actively developed | See [release notes](../release-notes/) for more information |
-| 3 | 2020 | Actively maintained | See [ACAP 3 Developer Guide](https://help.axis.com/acap-3-developer-guide) for more information |
+| 3 | 2020 | Actively maintained | See [ACAP version 3 Developer Guide](https://help.axis.com/acap-3-developer-guide) for more information |
 | 2 | 2014 | End of support: Q4 2021 | No maintenance |
 | 1 | 2009 | Deprecated | No maintenance |

docs/release-notes/4.0.md

@@ -4,7 +4,7 @@ parent: Release notes
 title: 4.0
 ---
 
-# ACAP 4.0 – September 27, 2021
+# ACAP version 4.0 – September 27, 2021
 
 ## Overview
 

docs/release-notes/4.0_beta1.md

@@ -5,11 +5,11 @@ title: 4.0_beta1
 nav_order: 4.0 beta1
 ---
 
-# ACAP 4 Beta 1 – July 13 2021
+# ACAP version 4 Beta 1 – July 13 2021
 
 ## Overview
 
-This is the first ACAP 4 beta release (limited availability). It contains:
+This is the first ACAP version 4 beta release (limited availability). It contains:
 
 - [ACAP Computer Vision SDK 1.0 beta1](#acap-computer-vision-sdk)
 - [ACAP Native SDK 1.0 beta1](#acap-native-sdk)