diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-11-19 15:30:49 +0100 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-11-19 15:30:49 +0100 |
commit | 68003139e133835805b143b62c4407f19b495dab (patch) | |
tree | 9a71a15d021330fb6d55cc338f125161ddfc61dd /docs/fr/user/share.rst | |
parent | bbd4ae7b56d9db744482a5630abad350f2d819af (diff) | |
parent | cb1a6590c0e58c56d0612066501b3a586b103ed5 (diff) | |
download | wallabag-68003139e133835805b143b62c4407f19b495dab.tar.gz wallabag-68003139e133835805b143b62c4407f19b495dab.tar.zst wallabag-68003139e133835805b143b62c4407f19b495dab.zip |
Merge remote-tracking branch 'origin/master' into 2.2
# Conflicts:
# .editorconfig
# docs/de/index.rst
# docs/de/user/import.rst
# docs/en/index.rst
# docs/en/user/configuration.rst
# docs/en/user/import.rst
# docs/fr/index.rst
# docs/fr/user/import.rst
# src/Wallabag/CoreBundle/Command/InstallCommand.php
# src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
# src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
# web/bundles/wallabagcore/themes/baggy/css/style.min.css
# web/bundles/wallabagcore/themes/baggy/js/baggy.min.js
# web/bundles/wallabagcore/themes/material/css/style.min.css
# web/bundles/wallabagcore/themes/material/js/material.min.js
Diffstat (limited to 'docs/fr/user/share.rst')
-rw-r--r-- | docs/fr/user/share.rst | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/docs/fr/user/share.rst b/docs/fr/user/share.rst deleted file mode 100644 index b5faa5ba..00000000 --- a/docs/fr/user/share.rst +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | Partager des articles | ||
2 | ===================== | ||
3 | |||
4 | Quand vous lisez un article, vous pouvez le partager. Cliquez sur le bouton de partage : | ||
5 | |||
6 | .. image:: ../../img/user/share.png | ||
7 | :alt: partager un article | ||
8 | :align: center | ||
9 | |||
10 | Vous pouvez maintenant le partager : | ||
11 | |||
12 | - avec une URL publique (vous obtiendrez une vue allégée de l'article) | ||
13 | - avec un tweet | ||
14 | - dans votre Shaarli | ||
15 | - avec un message dans Diaspora* | ||
16 | - sur Carrot | ||
17 | - avec un email | ||