This is an automated email from the ASF dual-hosted git repository.
skygo pushed a commit to branch delivery
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/delivery by this push:
new ee0c4adda6 release180 apidoc fixes
new 363eec520b Merge pull request #5844 from ebarboni/apidocr80fix
ee0c4adda6 is described below
commit ee0c4adda65d669a4d378d489c288b4ad7d6221b
Author: Eric Barboni <[email protected]>
AuthorDate: Tue Apr 18 20:18:29 2023 +0200
release180 apidoc fixes
---
ide/editor.codetemplates/arch.xml | 5 +++--
.../maven/src/org/netbeans/modules/maven/options/MavenSettings.java | 6 +++---
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/ide/editor.codetemplates/arch.xml
b/ide/editor.codetemplates/arch.xml
index 6b2c6f70fb..3393c06a0d 100644
--- a/ide/editor.codetemplates/arch.xml
+++ b/ide/editor.codetemplates/arch.xml
@@ -476,7 +476,7 @@ JRE is sufficient.
is required.
</api>
</li>
-<li><api type='import' group='java' category='private'
name='org.openide.options' url='../org-openide-options/overview-summary.html' >
+<!-- deprecated <li><api type='import' group='java' category='private'
name='org.openide.options' url='../org-openide-options/overview-summary.html' >
The module is needed for compilation.
The module is used during runtime.
@@ -485,7 +485,8 @@ JRE is sufficient.
6.2
is required.
</api>
-</li>
+</li>
+-->
<li><api type='import' group='java' category='official' name='EditorAPI'
url='../org-openide-text/overview-summary.html' >
The module is needed for compilation.
diff --git
a/java/maven/src/org/netbeans/modules/maven/options/MavenSettings.java
b/java/maven/src/org/netbeans/modules/maven/options/MavenSettings.java
index 850fd76708..d763e0bbc1 100644
--- a/java/maven/src/org/netbeans/modules/maven/options/MavenSettings.java
+++ b/java/maven/src/org/netbeans/modules/maven/options/MavenSettings.java
@@ -548,11 +548,11 @@ public final class MavenSettings {
* <ul>
* <li>MAVEN_HOME</li>
* <li>M2_HOME</li>
- * <li>PATH</li></ul>
- * </p>
+ * <li>PATH</li>
+ * </ul>
* <p>Only the first appereance will be appended.</p>
*
- * @returns the default external Maven runtime on the path.
+ * @return the default external Maven runtime on the path.
*/
public static String getDefaultExternalMavenRuntime() {
String paths = System.getenv("PATH"); // NOI18N
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
