1 files changed, 9 insertions, 8 deletions
diff --git a/docs/en/User_documentation/Download_and_install.html b/docs/en/User_documentation/Download_and_install.html
index 5ed5ce36..5ee9221f 100644
--- a/docs/en/User_documentation/Download_and_install.html
+++ b/docs/en/User_documentation/Download_and_install.html
@@ -5,7 +5,7 @@
 <!--[if gt IE 8]><!-->  <html class="no-js" lang="en"> <!--<![endif]-->
 <head>
    <title>Download and install</title>
-    <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+    <meta charset="utf-8">
    <meta name="description" content="Documentation for wallabag" />
    <meta name="author" content="Nicolas Lœuillet">
    <link rel="icon" href="../../templates/default/themes/daux-blue/img/favicon-blue.png" type="image/x-icon">
@@ -14,7 +14,7 @@
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <!-- Font -->
-    <link href='//fonts.googleapis.com/css?family=Roboto+Slab:400,100,300,700&subset=latin,cyrillic-ext,cyrillic' rel='stylesheet' type='text/css'>
+    
    <!-- CSS -->
    <link href='../../templates/default/themes/daux-blue/css/daux-blue.css' rel='stylesheet' type='text/css'>
 </head>
@@ -39,7 +39,7 @@
                    </div>
                    <div id="sub-nav-collapse" class="sub-nav-collapse">
                        <!-- Navigation -->
-                        <ul class="nav nav-list"><li><a href="../../en/Getting_started.html">Getting started</a></li><li><a href="../../en/Help_wallabag.html">Help wallabag</a></li><li class="open"><a href="#" class="aj-nav folder">User documentation</a><ul class="nav nav-list"><li class="active"><a href="../../en/User_documentation/Download_and_install.html">Download and install</a></li><li><a href="../../en/User_documentation/Save_your_first_article.html">Save your first article</a></li><li><a href="../../en/User_documentation/Hidden_options.html">Hidden options</a></li></ul></li><li><a href="#" class="aj-nav folder">Technical documentation</a><ul class="nav nav-list"></ul></li></ul>                                                    <div class="well well-sidebar">
+                        <ul class="nav nav-list"><li><a href="../../en/Getting_started.html">Getting started</a></li><li><a href="../../en/Help_wallabag.html">Help wallabag</a></li><li class="open"><a href="#" class="aj-nav folder">User documentation</a><ul class="nav nav-list"><li class="active"><a href="../../en/User_documentation/Download_and_install.html">Download and install</a></li><li><a href="../../en/User_documentation/Save_your_first_article.html">Save your first article</a></li><li><a href="../../en/User_documentation/Configure_wallabag.html">Configure wallabag</a></li><li><a href="../../en/User_documentation/Hidden_options.html">Hidden options</a></li></ul></li></ul>                                                    <div class="well well-sidebar">
                                <!-- Links -->
                                <a href="https://www.wallabag.org/downloads" target="_blank">Download</a><br><a href="https://github.com/wallabag/wallabag" target="_blank">GitHub Repo</a><br><a href="http://support.wallabag.org" target="_blank">Help</a><br><a href="https://github.com/wallabag/documentation/graphs/contributors" target="_blank">Documentation contributors</a><br>                                
@@ -51,11 +51,11 @@
                    <div class="content-page">
                        <article>
                                                            <div class="page-header sub-header clearfix">
-                                    <h1>Download and install                                                                            </h1>
+                                    <h1>Download and install                                                                                <a href="https://github.com/wallabag/documentation/blob/master/en/02_User_documentation/02_Download_and_install.md" class="btn">Fix this page</a>                                    </h1>
                                    <span style="float: left; font-size: 10px; color: gray;">
-                                        Friday, October 31, 2014                                    </span>
+                                        Sunday, November 16, 2014                                    </span>
                                    <span style="float: right; font-size: 10px; color: gray;">
-                                        6:13 AM                                    </span>
+                                        9:22 PM                                    </span>
                                </div>
                            
                            <h2>I don't want to install wallabag</h2>
@@ -84,11 +84,12 @@ php composer.phar install</code></pre>
 <p>Your web server needs a writing access in <code>assets</code>, <code>cache</code> and <code>db</code> directory. Otherwise, a message will report that the installation is impossible.</p>
 <h2>Installation of wallabag. At last.</h2>
 <p>Access to wallabag from your web browser. If your server is correctly configured, you reach the setup screen.  </p>
-<p>Fill your database type (<code>sqlite</code>, <code>mysql</code> ou <code>postgresql</code>) and finally the information for your user account.</p>
+<p>Fill your database type (<code>sqlite</code>, <code>mysql</code> or <code>postgresql</code>) and finally the information for your user account.</p>
 <p>wallabag is now installed. </p>
 <h2>Login</h2>
 <p>From your web browser, you reach the login screen : fill your username and your password to connect to your account.</p>
-<p>Enjoy!</p>                                                    </article>
+<p>Enjoy!</p>                            
+                        </article>
                    </div>
                </div>
            </div>

diff --git a/docs/en/User_documentation/Download_and_install.html b/docs/en/User_documentation/Download_and_install.html index 5ed5ce36..5ee9221f 100644 --- a/docs/en/User_documentation/Download_and_install.html +++ b/docs/en/User_documentation/Download_and_install.html
@@ -5,7 +5,7 @@
5	<!--[if gt IE 8]><!--> <html class="no-js" lang="en"> <!--<![endif]-->	5	<!--[if gt IE 8]><!--> <html class="no-js" lang="en"> <!--<![endif]-->
6	<head>	6	<head>
7	<title>Download and install</title>	7	<title>Download and install</title>
8	<meta http-equiv="content-type" content="text/html; charset=UTF-8">	8	<meta charset="utf-8">
9	<meta name="description" content="Documentation for wallabag" />	9	<meta name="description" content="Documentation for wallabag" />
10	<meta name="author" content="Nicolas Lœuillet">	10	<meta name="author" content="Nicolas Lœuillet">
11	<link rel="icon" href="../../templates/default/themes/daux-blue/img/favicon-blue.png" type="image/x-icon">	11	<link rel="icon" href="../../templates/default/themes/daux-blue/img/favicon-blue.png" type="image/x-icon">
@@ -14,7 +14,7 @@
14	<meta name="viewport" content="width=device-width, initial-scale=1.0">	14	<meta name="viewport" content="width=device-width, initial-scale=1.0">
15		15
16	<!-- Font -->	16	<!-- Font -->
17	<link href='//fonts.googleapis.com/css?family=Roboto+Slab:400,100,300,700&subset=latin,cyrillic-ext,cyrillic' rel='stylesheet' type='text/css'>	17
18	<!-- CSS -->	18	<!-- CSS -->
19	<link href='../../templates/default/themes/daux-blue/css/daux-blue.css' rel='stylesheet' type='text/css'>	19	<link href='../../templates/default/themes/daux-blue/css/daux-blue.css' rel='stylesheet' type='text/css'>
20	</head>	20	</head>
@@ -39,7 +39,7 @@
39	</div>	39	</div>
40	<div id="sub-nav-collapse" class="sub-nav-collapse">	40	<div id="sub-nav-collapse" class="sub-nav-collapse">
41	<!-- Navigation -->	41	<!-- Navigation -->
42	<ul class="nav nav-list"><li><a href="../../en/Getting_started.html">Getting started</a></li><li><a href="../../en/Help_wallabag.html">Help wallabag</a></li><li class="open"><a href="#" class="aj-nav folder">User documentation</a><ul class="nav nav-list"><li class="active"><a href="../../en/User_documentation/Download_and_install.html">Download and install</a></li><li><a href="../../en/User_documentation/Save_your_first_article.html">Save your first article</a></li><li><a href="../../en/User_documentation/Hidden_options.html">Hidden options</a></li></ul></li><li><a href="#" class="aj-nav folder">Technical documentation</a><ul class="nav nav-list"></ul></li></ul> <div class="well well-sidebar">	42	<ul class="nav nav-list"><li><a href="../../en/Getting_started.html">Getting started</a></li><li><a href="../../en/Help_wallabag.html">Help wallabag</a></li><li class="open"><a href="#" class="aj-nav folder">User documentation</a><ul class="nav nav-list"><li class="active"><a href="../../en/User_documentation/Download_and_install.html">Download and install</a></li><li><a href="../../en/User_documentation/Save_your_first_article.html">Save your first article</a></li><li><a href="../../en/User_documentation/Configure_wallabag.html">Configure wallabag</a></li><li><a href="../../en/User_documentation/Hidden_options.html">Hidden options</a></li></ul></li></ul> <div class="well well-sidebar">
43		43
44	<!-- Links -->	44	<!-- Links -->
45	<a href="https://www.wallabag.org/downloads" target="_blank">Download</a><br><a href="https://github.com/wallabag/wallabag" target="_blank">GitHub Repo</a><br><a href="http://support.wallabag.org" target="_blank">Help</a><br><a href="https://github.com/wallabag/documentation/graphs/contributors" target="_blank">Documentation contributors</a><br>	45	<a href="https://www.wallabag.org/downloads" target="_blank">Download</a><br><a href="https://github.com/wallabag/wallabag" target="_blank">GitHub Repo</a><br><a href="http://support.wallabag.org" target="_blank">Help</a><br><a href="https://github.com/wallabag/documentation/graphs/contributors" target="_blank">Documentation contributors</a><br>
@@ -51,11 +51,11 @@
51	<div class="content-page">	51	<div class="content-page">
52	<article>	52	<article>
53	<div class="page-header sub-header clearfix">	53	<div class="page-header sub-header clearfix">
54	<h1>Download and install </h1>	54	<h1>Download and install <a href="https://github.com/wallabag/documentation/blob/master/en/02_User_documentation/02_Download_and_install.md" class="btn">Fix this page</a> </h1>
55	<span style="float: left; font-size: 10px; color: gray;">	55	<span style="float: left; font-size: 10px; color: gray;">
56	Friday, October 31, 2014 </span>	56	Sunday, November 16, 2014 </span>
57	<span style="float: right; font-size: 10px; color: gray;">	57	<span style="float: right; font-size: 10px; color: gray;">
58	6:13 AM </span>	58	9:22 PM </span>
59	</div>	59	</div>
60		60
61	<h2>I don't want to install wallabag</h2>	61	<h2>I don't want to install wallabag</h2>
@@ -84,11 +84,12 @@ php composer.phar install</code></pre>
84	<p>Your web server needs a writing access in <code>assets</code>, <code>cache</code> and <code>db</code> directory. Otherwise, a message will report that the installation is impossible.</p>	84	<p>Your web server needs a writing access in <code>assets</code>, <code>cache</code> and <code>db</code> directory. Otherwise, a message will report that the installation is impossible.</p>
85	<h2>Installation of wallabag. At last.</h2>	85	<h2>Installation of wallabag. At last.</h2>
86	<p>Access to wallabag from your web browser. If your server is correctly configured, you reach the setup screen. </p>	86	<p>Access to wallabag from your web browser. If your server is correctly configured, you reach the setup screen. </p>
87	<p>Fill your database type (<code>sqlite</code>, <code>mysql</code> ou <code>postgresql</code>) and finally the information for your user account.</p>	87	<p>Fill your database type (<code>sqlite</code>, <code>mysql</code> or <code>postgresql</code>) and finally the information for your user account.</p>
88	<p>wallabag is now installed. </p>	88	<p>wallabag is now installed. </p>
89	<h2>Login</h2>	89	<h2>Login</h2>
90	<p>From your web browser, you reach the login screen : fill your username and your password to connect to your account.</p>	90	<p>From your web browser, you reach the login screen : fill your username and your password to connect to your account.</p>
91	<p>Enjoy!</p> </article>	91	<p>Enjoy!</p>
		92	</article>
92	</div>	93	</div>
93	</div>	94	</div>
94	</div>	95	</div>