diff --git a/jOOQ-website/.htaccess b/jOOQ-website/.htaccess index c473ba1aa9..92a629efa0 100644 --- a/jOOQ-website/.htaccess +++ b/jOOQ-website/.htaccess @@ -1,55 +1,32 @@ ################################## Errors ###################################### -#ErrorDocument 301 /error/301-moved_permanently.html -#ErrorDocument 302 /error/302-moved_temporarily.html -#ErrorDocument 303 /error/303-see_other.html -#ErrorDocument 400 /error/400-bad_request.html -ErrorDocument 401 /error/401-authorization_required.html -#ErrorDocument 402 /error/402-payment_required.html -ErrorDocument 403 /error/403-forbidden.html -ErrorDocument 404 /error/404-not_found.html -#ErrorDocument 405 /error/405-method_not_allowed.html -#ErrorDocument 406 /error/406-not_acceptable.html -#ErrorDocument 407 /error/407-proxy_authentication_required.html -ErrorDocument 408 /error/408-request_timed_out.html -#ErrorDocument 409 /error/409-conflicting_request.html -#ErrorDocument 410 /error/410-gone.html -#ErrorDocument 411 /error/411-content_length_required.html -#ErrorDocument 412 /error/412-precondition_failed.html -#ErrorDocument 413 /error/413-request_entity_too_long.html -#ErrorDocument 414 /error/414-request_uri_too_long.html -#ErrorDocument 415 /error/415-unsupported_media_type.html -ErrorDocument 500 /error/500-internal_server_error.html -#ErrorDocument 501 /error/501-not_implemented.html -#ErrorDocument 502 /error/502-bad_gateway.html -ErrorDocument 503 /error/503-service_unavailable.html -#ErrorDocument 504 /error/504-gateway_timeout.html -#ErrorDocument 505 /error/505-http_version_not_supported.html -################################################################################ - -######################### Howto map /~user to /user ############################ -#RewriteEngine On -#RewriteCond %{REQUEST_URI} ^/([^/]+)$ -#RewriteCond %{DOCUMENT_ROOT}/%1 !-d -#RewriteCond /home/sites/%{SERVER_NAME}/users/%1 -d -#RewriteRule ^([^/]+)$ http://%{HTTP_HOST}/$1/ [R,L] -#RewriteCond %{REQUEST_URI} ^/([^/]+)/ -#RewriteCond %{DOCUMENT_ROOT}/%1 !-d -#RewriteCond /home/sites/%{SERVER_NAME}/users/%1 -d -#RewriteRule ^([^/]+)(.+)$ /~$1/$2 -################################################################################ - -###################### Howto map /users/user to /users/user #################### -#RewriteEngine On -#RewriteCond %{REQUEST_URI} ^/users/([^/]+)$ -#RewriteCond %{DOCUMENT_ROOT}/%1 !-d -#RewriteCond /home/sites/%{SERVER_NAME}/users/%1 -d -#RewriteRule ^users/([^/]+)$ http://%{HTTP_HOST}/users/$1/ [R,L] -#RewriteCond %{REQUEST_URI} ^/users/([^/]+)/ -#RewriteCond %{DOCUMENT_ROOT}/%1 !-d -#RewriteCond /home/sites/%{SERVER_NAME}/users/%1 -d -#RewriteRule ^users/([^/]+)(.+)$ /~$1/$2 +#ErrorDocument 301 /e/301-moved_permanently.html +#ErrorDocument 302 /e/302-moved_temporarily.html +#ErrorDocument 303 /e/303-see_other.html +#ErrorDocument 400 /e/400-bad_request.html +ErrorDocument 401 /e/401-authorization_required.html +#ErrorDocument 402 /e/402-payment_required.html +ErrorDocument 403 /e/403-forbidden.html +ErrorDocument 404 /e/404-not_found.html +#ErrorDocument 405 /e/405-method_not_allowed.html +#ErrorDocument 406 /e/406-not_acceptable.html +#ErrorDocument 407 /e/407-proxy_authentication_required.html +ErrorDocument 408 /e/408-request_timed_out.html +#ErrorDocument 409 /e/409-conflicting_request.html +#ErrorDocument 410 /e/410-gone.html +#ErrorDocument 411 /e/411-content_length_required.html +#ErrorDocument 412 /e/412-precondition_failed.html +#ErrorDocument 413 /e/413-request_entity_too_long.html +#ErrorDocument 414 /e/414-request_uri_too_long.html +#ErrorDocument 415 /e/415-unsupported_media_type.html +ErrorDocument 500 /e/500-internal_server_error.html +#ErrorDocument 501 /e/501-not_implemented.html +#ErrorDocument 502 /e/502-bad_gateway.html +ErrorDocument 503 /e/503-service_unavailable.html +#ErrorDocument 504 /e/504-gateway_timeout.html +#ErrorDocument 505 /e/505-http_version_not_supported.html ################################################################################ +#Create uniform manual URLs, also for 2.4 manual RewriteEngine On RewriteBase / RewriteRule ^manual(.*)$ doc/2.4/manual$1 [L,R=301] \ No newline at end of file diff --git a/jOOQ-website/error/.htaccess b/jOOQ-website/e/.htaccess similarity index 100% rename from jOOQ-website/error/.htaccess rename to jOOQ-website/e/.htaccess diff --git a/jOOQ-website/e/400-bad_request.html b/jOOQ-website/e/400-bad_request.html new file mode 100644 index 0000000000..0308bddab8 --- /dev/null +++ b/jOOQ-website/e/400-bad_request.html @@ -0,0 +1,89 @@ + + + + + 400 Bad Request + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ The jOOQ Logo + + diff --git a/jOOQ-website/e/401-authorization_required.html b/jOOQ-website/e/401-authorization_required.html new file mode 100644 index 0000000000..49bc7bb1bc --- /dev/null +++ b/jOOQ-website/e/401-authorization_required.html @@ -0,0 +1,89 @@ + + + + + 401 Authorization Required + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ The jOOQ Logo + + diff --git a/jOOQ-website/e/403-forbidden.html b/jOOQ-website/e/403-forbidden.html new file mode 100644 index 0000000000..b9e634ec06 --- /dev/null +++ b/jOOQ-website/e/403-forbidden.html @@ -0,0 +1,89 @@ + + + + + 403 Forbidden + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ The jOOQ Logo + + diff --git a/jOOQ-website/e/404-not_found.html b/jOOQ-website/e/404-not_found.html new file mode 100644 index 0000000000..fc20a00486 --- /dev/null +++ b/jOOQ-website/e/404-not_found.html @@ -0,0 +1,89 @@ + + + + + 404 Not Found + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ The jOOQ Logo + + diff --git a/jOOQ-website/e/408-request_timed_out.html b/jOOQ-website/e/408-request_timed_out.html new file mode 100644 index 0000000000..ef164dd02c --- /dev/null +++ b/jOOQ-website/e/408-request_timed_out.html @@ -0,0 +1,89 @@ + + + + + 408 Request Timed Out + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ The jOOQ Logo + + diff --git a/jOOQ-website/e/500-internal_server_error.html b/jOOQ-website/e/500-internal_server_error.html new file mode 100644 index 0000000000..a484087644 --- /dev/null +++ b/jOOQ-website/e/500-internal_server_error.html @@ -0,0 +1,89 @@ + + + + + 500 Internal Server Error + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ The jOOQ Logo + + diff --git a/jOOQ-website/e/503-service_unavailable.html b/jOOQ-website/e/503-service_unavailable.html new file mode 100644 index 0000000000..527f5fd284 --- /dev/null +++ b/jOOQ-website/e/503-service_unavailable.html @@ -0,0 +1,89 @@ + + + + + 503 Service Unavailable + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ The jOOQ Logo + + diff --git a/jOOQ-website/error/index.html b/jOOQ-website/e/index.html similarity index 100% rename from jOOQ-website/error/index.html rename to jOOQ-website/e/index.html diff --git a/jOOQ-website/error/400-bad_request.html b/jOOQ-website/error/400-bad_request.html deleted file mode 100644 index 60b657cc11..0000000000 --- a/jOOQ-website/error/400-bad_request.html +++ /dev/null @@ -1,19 +0,0 @@ - - - - 400 Bad Request - - - -

Bad Request

-

Your browser sent a request that this server could not understand.

-
- - diff --git a/jOOQ-website/error/401-authorization_required.html b/jOOQ-website/error/401-authorization_required.html deleted file mode 100644 index 1c9cfd8387..0000000000 --- a/jOOQ-website/error/401-authorization_required.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - 401 Authorization Required - - - -

Authorization Required

-

This server could not verify that you - are authorized to access the document - requested. Either you supplied the wrong - credentials (e.g., bad password), or your - browser doesn't understand how to supply - the credentials required.

-
- - diff --git a/jOOQ-website/error/403-forbidden.html b/jOOQ-website/error/403-forbidden.html deleted file mode 100644 index 78f1a2e222..0000000000 --- a/jOOQ-website/error/403-forbidden.html +++ /dev/null @@ -1,19 +0,0 @@ - - - - 403 Forbidden - - - -

Forbidden

-

You don't have permission to access this file on this server.

-
- - diff --git a/jOOQ-website/error/404-not_found.html b/jOOQ-website/error/404-not_found.html deleted file mode 100644 index 5d50d7a92c..0000000000 --- a/jOOQ-website/error/404-not_found.html +++ /dev/null @@ -1,19 +0,0 @@ - - - - 404 Not Found - - - -

Not Found

-

The requested URL was not found on this server.

-
- - diff --git a/jOOQ-website/error/408-request_timed_out.html b/jOOQ-website/error/408-request_timed_out.html deleted file mode 100644 index 0f8718fc95..0000000000 --- a/jOOQ-website/error/408-request_timed_out.html +++ /dev/null @@ -1,19 +0,0 @@ - - - - 408 Request Time-out - - - -

Request Time-out

-

Server timeout waiting for the HTTP request from the client.

-
- - diff --git a/jOOQ-website/error/500-internal_server_error.html b/jOOQ-website/error/500-internal_server_error.html deleted file mode 100644 index b2466516d8..0000000000 --- a/jOOQ-website/error/500-internal_server_error.html +++ /dev/null @@ -1,17 +0,0 @@ - - -500 Internal Server Error - -

Internal Server Error

-

The server encountered an internal error or -misconfiguration and was unable to complete -your request.

-Please contact the server administrator, -and inform them of the time the error occurred, -and anything you might have done that may have -caused the error.

-More information about this error may be available -in the server error log. -

-
- diff --git a/jOOQ-website/error/503-service_unavailable.html b/jOOQ-website/error/503-service_unavailable.html deleted file mode 100644 index 7f5d3247ff..0000000000 --- a/jOOQ-website/error/503-service_unavailable.html +++ /dev/null @@ -1,18 +0,0 @@ - - - - 503 Service Temporarily Unavailable - - - -

Service Temporarily Unavailable

-

The server is temporarily unable to service your - request due to maintenance downtime or capacity - problems. Please try again later.

-
- -