summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorPatrick Totzke <patricktotzke@gmail.com>2013-06-02 20:48:40 +0100
committerPatrick Totzke <patricktotzke@gmail.com>2013-06-02 20:48:40 +0100
commitd7d481aaab924db20112cd58f984bba6cd13298a (patch)
tree30a5c6ec73dcba844f51d6335688ff38b332a82e /docs
parentf84e34f5989313a715256327aa048f025b6a42be (diff)
doc: move crypto docs to usage section
Diffstat (limited to 'docs')
-rw-r--r--docs/source/index.rst1
-rw-r--r--docs/source/usage/commands.rst3
-rw-r--r--docs/source/usage/crypto.rst (renamed from docs/source/crypto/index.rst)4
-rw-r--r--docs/source/usage/index.rst12
4 files changed, 12 insertions, 8 deletions
diff --git a/docs/source/index.rst b/docs/source/index.rst
index 323bec4c..d383dad5 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -14,7 +14,6 @@ User Manual
installation
usage/index
configuration/index
- crypto/index
api/index
faq
diff --git a/docs/source/usage/commands.rst b/docs/source/usage/commands.rst
index 6fa99b58..a3855b21 100644
--- a/docs/source/usage/commands.rst
+++ b/docs/source/usage/commands.rst
@@ -1,6 +1,3 @@
-Commands
-========
-
Alot interprets user input as command line strings given via its prompt
or :ref:`bound to keys <config.key_bindings>` in the config.
Command lines are semi-colon separated command strings, each of which
diff --git a/docs/source/crypto/index.rst b/docs/source/usage/crypto.rst
index 7553f668..b656078d 100644
--- a/docs/source/crypto/index.rst
+++ b/docs/source/usage/crypto.rst
@@ -1,7 +1,3 @@
-************
-Cryptography
-************
-
Alot has built in support for constructing signed and/or encrypted mails
according to PGP/MIME (:rfc:`3156`, :rfc:`3156`) via gnupg.
It does however rely on a running `gpg-agent` to handle password entries.
diff --git a/docs/source/usage/index.rst b/docs/source/usage/index.rst
index 224f831a..6520fb05 100644
--- a/docs/source/usage/index.rst
+++ b/docs/source/usage/index.rst
@@ -12,13 +12,25 @@ First Steps
.. _usage.first_steps:
.. include:: first_steps.rst
+
+Commands
+========
+
.. _usage.commands:
.. include:: commands.rst
+
+Cryptography
+============
+
+.. _usage.crypto:
+.. include:: crypto.rst
+
.. toctree::
:hidden:
commands
first_steps
synopsis
+ crypto