Merge branch 'feature/upstream' into develop

1 files changed, 28 insertions, 4 deletions

diff --git a/help/shotwell.1 b/help/shotwell.1
index a68f387..0ecb6ed 100644
--- a/help/shotwell.1
+++ b/help/shotwell.1
@@ -16,14 +16,14 @@ import photos from disk or camera, organize them in various ways, view them in f
 Show help options
 .RE
 
-.B \-d, \-\-datadir=DIRECTORY
+.B \-d, \-\-datadir=FOLDER
 .RS
-Path to Shotwell's private data
+Path to Shotwell's private data. Using \-d stand-alone without --profile --create is considered deprecated and should not be used anymore.
 .RE
 
 .B \-\-no-runtime-monitoring
 .RS
-Do not monitor library directory at runtime for changes
+Do not monitor library folder at runtime for changes
 .RE
 
 .B \-f, \-\-fullscreen
@@ -46,6 +46,25 @@ Show the application's version
 X display to use
 .RE
 
+.B \-p, \-\-show-metadata
+.RS
+Dump all Exif, IPTC and XMP metadata of \f1FILE\fR
+.RE
+
+.B \-i, \-\-profile=PROFILE
+.RS
+Start shotwell with a different profile. A profile consists of a set of settings and a new private data dir. The data dir can be overriden by secifying \-\-datadir as well.
+.RE
+
+.B \-l, \-\-list-profiles
+.RS
+Show the available profiles
+.RE
+
+.B \-b, \-\-profile-browser
+.RS
+Show the available profiles in a dialog, with managing capabilities and the ability to start Shotwell with a specific profile by double-clicking.
+.RE
 .SH "EXAMPLES"
 \fBshotwell
 .RS
@@ -57,11 +76,16 @@ X display to use
 \fROpens an image file for direct editing.  File is not imported into library and unsaved changes are lost on close.
 .RE
 
+\fBshotwell \-\-profile="Development environment"
+.RS
+\fROpens shotwell using the profile named "Development environment".
+.RE
+
 .SH "NOTES"
 .P
 Shotwell homepage: https://wiki.gnome.org/Apps/Shotwell
 .P
-Report bugs: https://bugzilla.gnome.org/enter_bug.cgi?product=Shotwell
+Report bugs: https://gitlab.gnome.org/GNOME/shotwell/issues
 
 .SH "AUTHOR"
 .PP