Merge lp:~computergeoffrey/pantheon-photos/master into lp:~pantheon-photos/pantheon-photos/trunk

[Geoffrey De Belie]

Changed README to reflect Photos being a separate product

[Zisu Andrei (matzipan)]

Looks good

review: Approve

[Cody Garver (codygarver)]

See my comments in the diff below.

review: Needs Fixing

[lp:~computergeoffrey/pantheon-photos/master]

3060. By Geoffrey De Belie on 2016-11-19

Rewrite README - take 2

[Geoffrey De Belie (computergeoffrey)]

Thanks for the comments. I've updated by branch.

review: Needs Resubmitting

=== modified file 'README' (properties changed: -x to +x)
--- README	2013-01-21 21:16:09 +0000
+++ README	2016-11-19 18:03:56 +0000
@@ -1,16 +1,16 @@
 
-    Shotwell Photo Manager
+    Photos
     ----------------------
     
   * Introduction
     
-    Shotwell is a digital photo manager designed for the GNOME desktop
+    Photos is a digital photo manager designed for the Pantheon 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.
     
-    Visit http://www.yorba.org/shotwell to read about the current state of
-    Shotwell's development and to make sure you're running the latest version.
+    Visit https://launchpad.net/pantheon-photos to read about the current state of
+    Photos' development and to make sure you're running the latest version.
     
 
   * Installation & Licensing
@@ -21,41 +21,39 @@
   * Quick Start
     
     There are three ways to import photos: via drag-and-drop, from a digital
-    camera, and from the File menu.
+    camera, and from the menu.
     
     * Drag-and-drop: Simply drag photos from your file manager and drop them
-    onto the Shotwell window.  You may drag files or directories.  The photos
+    onto the Photos window.  You may drag files or directories.  The photos
     will be imported into the library.
     
-    * Camera: Connect your digital camera to your computer.  Shotwell will 
-    detect it and list it in the sidebar.  When you select the camera, Shotwell 
+    * Camera: Connect your digital camera to your computer.  Photos will 
+    detect it and list it in the sidebar.  When you select the camera, Photos 
     will load previews of each photo.  You may choose specific photos to 
     import or to import them all.
     
-    Shotwell uses gPhoto to communicate with digital cameras.  If your camera 
-    does not appear in Shotwell's sidebar or there is a problem importing
+    Photos uses gPhoto to communicate with digital cameras.  If your camera 
+    does not appear in Photos' sidebar or there is a problem importing
     photos, visit http://www.gphoto.org to see if it is supported.
     
-    * File menu: Select File -> Import From Folder ... and select a directory
-    from the chooser dialog box.  Shotwell will scan the directory and all
+    * Open the Menu: click Import From Folder ... and select a directory
+    from the chooser dialog box.  Photos will scan the directory and all
     sub-directories for photo files and automatically import them.
     
-    Once your photos are in Shotwell's library, you can view, edit, and export
-    them.  More features are planned, so check http://www.yorba.org/shotwell
-    regularly for updates.
+    Once your photos are in Photos' library, you can view, edit, and export
+    them.  More features are planned.
 
     
-  * Contacting Yorba
-    
-    Yorba:                      http://www.yorba.org
-    Shotwell project page:      http://www.yorba.org/shotwell
-    Shotwell documentation:     http://www.yorba.org/shotwell/help
-    
-    We also encourage you to join the Shotwell mailing list.  Send an email
-    with a subject: line of "subscribe" (no quotes) to
-    [e-mail].
-    
+  * Contacting elementary OS
+    
+    elementary OS:                 http://www.elementary.io
+    Photos on Launchpad.net        https://bugs.launchpad.net/pantheon-photos
+    Shotwell/Photos documentation: http://www.yorba.org/shotwell/help
+    
+    We also encourage you to join the #elementary IRC channel on Freenode
+       
     
     
     Copyright 2009-2013 Yorba Foundation
+    Copyright 2016 elementary LLC.