(no commit message)

diff --git a/doc/index.html b/doc/index.html
index f472ea9..80c9f14 100644 (file)
--- a/doc/index.html
+++ b/doc/index.html
@@ -750,8 +750,154 @@ asciidoc.install(2);
 </div>\r
 </div>\r
 <div class="sect1">\r
-<h2 id="_download_sources">1. Download sources</h2>\r
+<h2 id="_installation_from_sources">1. Installation from sources</h2>\r
 <div class="sectionbody">\r
+<div class="sect2">\r
+<h3 id="_build_prerequisites">1.1. Build prerequisites</h3>\r
+<div class="paragraph"><p>To compile PRSS, the following librairies and tools must be installed:</p></div>\r
+<div class="ulist"><ul>\r
+<li>\r
+<p>\r
+asciidoc\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+autoconf\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+automake\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+autopoint\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+cppcheck\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+gettext\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+help2man\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+CURL library\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+GConf2 library\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+GTK+ 3 library\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+JSON-C library\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+GTK+ Webkit 2 library\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+perl\r
+</p>\r
+</li>\r
+</ul></div>\r
+<div class="paragraph"><p>For Ubuntu 13.04, the following list of packages must be installed:</p></div>\r
+<div class="ulist"><ul>\r
+<li>\r
+<p>\r
+asciidoc\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+autoconf\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+automake\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+autopoint\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+debhelper\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+cppcheck\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+gettext\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+help2man\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+libcurl4-gnutls-dev\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+libgconf2-dev\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+libgtk-3-dev\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+libjson0-dev\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+libwebkitgtk-3.0-dev\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+perl\r
+</p>\r
+</li>\r
+</ul></div>\r
+</div>\r
+<div class="sect2">\r
+<h3 id="_download_sources">1.2. Download sources</h3>\r
 <div class="paragraph"><p>Download a source archive from <a href="http://wpitchoune.net/prss/files">http://wpitchoune.net/prss/files</a> or\r
 checkout the last development sources from the repository:</p></div>\r
 <div class="listingblock">\r
@@ -759,10 +905,8 @@ checkout the last development sources from the repository:</p></div>
 <pre><tt>svn co http://wpitchoune.net/svnpub/prss/trunk</tt></pre>\r
 </div></div>\r
 </div>\r
-</div>\r
-<div class="sect1">\r
-<h2 id="_installation_from_source_archive">2. Installation from source archive</h2>\r
-<div class="sectionbody">\r
+<div class="sect2">\r
+<h3 id="_compilation_and_installation_of_prss">1.3. Compilation and installation of PRSS</h3>\r
 <div class="paragraph"><p>In the directory of the sources:</p></div>\r
 <div class="listingblock">\r
 <div class="content">\r
@@ -772,8 +916,9 @@ sudo make install</tt></pre>
 </div></div>\r
 </div>\r
 </div>\r
+</div>\r
 <div class="sect1">\r
-<h2 id="_ubuntu_installation_using_ppa">3. Ubuntu: Installation Using PPA</h2>\r
+<h2 id="_installation_from_ppa">2. Installation from PPA</h2>\r
 <div class="sectionbody">\r
 <div class="listingblock">\r
 <div class="content">\r
@@ -783,11 +928,22 @@ sudo apt-get install</tt></pre>
 </div></div>\r
 </div>\r
 </div>\r
+<div class="sect1">\r
+<h2 id="_configuration">3. Configuration</h2>\r
+<div class="sectionbody">\r
+<div class="paragraph"><p>Open the web interface of Tiny Tiny RSS, login, open the preferences,\r
+set <tt>Enable external API</tt> to <tt>Yes</tt> and click on the button <tt>Save\r
+configuration</tt>.</p></div>\r
+<div class="paragraph"><p>Launch PRSS, click on the button <em>Preferences</em> in the toolbar, set\r
+the <tt>URL</tt> to <tt>http://server_hostname/tt-rss</tt>, and set the login and\r
+password fields.</p></div>\r
+</div>\r
+</div>\r
 </div>\r
 <div id="footnotes"><hr /></div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 2013-05-01 17:20:56 CEST\r
+Last updated 2013-05-03 10:49:00 CEST\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/doc/index.txt b/doc/index.txt
index 4d07b83..1cb2c84 100644 (file)
--- a/doc/index.txt
+++ b/doc/index.txt
@@ -3,8 +3,48 @@ PRSS
 
 PRSS is a GTK+ client application for Tiny Tiny RSS.
 
+Installation from sources
+-------------------------
+
+Build prerequisites
+~~~~~~~~~~~~~~~~~~~
+
+To compile PRSS, the following librairies and tools must be installed:
+
+ * asciidoc
+ * autoconf
+ * automake
+ * autopoint
+ * cppcheck
+ * gettext
+ * help2man
+ * CURL library
+ * GConf2 library
+ * GTK+ 3 library
+ * JSON-C library
+ * GTK+ Webkit 2 library
+ * perl
+
+For Ubuntu 13.04, the following list of packages must be installed:
+
+ * asciidoc
+ * autoconf
+ * automake
+ * autopoint
+ * debhelper
+ * cppcheck
+ * gettext
+ * help2man
+ * libcurl4-gnutls-dev
+ * libgconf2-dev
+ * libgtk-3-dev
+ * libjson0-dev
+ * libwebkitgtk-3.0-dev
+ * perl
+
+
 Download sources
-----------------
+~~~~~~~~~~~~~~~~
 
 Download a source archive from http://wpitchoune.net/prss/files or
 checkout the last development sources from the repository:
@@ -12,22 +52,33 @@ checkout the last development sources from the repository:
 svn co http://wpitchoune.net/svnpub/prss/trunk
 -----------------------------
 
-Installation from source archive
---------------------------------
+Compilation and installation of PRSS
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 In the directory of the sources:
+
 -----------------------------
 ./configure
 make clean all
 sudo make install
 -----------------------------
 
-Ubuntu: Installation Using PPA
-------------------------------
-
+Installation from PPA
+---------------------
 
 ------------------------------
 sudo apt-add-repository ppa:jfi/prss
 sudo apt-get update
 sudo apt-get install
 ------------------------------
+
+Configuration
+-------------
+
+Open the web interface of Tiny Tiny RSS, login, open the preferences,
+set +Enable external API+ to +Yes+ and click on the button +Save
+configuration+.
+
+Launch PRSS, click on the button 'Preferences' in the toolbar, set
+the +URL+ to +http://server_hostname/tt-rss+, and set the login and
+password fields.

diff --git a/po/fr.gmo b/po/fr.gmo
index 09a7ff7..188b2d4 100644 (file)
Binary files a/po/fr.gmo and b/po/fr.gmo differ

diff --git a/po/fr.po b/po/fr.po
index e1737bc..099fd87 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ptask\n"
 "Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2013-05-01 16:56+0200\n"
+"POT-Creation-Date: 2013-05-03 10:27+0200\n"
 "PO-Revision-Date: 2012-05-13 18:15+0000\n"
 "Last-Translator: jeanfi <Unknown>\n"
 "Language-Team: French <>\n"
@@ -24,7 +24,7 @@ msgstr ""
 msgid "Cannot open log file: %s"
 msgstr ""
 
-#: src/main.c:68
+#: src/main.c:69
 #, c-format
 msgid ""
 "Copyright (C) %s jeanfi@gmail.com\n"
@@ -34,63 +34,63 @@ msgid ""
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
-#: src/main.c:79
+#: src/main.c:80
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr ""
 
-#: src/main.c:81
+#: src/main.c:82
 msgid "Prss is a GTK+ news reader for tt-rss."
 msgstr ""
 
-#: src/main.c:84
+#: src/main.c:85
 #, fuzzy
 msgid "Options:"
 msgstr "Description:"
 
-#: src/main.c:85
+#: src/main.c:86
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit"
 msgstr ""
 
-#: src/main.c:88
+#: src/main.c:89
 msgid "  -d, --debug=LEVEL   set the debug level, integer between 0 and 3"
 msgstr ""
 
-#: src/main.c:93
+#: src/main.c:94
 #, c-format
 msgid "Report bugs to: %s\n"
 msgstr ""
 
-#: src/main.c:95
+#: src/main.c:96
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr ""
 
-#: src/main.c:466
+#: src/main.c:471
 msgid "PRSS is a GTK+ client application for Tiny Tiny RSS"
 msgstr ""
 
-#: src/main.c:468
+#: src/main.c:473
 msgid ""
 "Copyright(c) 2010-2013\n"
 "jeanfi@gmail.com"
 msgstr ""
 
-#: src/main.c:471
+#: src/main.c:476
 msgid "About PRSS"
 msgstr ""
 
-#: src/main.c:474
+#: src/main.c:479
 msgid "PRSS Homepage"
 msgstr ""
 
-#: src/main.c:521
+#: src/main.c:526
 msgid "Enables debug mode."
 msgstr ""
 
-#: src/main.c:536
+#: src/main.c:541
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""

diff --git a/po/prss.pot b/po/prss.pot
index 6cc465e..f995e0c 100644 (file)
--- a/po/prss.pot
+++ b/po/prss.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2013-05-01 16:56+0200\n"
+"POT-Creation-Date: 2013-05-03 10:27+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,7 +22,7 @@ msgstr ""
 msgid "Cannot open log file: %s"
 msgstr ""
 
-#: src/main.c:68
+#: src/main.c:69
 #, c-format
 msgid ""
 "Copyright (C) %s jeanfi@gmail.com\n"
@@ -32,62 +32,62 @@ msgid ""
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
-#: src/main.c:79
+#: src/main.c:80
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr ""
 
-#: src/main.c:81
+#: src/main.c:82
 msgid "Prss is a GTK+ news reader for tt-rss."
 msgstr ""
 
-#: src/main.c:84
+#: src/main.c:85
 msgid "Options:"
 msgstr ""
 
-#: src/main.c:85
+#: src/main.c:86
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit"
 msgstr ""
 
-#: src/main.c:88
+#: src/main.c:89
 msgid "  -d, --debug=LEVEL   set the debug level, integer between 0 and 3"
 msgstr ""
 
-#: src/main.c:93
+#: src/main.c:94
 #, c-format
 msgid "Report bugs to: %s\n"
 msgstr ""
 
-#: src/main.c:95
+#: src/main.c:96
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr ""
 
-#: src/main.c:466
+#: src/main.c:471
 msgid "PRSS is a GTK+ client application for Tiny Tiny RSS"
 msgstr ""
 
-#: src/main.c:468
+#: src/main.c:473
 msgid ""
 "Copyright(c) 2010-2013\n"
 "jeanfi@gmail.com"
 msgstr ""
 
-#: src/main.c:471
+#: src/main.c:476
 msgid "About PRSS"
 msgstr ""
 
-#: src/main.c:474
+#: src/main.c:479
 msgid "PRSS Homepage"
 msgstr ""
 
-#: src/main.c:521
+#: src/main.c:526
 msgid "Enables debug mode."
 msgstr ""
 
-#: src/main.c:536
+#: src/main.c:541
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""