X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=htaccess.sample;h=f7513cc0c7dd54153a80600ea16eacd168c443c5;hb=017eee8e5d7fb4c976032f6e1b14947254fc073e;hp=c7be2d86a0cd30b23ca5ed737e118ed90dcb20dd;hpb=aeeec2f8a74397344ffa3e59c0eefa0ea4d2fdda;p=quix0rs-gnu-social.git

diff --git a/htaccess.sample b/htaccess.sample
index c7be2d86a0..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/
@@ -19,7 +39,6 @@
   RewriteCond %{REQUEST_FILENAME} !-f
   RewriteCond %{REQUEST_FILENAME} !-d
   RewriteRule (.*) index.php?p=$1 [L,QSA]
-<<<<<<< HEAD
 
   ## You can also use PATHINFO by using this RewriteRule instead:
   # RewriteRule (.*) index.php/$1 [L,QSA]
@@ -27,16 +46,8 @@
 
 <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
 </FilesMatch>
-=======
-</IfModule>
-
-<FilesMatch "\.(ini)">
-  Order allow,deny
-</FilesMatch>
-
->>>>>>> Adding htaccess.sample back*shame*