diff options
Diffstat (limited to 'docs/en/user')
-rw-r--r-- | docs/en/user/configuring_mobile.rst | 13 | ||||
-rw-r--r-- | docs/en/user/first_article.rst | 66 | ||||
-rw-r--r-- | docs/en/user/installation.rst | 17 | ||||
-rw-r--r-- | docs/en/user/share.rst | 17 |
4 files changed, 30 insertions, 83 deletions
diff --git a/docs/en/user/configuring_mobile.rst b/docs/en/user/configuring_mobile.rst new file mode 100644 index 00000000..7229aed6 --- /dev/null +++ b/docs/en/user/configuring_mobile.rst | |||
@@ -0,0 +1,13 @@ | |||
1 | Configuring mobile apps to work with wallabag | ||
2 | ============================================= | ||
3 | |||
4 | Steps to configure the app | ||
5 | -------------------------- | ||
6 | |||
7 | - First *create a new client* in the ``API clients management`` section. The name of your app doesn't matter as much as the ``Client ID`` and the ``Client secret``. Write these two values down. | ||
8 | - When you download a mobile app, it's going to ask for the server address of the hosted wallabag instance. For example, with wallabag.it that is: ``https://app.wallabag.it``. | ||
9 | - It's also going to ask for the aforementioned ``Client ID`` and ``secret``. Please insert those in the text fields, when asked. | ||
10 | - Lastly you need to provide your ``username`` and ``password``. These are the same credentials you use to login in to wallabag. | ||
11 | |||
12 | Please also have a look at `Android <android.html>`_ page. Especially the section on *known limitations*. | ||
13 | |||
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/installation.rst b/docs/en/user/installation.rst index 7d3bcf61..7fb81aeb 100644 --- a/docs/en/user/installation.rst +++ b/docs/en/user/installation.rst | |||
@@ -149,6 +149,23 @@ Assuming you install wallabag in the ``/var/www/wallabag`` folder and that you w | |||
149 | ErrorLog /var/log/apache2/wallabag_error.log | 149 | ErrorLog /var/log/apache2/wallabag_error.log |
150 | CustomLog /var/log/apache2/wallabag_access.log combined | 150 | CustomLog /var/log/apache2/wallabag_access.log combined |
151 | </VirtualHost> | 151 | </VirtualHost> |
152 | |||
153 | |||
154 | .. tip:: Note for Apache 2.4, in the section `<Directory /var/www/wallabag/web>` you have to replace the directives : | ||
155 | |||
156 | :: | ||
157 | |||
158 | AllowOverride None | ||
159 | Order Allow,Deny | ||
160 | Allow from All | ||
161 | |||
162 | |||
163 | by | ||
164 | |||
165 | :: | ||
166 | |||
167 | Require All granted | ||
168 | |||
152 | 169 | ||
153 | After reloading or restarting Apache, you should now be able to access wallabag at http://domain.tld. | 170 | After reloading or restarting Apache, you should now be able to access wallabag at http://domain.tld. |
154 | 171 | ||
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 | ||