From 7a6ac6dbccd8bb7268389cd4ed4f891614f35341 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Ignacio=20Torres?= Date: Sun, 24 Feb 2019 23:31:00 -0400 Subject: [PATCH 1/2] Fix XAMPP docs .htaccess code samples --- docs/setup_alternatives/xampp.md | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/docs/setup_alternatives/xampp.md b/docs/setup_alternatives/xampp.md index 58746e1106..b0f8df25c7 100644 --- a/docs/setup_alternatives/xampp.md +++ b/docs/setup_alternatives/xampp.md @@ -26,9 +26,9 @@ * Add the api url to your hosts file \(127.0.0.1 api.ushahidi.test\) * Add this file platform/httpdocs/.htaccess: - \`\`\` + ``` - **Turn on URL rewriting** +## Turn on URL rewriting RewriteEngine On @@ -54,10 +54,11 @@ RewriteCond %{REQUEST\_FILENAME} !-f RewriteCond %{REQUEST\_FILENAME} !-d RewriteRule .\* index.php/$0 \[PT\] -```text -- Add this file platform/.htaccess ``` +* Add this file platform/.htaccess + +``` ## Turn on URL rewriting RewriteEngine On @@ -74,15 +75,16 @@ Order Deny,Allow Deny From All RewriteRule .\* httpdocs/$0 \[PT\] -```text -- In your httpd.conf file (open xampp => config -> httpd.conf) , add this virtualhost ``` +* In your httpd.conf file (open xampp => config -> httpd.conf) , add this virtualhost + +``` ServerAdmin webmaster@localhost DocumentRoot "C:/newxamp/htdocs/platform" ServerName ushahidi.api.test AllowOverride all </VirtualHost> -\`\`\` +``` * You're all done. You should be able to access api.ushahidi.test now and see the default API response From e15115d8452f4f40e41880503f18380fb6ac664a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Ignacio=20Torres?= Date: Sun, 24 Feb 2019 23:34:06 -0400 Subject: [PATCH 2/2] Fix wrongly parsed special symbols --- docs/setup_alternatives/xampp.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/setup_alternatives/xampp.md b/docs/setup_alternatives/xampp.md index b0f8df25c7..57874de890 100644 --- a/docs/setup_alternatives/xampp.md +++ b/docs/setup_alternatives/xampp.md @@ -82,7 +82,7 @@ RewriteRule .\* httpdocs/$0 \[PT\] ``` ServerAdmin webmaster@localhost DocumentRoot "C:/newxamp/htdocs/platform" ServerName ushahidi.api.test -AllowOverride all </VirtualHost> +AllowOverride all ```