Repository: jspwiki-site Updated Branches: refs/heads/asf-site 64b439230 -> 73362d042
Automatic Site Publish by Buildbot Project: http://git-wip-us.apache.org/repos/asf/jspwiki-site/repo Commit: http://git-wip-us.apache.org/repos/asf/jspwiki-site/commit/73362d04 Tree: http://git-wip-us.apache.org/repos/asf/jspwiki-site/tree/73362d04 Diff: http://git-wip-us.apache.org/repos/asf/jspwiki-site/diff/73362d04 Branch: refs/heads/asf-site Commit: 73362d0429bbaab3bf3bda911de5deb6864cf3dc Parents: 64b4392 Author: jenkins <bui...@apache.org> Authored: Sat Jul 1 21:58:58 2017 +0000 Committer: jenkins <bui...@apache.org> Committed: Sat Jul 1 21:58:58 2017 +0000 ---------------------------------------------------------------------- community/mailing_lists.html | 3 ++- community/people.html | 3 ++- community/social_media.html | 3 ++- development/edit_website.html | 42 +++++++++++++++++++--------------- development/source_and_guide.html | 3 ++- general/downloads.html | 3 ++- general/news.html | 3 ++- index.html | 11 +++++---- pmc/board_reports.html | 3 ++- pmc/how_to_release.html | 3 ++- 10 files changed, 45 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/73362d04/community/mailing_lists.html ---------------------------------------------------------------------- diff --git a/community/mailing_lists.html b/community/mailing_lists.html index 389630a..6379aa6 100644 --- a/community/mailing_lists.html +++ b/community/mailing_lists.html @@ -111,7 +111,7 @@ <ul class="dropdown-menu pull-right" data-hover-parent=".userbox" style="opacity: 0; visibility: hidden;"> <li> <a class="wikipage" href="https://jspwiki-wiki.apache.org/Wiki.jsp?page=UserPreferences"; accesskey="" title=""> - <span class="icon-user"></span>&nsbp;Gâday! + <span class="icon-user"></span> Gâday! </a> </li> <li class="divider"></li> @@ -207,6 +207,7 @@ <li><a class="external" href="https://git-wip-us.apache.org/repos/asf?p=jspwiki.git;a=summary";>Browse sources</a><img class="outlink" src="./images/out.png" alt=""></li> <li><a class="external" href="http://jspwiki.apache.org/apidocs/index.html";>JavaDoc</a><img class="outlink" src="./images/out.png" alt=""></li> <li><a class="wikipage" href="https://jspwiki-wiki.apache.org/Wiki.jsp?page=Building%20from%20source%20code";>Get and build source</a></li> + <li><a class="wikipage" href="https://jspwiki.apache.org/development/edit_website.html";>Editing website</a></li> <li><a class="external" href="https://issues.apache.org/jira/browse/JSPWIKI";>Issue tracker</a><img class="outlink" src="./images/out.png" alt=""></li> <li><a class="external" href="https://builds.apache.org/job/JSPWiki/";>Jenkins build</a><img class="outlink" src="./images/out.png" alt=""></li> <li><a class="external" href="https://builds.apache.org/analysis/overview?id=org.apache.jspwiki%3Ajspwiki-builder";>Sonar Analysis</a><img class="outlink" src="./images/out.png" alt=""></li> http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/73362d04/community/people.html ---------------------------------------------------------------------- diff --git a/community/people.html b/community/people.html index 29f2bea..e185495 100644 --- a/community/people.html +++ b/community/people.html @@ -111,7 +111,7 @@ <ul class="dropdown-menu pull-right" data-hover-parent=".userbox" style="opacity: 0; visibility: hidden;"> <li> <a class="wikipage" href="https://jspwiki-wiki.apache.org/Wiki.jsp?page=UserPreferences"; accesskey="" title=""> - <span class="icon-user"></span>&nsbp;Gâday! + <span class="icon-user"></span> Gâday! </a> </li> <li class="divider"></li> @@ -231,6 +231,7 @@ <li><a class="external" href="https://git-wip-us.apache.org/repos/asf?p=jspwiki.git;a=summary";>Browse sources</a><img class="outlink" src="./images/out.png" alt=""></li> <li><a class="external" href="http://jspwiki.apache.org/apidocs/index.html";>JavaDoc</a><img class="outlink" src="./images/out.png" alt=""></li> <li><a class="wikipage" href="https://jspwiki-wiki.apache.org/Wiki.jsp?page=Building%20from%20source%20code";>Get and build source</a></li> + <li><a class="wikipage" href="https://jspwiki.apache.org/development/edit_website.html";>Editing website</a></li> <li><a class="external" href="https://issues.apache.org/jira/browse/JSPWIKI";>Issue tracker</a><img class="outlink" src="./images/out.png" alt=""></li> <li><a class="external" href="https://builds.apache.org/job/JSPWiki/";>Jenkins build</a><img class="outlink" src="./images/out.png" alt=""></li> <li><a class="external" href="https://builds.apache.org/analysis/overview?id=org.apache.jspwiki%3Ajspwiki-builder";>Sonar Analysis</a><img class="outlink" src="./images/out.png" alt=""></li> http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/73362d04/community/social_media.html ---------------------------------------------------------------------- diff --git a/community/social_media.html b/community/social_media.html index bbffb2e..e7489f4 100644 --- a/community/social_media.html +++ b/community/social_media.html @@ -111,7 +111,7 @@ <ul class="dropdown-menu pull-right" data-hover-parent=".userbox" style="opacity: 0; visibility: hidden;"> <li> <a class="wikipage" href="https://jspwiki-wiki.apache.org/Wiki.jsp?page=UserPreferences"; accesskey="" title=""> - <span class="icon-user"></span>&nsbp;Gâday! + <span class="icon-user"></span> Gâday! </a> </li> <li class="divider"></li> @@ -206,6 +206,7 @@ <li><a class="external" href="https://git-wip-us.apache.org/repos/asf?p=jspwiki.git;a=summary";>Browse sources</a><img class="outlink" src="./images/out.png" alt=""></li> <li><a class="external" href="http://jspwiki.apache.org/apidocs/index.html";>JavaDoc</a><img class="outlink" src="./images/out.png" alt=""></li> <li><a class="wikipage" href="https://jspwiki-wiki.apache.org/Wiki.jsp?page=Building%20from%20source%20code";>Get and build source</a></li> + <li><a class="wikipage" href="https://jspwiki.apache.org/development/edit_website.html";>Editing website</a></li> <li><a class="external" href="https://issues.apache.org/jira/browse/JSPWIKI";>Issue tracker</a><img class="outlink" src="./images/out.png" alt=""></li> <li><a class="external" href="https://builds.apache.org/job/JSPWiki/";>Jenkins build</a><img class="outlink" src="./images/out.png" alt=""></li> <li><a class="external" href="https://builds.apache.org/analysis/overview?id=org.apache.jspwiki%3Ajspwiki-builder";>Sonar Analysis</a><img class="outlink" src="./images/out.png" alt=""></li> http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/73362d04/development/edit_website.html ---------------------------------------------------------------------- diff --git a/development/edit_website.html b/development/edit_website.html index e6373ea..f55a9ea 100644 --- a/development/edit_website.html +++ b/development/edit_website.html @@ -111,7 +111,7 @@ <ul class="dropdown-menu pull-right" data-hover-parent=".userbox" style="opacity: 0; visibility: hidden;"> <li> <a class="wikipage" href="https://jspwiki-wiki.apache.org/Wiki.jsp?page=UserPreferences"; accesskey="" title=""> - <span class="icon-user"></span>&nsbp;Gâday! + <span class="icon-user"></span> Gâday! </a> </li> <li class="divider"></li> @@ -163,47 +163,50 @@ <div class="page-content "> <h2>Apache JSPWiki website</h2> <p>(adapted from <a href="https://github.com/apache/incubator-guacamole-website";>Apache Guacamole site</a>)</p> -<p><a href="https://git-wip-us.apache.org/repos/asf?p=jspwiki-site.git";>This repository</a> contains the source for the website of Apache JSPWiki, so it can be deployed via <a href="https://blogs.apache.org/infra/entry/git_based_websites_available";>gitpubsub</a>.</p> -<p>The website itself is completely static, being automatically generated by <a href="https://jbake.org/";>JBake</a> prior to deployment. The content<br/>of the website is written in a mixture of Freemarker templates and Markdown. Templated content is interpreted only<br/>at build time, with the final result being completely static.</p> -<p>To facilitate ease of development and testing, this repository also contains a couple of build scripts, <code>ci.sh</code><br/>and <code>mvn-ci.sh</code>, the usage of which is documented below.</p> +<p>Most of this website is powered by Apache JSPWiki itself, under <a href="">http://jspwiki-wiki.apache.org</a></p> +<p><a href="https://git-wip-us.apache.org/repos/asf?p=jspwiki-site.git";>This repository</a> contains the source for the website of Apache JSPWiki, available under <a href="">http://jspwiki.apache.org</a>, which can be deployed via <a href="https://blogs.apache.org/infra/entry/git_based_websites_available";>gitpubsub</a>.</p> +<p>This website itself is completely static, being automatically generated by <a href="https://jbake.org/";>JBake</a> prior to deployment. The content of the website is written in a mixture of Freemarker templates and Markdown. Templated content is interpreted only at build time, with the final result being completely static. This allows us to have a fast, backup site if needed, and also to publish our <a href="/apidocs/index.html">apidocs</a> easily (see <a href="/development/edit_website.html#publishing-apidocs">publishing apidocs</a> below).</p> +<p>To facilitate ease of development and testing, this repository also contains a couple of build scripts, <code>ci.sh</code> and <code>mvn-ci.sh</code>, the usage of which is documented below.</p> <h2>Table of contents</h2> <ul> - <li><a href="#repository-structure">Repository structure</a></li> - <li><a href="#build-prerequisites">Build prerequisites</a></li> - <li><a href="#testing-changes-locally">Testing changes locally</a></li> - <li><a href="#publishing-changes">Publishing changes</a></li> + <li><a href="/development/edit_website.html#repository-structure">Repository structure</a></li> + <li><a href="/development/edit_website.html#build-prerequisites">Build prerequisites</a></li> + <li><a href="/development/edit_website.html#testing-changes-locally">Testing changes locally</a></li> + <li><a href="/development/edit_website.html#publishing-changes">Publishing changes</a></li> </ul> <h2>Repository structure<a name="repository-structure"></a></h2> -<p>In addition to the <code>LICENSE</code> and <code>NOTICE</code> files required of any proper Apache-licensed project,<br/>the repository contains the following critical files:</p> +<p>In addition to the <code>LICENSE</code> and <code>NOTICE</code> files required of any proper Apache-licensed project, the repository contains the following critical files:</p> <ul> <li><strong><code>./pom.xml</code></strong>: orchestrates the maven website build</li> <li><strong><code>./ci.sh</code></strong>: script, meant to be run by a CI server, to build and deploy the website.</li> <li><strong><code>./mvn-ci.sh</code></strong>: script to build and deploy the website using Maven.</li> <li><strong><code>./src/main/jbake/</code></strong>: standard <a href="https://github.com/ingenieux/jbake-maven-plugin";>jbake maven plugin structure</a>, contains three subdirectories: <ul> - <li><code>./src/main/jbake/assets/</code>: The assets directory is where you should place your static files such as images,<br/>CSS files, JavaScript files, etc. These files are copied over to the baked output as is. You can create any<br/>directory structure you like in the assets directory and this structure will be maintained when copied.</li> - <li><code>./src/main/jbake/content/</code>: holds content files, with the extension of these files determining what<br/>type of content it contains (i.e.: <code>.md</code> for <a href="http://daringfireball.net/projects/markdown/syntax";>Markdown</a>, <code>.html</code> for raw HTML, etc.)</li> - <li><code>./src/main/jbake/templates/</code>: holds templates files, with the extension of these files determining<br/>the templates engine (i.e.: <code>.ftl</code> for <a href="https://freemarker.apache.org/";>Freemarker</a>, <code>.thyme</code> for <a href="http://www.thymeleaf.org/";>Thymeleaf</a>, etc.)</li> + <li><code>./src/main/jbake/assets/</code>: The assets directory is where you should place your static files such as images, CSS files, JavaScript files, etc. These files are copied over to the baked output as is. You can create any directory structure you like in the assets directory and this structure will be maintained when copied.</li> + <li><code>./src/main/jbake/content/</code>: holds content files, with the extension of these files determining what type of content it contains (i.e.: <code>.md</code> for <a href="http://daringfireball.net/projects/markdown/syntax";>Markdown</a>, <code>.html</code> for raw HTML, etc.).</li> + <li><code>./src/main/jbake/templates/</code>: holds templates files, with the extension of these files determining the templates engine (i.e.: <code>.ftl</code> for <a href="https://freemarker.apache.org/";>Freemarker</a>, <code>.thyme</code> for <a href="http://www.thymeleaf.org/";>Thymeleaf</a>, etc.).</li> </ul> </li> - <li><strong><code>./content/</code></strong>: the actual content served for jspwiki.apache.org, see <a href="#publishing-changes">publishing changes</a> below</li> + <li><strong><code>./content/</code></strong>: the actual content served for jspwiki.apache.org, see <a href="/development/edit_website.html#publishing-changes">publishing changes</a> below.</li> </ul> <h2>Build prerequisites<a name="build-prerequisites"></a></h2> -<p>The CI build (<code>ci.sh</code>) needs Java 7 and a JBake installation under <code>$JBAKE_HOME</code>. This script is run at <a href="https://builds.apache.org/job/jspwiki-site/";>ASF's Jenkins instance</a>.<br/>As there isn't a Maven installation at the nodes which perform this job, this script only takes the changes from the "jbake" branch,<br/>generates the site and puts it on the "asf-site" branch. As for now, javadocs must be pushed locally through the Maven build script.</p> -<p>The Maven build (<code>mvn-ci.sh</code>) needs at least Maven 3.1.1 and Java 7, thus these must be installed first. It's essentially the<br/>same build as the CI build, but done through Maven. This allows us to generate the site and also put the javadocs in there.</p> +<p>The CI build (<code>ci.sh</code>) needs Java 7 and a JBake installation under <code>$JBAKE_HOME</code>. This script is run at <a href="https://builds.apache.org/job/jspwiki-site/";>ASF's Jenkins instance</a>. As there isn't a Maven installation at the nodes which perform this job, this script only takes the changes from the "jbake" branch, generates the site and puts it on the "asf-site" branch. As for now, javadocs must be pushed locally through the Maven build script.</p> +<p>The Maven build (<code>mvn-ci.sh</code>) needs at least Maven 3.1.1 and Java 7, thus these must be installed first. It's essentially the same build as the CI build, but done through Maven. This allows us to generate the site and also put the javadocs in there.</p> <h2>Testing changes locally<a name="testing-changes-locally"></a></h2> -<p>Just run <code>mvn clean jbake:inline</code> and the site will be accesible through <a href="http://localhost:8080";>http://localhost:8080</a>. Changes will be reloaded<br/>on the fly. When done testing your local changes, press <code>Enter</code> to stop the web server and return to the shell.</p> +<p>Just run <code>mvn clean jbake:inline</code> and the site will be accesible through <a href="http://localhost:8080";>http://localhost:8080</a>. Changes will be reloaded on the fly. When done testing your local changes, press <code>Enter</code> to stop the web server and return to the shell.</p> <p>In order to be able to navigate locally, you'll need to edit the <code>site.host</code> property at <code>./src/main/jbake/jbake.properties</code>.<br/>Do <strong>NOT</strong> commit that change.</p> <h2>Publishing changes<a name="publishing-changes"></a></h2> -<p>Changes to the website are published using Apache's <a href="https://blogs.apache.org/infra/entry/git_based_websites_available";>gitpubsub</a> which relies on a<br/>special branch called "asf-site" containing <em>all website content</em>.</p> +<p>Changes to the website are published using Apache's <a href="https://blogs.apache.org/infra/entry/git_based_websites_available";>gitpubsub</a> which relies on a special branch called "asf-site" containing <em>all website content</em>.</p> <p>In the Apache JSPWiki website repository, the "asf-site" branch is an "orphan" branch. Updating the website thus involves:</p> <ol> <li>Making and testing your changes locally</li> <li>Replacing the entire contents within "asf-site" with the newly-generated site from the "jbake" branch.</li> </ol> <p>Second step is automated through <code>ci.sh</code> and <code>mvn-ci.sh</code> scripts. </p> -<p>Keep in mind that the new content must be <em>staged</em> for and committed in this branch. Once you have verified that the staged<br/>content is as expected, commit your changes (along with a useful commit message describing the changes at a high level)<br/>using <code>git commit</code> and publish the update using <code>git push origin</code>.</p> -<p>If you wish to unstage your changes, use <code>git reset --hard HEAD</code> to return to the original state of "jbake", wiping<br/>out any local modifications. You can then return to whichever branch you were working on with <code>git checkout</code>.</p> +<p>Keep in mind that the new content must be <em>staged</em> for and committed in this branch. Once you have verified that the staged content is as expected, commit your changes (along with a useful commit message describing the changes at a high level) using <code>git commit</code> and publish the update using <code>git push origin</code>.</p> +<p>If you wish to unstage your changes, use <code>git reset --hard HEAD</code> to return to the original state of "jbake", wiping out any local modifications. You can then return to whichever branch you were working on with <code>git checkout</code>.</p> +<h3>Publishing apidocs<a name="publishing-apidocs"></a></h3> +<p>Run the <code>mvn-ci.sh</code> script locally. This will generate the whole site with the javadocs, and push it to the <code>asf-site</code> branch. As for today, this has to be done locally, as the Jenkins' nodes which build and deploy the site don't have a Maven installation.</p> </div> <div class="page-footer visible-print"> <a href="https://jspwiki-wiki.apache.org/rss.jsp?page=Main&mode=wiki"; class="feed" title="RSS feed for page Main"> </a> @@ -242,6 +245,7 @@ <li><a class="external" href="https://git-wip-us.apache.org/repos/asf?p=jspwiki.git;a=summary";>Browse sources</a><img class="outlink" src="./images/out.png" alt=""></li> <li><a class="external" href="http://jspwiki.apache.org/apidocs/index.html";>JavaDoc</a><img class="outlink" src="./images/out.png" alt=""></li> <li><a class="wikipage" href="https://jspwiki-wiki.apache.org/Wiki.jsp?page=Building%20from%20source%20code";>Get and build source</a></li> + <li><a class="wikipage" href="https://jspwiki.apache.org/development/edit_website.html";>Editing website</a></li> <li><a class="external" href="https://issues.apache.org/jira/browse/JSPWIKI";>Issue tracker</a><img class="outlink" src="./images/out.png" alt=""></li> <li><a class="external" href="https://builds.apache.org/job/JSPWiki/";>Jenkins build</a><img class="outlink" src="./images/out.png" alt=""></li> <li><a class="external" href="https://builds.apache.org/analysis/overview?id=org.apache.jspwiki%3Ajspwiki-builder";>Sonar Analysis</a><img class="outlink" src="./images/out.png" alt=""></li> http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/73362d04/development/source_and_guide.html ---------------------------------------------------------------------- diff --git a/development/source_and_guide.html b/development/source_and_guide.html index f5c32f5..a158053 100644 --- a/development/source_and_guide.html +++ b/development/source_and_guide.html @@ -111,7 +111,7 @@ <ul class="dropdown-menu pull-right" data-hover-parent=".userbox" style="opacity: 0; visibility: hidden;"> <li> <a class="wikipage" href="https://jspwiki-wiki.apache.org/Wiki.jsp?page=UserPreferences"; accesskey="" title=""> - <span class="icon-user"></span>&nsbp;Gâday! + <span class="icon-user"></span> Gâday! </a> </li> <li class="divider"></li> @@ -221,6 +221,7 @@ <li><a class="external" href="https://git-wip-us.apache.org/repos/asf?p=jspwiki.git;a=summary";>Browse sources</a><img class="outlink" src="./images/out.png" alt=""></li> <li><a class="external" href="http://jspwiki.apache.org/apidocs/index.html";>JavaDoc</a><img class="outlink" src="./images/out.png" alt=""></li> <li><a class="wikipage" href="https://jspwiki-wiki.apache.org/Wiki.jsp?page=Building%20from%20source%20code";>Get and build source</a></li> + <li><a class="wikipage" href="https://jspwiki.apache.org/development/edit_website.html";>Editing website</a></li> <li><a class="external" href="https://issues.apache.org/jira/browse/JSPWIKI";>Issue tracker</a><img class="outlink" src="./images/out.png" alt=""></li> <li><a class="external" href="https://builds.apache.org/job/JSPWiki/";>Jenkins build</a><img class="outlink" src="./images/out.png" alt=""></li> <li><a class="external" href="https://builds.apache.org/analysis/overview?id=org.apache.jspwiki%3Ajspwiki-builder";>Sonar Analysis</a><img class="outlink" src="./images/out.png" alt=""></li> http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/73362d04/general/downloads.html ---------------------------------------------------------------------- diff --git a/general/downloads.html b/general/downloads.html index 9d5b8b0..47c3eae 100644 --- a/general/downloads.html +++ b/general/downloads.html @@ -111,7 +111,7 @@ <ul class="dropdown-menu pull-right" data-hover-parent=".userbox" style="opacity: 0; visibility: hidden;"> <li> <a class="wikipage" href="https://jspwiki-wiki.apache.org/Wiki.jsp?page=UserPreferences"; accesskey="" title=""> - <span class="icon-user"></span>&nsbp;Gâday! + <span class="icon-user"></span> Gâday! </a> </li> <li class="divider"></li> @@ -215,6 +215,7 @@ <li><a class="external" href="https://git-wip-us.apache.org/repos/asf?p=jspwiki.git;a=summary";>Browse sources</a><img class="outlink" src="./images/out.png" alt=""></li> <li><a class="external" href="http://jspwiki.apache.org/apidocs/index.html";>JavaDoc</a><img class="outlink" src="./images/out.png" alt=""></li> <li><a class="wikipage" href="https://jspwiki-wiki.apache.org/Wiki.jsp?page=Building%20from%20source%20code";>Get and build source</a></li> + <li><a class="wikipage" href="https://jspwiki.apache.org/development/edit_website.html";>Editing website</a></li> <li><a class="external" href="https://issues.apache.org/jira/browse/JSPWIKI";>Issue tracker</a><img class="outlink" src="./images/out.png" alt=""></li> <li><a class="external" href="https://builds.apache.org/job/JSPWiki/";>Jenkins build</a><img class="outlink" src="./images/out.png" alt=""></li> <li><a class="external" href="https://builds.apache.org/analysis/overview?id=org.apache.jspwiki%3Ajspwiki-builder";>Sonar Analysis</a><img class="outlink" src="./images/out.png" alt=""></li> http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/73362d04/general/news.html ---------------------------------------------------------------------- diff --git a/general/news.html b/general/news.html index b634434..c566a3c 100644 --- a/general/news.html +++ b/general/news.html @@ -111,7 +111,7 @@ <ul class="dropdown-menu pull-right" data-hover-parent=".userbox" style="opacity: 0; visibility: hidden;"> <li> <a class="wikipage" href="https://jspwiki-wiki.apache.org/Wiki.jsp?page=UserPreferences"; accesskey="" title=""> - <span class="icon-user"></span>&nsbp;Gâday! + <span class="icon-user"></span> Gâday! </a> </li> <li class="divider"></li> @@ -236,6 +236,7 @@ <li><a class="external" href="https://git-wip-us.apache.org/repos/asf?p=jspwiki.git;a=summary";>Browse sources</a><img class="outlink" src="./images/out.png" alt=""></li> <li><a class="external" href="http://jspwiki.apache.org/apidocs/index.html";>JavaDoc</a><img class="outlink" src="./images/out.png" alt=""></li> <li><a class="wikipage" href="https://jspwiki-wiki.apache.org/Wiki.jsp?page=Building%20from%20source%20code";>Get and build source</a></li> + <li><a class="wikipage" href="https://jspwiki.apache.org/development/edit_website.html";>Editing website</a></li> <li><a class="external" href="https://issues.apache.org/jira/browse/JSPWIKI";>Issue tracker</a><img class="outlink" src="./images/out.png" alt=""></li> <li><a class="external" href="https://builds.apache.org/job/JSPWiki/";>Jenkins build</a><img class="outlink" src="./images/out.png" alt=""></li> <li><a class="external" href="https://builds.apache.org/analysis/overview?id=org.apache.jspwiki%3Ajspwiki-builder";>Sonar Analysis</a><img class="outlink" src="./images/out.png" alt=""></li> http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/73362d04/index.html ---------------------------------------------------------------------- diff --git a/index.html b/index.html index 0c11624..af76acd 100755 --- a/index.html +++ b/index.html @@ -111,7 +111,7 @@ <ul class="dropdown-menu pull-right" data-hover-parent=".userbox" style="opacity: 0; visibility: hidden;"> <li> <a class="wikipage" href="https://jspwiki-wiki.apache.org/Wiki.jsp?page=UserPreferences"; accesskey="" title=""> - <span class="icon-user"></span>&nsbp;Gâday! + <span class="icon-user"></span> Gâday! </a> </li> <li class="divider"></li> @@ -163,9 +163,9 @@ <div class="page-content "> <h2>Welcome to Apache JSPWiki</h2> <p><a href="https://jspwiki.apache.org";>Apache JSPWiki</a> is a leading open source <a href="https://jspwiki-wiki.apache.org/Wiki.jsp?page=WikiWiki";>WikiWiki</a> engine, feature-rich and built around standard <a href="https://jspwiki-wiki.apache.org/Wiki.jsp?page=JEE";>JEE</a> components (Java, servlets, JSP). </p> -<p>Some of its features include:</p> +<p>Some of its <a href="https://jspwiki-wiki.apache.org/Wiki.jsp?page=JSPWikiFeatures";>features</a> include:</p> <ul> - <li>WikiMarkup/Structured Text</li> + <li><a href="https://jspwiki-wiki.apache.org/Wiki.jsp?page=TextFormattingRules";>WikiMarkup</a> / Structured Text</li> <li>File attachments</li> <li>Templates support</li> <li>Data storage through your choice of two <a href="https://jspwiki-wiki.apache.org/Wiki.jsp?page=WikiPageProviders";>WikiPage Providers</a>, with the capability to create and plug in new ones</li> @@ -183,6 +183,8 @@ <h2>Project status</h2> <ul> <li> + <p><strong>01-Jul-2017:</strong> new website!</p></li> + <li> <p><strong>06-Apr-2016:</strong> new committer and PMC member - Dave Koelmeyer</p></li> <li> <p><strong>20-Feb-2016:</strong> Official <a href="general/downloads.html">Apache JSPWiki 2.10.2 release</a> is out!</p></li> @@ -192,8 +194,6 @@ <p><strong>21-Aug-2014:</strong> new committer and PMC member - Siegfried Goeschl</p></li> <li> <p><strong>29-May-2014:</strong> Official <a href="general/downloads.html">Apache JSPWiki 2.10.1 release</a> is out!</p></li> - <li> - <p><strong>01-Feb-2014:</strong> Official <a href="general/downloads.html">Apache JSPWiki 2.10.0 release</a> is out!</p></li> </ul> </div> <div class="page-footer visible-print"> @@ -233,6 +233,7 @@ <li><a class="external" href="https://git-wip-us.apache.org/repos/asf?p=jspwiki.git;a=summary";>Browse sources</a><img class="outlink" src="./images/out.png" alt=""></li> <li><a class="external" href="http://jspwiki.apache.org/apidocs/index.html";>JavaDoc</a><img class="outlink" src="./images/out.png" alt=""></li> <li><a class="wikipage" href="https://jspwiki-wiki.apache.org/Wiki.jsp?page=Building%20from%20source%20code";>Get and build source</a></li> + <li><a class="wikipage" href="https://jspwiki.apache.org/development/edit_website.html";>Editing website</a></li> <li><a class="external" href="https://issues.apache.org/jira/browse/JSPWIKI";>Issue tracker</a><img class="outlink" src="./images/out.png" alt=""></li> <li><a class="external" href="https://builds.apache.org/job/JSPWiki/";>Jenkins build</a><img class="outlink" src="./images/out.png" alt=""></li> <li><a class="external" href="https://builds.apache.org/analysis/overview?id=org.apache.jspwiki%3Ajspwiki-builder";>Sonar Analysis</a><img class="outlink" src="./images/out.png" alt=""></li> http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/73362d04/pmc/board_reports.html ---------------------------------------------------------------------- diff --git a/pmc/board_reports.html b/pmc/board_reports.html index 92792cd..6a877f8 100644 --- a/pmc/board_reports.html +++ b/pmc/board_reports.html @@ -111,7 +111,7 @@ <ul class="dropdown-menu pull-right" data-hover-parent=".userbox" style="opacity: 0; visibility: hidden;"> <li> <a class="wikipage" href="https://jspwiki-wiki.apache.org/Wiki.jsp?page=UserPreferences"; accesskey="" title=""> - <span class="icon-user"></span>&nsbp;Gâday! + <span class="icon-user"></span> Gâday! </a> </li> <li class="divider"></li> @@ -207,6 +207,7 @@ <li><a class="external" href="https://git-wip-us.apache.org/repos/asf?p=jspwiki.git;a=summary";>Browse sources</a><img class="outlink" src="./images/out.png" alt=""></li> <li><a class="external" href="http://jspwiki.apache.org/apidocs/index.html";>JavaDoc</a><img class="outlink" src="./images/out.png" alt=""></li> <li><a class="wikipage" href="https://jspwiki-wiki.apache.org/Wiki.jsp?page=Building%20from%20source%20code";>Get and build source</a></li> + <li><a class="wikipage" href="https://jspwiki.apache.org/development/edit_website.html";>Editing website</a></li> <li><a class="external" href="https://issues.apache.org/jira/browse/JSPWIKI";>Issue tracker</a><img class="outlink" src="./images/out.png" alt=""></li> <li><a class="external" href="https://builds.apache.org/job/JSPWiki/";>Jenkins build</a><img class="outlink" src="./images/out.png" alt=""></li> <li><a class="external" href="https://builds.apache.org/analysis/overview?id=org.apache.jspwiki%3Ajspwiki-builder";>Sonar Analysis</a><img class="outlink" src="./images/out.png" alt=""></li> http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/73362d04/pmc/how_to_release.html ---------------------------------------------------------------------- diff --git a/pmc/how_to_release.html b/pmc/how_to_release.html index 093e3eb..a8e7a0d 100644 --- a/pmc/how_to_release.html +++ b/pmc/how_to_release.html @@ -111,7 +111,7 @@ <ul class="dropdown-menu pull-right" data-hover-parent=".userbox" style="opacity: 0; visibility: hidden;"> <li> <a class="wikipage" href="https://jspwiki-wiki.apache.org/Wiki.jsp?page=UserPreferences"; accesskey="" title=""> - <span class="icon-user"></span>&nsbp;Gâday! + <span class="icon-user"></span> Gâday! </a> </li> <li class="divider"></li> @@ -475,6 +475,7 @@ The Apache JSPWiki Team <li><a class="external" href="https://git-wip-us.apache.org/repos/asf?p=jspwiki.git;a=summary";>Browse sources</a><img class="outlink" src="./images/out.png" alt=""></li> <li><a class="external" href="http://jspwiki.apache.org/apidocs/index.html";>JavaDoc</a><img class="outlink" src="./images/out.png" alt=""></li> <li><a class="wikipage" href="https://jspwiki-wiki.apache.org/Wiki.jsp?page=Building%20from%20source%20code";>Get and build source</a></li> + <li><a class="wikipage" href="https://jspwiki.apache.org/development/edit_website.html";>Editing website</a></li> <li><a class="external" href="https://issues.apache.org/jira/browse/JSPWIKI";>Issue tracker</a><img class="outlink" src="./images/out.png" alt=""></li> <li><a class="external" href="https://builds.apache.org/job/JSPWiki/";>Jenkins build</a><img class="outlink" src="./images/out.png" alt=""></li> <li><a class="external" href="https://builds.apache.org/analysis/overview?id=org.apache.jspwiki%3Ajspwiki-builder";>Sonar Analysis</a><img class="outlink" src="./images/out.png" alt=""></li>
