From 6abcc24834affa681362cc8c5657a6d7ae72f8fe Mon Sep 17 00:00:00 2001
From: Mikael Nordfeldth <mmn@hethane.se>
Date: Fri, 27 Feb 2015 15:42:45 +0100
Subject: [PATCH] htaccess.sample updating

---
 htaccess.sample | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/htaccess.sample b/htaccess.sample
index 90e18e72e6..f7513cc0c7 100644
--- a/htaccess.sample
+++ b/htaccess.sample
@@ -1,11 +1,31 @@
+### GNU social "fancy URL" setup
+#
+#   Change the "RewriteBase" in the new .htaccess file to be the URL path
+#       to your GNU Social installation on your server. Typically this will
+#       be the path to your GNU Social directory relative to your Web root.
+#       If you are installing it in the root directory, leave it as '/'.
+#
+#   If it doesn't work, double-check that AllowOverride for the GNU Social
+#       directory is 'All' in your Apache configuration file. This can be
+#       * /etc/apache2/apache2.conf (generic)
+#       * /etc/apache2/sites-available/default(on Debian and Ubuntu)
+#       * ...many other variations depending on distribution...
+#
+#   See the Apache documentation for .htaccess files for more details:
+#       https://httpd.apache.org/docs/2.4/howto/htaccess.html
+#
+#   Also, check that mod_rewrite is installed and enabled:
+#       https://httpd.apache.org/docs/2.4/mod/mod_rewrite.html
+
+
 <IfModule mod_rewrite.c>
   RewriteEngine On
 
-  # NOTE: change this to your actual StatusNet base URL path,
+  # NOTE: change this to your actual GNU social base URL path,
   # minus the domain part:
   #
-  #   http://example.com/        => /
-  #   http://example.com/mublog/ => /mublog/
+  #   https://social.example.com/        => /
+  #   https://example.com/social/ => /social/
   #
   RewriteBase /
   #RewriteBase /mublog/
@@ -26,7 +46,7 @@
 
 <FilesMatch "\.(ini)">
   # For mod_access_compat in Apache <2.4
-  Order allow,deny
+  #Order allow,deny
 
   # Use this instead for Apache >2.4 (mod_authz_host)
   # Require all denied
-- 
2.39.5