From ca85f9ab58f1699d925210f984deedb215b0c2bc Mon Sep 17 00:00:00 2001 From: alfeilex <101652401+alfeilex@users.noreply.github.com> Date: Tue, 1 Oct 2024 12:59:09 +0200 Subject: [PATCH 1/4] Fix project.adoc --- documentation/projects.adoc | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/documentation/projects.adoc b/documentation/projects.adoc index 422551829..af1e45a82 100644 --- a/documentation/projects.adoc +++ b/documentation/projects.adoc @@ -1,10 +1,7 @@ -:toc: -toc::[] - = Repositories -IDEasy supports to automatically clone and import required git repositories into your IDE during link:setup.asciidoc[setup]. -To configure this you put a `.properties` file for each desired repository into the `repositories` sub-folder in your link:settings.asciidoc[settings]. +IDEasy supports to automatically clone and import required git repositories into your IDE during link:setup.adoc[setup]. +To configure this you put a `.properties` file for each desired repository into the `repositories` sub-folder in your link:settings.adoc[settings]. Each `.properties` file describes one (git) "repository" which you would like to clone and (potentially) import: [source,properties] @@ -20,10 +17,10 @@ import=eclipse,intellij active=true ---- - .Variables of project import -[options="header"] - -|=== |*Variable*|*Value*|*Meaning* +.Variables of project import +[options="header",cols="3"] +|=== +|*Variable*|*Value*|*Meaning* |`path`|e.g. `myproject`, will clone into `${WORKSPACE_PATH}/myproject`|(required) Path into which the projects is cloned. This path is relative to the workspace. |`working sets`|e.g. `ws1,ws2`|(optional) This will create working sets (in eclipse). @@ -42,6 +39,5 @@ For a regular project use `.` to build top-level project. If omitted no build is triggered. |`import`|e.g. `intellij`|(optional) IDEs where to automatically import the project. Currently only maven projects are supported. -|`active`|`true`|(optional) If set to `false` the project is skipped during the link:setup.asciidoc[setup]. - +|`active`|`true`|(optional) If set to `false` the project is skipped during the link:setup.adoc[setup]. |=== From bd5bf94d3b924e2be8c6af428413b6f0629985b7 Mon Sep 17 00:00:00 2001 From: alfeilex <101652401+alfeilex@users.noreply.github.com> Date: Tue, 1 Oct 2024 13:19:16 +0200 Subject: [PATCH 2/4] Fix License.adoc and proxy-support.adoc and typo in project.adoc --- documentation/LICENSE.adoc | 7 +++---- documentation/projects.adoc | 2 +- documentation/proxy-support.adoc | 6 +++--- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/documentation/LICENSE.adoc b/documentation/LICENSE.adoc index 2e8421f65..ac278cef3 100644 --- a/documentation/LICENSE.adoc +++ b/documentation/LICENSE.adoc @@ -1,15 +1,14 @@ += License :toc: toc::[] -= License - The product `IDEasy` is licensed under the following terms. Binaries of this product have been made available to you by https://devonfw.com[devonfw] under the https://github.com/devonfw/ide/blob/master/LICENSE[Apache License 2.0]. The documentation of this product is licensed under the terms of the http://creativecommons.org/licenses/by-nd/4.0/[Creative Commons License (Attribution-No Derivatives 4.0 International)]. -All of the source code to this product is available under licenses which are both free and open source. +All the source code to this product is available under licenses which are both free and open source. More specifically, most of the source code is available under the Apache License 2.0. The remainder of the software which is not under the Apache License is available under one of a variety of other free and open source licenses. Those that require reproduction of the license text in the distribution are given below. @@ -19,7 +18,7 @@ The following table shows the components that may be used. The column `inclusion` indicates the way the component is included: * `directly included` means the component is directly contained in the download package of `IDEasy` we provide -* `default setup` means the component is not initially included but will be downloaded during the link:setup.asciidoc[`setup`] by default +* `default setup` means the component is not initially included but will be downloaded during the link:setup.adoc[`setup`] by default * `optional` means the component is neither initially included nor downloaded by default, but only gets downloaded and installed if explicitly triggered by you when invoking additional commands or if explicitly configured by your project. .Third party components diff --git a/documentation/projects.adoc b/documentation/projects.adoc index af1e45a82..e4fd52fd6 100644 --- a/documentation/projects.adoc +++ b/documentation/projects.adoc @@ -21,7 +21,7 @@ active=true [options="header",cols="3"] |=== |*Variable*|*Value*|*Meaning* -|`path`|e.g. `myproject`, will clone into `${WORKSPACE_PATH}/myproject`|(required) Path into which the projects is cloned. +|`path`|e.g. `myproject`, will clone into `${WORKSPACE_PATH}/myproject`|(required) Path into which the projects are cloned. This path is relative to the workspace. |`working sets`|e.g. `ws1,ws2`|(optional) This will create working sets (in eclipse). Each module (eclipse project) of this project will be part of all these working sets. diff --git a/documentation/proxy-support.adoc b/documentation/proxy-support.adoc index 0169bd27e..920ad8c71 100644 --- a/documentation/proxy-support.adoc +++ b/documentation/proxy-support.adoc @@ -1,9 +1,9 @@ -:toc: -toc::[] - [[proxy-support.adoc]] = Proxy support +:toc: +toc::[] + IDEasy provides built-in support for automatic HTTP and HTTPS proxy recognition. [[proxy-support.adoc_Configuring-Proxy-settings]] From f9affaa2dcd7961be04c1ebd4588d7692c0bd02c Mon Sep 17 00:00:00 2001 From: alfeilex <101652401+alfeilex@users.noreply.github.com> Date: Tue, 1 Oct 2024 16:53:39 +0200 Subject: [PATCH 3/4] Update documentation/LICENSE.adoc Co-authored-by: jan-vcapgemini <59438728+jan-vcapgemini@users.noreply.github.com> --- documentation/LICENSE.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/LICENSE.adoc b/documentation/LICENSE.adoc index ac278cef3..c0a9367c6 100644 --- a/documentation/LICENSE.adoc +++ b/documentation/LICENSE.adoc @@ -8,7 +8,7 @@ Binaries of this product have been made available to you by https://devonfw.com[ The documentation of this product is licensed under the terms of the http://creativecommons.org/licenses/by-nd/4.0/[Creative Commons License (Attribution-No Derivatives 4.0 International)]. -All the source code to this product is available under licenses which are both free and open source. +The source code for this product is available under free and open-source licenses. More specifically, most of the source code is available under the Apache License 2.0. The remainder of the software which is not under the Apache License is available under one of a variety of other free and open source licenses. Those that require reproduction of the license text in the distribution are given below. From 97a80b4ddae028f6ad3d03105aebec67d4c3bd7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Hohwiller?= Date: Wed, 9 Oct 2024 19:20:28 +0200 Subject: [PATCH 4/4] Update documentation/LICENSE.adoc --- documentation/LICENSE.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/LICENSE.adoc b/documentation/LICENSE.adoc index c0a9367c6..ae19afad4 100644 --- a/documentation/LICENSE.adoc +++ b/documentation/LICENSE.adoc @@ -8,7 +8,7 @@ Binaries of this product have been made available to you by https://devonfw.com[ The documentation of this product is licensed under the terms of the http://creativecommons.org/licenses/by-nd/4.0/[Creative Commons License (Attribution-No Derivatives 4.0 International)]. -The source code for this product is available under free and open-source licenses. +The source code of this product is available under free and open-source licenses. More specifically, most of the source code is available under the Apache License 2.0. The remainder of the software which is not under the Apache License is available under one of a variety of other free and open source licenses. Those that require reproduction of the license text in the distribution are given below.