Merge lp:~mpt/ubuntu/vivid/libnotify/533631-timeout-doc into lp:ubuntu/vivid/libnotify

Proposed by Matthew Paul Thomas
Status: Merged
Merge reported by: Martin Pitt
Merged at revision: not available
Proposed branch: lp:~mpt/ubuntu/vivid/libnotify/533631-timeout-doc
Merge into: lp:ubuntu/vivid/libnotify
Diff against target: 13 lines (+2/-1)
1 file modified
debian/notify-send.1 (+2/-1)
To merge this branch: bzr merge lp:~mpt/ubuntu/vivid/libnotify/533631-timeout-doc
Reviewer Review Type Date Requested Status
Martin Pitt Approve
Sebastien Bacher Approve
Review via email: mp+248872@code.launchpad.net

Description of the change

Makes clear that -t/--expire-time is ignored by Notify OSD and GNOME Shell.

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

Thanks Matthew!

review: Approve
Revision history for this message
Sebastien Bacher (seb128) wrote :
Revision history for this message
Martin Pitt (pitti) wrote :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/notify-send.1'
2--- debian/notify-send.1 2006-11-30 21:54:53 +0000
3+++ debian/notify-send.1 2015-02-06 10:05:31 +0000
4@@ -14,7 +14,8 @@
5 Specifies the urgency level (low, normal, critical).
6 .TP
7 \fB\-t, \-\-expire-time=TIME\fR
8-Specifies the timeout in milliseconds at which to expire the notification.
9+The duration, in milliseconds, for the notification to appear on screen.
10+(Ubuntu's Notify OSD, and GNOME Shell, both ignore this parameter.)
11 .TP
12 \fB\-i, \-\-icon=ICON[,ICON...]\fR
13 Specifies an icon filename or stock icon to display.

Subscribers

People subscribed via source and target branches