diff options
Diffstat (limited to 'docs')
-rw-r--r-- | docs/en/user/first_article.rst | 66 | ||||
-rw-r--r-- | docs/en/user/share.rst | 17 | ||||
-rw-r--r-- | docs/fr/user/installation.rst | 18 |
3 files changed, 18 insertions, 83 deletions
diff --git a/docs/en/user/first_article.rst b/docs/en/user/first_article.rst deleted file mode 100644 index 1400e1e8..00000000 --- a/docs/en/user/first_article.rst +++ /dev/null | |||
@@ -1,66 +0,0 @@ | |||
1 | Save your first article | ||
2 | ======================= | ||
3 | |||
4 | The main purpose of wallabag is to save web articles. You have many ways to do it. | ||
5 | |||
6 | .. note:: | ||
7 | |||
8 | A quickstart will be displayed in the application until you save your first article. | ||
9 | |||
10 | By using a bookmarklet | ||
11 | ---------------------- | ||
12 | |||
13 | On the ``Howto`` page, you have a ``Bookmarklet`` tab. Drag and drop the ``bag it!`` | ||
14 | link to your bookmarks bar of your browser. | ||
15 | |||
16 | Now, each time you're reading an article on the web and you want to save it, | ||
17 | click on the ``bag it!`` link in your bookmarks bar. The article is saved. | ||
18 | |||
19 | By using the classic form | ||
20 | ------------------------- | ||
21 | |||
22 | In the top bar of your screen, you have 3 icons. With the first one, a plus sign, | ||
23 | you can easily save a new article. | ||
24 | |||
25 | .. image:: ../../img/user/topbar.png | ||
26 | :alt: Top bar | ||
27 | :align: center | ||
28 | |||
29 | Click on it to display a new field, paste the article URL inside and press your | ||
30 | ``Return`` key. The article is saved. | ||
31 | |||
32 | By using a browser add-on | ||
33 | ------------------------- | ||
34 | |||
35 | Firefox | ||
36 | ~~~~~~~ | ||
37 | |||
38 | *This addon is not yet available for wallabag v2*. | ||
39 | |||
40 | Chrome | ||
41 | ~~~~~~ | ||
42 | |||
43 | *This addon is not yet available for wallabag v2*. | ||
44 | |||
45 | By using your smarphone application | ||
46 | ----------------------------------- | ||
47 | |||
48 | Android | ||
49 | ~~~~~~~ | ||
50 | |||
51 | *This application is not yet available for wallabag v2*. | ||
52 | |||
53 | Firefox OS | ||
54 | ~~~~~~~~~~ | ||
55 | |||
56 | *This application is not yet available for wallabag v2*. | ||
57 | |||
58 | Windows Phone | ||
59 | ~~~~~~~~~~~~~ | ||
60 | |||
61 | *This application is not yet available for wallabag v2*. | ||
62 | |||
63 | iOS | ||
64 | ~~~ | ||
65 | |||
66 | *This application is not yet available for wallabag v2*. | ||
diff --git a/docs/en/user/share.rst b/docs/en/user/share.rst deleted file mode 100644 index e99e51ab..00000000 --- a/docs/en/user/share.rst +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | Share articles | ||
2 | ============== | ||
3 | |||
4 | When you're reading an article, you can share it. Just click on the share button: | ||
5 | |||
6 | .. image:: ../../img/user/share.png | ||
7 | :alt: share article | ||
8 | :align: center | ||
9 | |||
10 | Now, you can share the article: | ||
11 | |||
12 | - with a public URL (you'll have a light view of the article) | ||
13 | - with a tweet | ||
14 | - into your Shaarli | ||
15 | - with a post in Diaspora* | ||
16 | - to Carrot | ||
17 | - with an email | ||
diff --git a/docs/fr/user/installation.rst b/docs/fr/user/installation.rst index 9ef5ee98..319735af 100644 --- a/docs/fr/user/installation.rst +++ b/docs/fr/user/installation.rst | |||
@@ -147,6 +147,24 @@ En imaginant que vous vouliez installer wallabag dans le dossier ``/var/www/wall | |||
147 | CustomLog /var/log/apache2/wallabag_access.log combined | 147 | CustomLog /var/log/apache2/wallabag_access.log combined |
148 | </VirtualHost> | 148 | </VirtualHost> |
149 | 149 | ||
150 | .. tip:: Pour Apache 2.4, dans la section `<Directory /var/www/wallabag/web>` vous devez remplacer les directives suivantes : | ||
151 | |||
152 | :: | ||
153 | |||
154 | AllowOverride None | ||
155 | Order Allow,Deny | ||
156 | Allow from All | ||
157 | |||
158 | |||
159 | par | ||
160 | |||
161 | :: | ||
162 | |||
163 | Require All granted | ||
164 | |||
165 | |||
166 | |||
167 | |||
150 | Après que vous ayez rechargé/redémarré Apache, vous devriez pouvoir avoir accès à wallabag à l'adresse http://domain.tld. | 168 | Après que vous ayez rechargé/redémarré Apache, vous devriez pouvoir avoir accès à wallabag à l'adresse http://domain.tld. |
151 | 169 | ||
152 | Configuration avec Nginx | 170 | Configuration avec Nginx |