diff --git a/setup/upload.py b/setup/upload.py index d1ab1f3c85..a671a8d3d8 100644 --- a/setup/upload.py +++ b/setup/upload.py @@ -82,7 +82,7 @@ def get_sourceforge_data(): return {'username':'kovidgoyal', 'project':'calibre'} def send_data(loc): - subprocess.check_call(['rsync', '-r', '-z', '-h', '--progress', '-e', 'ssh -x', + subprocess.check_call(['rsync', '--delete', '-r', '-z', '-h', '--progress', '-e', 'ssh -x', loc+'/', '%s@%s:%s'%(STAGING_USER, STAGING_HOST, STAGING_DIR)]) def gc_cmdline(ver, gdata): diff --git a/src/calibre/ebooks/oeb/display/cfi.coffee b/src/calibre/ebooks/oeb/display/cfi.coffee index b14d26950e..b471b3cb1b 100644 --- a/src/calibre/ebooks/oeb/display/cfi.coffee +++ b/src/calibre/ebooks/oeb/display/cfi.coffee @@ -393,7 +393,7 @@ class CanonicalFragmentIdentifier py = ((y + cwin.scrollY - target.offsetTop)*100)/target.offsetHeight tail = "#{ tail }@#{ fstr px },#{ fstr py }" else if name != 'audio' - # Get the test offset + # Get the text offset # We use a custom function instead of caretRangeFromPoint as # caretRangeFromPoint does weird things when the point falls in the # padding of the element