diff --git a/manual/catalogs.rst b/manual/catalogs.rst index ac97fa7a66..e13e78fb35 100644 --- a/manual/catalogs.rst +++ b/manual/catalogs.rst @@ -116,7 +116,7 @@ Other options :guilabel:`Thumb width` specifies a width preference for cover thumbnails included with Descriptions pages. Thumbnails are cached to improve performance. To experiment with different widths, try generating a catalog with just a few books until you've determined your preferred width, then generate your full catalog. The first time a catalog is generated with a new thumbnail width, performance will be slower, but subsequent builds of the catalog will take advantage of the thumbnail cache. -:guilabel:`Merge with comments` specifies a custom column whose content will be non-destructively merged with the Comments metadata during catalog generation. For example, you might have a custom column :guilabel:`Author bio` that you'd like to append to the Comments metadata. You can choose to insert the custom column contents *before or after* the Comments section, and optionally separate the appended content with a horizontal rule separator. Eligible custom column types include ``text, comments, and composite``. +:guilabel:`Merge with comments` specifies a custom column whose content will be non-destructively merged with the comments metadata during catalog generation. For example, you might have a custom column :guilabel:`Author bio` that you'd like to append to the comments metadata. You can choose to insert the custom column contents *before or after* the comments section, and optionally separate the appended content with a horizontal rule separator. Eligible custom column types include ``text, comments, and composite``. .. _Custom catalog covers: diff --git a/manual/viewer.rst b/manual/viewer.rst index 2949652bf0..5c806fd721 100644 --- a/manual/viewer.rst +++ b/manual/viewer.rst @@ -80,7 +80,7 @@ can enter these locations under :guilabel:`Go to->Location` in the viewer controls. There is a URL you can copy to the clipboard and paste into other programs -or documents. Clicking on this URL will open the book in the calibre viewer at +or documents. Clicking on this URL will open the book in the calibre E-book viewer at the current location. If you click on links inside the e-book to take you to different parts of the diff --git a/src/calibre/gui2/dialogs/quickview.py b/src/calibre/gui2/dialogs/quickview.py index a93c3dc02a..0e4612dfe9 100644 --- a/src/calibre/gui2/dialogs/quickview.py +++ b/src/calibre/gui2/dialogs/quickview.py @@ -597,7 +597,7 @@ class Quickview(QDialog, Ui_Quickview): tt = ('
' + _( 'Double click on a book to change the selection in the library view or ' 'change the column shown in the left-hand panel. ' - 'Shift- or Control- double click to edit the metadata of a book, ' + 'Shift- or Ctrl- double click to edit the metadata of a book, ' 'which also changes the selected book.' ) + '
') for row, b in enumerate(books): diff --git a/src/calibre/gui2/main.py b/src/calibre/gui2/main.py index ed861cd237..a09c0f721e 100644 --- a/src/calibre/gui2/main.py +++ b/src/calibre/gui2/main.py @@ -49,7 +49,7 @@ different actions, than just adding books. For example: calibre://view-book/test_library/1842/epub Will open the book with id 1842 in the EPUB format from the library -"test_library" in the calibre viewer. Library names are the folder names of the +"test_library" in the calibre E-book viewer. Library names are the folder names of the libraries with spaces replaced by underscores. A full description of the various URL based actions is in the User Manual. '''))