forked from GNUsocial/gnu-social
		
	Revert "Revert "Added some explanatory text to README""
This reverts commit 446de62d02.
Conflicts:
	README
	htaccess.sample
			
			
This commit is contained in:
		
							
								
								
									
										4
									
								
								README
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								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
 | 
			
		||||
=========
 | 
			
		||||
 
 | 
			
		||||
@@ -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]
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user