Merge pull request #1967 from wallabag/add-faq-documentation

Add FAQ page in documentation

diff --git a/docs/en/index.rst b/docs/en/index.rst
index 87b62121a167cd37af55419dc17c5e99c2582ada..34ec79992e83f104276bbf774faf30e7976211f6 100644 (file)
--- a/docs/en/index.rst
+++ b/docs/en/index.rst
@@ -23,6 +23,7 @@ The main documentation for this application is organized into a couple sections:
    :maxdepth: 2
    :caption: User documentation
 
+   user/faq
    user/installation
    user/migration
    user/create_account

diff --git a/docs/en/user/faq.rst b/docs/en/user/faq.rst
new file mode 100644 (file)
index 0000000..04fb25e
--- /dev/null
+++ b/docs/en/user/faq.rst
@@ -0,0 +1,10 @@
+Frequently Asked Questions
+==========================
+
+During the installation, I've got this error ``Error Output: sh: 1: @post-cmd: not found``
+------------------------------------------------------------------------------------------
+
+It seems you have a problem with your ``composer`` installation. Try to uninstall and reinstall it.
+
+`Read the documentation about composer to know how to install it
+<https://getcomposer.org/doc/00-intro.md>`__.

diff --git a/docs/fr/index.rst b/docs/fr/index.rst
index 628c62a5bfcec0ad567b104a65ae9e5ae1c2865d..29237721c1a5283194ecc00a35f6f102ad5a7e0f 100644 (file)
--- a/docs/fr/index.rst
+++ b/docs/fr/index.rst
@@ -24,6 +24,7 @@ La documentation principale de cette application est découpée en plusieurs sec
    :maxdepth: 2
    :caption: Documentation utilisateur
 
+   user/faq
    user/installation
    user/migration
    user/create_account

diff --git a/docs/fr/user/faq.rst b/docs/fr/user/faq.rst
new file mode 100644 (file)
index 0000000..f5ae277
--- /dev/null
+++ b/docs/fr/user/faq.rst
@@ -0,0 +1,10 @@
+Foire Aux Questions
+===================
+
+Durant l'installation, je rencontre cette erreur ``Error Output: sh: 1: @post-cmd: not found``
+----------------------------------------------------------------------------------------------
+
+Il semblerait que vous ayiez un problème avec votre installation de ``composer``. Essayez de le désinstaller puis de le réinstaller.
+
+`Vous pouvez lire la documentation de composer pour savoir comment l'installer
+<https://getcomposer.org/doc/00-intro.md>`__.