struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lukaszlen...@apache.org
Subject [struts-site] branch master updated: Drops links to old docs and adds proper redirects
Date Fri, 27 Oct 2017 16:15:20 GMT
This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts-site.git


The following commit(s) were added to refs/heads/master by this push:
     new 68876f8  Drops links to old docs and adds proper redirects
68876f8 is described below

commit 68876f87626b462db170bd62c344f3b6854d0630
Author: Lukasz Lenart <lukaszlenart@apache.org>
AuthorDate: Fri Oct 27 18:15:14 2017 +0200

    Drops links to old docs and adds proper redirects
---
 source/.htaccess             | 18 +++++++++++++-----
 source/_includes/header.html |  8 +-------
 source/docs/index.md         | 28 ++++++++++++++++++++++++++++
 3 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/source/.htaccess b/source/.htaccess
index f8a2f2f..c5d94cc 100644
--- a/source/.htaccess
+++ b/source/.htaccess
@@ -1,6 +1,14 @@
-# This file is maintained at https://git-wip-us.apache.org/repos/asf?p=struts-site.git
-DirectoryIndex index.html home.html
+# This file is maintained at https://gitbox.apache.org/repos/asf?p=struts-site.git
+DirectoryIndex index.html
 
-RedirectMatch \/2.*\/docs\/(.*)?    http://struts.apache.org/docs/$1
-RedirectMatch \/release\/2.*\/(.*)? http://struts.apache.org/$1
-RedirectMatch \/2.*\/(.*)?          http://struts.apache.org/$1
+RedirectMatch \/docs\/version\-notes\-25([0-9]{1,2})+\.html   https://cwiki.apache.org/confluence/display/WW/Version+Notes+2.5.$1
+RedirectMatch \/docs\/version\-notes\-23([0-9]{1,2})+\.html   https://cwiki.apache.org/confluence/display/WW/Version+Notes+2.3.$1
+RedirectMatch \/docs\/version\-notes\-22([0-9]{1,2})+\.html   https://cwiki.apache.org/confluence/display/WW/Version+Notes+2.2.$1
+RedirectMatch \/docs\/version\-notes\-21([0-9]{1,2})+\.html   https://cwiki.apache.org/confluence/display/WW/Version+Notes+2.1.$1
+RedirectMatch \/docs\/version\-notes\-20([0-9]{1,2})+\.html   https://cwiki.apache.org/confluence/display/WW/Version+Notes+2.0.$1
+
+RedirectMatch \/docs\/s2-0([0-9]{2}).html                     https://cwiki.apache.org/confluence/display/WW/Security+Bulletin+S2-0$1
+
+RedirectMatch \/2.*\/docs\/(.*)?                    http://struts.apache.org/docs/$1
+RedirectMatch \/release\/2.*\/(.*)?                 http://struts.apache.org/$1
+RedirectMatch \/2.*\/(.*)?                          http://struts.apache.org/$1
diff --git a/source/_includes/header.html b/source/_includes/header.html
index c488add..54ebed2 100644
--- a/source/_includes/header.html
+++ b/source/_includes/header.html
@@ -61,15 +61,9 @@
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
-                <li class="divider"></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core
API</a></li>
-                <li><a href="/docs/plugins.html">Plugin APIs</a></li>
-                <li><a href="/docs/tag-reference.html">Tag reference</a></li>
+                <li><a href="/tag-developers/tag-reference.html">Tag reference</a></li>
                 <li><a href="http://cwiki.apache.org/S2PLUGINS/home.html">Plugin
registry</a></li>
-                <li class="divider"></li>
-                <li><a href="/docs/tutorials.html">Tutorials - DEPRECATED</a></li>
-                <li><a href="/docs/faqs.html">FAQs - DEPRECATED</a></li>
-                <li><a href="/docs/guides.html">Guides - DEPRECATED</a></li>
               </ul>
             </li>
             <li class="dropdown">
diff --git a/source/docs/index.md b/source/docs/index.md
new file mode 100644
index 0000000..aea2560
--- /dev/null
+++ b/source/docs/index.md
@@ -0,0 +1,28 @@
+---
+layout: default
+title: Old docs
+---
+
+# Old docs
+[Edit on GitHub]({{ site.repository_url }}/edit/master/source/{{ page.path }}){: .edit-on-gh
title="Edit this page on GitHub"}
+
+The [old docs](https://cwiki.apache.org/confluence/display/WW/) are still available for reference
on our wiki. We have migrated 
+all of them to Markdown and are hosted directly in [struts-site](https://gitbox.apache.org/repos/asf?p=struts-site.git)
+repo.
+
+Please follow the links below to find appropriate content:
+ 
+ - [Getting Started](../getting-started/)
+ - [Security Guide](../security/)
+ - [Core Developers Guide](../core-developers/)
+ - [Tag Developers Guide](../tag-developers/)
+ - [Maven Archetypes](../maven-archetypes/)
+ - [Plugins](../plugins/)
+
+There are still some pages hosted on wiki:
+
+ - [Version Notes](https://cwiki.apache.org/confluence/display/WW/Migration+Guide)
+ - [Security Bulletins](https://cwiki.apache.org/confluence/display/WW/Security+Bulletins)
+ - [Architects Guide](https://cwiki.apache.org/confluence/display/WW/Architects+Guide)
+ - [Contributors Guide](https://cwiki.apache.org/confluence/display/WW/Contributors+Guide)
+ - [FAQs](https://cwiki.apache.org/confluence/display/WW/FAQs)

-- 
To stop receiving notification emails like this one, please contact
['"commits@struts.apache.org" <commits@struts.apache.org>'].

Mime
View raw message