diff --git a/bypy/windows/wix.py b/bypy/windows/wix.py index 29b2cec316..7b3ef729a5 100644 --- a/bypy/windows/wix.py +++ b/bypy/windows/wix.py @@ -78,7 +78,7 @@ def create_installer(env): cmd.extend([ '-sice:ICE60', # No language in dlls warning '-sice:ICE61', # Allow upgrading with same version number - '-sice:ICE40', # Re-install mode overriden + '-sice:ICE40', # Re-install mode overridden '-sice:ICE69', # Shortcut components are part of a different feature than the files they point to ]) cmd.append('-sval') # Disable all checks since they fail when running under ssh diff --git a/format_docs/pdb/plucker.html b/format_docs/pdb/plucker.html index 07f7b926ca..97432d7e67 100644 --- a/format_docs/pdb/plucker.html +++ b/format_docs/pdb/plucker.html @@ -1512,7 +1512,7 @@ from the end of the header. String sequence -A concatenated sequence of one or more NUL-terminated US-ASCII strings. Each contains a header-value, which follows the contraints on header values laid down in IETF RFC 2822. Header folding is not allowed. Any of the four headers shown above may be absent; header values should be accessed via the above offsets. +A concatenated sequence of one or more NUL-terminated US-ASCII strings. Each contains a header-value, which follows the constraints on header values laid down in IETF RFC 2822. Header folding is not allowed. Any of the four headers shown above may be absent; header values should be accessed via the above offsets. @@ -1936,7 +1936,7 @@ considered the default page ordering for the document. a concatenated sequence of NUL-terminated strings, each representing the name of a page list. The first entry in the list corresponds to the default page ordering. For -unnamed page lists, a NUL charater should still be specified. +unnamed page lists, a NUL character should still be specified. diff --git a/manual/conversion.rst b/manual/conversion.rst index 09d4aa563d..d17a57d48f 100644 --- a/manual/conversion.rst +++ b/manual/conversion.rst @@ -800,7 +800,7 @@ Convert ODT documents calibre can directly convert ODT (OpenDocument Text) files. You should use styles to format your document and minimize the use of direct formatting. When inserting images into your document you need to anchor them to the paragraph, images anchored to a page will all end up in the front of the conversion. -To enable automatic detection of chapters, you need to mark them with the build-in styles called 'Heading 1', 'Heading 2', ..., 'Heading 6' ('Heading 1' equates to the HTML tag

, 'Heading 2' to

etc). When you convert in calibre you can enter which style you used into the 'Detect chapters at' box. Example: +To enable automatic detection of chapters, you need to mark them with the built-in styles called 'Heading 1', 'Heading 2', ..., 'Heading 6' ('Heading 1' equates to the HTML tag

, 'Heading 2' to

etc). When you convert in calibre you can enter which style you used into the 'Detect chapters at' box. Example: * If you mark Chapters with style 'Heading 2', you have to set the 'Detect chapters at' box to ``//h:h2`` * For a nested TOC with Sections marked with 'Heading 2' and the Chapters marked with 'Heading 3' you need to enter ``//h:h2|//h:h3``. On the Convert - TOC page set the 'Level 1 TOC' box to ``//h:h2`` and the 'Level 2 TOC' box to ``//h:h3``. diff --git a/manual/drm.rst b/manual/drm.rst index 8dfa3a73aa..29a27ed732 100644 --- a/manual/drm.rst +++ b/manual/drm.rst @@ -59,7 +59,7 @@ Although digital content can be used to make information as well as creative works easily available to everyone and empower humanity, this is not in the interests of some publishers who want to steer people away from this possibility of freedom simply to maintain their relevance in world developing -so fast that they cant keep up. +so fast that they can't keep up. Why does calibre not support DRM? diff --git a/manual/faq.rst b/manual/faq.rst index 9393ffbc19..913f7a1cb0 100644 --- a/manual/faq.rst +++ b/manual/faq.rst @@ -589,7 +589,7 @@ With all this flexibility, it is possible to have calibre manage your author nam Why doesn't calibre let me store books in my own folder structure? ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -The whole point of calibre's library management features is that they provide a search and sort based interface for locating books that is *much* more efficient than any possible folder scheme you could come up with for your collection. Indeed, once you become comfortable using calibre's interface to find, sort and browse your collection, you wont ever feel the need to hunt through the files on your disk to find a book again. By managing books in its own folder structure of Author -> Title -> Book files, calibre is able to achieve a high level of reliability and standardization. To illustrate why a search/tagging based interface is superior to folders, consider the following. Suppose your book collection is nicely sorted into folders with the following scheme:: +The whole point of calibre's library management features is that they provide a search and sort based interface for locating books that is *much* more efficient than any possible folder scheme you could come up with for your collection. Indeed, once you become comfortable using calibre's interface to find, sort and browse your collection, you won't ever feel the need to hunt through the files on your disk to find a book again. By managing books in its own folder structure of Author -> Title -> Book files, calibre is able to achieve a high level of reliability and standardization. To illustrate why a search/tagging based interface is superior to folders, consider the following. Suppose your book collection is nicely sorted into folders with the following scheme:: Genre -> Author -> Series -> ReadStatus @@ -671,7 +671,7 @@ then import it on another computer. First let's see how to export the data: Now on the new computer, start calibre for the first time. It will run the :guilabel:`Welcome wizard` asking you for the location of the calibre library. Point it to the previously copied folder. If the computer you are transferring to - already has a calibre installation, then the :guilabel:`Welcome wizard` wont run. In + already has a calibre installation, then the :guilabel:`Welcome wizard` won't run. In that case, right-click the calibre icon in the toolbar and point it to the newly copied folder. You will now have two calibre libraries on your computer and you can switch between them by clicking the calibre icon on @@ -756,7 +756,7 @@ Otherwise, you can request a particular news site by posting in the `calibre Rec Why the name calibre? ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Take your pick: - * Convertor And LIBRary for E-books + * Converter And LIBRary for E-books * A high *calibre* product * A tribute to the SONY Librie which was the first e-ink based e-book reader * My wife chose it ;-) @@ -793,7 +793,7 @@ There can be several causes for this: has trouble with library locations if the path contains non-English characters, or only numbers, etc.) * Try running it as Administrator (Right click on the icon and select "Run as Administrator") -If it still wont launch, start a command prompt (press the Windows key and R; then type :command:`cmd.exe` in the Run dialog that appears). At the command prompt type the following command and press Enter:: +If it still won't launch, start a command prompt (press the Windows key and R; then type :command:`cmd.exe` in the Run dialog that appears). At the command prompt type the following command and press Enter:: calibre-debug -g diff --git a/manual/function_mode.rst b/manual/function_mode.rst index ec647aac49..f2852d4c00 100644 --- a/manual/function_mode.rst +++ b/manual/function_mode.rst @@ -54,7 +54,7 @@ function and copy the Python code from below. Every :guilabel:`Search & replace` custom function must have a unique name and consist of a Python function named replace, that accepts all the arguments shown above. -For the moment, we wont worry about all the different arguments to +For the moment, we won't worry about all the different arguments to ``replace()`` function. Just focus on the ``match`` argument. It represents a match when running a search and replace. Its full documentation in available `here `_. diff --git a/resources/calibre-portable.bat b/resources/calibre-portable.bat index 784d4f2ee9..682ab5d866 100644 --- a/resources/calibre-portable.bat +++ b/resources/calibre-portable.bat @@ -152,7 +152,7 @@ REM Location of Calibre Temporary files (optional) REM REM Calibre creates a lot of temporary files while running REM In theory these are removed when Calibre finishes, but -REM in practise files can be left behind (particularily if +REM in practise files can be left behind (particularly if REM any errors occur). Using this option allows some REM explicit clean-up of these files. REM If not set Calibre uses the normal system TEMP location @@ -193,7 +193,7 @@ REM Start up the calibre program. REM REM The use of 'belownormal' priority helps keep the system REM responsive while Calibre is running. Within Calibre itself -REM the backgound processes should be set to run with 'low' priority. +REM the background processes should be set to run with 'low' priority. REM Using the START command starts up Calibre in a separate process. REM If used without /WAIT option it launches Calibre and contines batch file. diff --git a/resources/calibre-portable.sh b/resources/calibre-portable.sh index beafb106a3..a9f691a542 100755 --- a/resources/calibre-portable.sh +++ b/resources/calibre-portable.sh @@ -346,7 +346,7 @@ elif [[ -z "${BIN_DIR}" ]]; then else CALIBRE="calibre" echo "PROGRAM FILES: No portable copy found." - echo "To intall a portable copy, run './calibre-portable.sh --upgrade-install'" + echo "To install a portable copy, run './calibre-portable.sh --upgrade-install'" echo -e "\033[0;31m*** Using System search path instead***\033[0m" fi echo "--------------------------------------------------" diff --git a/setup/build.py b/setup/build.py index 7a7ebcd9bc..3a5d95b21f 100644 --- a/setup/build.py +++ b/setup/build.py @@ -428,7 +428,7 @@ class Build(Command): os.remove(x) def check_call(self, *args, **kwargs): - """print cmdline if an error occured + """print cmdline if an error occurred If something is missing (qmake e.g.) you get a non-informative error self.check_call(qmc + [ext.name+'.pro']) diff --git a/setup/csslint.py b/setup/csslint.py index 3b6cc0cef4..97b493829b 100644 --- a/setup/csslint.py +++ b/setup/csslint.py @@ -10,7 +10,7 @@ from setup import Command class CSSLint(Command): - # We cant use the released copy since it has not had a release in years and + # We can't use the released copy since it has not had a release in years and # there are several critical bug fixes we need description = 'Update the bundled copy of csslint' diff --git a/src/calibre/constants.py b/src/calibre/constants.py index c28001166b..147e573ace 100644 --- a/src/calibre/constants.py +++ b/src/calibre/constants.py @@ -363,7 +363,7 @@ else: if not os.path.exists(config_dir) or \ not os.access(config_dir, os.W_OK) or not \ os.access(config_dir, os.X_OK): - print('No write acces to', config_dir, 'using a temporary dir instead') + print('No write access to', config_dir, 'using a temporary dir instead') import tempfile, atexit config_dir = tempfile.mkdtemp(prefix='calibre-config-') diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py index 0bf4038596..6b67987799 100644 --- a/src/calibre/customize/builtins.py +++ b/src/calibre/customize/builtins.py @@ -1737,7 +1737,7 @@ class StoreOzonRUStore(StoreBase): class StorePragmaticBookshelfStore(StoreBase): name = 'Pragmatic Bookshelf' - description = 'The Pragmatic Bookshelf\'s collection of programming and tech books avaliable as e-books.' + description = 'The Pragmatic Bookshelf\'s collection of programming and tech books available as e-books.' actual_plugin = 'calibre.gui2.store.stores.pragmatic_bookshelf_plugin:PragmaticBookshelfStore' drm_free_only = True diff --git a/src/calibre/linux.py b/src/calibre/linux.py index d55abb8869..1037c3dd0a 100644 --- a/src/calibre/linux.py +++ b/src/calibre/linux.py @@ -1027,7 +1027,7 @@ complete -F _'''%(opts, words) + fname + ' ' + name +"\n\n").encode('utf-8') pics = {'jpg', 'jpeg', 'gif', 'png', 'bmp'} -pics = list(sorted(pics)) # for reproducability +pics = list(sorted(pics)) # for reproducibility def opts_and_exts(name, op, exts, cover_opts=('--cover',), opf_opts=(), diff --git a/src/tinycss/css21.py b/src/tinycss/css21.py index d23b5fad07..1ccd45cde0 100644 --- a/src/tinycss/css21.py +++ b/src/tinycss/css21.py @@ -304,7 +304,7 @@ class ImportRule: def _remove_at_charset(tokens): - """Remove any valid @charset at the beggining of a token stream. + """Remove any valid @charset at the beginning of a token stream. :param tokens: An iterable of tokens diff --git a/src/tinycss/parsing.py b/src/tinycss/parsing.py index 7e4c9a0370..ad8a4014b3 100644 --- a/src/tinycss/parsing.py +++ b/src/tinycss/parsing.py @@ -152,7 +152,7 @@ class ParseError(ValueError): .. attribute:: reason - What happend (a string). + What happened (a string). """ def __init__(self, subject, reason):