MNEMONIC-432: Update links, text and instruction in site-wide to reflect TLP status
diff --git a/BUILD.md b/BUILD.md
index 17bfbd6..f07b95a 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -5,7 +5,7 @@
## Setup
-1. `git clone https://git-wip-us.apache.org/repos/asf/incubator-mnemonic.git -b asf-site target`
+1. `git clone https://git-wip-us.apache.org/repos/asf/mnemonic.git -b asf-site target`
2. `sudo gem install bundler`
3. `sudo gem install github-pages jekyll`
4. `bundle install`
diff --git a/README.md b/README.md
index 1304935..f48a751 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
-# Apache Incubator Mnemonic html branch
+# Apache Mnemonic html branch
This branch contains the generated HTML for the
[Mnemonic website](https://mnemonic.apache.org).
You are probably looking for the
-[Mnemonic master branch](https://github.com/apache/incubator-nmemonic/tree/master).
+[Mnemonic master branch](https://github.com/apache/mnemonic/tree/master).
diff --git a/_config.yml b/_config.yml
index 30d4758..db7df8f 100644
--- a/_config.yml
+++ b/_config.yml
@@ -3,7 +3,7 @@
permalink: /news/:year/:month/:day/:title/
excerpt_separator: ""
-repository: https://github.com/apache/incubator-mnemonic
+repository: https://github.com/apache/mnemonic
destination: public
source: src
exclude: [docker, BUILD.md, Gemfile*]
diff --git a/package.json b/package.json
index 8548caa..c6200b1 100644
--- a/package.json
+++ b/package.json
@@ -1,14 +1,14 @@
{
"name": "mnemonic",
"version": "1.0.0",
- "description": "This branch contains the generated HTML for the [Mnemonic website](https://mnemonic.incubator.apache.org).",
+ "description": "This branch contains the generated HTML for the [Mnemonic website](https://mnemonic.apache.org).",
"main": "index.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"repository": {
"type": "git",
- "url": "https://garyw@git-wip-us.apache.org/repos/asf/incubator-mnemonic-site.git"
+ "url": "https://garyw@git-wip-us.apache.org/repos/asf/mnemonic-site.git"
},
"author": "Gang(Gary) Wang",
"license": "LicenseRef-LICENSE",
diff --git a/src/README.md b/src/README.md
index 1304935..d0a2ebc 100644
--- a/src/README.md
+++ b/src/README.md
@@ -1,7 +1,7 @@
-# Apache Incubator Mnemonic html branch
+# Apache Mnemonic html branch
This branch contains the generated HTML for the
[Mnemonic website](https://mnemonic.apache.org).
You are probably looking for the
-[Mnemonic master branch](https://github.com/apache/incubator-nmemonic/tree/master).
+[Mnemonic master branch](https://github.com/apache/nmemonic/tree/master).
diff --git a/src/_docs/devsetup.md b/src/_docs/devsetup.md
index d339ea0..6b938d5 100644
--- a/src/_docs/devsetup.md
+++ b/src/_docs/devsetup.md
@@ -18,22 +18,22 @@
* Install Docker on your system [Docker Official Website](https://www.docker.com/){:target="_blank"}
* Install IDE on your Linux/MacOS/Windows box [IntelliJ IDEA Official Website](https://www.jetbrains.com/idea/){:target="_blank"}
* Register an account on Github for yourself if not yet have one
-* Log into Github and fork [Apache Incubator Mnemonic repository](https://github.com/apache/incubator-mnemonic){:target="_blank"}.
+* Log into Github and fork [Apache Mnemonic repository](https://github.com/apache/mnemonic){:target="_blank"}.
[Fork and Set up Git](https://help.github.com/articles/fork-a-repo/){:target="_blank"}
-* Configure Apache incubator Mnemonic repo. as upstream remote in your local repository
+* Configure Apache Mnemonic repo. as upstream remote in your local repository
```bash
$ cd <your_project_folder>
- $ git remote add upstream https://github.com/apache/incubator-mnemonic.git
+ $ git remote add upstream https://github.com/apache/mnemonic.git
```
* Prepare Mnemonic Docker image on you system
```bash
- $ docker build -t mnedev https://github.com/apache/incubator-mnemonic.git#:docker/docker-CentOS
+ $ docker build -t mnedev https://github.com/apache/mnemonic.git#:docker/docker-CentOS
$ # --------- OR ---------
- $ docker build -t mnedev https://github.com/apache/incubator-mnemonic.git#:docker/docker-Ubuntu
+ $ docker build -t mnedev https://github.com/apache/mnemonic.git#:docker/docker-Ubuntu
```
* Mount your host repo. to Docker container, this following command would hide the original Mnemonic project folder in container
```bash
- $ docker run -it -v <mnemonic_project_folder>:/ws/incubator-mnemonic mnedev
+ $ docker run -it -v <mnemonic_project_folder>:/ws/mnemonic mnedev
```
* Open Mnemonic project in the IDE
diff --git a/src/_docs/disclaimer.md b/src/_docs/disclaimer.md
deleted file mode 100644
index 49bb4da..0000000
--- a/src/_docs/disclaimer.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-layout: docs
-title: Disclaimer
-permalink: /docs/disclaimer.html
----
-Apache Mnemonic is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.
diff --git a/src/_docs/docker.md b/src/_docs/docker.md
index 7c564b2..e76c241 100644
--- a/src/_docs/docker.md
+++ b/src/_docs/docker.md
@@ -35,8 +35,8 @@
Build from git repository
```bash
- $ docker build -t NAME[:TAG] https://github.com/apache/incubator-mnemonic.git#:docker/docker-CentOS
- $ docker build -t NAME[:TAG] https://github.com/apache/incubator-mnemonic.git#:docker/docker-Ubuntu
+ $ docker build -t NAME[:TAG] https://github.com/apache/mnemonic.git#:docker/docker-CentOS
+ $ docker build -t NAME[:TAG] https://github.com/apache/mnemonic.git#:docker/docker-Ubuntu
```
-- OR --
@@ -70,7 +70,7 @@
### Sharing host project folder to Dock container for IDEs e.g. Eclipse, Intellij IDEA
```bash
- $ docker run -v <hostdir>/incubator-mnemonic:/ws/incubator-mnemonic -it NAME[:TAG]
+ $ docker run -v <hostdir>/mnemonic:/ws/mnemonic -it NAME[:TAG]
```
Note: this command will override the container's project folder, you can use another name to avoid it.
diff --git a/src/_docs/getstarted.html b/src/_docs/getstarted.html
index 94f3429..ff872f1 100644
--- a/src/_docs/getstarted.html
+++ b/src/_docs/getstarted.html
@@ -5,7 +5,7 @@
---
<section class="example">
- <a class="title" href="https://github.com/apache/incubator-mnemonic/blob/master/mnemonic-collections/src/test/java/org/apache/mnemonic/collections/DurableHashMapNGTest.java" target="_blank"> Durable Map </a>
+ <a class="title" href="https://github.com/apache/mnemonic/blob/master/mnemonic-collections/src/test/java/org/apache/mnemonic/collections/DurableHashMapNGTest.java" target="_blank"> Durable Map </a>
<div class="code">
<div style="background: #111111; overflow:auto;width:auto;border:solid gray;border-width:.1em .1em .1em .1em;padding:.2em .6em;"> <pre style="margin: 0; line-height: 125%"> <span style="color: #008800; font-style: italic; background-color: #0f140f">/* initialize a memory allocator */</span>
<span style="color: #ffffff">m_act</span> <span style="color: #ffffff">=</span> <span style="color: #fb660a; font-weight: bold">new</span> <span style="color: #ffffff">NonVolatileMemAllocator(</span>
@@ -63,7 +63,7 @@
</section>
<section class="example">
- <a class="title" href="https://github.com/apache/incubator-mnemonic/blob/v0.9.0-incubating/mnemonic-benches/mnemonic-sort-bench/src/main/java/org/apache/mnemonic/bench/DNCSTextFileSort.java" target="_blank"> Durable Sorting </a>
+ <a class="title" href="https://github.com/apache/mnemonic/blob/master/mnemonic-benches/mnemonic-sort-bench/src/main/java/org/apache/mnemonic/bench/DNCSTextFileSort.java" target="_blank"> Durable Sorting </a>
<div class="code">
<div style="background: #111111; overflow:auto;width:auto;border:solid gray;border-width:.1em .1em .1em .1em;padding:.2em .6em;"> <pre style="margin: 0; line-height: 125%"> <span style="color: #008800; font-style: italic; background-color: #0f140f">/* get sort service instance */</span>
<span style="color: #ffffff">GeneralComputingService</span> <span class="tooltip" data-tooltip="a general native computing instance"><span style="color: #ffffff">gcsvr</span></span> <span style="color: #ffffff">=</span> <span style="color: #ffffff">Utils.</span><span style="color: #ff0086; font-weight: bold">getGeneralComputingService</span><span style="color: #ffffff">(</span><span style="color: #0086d2">"sort"</span><span style="color: #ffffff">);</span>
diff --git a/src/_docs/submitchanges.md b/src/_docs/submitchanges.md
index 762b277..acc3669 100644
--- a/src/_docs/submitchanges.md
+++ b/src/_docs/submitchanges.md
@@ -12,7 +12,7 @@
* Building project in the Docker container
```bash
## for Docker container
- # cd /ws/incubator-mnemonic
+ # cd /ws/mnemonic
# mvn clean install
```
* Resolve any problems found by building process
@@ -31,7 +31,7 @@
Note: Please make sure enough available space for test data generation (>30G)
```bash
## for Docker container
- # cd /ws/incubator-mnemonic
+ # cd /ws/mnemonic
# bin/runall.sh
```
* Resolve any problems found by test cases and then **amend** your previous commit in IDE<br/>
diff --git a/src/_includes/header.html b/src/_includes/header.html
index a127937..bf8fadd 100644
--- a/src/_includes/header.html
+++ b/src/_includes/header.html
@@ -6,7 +6,7 @@
<div class="unit one-third center-on-mobiles">
<h1>
<a href="/">
- <span class="sr-only">Apache Incubator Mnemonic</span>
+ <span class="sr-only">Apache Mnemonic</span>
<img src="/img/mnemonic_logo.png" width="289" alt="Mnemonic Logo" class="logo">
</a>
</h1>
diff --git a/src/develop/bylaws.md b/src/develop/bylaws.md
index 922de2a..15ed28d 100644
--- a/src/develop/bylaws.md
+++ b/src/develop/bylaws.md
@@ -30,12 +30,6 @@
efforts to work on this project. Please be respectful of everyone
and their views.
-mnemonic is typical of Apache projects in that it operates under a set of
-principles, known collectively as the "Apache Way". If you are new to
-Apache development, please refer to the [Incubator
-project](http://incubator.apache.org/) for more
-information on how Apache projects operate.
-
## Roles and Responsibilities
Apache projects define a set of roles with associated rights and
diff --git a/src/develop/index.md b/src/develop/index.md
index 8817e6f..bf1ba05 100644
--- a/src/develop/index.md
+++ b/src/develop/index.md
@@ -160,18 +160,18 @@
mnemonic uses git for version control. Get the source code:
-`% git clone https://git-wip-us.apache.org/repos/asf/incubator-mnemonic.git`
+`% git clone https://git-wip-us.apache.org/repos/asf/mnemonic.git`
The important branches are:
-* [master](https://git-wip-us.apache.org/repos/asf/incubator-mnemonic.git){:target="_blank"} -
+* [master](https://git-wip-us.apache.org/repos/asf/mnemonic.git){:target="_blank"} -
The trunk for all development, please find master branch marked in light green.
-* [asf-site](https://git-wip-us.apache.org/repos/asf/incubator-mnemonic-site.git){:target="_blank"} -
+* [asf-site](https://git-wip-us.apache.org/repos/asf/mnemonic-site.git){:target="_blank"} -
The pages that are deployed to https://mnemonic.apache.org/
Please check our [coding guidelines](coding).
-You can also find the mirrored repo. on [Github](https://github.com/apache/incubator-mnemonic.git){:target="_blank"}
+You can also find the mirrored repo. on [Github](https://github.com/apache/mnemonic.git){:target="_blank"}
## Reviews
diff --git a/src/docker/Dockerfile b/src/docker/Dockerfile
index 01f2e32..0f690f7 100644
--- a/src/docker/Dockerfile
+++ b/src/docker/Dockerfile
@@ -39,10 +39,10 @@
RUN gem install jekyll bundler nokogiri
-RUN mkdir -p /ws && cd /ws && git clone https://git-wip-us.apache.org/repos/asf/incubator-mnemonic-site.git && \
- cd incubator-mnemonic-site && bundle install
+RUN mkdir -p /ws && cd /ws && git clone https://git-wip-us.apache.org/repos/asf/mnemonic-site.git && \
+ cd mnemonic-site && bundle install
-ENV MNEMONIC_SITE_HOME /ws/incubator-mnemonic-site
+ENV MNEMONIC_SITE_HOME /ws/mnemonic-site
WORKDIR /ws
CMD ["bash"]
diff --git a/src/docker/docker-Ubuntu/Dockerfile b/src/docker/docker-Ubuntu/Dockerfile
index eca5be8..613d99f 100644
--- a/src/docker/docker-Ubuntu/Dockerfile
+++ b/src/docker/docker-Ubuntu/Dockerfile
@@ -40,10 +40,10 @@
RUN gem install jekyll bundler nokogiri
-RUN mkdir -p /ws && cd /ws && git clone https://git-wip-us.apache.org/repos/asf/incubator-mnemonic-site.git && \
- cd incubator-mnemonic-site && bundle install
+RUN mkdir -p /ws && cd /ws && git clone https://git-wip-us.apache.org/repos/asf/mnemonic-site.git && \
+ cd mnemonic-site && bundle install
-ENV MNEMONIC_SITE_HOME /ws/incubator-mnemonic-site
+ENV MNEMONIC_SITE_HOME /ws/mnemonic-site
WORKDIR /ws
CMD ["bash"]
diff --git a/src/help/index.md b/src/help/index.md
index 5ece410..44d95cc 100644
--- a/src/help/index.md
+++ b/src/help/index.md
@@ -8,11 +8,11 @@
## Mailing Lists
The best option is to send email to the user list
-[user@mnemonic.incubator.apache.org](mailto:user@mnemonic.incubator.apache.org), which is for user
+[user@mnemonic.apache.org](mailto:user@mnemonic.apache.org), which is for user
discussions. All of the historic traffic is available in the
-[archive](http://mail-archives.apache.org/mod_mbox/incubator-mnemonic-user/). To
+[archive](http://mail-archives.apache.org/mod_mbox/mnemonic-user/). To
subscribe to the user list, please send email to
-[user-subscribe@mnemonic.incubator.apache.org](mailto:user-subscribe@mnemonic.incubator.apache.org).
+[user-subscribe@mnemonic.apache.org](mailto:user-subscribe@mnemonic.apache.org).
## Bug Reports
@@ -29,4 +29,4 @@
## Browse the code
One of the advantages of open source software is that you can browse the code.
-The code is available on [github](https://github.com/apache/incubator-mnemonic/tree/master).
+The code is available on [github](https://github.com/apache/mnemonic/tree/master).
diff --git a/src/index.html b/src/index.html
index 3164c09..1a5eab3 100644
--- a/src/index.html
+++ b/src/index.html
@@ -1,6 +1,6 @@
---
layout: default
-title: Apache Incubator Mnemonic • Non-volatile memory
+title: Apache Mnemonic • Durable Object Oriented Programming on Hybrid Storage-Class Memory Space
overview: true
---
