Revert "Revert "Added some explanatory text to README""

This reverts commit 446de62d02f372b6755237ae61e08bfcd4bf5100.

Conflicts:

	README
	htaccess.sample

diff --git a/README b/README
index 28f99405e32d1c42fa533a60f0bc634eedf34881..a0fb9ab0b29fa6a9dbdb0249f5cdacedccff7906 100644 (file)
--- a/README
+++ b/README
@@ -688,9 +688,13 @@ to users on a remote site. (Or not... it's not well tested.) The
 
 If fancy URLs is enabled, access to file attachments can also be
 restricted to logged-in users only. Uncomment the appropriate rewrite
+<<<<<<< HEAD:README
 rule in .htaccess or your server's httpd.conf. (This most likely will
 not work if you are using a virtual server for attachments, so consider
 the performance/security tradeoff.)
+=======
+rule in .htaccess or your server's httpd.conf.
+>>>>>>> 446de62... Revert "Added some explanatory text to README":README
 
 Upgrading
 =========

diff --git a/htaccess.sample b/htaccess.sample
index 37eb8e01ec01f1169159a1b920c265c00b9bfdc2..373108c81650757c0e8e4fb731d47e5d0851c994 100644 (file)
--- a/htaccess.sample
+++ b/htaccess.sample
@@ -5,6 +5,14 @@
 
   RewriteBase /mublog/
 
+  # If your site is private and want access to file attachments
+  # restricted to logged-in users only, uncomment this rule.
+  #
+  # If you have a custom attachment path
+  # ($config['attachments']['path']), change "file/" to match.
+  #
+  #RewriteRule ^file/(.*) getfile/$1
+
   RewriteCond %{REQUEST_FILENAME} !-f
   RewriteCond %{REQUEST_FILENAME} !-d
   RewriteRule (.*) index.php?p=$1 [L,QSA]