Merge tag 'upstream/0.23.5'

Upstream version 0.23.5

1 files changed, 62 insertions, 0 deletions

diff --git a/help/shotwell.1 b/help/shotwell.1
new file mode 100644
index 0000000..334cd7c
--- /dev/null
+++ b/help/shotwell.1
@@ -0,0 +1,62 @@
+.TH "shotwell" "1"
+
+.SH "NAME"
+shotwell \- Digital photo manager
+
+.SH "SYNOPSIS"
+\fBshotwell \fR[\fIOPTION\fR]... [\fIFILE\fR]
+
+.SH "DESCRIPTION"
+.P
+Shotwell is a digital photo organizer designed for the GNOME desktop environment.  It allows you to 
+import photos from disk or camera, organize them in various ways, view them in full-window or fullscreen mode, and export them to share with others.
+
+.SH "OPTIONS"
+.B \-h, \-\-help
+.R Show help options
+
+.B \-d, \-\-datadir=DIRECTORY
+.RS
+Path to Shotwell's private data
+.RE
+
+.B \-\-no-runtime-monitoring
+.RS
+Do not monitor library directory at runtime for changes
+.RE
+
+.B \-\-no-startup-progress
+.RS
+Don't display startup progress meter
+.RE
+
+.B \-V, \-\-version
+.RS
+Show the application's version
+.RE
+
+.B \-\-display=DISPLAY
+.RS
+X display to use
+.RE
+
+.SH "EXAMPLES"
+\fBshotwell
+.RS
+\fROpens Shotwell with the user's library.
+.RE
+
+\fBshotwell \fIFILE
+.RS
+\fROpens an image file for direct editing.  File is not imported into library and unsaved changes are lost on close.
+.RE
+
+.SH "NOTES"
+.P
+Shotwell homepage: https://wiki.gnome.org/Apps/Shotwell
+.P
+Report bugs: https://bugzilla.gnome.org/enter_bug.cgi?product=Shotwell
+
+.SH "AUTHOR"
+.PP
+This manual page was written by Jim Nelson jim@yorba.org and Allison Barlow allison@yorba.org.