[tomboy] Change deleting docs from tips to warnings
- From: Sanford Armstrong <sharm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tomboy] Change deleting docs from tips to warnings
- Date: Mon, 28 Jun 2010 19:40:36 +0000 (UTC)
commit 0c7bae42f648c6a4344667fe9bbc306ca7ede922
Author: Paul Cutler <pcutler gnome org>
Date: Sat May 8 15:55:56 2010 -0500
Change deleting docs from tips to warnings
help/C/delete-notes.page | 2 +-
help/C/sync-setup.page | 21 +++++++++++++--------
2 files changed, 14 insertions(+), 9 deletions(-)
---
diff --git a/help/C/delete-notes.page b/help/C/delete-notes.page
index 2ba1c34..4111e83 100644
--- a/help/C/delete-notes.page
+++ b/help/C/delete-notes.page
@@ -27,7 +27,7 @@
<p>You can delete a note by pressing the <gui>Delete</gui> icon in the
toolbar of the note you wish to delete.</p>
-<note style="tip">
+<note style="warning">
<p>Deleting a note is permanent. You will be prompted <gui>Really delete
this note?</gui> when deleting a note and after deletion the note is
not recoverable.</p>
diff --git a/help/C/sync-setup.page b/help/C/sync-setup.page
index 2fc03ed..8ef59e2 100644
--- a/help/C/sync-setup.page
+++ b/help/C/sync-setup.page
@@ -60,27 +60,30 @@
</p>
<list>
- <li><p><gui>Always ask me what to do.</gui> This is the default
+ <item><p><gui>Always ask me what to do.</gui> This is the default
choice and when Tomboy encounters a conflict Tomboy will
always prompt you to ask you if you want to rename the local
note or replace your local note with the note the server has
- stored.</p></li>
- <li><p><gui>Rename my local note.</gui> If this option is
+ stored.</p></item>
+ <item><p><gui>Rename my local note.</gui> If this option is
selected, Tomboy will automatically replace the note with a
copy from the remote computer and rename the note on your
computer so you don't lose your information in your note.</p>
- </li>
+ </item>
- <li><p><gui>Replace my local note with the server's update.
+ <item><p><gui>Replace my local note with the server's update.
</gui>. If you have selected this option, when you sync
Tomboy will overwrite and replace your note stored on your
- computer with a copy from the remote computer.</p></li>
+ computer with a copy from the remote computer.</p></item>
- <note style="tip">
+ <note style="warning">
<p>Automatically overwriting the note is permanent. Your
local note will be replaced by the copy on the remote
computer and you will lose your information that was
stored prior to syncing. </p>
+ </note>
+
+ </list>
</section>
@@ -114,7 +117,8 @@
<p>Open <app>Passwords and Encryption Keys</app> by choosing
<guiseq><gui>Applications</gui><gui>Accessories</gui>
<gui>Passwords and Encryption Keys</gui></guiseq>.
- Click on your key, and from the menu choose <guiseq><gui>Remote</gui> <gui>Configure Key for Secure Shell</gui> and enter the domain name
+ Click on your key, and from the menu choose <guiseq><gui>Remote</gui> <gui>Configure Key for Secure Shell</gui></guiseq>
+ and enter the domain name
or IP address of the computer you want to sync to in Computer Name. Enter the username of the remote computer in Computer Name: and click Set Up.
When prompted, enter the password and setting up your key will be completed.
</p>
@@ -139,4 +143,5 @@
You are now ready to synchronize your notes.</p>
</section>
+
</page>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]