Ubuntu Documentation

Merge lp:~mguthart-x/ubuntu-docs/ubuntu-docs into lp:~ubuntu-core-doc/ubuntu-docs/trunk2017-07-10

  1. ubuntu-docs
  2. Merge into trunk2017-07-10
Proposed by Mark Guthart
Status: Merged
Approved by: Doug Smythies
Approved revision: 488
Merged at revision: 489
Proposed branch: lp:~mguthart-x/ubuntu-docs/ubuntu-docs
Merge into: lp:~ubuntu-core-doc/ubuntu-docs/trunk2017-07-10
Diff against target: 55 lines (+12/-29)
1 file modified
ubuntu-help/C/clock-calendar.page (+12/-29)
To merge this branch: bzr merge lp:~mguthart-x/ubuntu-docs/ubuntu-docs
Reviewer Review Type Date Requested Status
Doug Smythies Approve
Review via email: mp+289386@code.launchpad.net

Description of the change

Modified the clock-calendar page to reflect the built in Calendar application and removed the Evolution text.

To post a comment you must log in.
Revision history for this message
Doug Smythies (dsmythies) wrote :

Mark, Looks good, thanks. I'll approve and merge after looking at my web site formatted version.

Revision history for this message
Doug Smythies (dsmythies) wrote :

O.K.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntu-help/C/clock-calendar.page'
2--- ubuntu-help/C/clock-calendar.page 2013-09-15 02:01:21 +0000
3+++ ubuntu-help/C/clock-calendar.page 2016-03-17 16:20:47 +0000
4@@ -26,39 +26,22 @@
5
6 <title>Calendar appointments</title>
7
8-<p>You can organize your calendar appointments by clicking on the clock in the panel,
9-if you're using a mail and calendar application called <app>Evolution</app>.</p>
10-
11-<p>If you have already set up Evolution, click the clock on the menu bar and then click
12-the <gui>Add Event</gui> to start adding appointments. As appointments are added, they
13-will appear below the calendar when you click on the clock.</p>
14-
15-<p>To quickly get to the full Evolution calendar, click on the clock and click the first
16-line where today's date is.</p>
17-
18-<!--Disabling unless someone wants to make a screenshot
19-<media type="image" src="figures/shell-appts.png"
20- width="500" height="282">
21- <p>Clock, calendar, and appointments</p>
22-</media>-->
23-
24-<note><p>This will work only if you have an existing <app>Evolution</app> account. Otherwise,
25-a window will appear with the necessary steps for adding your first account.</p></note>
26-
27-<section id="turn-off-appointments">
28- <title>Turn off Evolution calendar integration</title>
29-<p>You can also turn off this feature if you like.</p>
30+<p>A built in calendar application called <app>Calendar</app> allows you to organize your calendar appointments or events. Up to five of these, over a four-week duration, will appear by clicking on the clock in the <gui>menu bar</gui>.</p>
31+
32+<note><p>Calendar appointment integration is also supported with a mail and calendar application called <app>Evolution</app>, which may be installed separately.</p></note>
33+
34+<section id="launch-calendar-application">
35+ <title>Launch the Calendar application</title>
36+<p>Appointments and events may be managed through the built in <app>Calendar</app> application.</p>
37
38 <steps>
39- <item><p>Click on the clock and select <gui>Time &amp; Date Settings</gui>.</p></item>
40- <item><p>Now, switch to the <gui>Clock</gui> tab.</p></item>
41- <item><p>Uncheck <gui>Coming events from Evolution Calendar</gui>.</p></item>
42+ <item><p>Click on the <gui>Dash</gui> icon in the <link xref="unity-launcher-intro">Launcher</link>.</p></item>
43+ <item><p>Type <input>calendar</input> in the <gui>Search your computer</gui> to locate the <app>Calendar</app> application.</p></item>
44+ <item><p>Click the <gui>Calendar</gui> application icon.</p></item>
45 </steps>
46
47+<p>Alternatively, you may also type <input>gnome-calendar</input> in the <app>Terminal</app> application.</p>
48 </section>
49
50-<!--<comment>
51- <cite date="2011-02-10" href="mailto:nruz@alumnos.inf.utfsm.cl">Natalia Ruz</cite>
52- <p>Should have some information or link to "how to add a mail account to Evolution", and possibly an image (but maybe a screenshot is too big).</p>
53- </comment>-->
54+
55 </page>

Subscribers

People subscribed via source and target branches