Revised move/rename/copy questions, now that these functions work.

2001-06-26  Aaron Weber  <aaron@ximian.com>

	* C/evolution-faq.sgml: Revised move/rename/copy questions, now
	that these functions work.

svn path=/trunk/; revision=10507

4 files changed, 26 insertions, 70 deletions

diff --git a/doc/C/evolution-faq.sgml b/doc/C/evolution-faq.sgml
index 1f784061de..d1a59e95be 100644
--- a/doc/C/evolution-faq.sgml
+++ b/doc/C/evolution-faq.sgml
@@ -59,27 +59,9 @@
 	</question>
 	<answer>
 	  <para>
-	    We're going to add a good way to do this soon.  In the
-	    mean time, you have to remove it by hand.
-	  </para>
-
-	  <para>
-	    All the folders are stored in
-	    <filename>~/evolution/local</filename>.  Each folder is a
-	    directory containing the data files, as well as a
-	    <filename>subfolders</filename> directory that contains
-	    all its subfolders.  So for example if you have a
-	    subfolder of the <filename>Inbox</filename> called
-	    <filename>Foo</filename>, you can run the following
-	    command to get rid of it (and all it subfolders):
-          </para>
-
-	  <programlisting>
-rm -rf ~/evolution/local/Inbox/subfolders/Foo
-          </programlisting>
-
-	  <para>
-	    You should do this after exiting Evolution.
+            Right-click on the folder and select the
+            <guimenuitem>Delete</guimenuitem> or
+            <guimenuitem>Rename</guimenuitem> items.
 	  </para>
 	</answer> 
       </qandaentry>
@@ -92,23 +74,14 @@ rm -rf ~/evolution/local/Inbox/subfolders/Foo
 	</question>
 	<answer>
 	  <para>
-	    The implementation isn't finished, although it's planned
-	    to be finished soon.
+	    The implementation isn't finished, although it's nearly done.
   	  </para>
 
 	  <para>
-	    In the meantime, you can copy the folders' contents by
-	    hand from the shell (please do this after quitting
-	    Evolution).  For example:
-	  </para>
-
-	  <programlisting>
-cp -r ~/evolution/local/Inbox/subfolders/Foo ~/evolution/local/Inbox/subfolders/Bar
-	  </programlisting>
-
-	  <para>
-	    Likewise, you can use <command>mv</command> to rename or
-	    move folders.
+	    In the meantime, right-click on the folders or messages
+	    you want to move, and select the
+	    <guimenuitem>Move</guimenuitem> or
+	    <guimenuitem>Copy</guimenuitem> options.
 	  </para>
 	</answer>
       </qandaentry>
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 4d2b84376e..55d89f20ba 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-26  Aaron Weber  <aaron@ximian.com>
+
+	* C/evolution-faq.sgml: Revised move/rename/copy questions, now
+	that these functions work.
+
 2001-06-25  Aaron Weber  <aaron@ximian.com>
 
 	* C/evolution-faq.sgml: Now that bug-buddy works with our
diff --git a/help/C/evolution-faq.sgml b/help/C/evolution-faq.sgml
index 1f784061de..d1a59e95be 100644
--- a/help/C/evolution-faq.sgml
+++ b/help/C/evolution-faq.sgml
@@ -59,27 +59,9 @@
 	</question>
 	<answer>
 	  <para>
-	    We're going to add a good way to do this soon.  In the
-	    mean time, you have to remove it by hand.
-	  </para>
-
-	  <para>
-	    All the folders are stored in
-	    <filename>~/evolution/local</filename>.  Each folder is a
-	    directory containing the data files, as well as a
-	    <filename>subfolders</filename> directory that contains
-	    all its subfolders.  So for example if you have a
-	    subfolder of the <filename>Inbox</filename> called
-	    <filename>Foo</filename>, you can run the following
-	    command to get rid of it (and all it subfolders):
-          </para>
-
-	  <programlisting>
-rm -rf ~/evolution/local/Inbox/subfolders/Foo
-          </programlisting>
-
-	  <para>
-	    You should do this after exiting Evolution.
+            Right-click on the folder and select the
+            <guimenuitem>Delete</guimenuitem> or
+            <guimenuitem>Rename</guimenuitem> items.
 	  </para>
 	</answer> 
       </qandaentry>
@@ -92,23 +74,14 @@ rm -rf ~/evolution/local/Inbox/subfolders/Foo
 	</question>
 	<answer>
 	  <para>
-	    The implementation isn't finished, although it's planned
-	    to be finished soon.
+	    The implementation isn't finished, although it's nearly done.
   	  </para>
 
 	  <para>
-	    In the meantime, you can copy the folders' contents by
-	    hand from the shell (please do this after quitting
-	    Evolution).  For example:
-	  </para>
-
-	  <programlisting>
-cp -r ~/evolution/local/Inbox/subfolders/Foo ~/evolution/local/Inbox/subfolders/Bar
-	  </programlisting>
-
-	  <para>
-	    Likewise, you can use <command>mv</command> to rename or
-	    move folders.
+	    In the meantime, right-click on the folders or messages
+	    you want to move, and select the
+	    <guimenuitem>Move</guimenuitem> or
+	    <guimenuitem>Copy</guimenuitem> options.
 	  </para>
 	</answer>
       </qandaentry>
diff --git a/help/ChangeLog b/help/ChangeLog
index 4d2b84376e..55d89f20ba 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-26  Aaron Weber  <aaron@ximian.com>
+
+	* C/evolution-faq.sgml: Revised move/rename/copy questions, now
+	that these functions work.
+
 2001-06-25  Aaron Weber  <aaron@ximian.com>
 
 	* C/evolution-faq.sgml: Now that bug-buddy works with our