diff --git a/resources/recipes/outlook_india.recipe b/resources/recipes/outlook_india.recipe index 6bec491c75..1dccd468e5 100644 --- a/resources/recipes/outlook_india.recipe +++ b/resources/recipes/outlook_india.recipe @@ -14,7 +14,6 @@ class OutlookIndia(BasicNewsRecipe): encoding = 'utf-8' language = 'en_IN' - recursions = 1 extra_css = ''' body{font-family:Arial,Helvetica,sans-serif; font-size:xx-small;} .fspheading{color:#AF0E25 ; font-family:"Times New Roman",Times,serif; font-weight:bold ; font-size:large; } diff --git a/src/calibre/manual/conversion.rst b/src/calibre/manual/conversion.rst index 54fbc7362e..949bd9527b 100644 --- a/src/calibre/manual/conversion.rst +++ b/src/calibre/manual/conversion.rst @@ -418,11 +418,11 @@ Convert Microsoft Word documents |app| does not directly convert .doc files from Microsoft Word. However, in Word, you can save the document as HTML and then convert the resulting HTML file with |app|. When saving as HTML, be sure to use the -"Save as filtered HTML" option as this will produce clean HTML that will convert well. +"Save as Web Page, Filtered" option as this will produce clean HTML that will convert well. There is a Word macro package that can automate the conversion of Word documents using |app|. It also makes generating the Table of Contents much simpler. It is called BookCreator and is available for free -`here `_. +`here `_. Convert TXT documents ~~~~~~~~~~~~~~~~~~~~~~ diff --git a/src/calibre/utils/complete.py b/src/calibre/utils/complete.py index 26b3108c0b..d196a9521b 100644 --- a/src/calibre/utils/complete.py +++ b/src/calibre/utils/complete.py @@ -65,6 +65,7 @@ def split(src): def files_and_dirs(prefix, allowed_exts=[]): + prefix = os.path.expanduser(prefix) for i in glob.iglob(prefix+'*'): _, ext = os.path.splitext(i) ext = ext.lower().replace('.', '')