From 6c270b363ac018dfd4d66b23af95efcc35610da0 Mon Sep 17 00:00:00 2001 From: mathieui Date: Sun, 21 Aug 2016 00:20:17 +0200 Subject: Update the tls warning doc and remove the image --- doc/source/images/ssl_warning.png | Bin 1307 -> 0 bytes doc/source/misc/ssl.rst | 11 ++++------- doc/source/usage.rst | 2 ++ 3 files changed, 6 insertions(+), 7 deletions(-) delete mode 100644 doc/source/images/ssl_warning.png (limited to 'doc') diff --git a/doc/source/images/ssl_warning.png b/doc/source/images/ssl_warning.png deleted file mode 100644 index 8607ec14..00000000 Binary files a/doc/source/images/ssl_warning.png and /dev/null differ diff --git a/doc/source/misc/ssl.rst b/doc/source/misc/ssl.rst index dd18ef12..ac123b47 100644 --- a/doc/source/misc/ssl.rst +++ b/doc/source/misc/ssl.rst @@ -60,20 +60,17 @@ connections. If you are paranoid (or run poezio for the first time in an unsafe environment), you can set the :term:`certificate` value of your config file yourself -(the hash, not colon-separated). +(the hash, colon-separated). -If the certificate is not the same, poezio will show an error message and wait +If the certificate is not the same, poezio will open a :ref:`confirmtab` and wait for confirmation: -.. figure:: ../images/ssl_warning.png +.. figure:: ../images/cert_warning.png :alt: Warning message -If you press y, the change is validated an poezio will match the next certs -with the accepted one. +If you refuse, you will be disconnected. -If you press n, you will get the confirmation that the change has been -refused, and you will be disconnected. CA-Based -------- diff --git a/doc/source/usage.rst b/doc/source/usage.rst index d60ded15..d74db5ed 100644 --- a/doc/source/usage.rst +++ b/doc/source/usage.rst @@ -241,6 +241,8 @@ use ``Enter`` or ``j`` to join the selected room. You can sort the rooms by moving the direction arrows (``←`` or ``→``) and pressing ``Space`` when you are on the appropriate column. +.. _confirmtab: + Confirm tab ~~~~~~~~~~~ -- cgit v1.2.3