...
...
...
...
pep8
Fix smarypants test runner
Smarten punctuation: Correct handling for decade abbreviations like '60s and measurements in feet and inches like 1' 2". Fixes #1285351 [Edit Book: Smarten Punctuation handles years and measurements incorrectly](https://bugs.launchpad.net/calibre/+bug/1285351)
...
...
Metadata download: Add an option to merge the downloaded comments into existing comments, instead of overwriting (Preferences->Metadata download). Fixes #1285319 [[Enhancment] Enable Undo in the comments field](https://bugs.launchpad.net/calibre/+bug/1285319)
Edit Book: When editing EPUB files, and a file is added in META-INF/ do not automatically add it to the manifest. Also do not warn about unmanifested files inside META-INF/ since a few vendors (Apple) require non standard files in that location. Fixes #1283015 [com.apple.ibooks.display-options.xml](https://bugs.launchpad.net/calibre/+bug/1283015)
Update AnandTech
Bulk metadata download: When reviewing downloaded metadata allow hiding the controls on the comments box by right clicking in the comments area. Useful on smaller screens. Fixes #1283251 [review downloaded metadata fix/enhancement](https://bugs.launchpad.net/calibre/+bug/1283251)
Merge pull request #193 from cbhaley/master

Add some sanity checking to the device read info syncing
Merge branch 'master' of github.com:kovidgoyal/calibre
Edit Book: Allow direct importing of HTML or DOCX files as new books without doing a full conversion. Use File->Import HTML or DOCX to import a file as a new EPUB book with minimal changes from the original.
...
Allow passing importable file formats as arguments to ebook-edit
Documentation for the direct import feature
...