From: Daira Hopwood <daira@jacaranda.org>
Date: Mon, 20 Jul 2015 23:16:40 +0000 (+0100)
Subject: Change the separator character in the Magic Folder user interface design doc from... 
X-Git-Tag: allmydata-tahoe-1.10.2b1~10
X-Git-Url: https://git.rkrishnan.org/Site/Content/Exhibitors/htmlfontify-example.html?a=commitdiff_plain;h=8cad9f4fd60a96845e0ca530f2f19521ecfd6574;p=tahoe-lafs%2Ftahoe-lafs.git

Change the separator character in the Magic Folder user interface design doc from '|' to '+'.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
---

diff --git a/docs/proposed/magic-folder/user-interface-design.rst b/docs/proposed/magic-folder/user-interface-design.rst
index ce428b87..0d9af05d 100644
--- a/docs/proposed/magic-folder/user-interface-design.rst
+++ b/docs/proposed/magic-folder/user-interface-design.rst
@@ -139,14 +139,14 @@ For "``tahoe magic-folder invite COLLECTIVE_WRITECAP NICKNAME``" :
 2. Diminish ``CLIENT_WRITECAP`` to ``CLIENT_READCAP``, and
    diminish ``COLLECTIVE_WRITECAP`` to ``COLLECTIVE_READCAP``.
 3. Run "``tahoe ln CLIENT_READCAP COLLECTIVE_WRITECAP/NICKNAME``".
-4. Print "``COLLECTIVE_READCAP|CLIENT_WRITECAP``" as the invitation,
+4. Print "``COLLECTIVE_READCAP+CLIENT_WRITECAP``" as the invitation,
    accompanied by instructions on how to accept the invitation and
    the need to send it over a secure channel.
 
 
 For "``tahoe magic-folder join INVITATION LOCAL_DIR``" :
 
-1. Parse ``INVITATION`` as ``COLLECTIVE_READCAP|CLIENT_WRITECAP``.
+1. Parse ``INVITATION`` as ``COLLECTIVE_READCAP+CLIENT_WRITECAP``.
 2. Write ``CLIENT_WRITECAP`` to the file ``magic_folder_dircap``
    under the client's ``private`` directory.
 3. Write ``COLLECTIVE_READCAP`` to the file ``collective_dircap``