diff --git a/manual/faq.rst b/manual/faq.rst index 9d49446613..784465bc93 100644 --- a/manual/faq.rst +++ b/manual/faq.rst @@ -308,8 +308,8 @@ How do I use calibre with my iPad/iPhone/iPod touch? ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ The easiest way to transfer books wirelessly to your Apple device (iPad/iPhone/iPod) -is to use the `Calibre Companion `_ iOS app. -This app allows calibre to connect to your Apple device wirelessly, just as though you +is to use the `Calibre Companion `__ iOS app. +This app allows calibre to connect to your Apple device wirelessly, just as though you plugged in the device with a USB cable. You can browse files on the device in calibre and use the :guilabel:`Send to device` button to transfer files to your device wirelessly. @@ -330,7 +330,7 @@ over the net. First perform the following steps in calibre The Content server allows you to read books directly in Safari itself. In addition, there are many apps for your iDevice that can connect to the calibre -Content server. Examples include: Marvin, Mapleread and iBooks itself. +Content server. Examples include: Marvin, Mapleread and iBooks itself. Using the Content server ^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -385,7 +385,7 @@ Over the air ^^^^^^^^^^^^^^ The easiest way to transfer books wirelessly to your Android device is to use -the `Calibre Companion `_ Android app. +the `Calibre Companion `__ Android app. This app allows calibre to connect to your Android device wirelessly, just as though you plugged in the device with a USB cable. You can browse files on the device in calibre and use the :guilabel:`Send to device` button to transfer files to @@ -412,11 +412,11 @@ You can now browse your book collection and download books from calibre to your device to open with whatever e-book reading software you have on your android device. -Calibre Companion and many reading apps support browsing the calibre library -directly. For example, in Aldiko, click My Catalogs, then + to add a catalog, -then give the catalog a title such as "calibre" and provide the URL listed -above. You can now browse the calibre library and download directly into the -reading software. +Calibre Companion and many reading apps support browsing the calibre library +directly. For example, in Aldiko, click My Catalogs, then + to add a catalog, +then give the catalog a title such as "calibre" and provide the URL listed +above. You can now browse the calibre library and download directly into the +reading software. Can I access my calibre books using the web browser in my Kindle or other reading device? ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -689,7 +689,7 @@ then import it on another computer. First let's see how to export the data: find out what the library folder is by clicking the calibre icon in the toolbar. Choose the :guilabel:`Switch/create calibre library` action and you will see the path to the current calibre library. - + 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 diff --git a/src/calibre/web/feeds/news.py b/src/calibre/web/feeds/news.py index c2220e1af0..678a9af3ad 100644 --- a/src/calibre/web/feeds/news.py +++ b/src/calibre/web/feeds/news.py @@ -226,7 +226,7 @@ class BasicNewsRecipe(Recipe): #: } #: #: All keys are optional. For a full explanation of the search criteria, see - #: `Beautiful Soup `_ + #: `Beautiful Soup `__ #: A common example:: #: #: remove_tags = [dict(name='div', class_='advert')] @@ -571,7 +571,7 @@ class BasicNewsRecipe(Recipe): an ad page, return the HTML of the real page. Otherwise return None. - `soup`: A `BeautifulSoup `_ + `soup`: A `BeautifulSoup `__ instance containing the downloaded :term:`HTML`. ''' return None @@ -613,7 +613,7 @@ class BasicNewsRecipe(Recipe): It can be used to do arbitrarily powerful pre-processing on the :term:`HTML`. It should return `soup` after processing it. - `soup`: A `BeautifulSoup `_ + `soup`: A `BeautifulSoup `__ instance containing the downloaded :term:`HTML`. ''' return soup @@ -625,7 +625,7 @@ class BasicNewsRecipe(Recipe): It can be used to do arbitrarily powerful post-processing on the :term:`HTML`. It should return `soup` after processing it. - :param soup: A `BeautifulSoup `_ instance containing the downloaded :term:`HTML`. + :param soup: A `BeautifulSoup `__ instance containing the downloaded :term:`HTML`. :param first_fetch: True if this is the first page of an article. ''' @@ -660,7 +660,7 @@ class BasicNewsRecipe(Recipe): def index_to_soup(self, url_or_raw, raw=False, as_tree=False, save_raw=None): ''' Convenience method that takes an URL to the index page and returns - a `BeautifulSoup `_ + a `BeautifulSoup `__ of it. `url_or_raw`: Either a URL or the downloaded index page as a string