...

src/calibre/manual/faq.rst

@@ -104,30 +104,46 @@ will appear in the next release of |app|.
 How does |app| manage collections on my SONY reader?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-When |app| connects with the device, it retrieves all collections for the books on the device. The collections
+When |app| connects with the reader, it retrieves all collections for the books on the reader. The collections
 of which books are members are shown on the device view.
 
-When you send a book to the device, |app| will add the book to collections based on the metadata for that book. By
+When you send a book to the reader, |app| will add the book to collections based on the metadata for that book. By
 default, collections are created from tags and series. You can control what metadata is used by going to
 Preferences->Plugins->Device Interface plugins and customizing the SONY device interface plugin. If you remove all
 values, |app| will not add the book to any collection.
 
-Collection management is largely controlled by 'Preserve device collections' found at Preferences->Add/Save->Sending
+Collection management is largely controlled by the 'Metadata management' option found at
-to device. If checked (the default), managing collections is left to the user; |app| will not delete already
+Preferences->Add/Save->Sending to device. If set to 'Manual' (the default), managing collections is left to
-existing collections for a book on your device when you resend the book to the device, but |app| will add the book to
+the user; |app| will not delete already existing collections for a book on your reader when you resend the
-collections if necessary.  To ensure that the collections for a book are based only on current |app| metadata, first
+book to the reader, but |app| will add the book to collections if necessary.  To ensure that the collections
-delete the books from the device, then resend the books.  You can edit collections directly on the device view by
+for a book are based only on current |app| metadata, first delete the books from the reader, then resend the
-double-clicking or right-clicking in the collections column.
+books.  You can edit collections directly on the device view by double-clicking or right-clicking in the
+collections column.
 
-If 'Preserve device collections' is not checked, then |app| will manage collections. Collections will be built using
+If 'Metadata management' is set to 'Only on send', then |app| will manage collections more aggressively.
-|app| metadata exclusively.  Sending a book to the device will correct the collections for that book so its
+Collections will be built using |app| metadata exclusively.  Sending a book to the reader will correct the
-collections exactly match the book's metadata. Collections are added and deleted as necessary.  Editing collections on
+collections for that book so its collections exactly match the book's metadata, adding and deleting
-the device pane is not permitted, because collections not in the metadata will be removed automatically.
+collections as necessary.  Editing collections on the device view is not permitted, because collections not in
+the metadata will be removed automatically.
 
-In summary, check 'Preserve device collections' if you want to manage collections yourself.  Collections for a book
+If 'Metadata management' is set to 'Automatic management', then |app| will update metadata and collections
-will never be removed by |app|, but can be removed by you by editing on the device view.  Uncheck 'Preserve device
+both when the reader is connected and when books are sent. When calibre detects the reader and generates the
-collections' if you want |app| to manage the collections, adding books to and removing books from collections as
+list of books on the reader, it will send metadata from the library to the reader for all books on the reader
-needed.  
+that are in the library (On device is True), adding and removing books from collections as indicated by the
+metadata and device customization. When a book is sent, |app| corrects the metadata for that book, adding and
+deleting collections. Manual editing of metadata on the device view is not allowed. Note that this option
+specifies sending metadata, not books. The book files on the reader are not changed.
+
+In summary, choose 'manual management' if you want to manage collections yourself.  Collections for a book
+will never be removed by |app|, but can be removed by you by editing on the device view.  Choose 'Only on
+send' if you want |app| to manage collections when you send a book, adding books to and removing books from
+collections as needed.  Choose 'Automatic management' if you want |app| to keep collections up to date
+whenever the reader is connected.
+
+If you use multiple installations of calibre to manage your reader, then option 'Automatic management' may not
+be what you want.  Connecting the reader to one library will reset the metadata to what is in that library.
+Connecting to the other library will reset the metadata to what is in that other library. Metadata in books
+found in both libraries will be flopped back and forth.
 
 Can I use both |app| and the SONY software to manage my reader?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~