Merge branch 'master' of https://github.com/GilaCMS/docs

source/about.md

@@ -9,7 +9,7 @@ The website is [gilacms.com](http://gilacms.com)
 Gila CMS is a good option for self-hosted blogs or startup websites
 - Installs by default a blogging system with social integrations.
 - No coding skills are required to install or maintain the website
-- Themes that includes are responsive, that makes it accessible in all devices.
+- Themes that include are responsive, that makes it accessible in all devices.
 - It is fast, and compresses the content where it needs to.
 
 ### Spreading the word!
@@ -21,5 +21,5 @@ You can help us spread the word about Gila CMS! We would surely appreciate it!
 
 ### Where you can get help
 
-- Join [Slack](https://gilacms.slack.com) or [Discord](https://discord.gg/BGYFfx6)
+- Join [Slack](https://gilacms.slack.com) or [Gitter](https://gitter.im/GilaCMS/Lobby)
 - Ask on stackoverflow using the tag **gilacms**

source/conf.py

@@ -61,9 +61,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'1.3'
+version = u'1.7'
 # The full version, including alpha/beta/rc tags.
-release = u'24 Nov 2017'
+release = u'1.7.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

source/content.md

@@ -9,36 +9,38 @@ In the administration menu the Content option gives a submenu of the basic conte
 - [**Media**](#media)
 
 
-### Pages
+## Pages
 
 Pages are the basic content type. A page can be just a text or have media. The information of a page is independent of time so you want them to be found by the visitor in the same place, like on the menu of the website.
 
-![alt text](assets/pages.png)
+![Pages](assets/pages.png)
 Every page have four values:
 - **ID**: a unique identifier
 - **Title**: the title of the page
 - **Slug**: is the path of the page. For example the path of a page with title 'My Page' will be *mysite.com/my-page*
 - **Public**: an on/off flag. If Public value is off for 'My Page' then *mysite.com/my-page* wont be accessible from the browser.
 
 To **create a new page** click on button **New** that you see on the up-right corner of the table.
-![alt text](assets/new-page.png)
+![New Page](assets/new-page.png)
 
-### Posts
+
+## Posts
 
 The posts can be news or articles about your business or the interests of the website. They are organized in categories and are listed in chronological order.
-![alt text](assets/posts.png)
+![Posts](assets/posts.png)
 
 To **create a new post** click on button **New** that you see on the up-right corner of the table.
-![alt text](assets/new-post.png)
+![New Post](assets/new-post.png)
 
 
-### Categories
+## Categories
 
 Categories are used to categorize posts or maybe other popular content that you could use later.
 You only add or edit the names of the categories.
 
-### Media
+
+## Media
 
 Media are the images that you want to use for your posts. They are saved as files and not in the database like the other content types. The root directory of media is */assets*. The files and subfolders of */assets* are visible in the public by the path *mysite.com/assets* so you should not upload files or images that you don't want to be found from search engines.
 
-![alt text](assets/media.png)
+![Media](assets/media.png)

source/install.md

@@ -7,31 +7,40 @@ Before beginning with installation make sure that your web host or local server
 
 - Apache 2 server
 - MySQL / MariaDB server
-- PHP 5.4+ with the following extensions *mysqli, zip, mysqlnd, json* and *mod_rewrite* enabled
+- PHP 5.4+ with the following extensions *mysqli, zip, mysqlnd, json, gd* and *mod_rewrite* enabled
 
 If you want to install gila cms in your local machine and not sure how to prepare your server don't hesitate to ask for help on [Slack](https://gilacms.slack.com)
 
 First unzip gila in a public html folder e.g */var/www/html/gila* and make sure that the folder is writable from the application.
 
-In order to proceed with the installation, you will need your database settings. If you do not know your database settings, please contact your host and ask for them. You will not be able to continue without them. More precisely you need the database hostname, the database name, the database username and password.
+On nginx server you will need to configure the redirects in */etc/nginx/sites-enabled/default* [(issue #1)](https://github.com/GilaCMS/gila/issues/1)
+```
+location / {
+    index index.php index.html index.htm;
+    rewrite gila/(?!install)(?!src)(?!themes)(?!lib)(?!assets)(?!tmp)(?!robots.txt)(.*)$ /gila/index.php?url=$1 last;
+}
+```
+
+In order to proceed with the installation, you will need your **database settings**. If you do not know your database settings, please contact your host and ask for them. You will not be able to continue without them. More precisely you need the database hostname, the database name, the database username and password.
 
 ### Installer
 
-We access in installation page with the browser e.g *http://localhost/gila/install*
+We access in installation page with the browser e.g *http:\/\/localhost/gila/install*
 
 ![Install](assets/install.jpg)
 
 In the installation page we must fill all the fields
 
-**Hostname:** the hostname of the database, usually it is *localhost*
+- **Hostname:** the hostname of the database, usually it is *localhost*
+
+- **Database:** name of the database
 
-**Database:** name of the database
+- **DB Username, DB Password:** the username and the password in order to connect to the mysql
 
-**DB Username, DB Password:** the username and the password in order to connect to the mysql
+- **Admin Username, Admin Email, Admin Password:** a user will be created for the website as administrator with these data
 
-**Admin Username, Admin Email, Admin Password:** a user will be created for the website as administrator with these data
+- **Base Url:** the web address of the website must finish with '/' e.g. *mywebsite.com/*
 
-**Base Url:** the web address of the website must finish with '/' e.g. *mywebsite.com/*
 
 After filling the data and submit them, we wait a few seconds untill the installation is finished.