You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ju...@apache.org on 2019/04/27 11:03:24 UTC
[netbeans-website] branch master updated: Remove incubat(or|ion|ing)
This is an automated email from the ASF dual-hosted git repository.
junichi11 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-website.git
The following commit(s) were added to refs/heads/master by this push:
new 25f58eb Remove incubat(or|ion|ing)
25f58eb is described below
commit 25f58eb2ca80978fe98e877ec834f97f325c4fda
Author: Junichi Yamamoto <ju...@apache.org>
AuthorDate: Sat Apr 27 10:07:05 2019 +0900
Remove incubat(or|ion|ing)
---
README.asciidoc | 7 ++-----
bits.netbeans.org/build.xml | 2 +-
netbeans.apache.org/README.asciidoc | 6 +++---
netbeans.apache.org/src/content/community/who.asciidoc | 8 ++++----
netbeans.apache.org/src/content/download/index.asciidoc | 2 +-
netbeans.apache.org/src/content/index.asciidoc | 2 +-
netbeans.apache.org/src/content/participate/index.asciidoc | 2 +-
7 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/README.asciidoc b/README.asciidoc
index 1d18813..6ebf799 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -1,4 +1,4 @@
-= Apache NetBeans (incubating) web sites
+= Apache NetBeans web sites
This repository is structured in different *subdirectories*, for different subdomains.
@@ -8,7 +8,7 @@ link:netbeans.apache.org[netbeans.apache.org]:: Main Apache NetBeans website
- Changes to "master" are automatically published to http://netbeans.apache.org (see link:https://issues.apache.org/jira/browse/NETBEANS-522[NETBEANS-522] for details)
link:bits.netbeans.org[bits.netbeans.org]:: Apache NetBeans API documentation
- - Will be integrated with http://github.com/apache/incubator-netbeans
+ - Will be integrated with http://github.com/apache/netbeans
- Will generate javadocs for each release.
== Apache guidelines for web sites
@@ -21,9 +21,6 @@ https://www.apache.org/foundation/marks/pmcs#nonapache
Apache Website Navigation Links Policy::
https://www.apache.org/foundation/marks/pmcs#navigation
-Incubator Branding Guide::
-http://incubator.apache.org/guides/branding.html
-
Using `svnpubsub` or `CMS` for web site publishing, and using branches::
https://www.apache.org/dev/project-site.html#generated
diff --git a/bits.netbeans.org/build.xml b/bits.netbeans.org/build.xml
index fd54d18..f7a3a02 100644
--- a/bits.netbeans.org/build.xml
+++ b/bits.netbeans.org/build.xml
@@ -20,7 +20,7 @@
<echo>
ant javadoc - Builds the NetBeans javadoc.
Mandatory properties:
--Dnetbeans.src.dir=Directory with a clone of https://github.com/apache/incubator-netbeans
+-Dnetbeans.src.dir=Directory with a clone of https://github.com/apache/netbeans
-Dnetbeans.branch=Branch ('master' if unset)
</echo>
</target>
diff --git a/netbeans.apache.org/README.asciidoc b/netbeans.apache.org/README.asciidoc
index 7379b18..4b0af4e 100644
--- a/netbeans.apache.org/README.asciidoc
+++ b/netbeans.apache.org/README.asciidoc
@@ -25,7 +25,7 @@ The http://netbeans.apache.org website.
The NetBeans project has a huge website at https://www.netbeans.org. The site
has grown over the years, and is indeed quite big. Now that
-link:https://github.com/apache/incubator-netbeans[NetBeans] is being donated by
+link:https://github.com/apache/netbeans[NetBeans] is being donated by
Oracle to the link:http://www.apache.org[Apache Software Foundation], a new static web site must be
created, trying to keep as much information as possible
from the "old" website.
@@ -33,7 +33,7 @@ from the "old" website.
This is ongoing effort and is being performed in these two steps:
1. Wade Chandler has made a great effort retrieving as much information as
- possible from the old website. This is actually kept in https://github.com/apache/incubator-netbeans-website-cleanup.
+ possible from the old website. This is actually kept in https://github.com/apache/netbeans-website-cleanup.
He has also set up the a sophisticated, yet simple to use, gradle build system.
2. Once this content is approved by Oracle it will be gradually added here.
3. And once all content is donated, http://netbeans.apache.org will become http://netbeans.org
@@ -41,7 +41,7 @@ This is ongoing effort and is being performed in these two steps:
== About this repository
As stated above, the objective of this repository is to construct the website at http://netbeans.apache.org
-that will gradually receive content from http://netbeans.org (as stored in https://github.com/apache/incubator-netbeans-website-cleanup).
+that will gradually receive content from http://netbeans.org (as stored in https://github.com/apache/netbeans-website-cleanup).
The tasks to do are described in a specific [NetBeans Wiki Page](https://cwiki.apache.org/confluence/display/NETBEANS/New+NetBeans+Web+Site+Planning).
diff --git a/netbeans.apache.org/src/content/community/who.asciidoc b/netbeans.apache.org/src/content/community/who.asciidoc
index 976e129..a861d0b 100644
--- a/netbeans.apache.org/src/content/community/who.asciidoc
+++ b/netbeans.apache.org/src/content/community/who.asciidoc
@@ -28,7 +28,7 @@
== The Apache NetBeans Team
-The Apache NetBeans (incubating) Team members (sorted alphabetically).
+The Apache NetBeans Team members (sorted alphabetically).
=== Alexander Simon
Committer, PPMC Member
@@ -76,7 +76,7 @@ Committer, PPMC Member
- http://bruehlicke.blogspot.com/
=== Bertrand Delacretaz
-Incubation Mentor
+Mentor
- apache id: bdelacretaz
- Switzerland
@@ -170,7 +170,7 @@ Committer, PPMC Member
- WildFly plugin
=== Emmanel Lécharny
-Incubation Mentor
+Mentor
- apache id: elecharny
- Symas, Paris, France
@@ -287,7 +287,7 @@ Committer, PPMC Member
- http://twitter.com/@tyvole
=== Jim Jagielski
-Incubation Mentor
+Mentor
- apache id: jim
- Forest Hill, MD USA
diff --git a/netbeans.apache.org/src/content/download/index.asciidoc b/netbeans.apache.org/src/content/download/index.asciidoc
index be36ec1..4efd1a8 100755
--- a/netbeans.apache.org/src/content/download/index.asciidoc
+++ b/netbeans.apache.org/src/content/download/index.asciidoc
@@ -84,7 +84,7 @@ Now that you have built Apache NetBeans from source you may want to link:/partic
[[repos]]
=== Repositories
-This is a list of Apache NetBeans (incubating) repositories:
+This is a list of Apache NetBeans repositories:
- https://github.com/apache/netbeans The main source code repository.
- https://github.com/apache/netbeans-website This website's repository.
diff --git a/netbeans.apache.org/src/content/index.asciidoc b/netbeans.apache.org/src/content/index.asciidoc
index 8e3859f..48acb11 100644
--- a/netbeans.apache.org/src/content/index.asciidoc
+++ b/netbeans.apache.org/src/content/index.asciidoc
@@ -22,7 +22,7 @@
:jbake-status: published
:keywords: My asciidoc keywords here!
:icons: font
-:description: Apache NetBeans (incubating)
+:description: Apache NetBeans
:note: The 'hero' tags below enable the 'hero' area in the page.gsp template
:hero.top: Version 11.0
:hero.title: Apache NetBeans
diff --git a/netbeans.apache.org/src/content/participate/index.asciidoc b/netbeans.apache.org/src/content/participate/index.asciidoc
index 97fb47d..63749c4 100644
--- a/netbeans.apache.org/src/content/participate/index.asciidoc
+++ b/netbeans.apache.org/src/content/participate/index.asciidoc
@@ -30,7 +30,7 @@ The Apache Software Foundation has set up link:http://community.apache.org/[a
specific website] designed to help newcomers take their first steps toward
being part of our Community.
-You can participate in the Apache NetBeans (Incubating) Project in many different ways.
+You can participate in the Apache NetBeans Project in many different ways.
Here are some ideas:
== Contributing code
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists