diff --git a/website/extra/htaccess b/website/extra/htaccess index db3393af..2d5b6b2a 100644 --- a/website/extra/htaccess +++ b/website/extra/htaccess @@ -22,8 +22,6 @@ RewriteRule ^all-versions$ /all-versions.html [L,END] RewriteRule ^all-versions(\.html)?$ /all-versions [NC,R=301] RewriteRule ^disable-checked-exceptions$ /disable-checked-exceptions.html [L,END] RewriteRule ^disable-checked-exceptions(\.html)?$ /disable-checked-exceptions [NC,R=301] -RewriteRule ^contributing$ /contributing.html [L,END] -RewriteRule ^contributing(\.html)?$ /contributing [NC,R=301] RewriteRule ^supporters$ /supporters.html [L,END] RewriteRule ^supporters(.html)?$ /supporters [NC,R=301] RewriteRule ^order-license-info$ /order-license-info.html [L,END] @@ -31,6 +29,14 @@ RewriteRule ^order-?license-?info(.html)?$ /order-license-info [NC,R=301] RewriteRule ^order-license$ /order-license.html [L,END] RewriteRule ^order-?license(.html)?$ /order-license [NC,R=301] +RewriteRule ^contributing/index$ /contributing/index.html [L,END] +RewriteRule ^contributing(\.html)?$ /contributing/index [NC,R=301] +RewriteRule ^contributing/index(\.html)?$ /contributing/index [NC,R=301] +RewriteRule ^contributing/contributing$ /contributing/contributing.html [L,END] +RewriteRule ^contributing/contributing(\.html)?$ /contributing/contributing [NC,R=301] +RewriteRule ^contributing/lombok-execution-path$ /contributing/lombok-execution-path.html [L,END] +RewriteRule ^contributing/lombok-execution-path(\.html)?$ /contributing/lombok-execution-path [NC,R=301] + <#list setupPages as pg> RewriteRule ^setup/${pg?no_esc}$ /setup/${pg?no_esc}.html [L,END] RewriteRule ^setup/${pg?no_esc}(\.html)?$ /setup/${pg?no_esc} [NC,R=301] diff --git a/website/templates/_scaffold.html b/website/templates/_scaffold.html index e3096d7d..7acfb6b6 100644 --- a/website/templates/_scaffold.html +++ b/website/templates/_scaffold.html @@ -102,7 +102,7 @@ ga('send', 'pageview');
  • diff --git a/website/templates/contributing.html b/website/templates/contributing/contributing.html similarity index 98% rename from website/templates/contributing.html rename to website/templates/contributing/contributing.html index 16d68f32..8da9b827 100644 --- a/website/templates/contributing.html +++ b/website/templates/contributing/contributing.html @@ -1,4 +1,4 @@ -<#import "/_scaffold.html" as main> +<#import "../_scaffold.html" as main> <@main.scaffold title="Contribute">