From 940f9330efca76c84e7a645cafc93acd2751a225 Mon Sep 17 00:00:00 2001
From: Nathan Kinkade <nkinkade@nkinka.de>
Date: Wed, 1 Sep 2010 17:38:01 +0000
Subject: Enabled some of the nice features available in the default .htaccess
 file.

---
 .htaccess | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/.htaccess b/.htaccess
index 404b43f5..88169bb6 100644
--- a/.htaccess
+++ b/.htaccess
@@ -24,22 +24,22 @@
 # in your Apache2 config file before you uncomment this block or
 # you'll get an "Internal Server Error".
 #
-# <FilesMatch "(\.(class|fla|inc|sql|txt|gitignore)|(README|LICENSE))$">
-#   Order allow,deny
-# </FilesMatch>
+<FilesMatch "(\.(class|fla|inc|sql|txt|gitignore)|(README|LICENSE))$">
+  Order allow,deny
+</FilesMatch>
 
 # Improve performance by uncommenting this block.  It tells the
 # browser that your images don't change very often so it won't keep
 # asking for them.  If you get an error after uncommenting this, make
 # sure you specify "AuthConfig Indexes" in your Apache config file.
 #
-# <IfModule mod_expires.c>
-#   ExpiresActive On
-#   # Cache all files for a month after access (A).
-#   ExpiresDefault A2678400
-#   # Do not cache dynamically generated pages.
-#   ExpiresByType text/html A1
-# </IfModule>
+<IfModule mod_expires.c>
+  ExpiresActive On
+  # Cache all files for a month after access (A).
+  ExpiresDefault A2678400
+  # Do not cache dynamically generated pages.
+  ExpiresByType text/html A1
+</IfModule>
 
 # You can use the mod_rewrite Apache module to get rid of the
 # "index.php" from your Gallery 3 urls.  Uncomment the block below
@@ -59,11 +59,11 @@
 # want these changes to be persistent, talk to your system admin about
 # putting this block into your Apache config files.
 #
-# <IfModule mod_rewrite.c>
-#   RewriteEngine On
-#   RewriteBase /
-#   RewriteCond %{REQUEST_FILENAME} !-f
-#   RewriteCond %{REQUEST_FILENAME} !-d
-#   RewriteRule ^(.*)$ index.php?kohana_uri=$1 [QSA,PT,L]
-#   RewriteRule ^$ index.php?kohana_uri=$1 [QSA,PT,L]
-# </IfModule>
+<IfModule mod_rewrite.c>
+  RewriteEngine On
+  RewriteBase /photos
+  RewriteCond %{REQUEST_FILENAME} !-f
+  RewriteCond %{REQUEST_FILENAME} !-d
+  RewriteRule ^(.*)$ index.php?kohana_uri=$1 [QSA,PT,L]
+  RewriteRule ^$ index.php?kohana_uri=$1 [QSA,PT,L]
+</IfModule>
-- 
cgit v1.2.3