summaryrefslogtreecommitdiff
path: root/doc/misc/ediff.texi
Commit message (Collapse)AuthorAgeFilesLines
* Clarify usage of 'ediff-cleanup-hook' (Bug#24675)Philipp Stephani2016-12-231-3/+8
| | | | * doc/misc/ediff.texi (Hooks): Clarify usage of 'ediff-cleanup-hook'
* Fix copyright years by handPaul Eggert2016-01-011-1/+1
| | | | | These are dates that admin/update-copyright did not update, or updated incorrectly.
* Restore some of the quoting in the manualsEli Zaretskii2015-09-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * doc/lispref/windows.texi (Coordinates and Windows) (Coordinates and Windows): * doc/lispref/variables.texi (Lexical Binding) (File Local Variables): * doc/lispref/text.texi (Format Properties): * doc/lispref/symbols.texi (Symbol Components): * doc/lispref/strings.texi (Creating Strings): * doc/lispref/sequences.texi (Sequence Functions): * doc/lispref/searching.texi (Regexp Special, Regexp Search) (Search and Replace): * doc/lispref/processes.texi (Bindat Spec): * doc/lispref/os.texi (Idle Timers): * doc/lispref/objects.texi (Basic Char Syntax): * doc/lispref/numbers.texi (Float Basics, Random Numbers): * doc/lispref/nonascii.texi (Character Properties): * doc/lispref/modes.texi (Major Mode Conventions, Mode Hooks) (Mode Line Variables): * doc/lispref/minibuf.texi (Text from Minibuffer): * doc/lispref/loading.texi (Autoload): * doc/lispref/keymaps.texi (Controlling Active Maps): * doc/lispref/frames.texi (Frame Layout, Size and Position) (Size Parameters, Implied Frame Resizing): * doc/lispref/files.texi (Changing Files, Magic File Names): * doc/lispref/eval.texi (Self-Evaluating Forms): * doc/lispref/display.texi (Progress, Abstract Display) (Abstract Display Example, Bidirectional Display): * doc/lispref/commands.texi (Event Mod): * doc/emacs/windows.texi (Displaying Buffers): * doc/emacs/trouble.texi (Bug Criteria, Checklist): * doc/emacs/text.texi (Enriched Text): * doc/emacs/programs.texi (MixedCase Words): * doc/emacs/picture-xtra.texi (Insert in Picture) (Tabs in Picture): * doc/emacs/misc.texi (Emacs Server, Printing): * doc/emacs/mini.texi (Minibuffer History): * doc/emacs/maintaining.texi (Old Revisions, VC Change Log) (Pulling / Pushing): * doc/emacs/killing.texi (Yanking, Cut and Paste, Clipboard): * doc/emacs/help.texi (Help, Help Echo): * doc/emacs/glossary.texi (Glossary): * doc/emacs/frames.texi (Mouse Commands, Creating Frames) (Frame Commands): * doc/emacs/files.texi (Reverting, Saving, Directories): * doc/emacs/entering.texi (Exiting): * doc/emacs/emacs.texi (Top): * doc/emacs/cmdargs.texi (Window Size X, Icons X): * doc/emacs/anti.texi (Antinews): Restore quoting of text where appropriate or replace quoting with @dfn. * doc/misc/ediff.texi (Window and Frame Configuration): * doc/lispref/processes.texi (Network Feature Testing): * doc/lispref/display.texi (Display Margins): Quote the phrase after "a.k.a." where appropriate.
* Prefer plain characters to Texinfo circumlocutionsPaul Eggert2015-05-011-2/+2
| | | | | For example, prefer 'François' to 'Fran\c{c}ois', 'Fran\c cois', 'Fran@,{c}ois' or 'Francois' (all of which were used!) in Texinfo sources.
* Fix single-quoting style in PDF manualsPaul Eggert2015-05-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The PDF versions of the GNU manuals used curved single quotes to represent grave accent and apostrophe, which made it a pain to cut and paste code examples from them. Fix the PDF versions to use grave accent and apostrophe for Lisp source code, keystrokes, etc. This change does not affect the info files, nor does it affect ordinary uses of curved single quotes in PDF. * doc/emacs/docstyle.texi: New file, which specifies treatment for grave accent and apostrophe, as well as the document encoding. * doc/emacs/emacs-xtra.texi, doc/emacs/emacs.texi: * doc/lispintro/emacs-lisp-intro.texi: * doc/lispref/back.texi, doc/lispref/book-spine.texi: * doc/lispref/elisp.texi, doc/lispref/lay-flat.texi: * doc/misc/ada-mode.texi, doc/misc/auth.texi: * doc/misc/autotype.texi, doc/misc/bovine.texi, doc/misc/calc.texi: * doc/misc/cc-mode.texi, doc/misc/cl.texi, doc/misc/dbus.texi: * doc/misc/dired-x.texi, doc/misc/ebrowse.texi, doc/misc/ede.texi: * doc/misc/ediff.texi, doc/misc/edt.texi, doc/misc/efaq-w32.texi: * doc/misc/efaq.texi, doc/misc/eieio.texi, doc/misc/emacs-gnutls.texi: * doc/misc/emacs-mime.texi, doc/misc/epa.texi, doc/misc/erc.texi: * doc/misc/ert.texi, doc/misc/eshell.texi, doc/misc/eudc.texi: * doc/misc/eww.texi, doc/misc/flymake.texi, doc/misc/forms.texi: * doc/misc/gnus-coding.texi, doc/misc/gnus-faq.texi: * doc/misc/gnus.texi, doc/misc/htmlfontify.texi: * doc/misc/idlwave.texi, doc/misc/ido.texi, doc/misc/info.texi: * doc/misc/mairix-el.texi, doc/misc/message.texi, doc/misc/mh-e.texi: * doc/misc/newsticker.texi, doc/misc/nxml-mode.texi: * doc/misc/octave-mode.texi, doc/misc/org.texi, doc/misc/pcl-cvs.texi: * doc/misc/pgg.texi, doc/misc/rcirc.texi, doc/misc/reftex.texi: * doc/misc/remember.texi, doc/misc/sasl.texi, doc/misc/sc.texi: * doc/misc/semantic.texi, doc/misc/ses.texi, doc/misc/sieve.texi: * doc/misc/smtpmail.texi, doc/misc/speedbar.texi: * doc/misc/srecode.texi, doc/misc/todo-mode.texi, doc/misc/tramp.texi: * doc/misc/url.texi, doc/misc/vhdl-mode.texi, doc/misc/vip.texi: * doc/misc/viper.texi, doc/misc/widget.texi, doc/misc/wisent.texi: * doc/misc/woman.texi: Use it instead of '@documentencoding UTF-8', to lessen the need for global changes like this in the future. * doc/emacs/Makefile.in (EMACS_XTRA): * doc/lispintro/Makefile.in (srcs): * doc/lispref/Makefile.in (srcs): Add dependency on docstyle.texi. * doc/misc/Makefile.in (style): New macro. (${buildinfodir}/%.info, %.dvi, %.pdf, %.html) (${buildinfodir}/ccmode.info, ${buildinfodir}/efaq%.info, gnus_deps): Use it.
* Minor quoting etc. fixes to misc manualsPaul Eggert2015-04-111-27/+33
| | | | | | | | | | Fix some minor quoting and spacing issues. Distinguish more clearly among grave accent and apostrophe (which are ASCII) and single quote (which is not). Prefer the standard terms "apostrophe" and "grave accent" to alternative names that can be confusing. Use apostrophes to single-quote ASCII text. * doc/misc/remember.texi: Spell the mystic's pseudonym in UTF-8 rather than approximating it in ASCII with grave accent.
* Fix copyright years by handPaul Eggert2015-01-011-1/+1
| | | | | | These are dates that admin/update-copyright did not update, or updated incorrectly. Also, back out the copyright-date change to doc/misc/texinfo.tex, as upstream hasn't updated that date yet.
* Remove remaining mentions of VMS as a hostReuben Thomas2014-08-071-7/+1
| | | | | | | | | | | | | | | | | * notes/exit-value: Remove specific discussion of VMS. * doc/emacs/programs.texi (Program Modes): Don't advertise VMS DCL support any more. * doc/misc/ediff.texi (Merging and diff3): Don't mention lack of support for VMS diff, we no longer support VMS. * lisp/progmodes/ada-mode.el: * lisp/net/tramp.el (tramp-handle-file-symlink-p): * lisp/net/tramp-ftp.el (tramp-ftp-file-name-handler): Remove a comment about VMS, which we no longer support. * lisp/progmodes/ada-xref.el (ada-xref-current): Remove mention of VMS, and fix a FIXME, using convert-standard-filename in place of removed ada-convert-file-name. * lisp/url/url-handlers.el: Remove a comment about VMS, which we no longer support.
* Add .info extension to @setfilename commands in doc/Glenn Morris2014-06-091-1/+1
| | | | | This makes no difference to anything, since we always use makeinfo -o, but it makes automake happier, if we ever decide to use that.
* Standardize case of "Front-Cover Texts" in texi file permissions notices.Glenn Morris2014-05-071-1/+1
| | | | Ref: http://lists.gnu.org/archive/html/bug-texinfo/2014-05/msg00015.html
* Specify .texi encoding.Paul Eggert2014-01-051-0/+1
| | | | | | | | | | | | | | | | | | * emacs-lisp-intro.texi: * back.texi, book-spine.texi, lay-flat.texi: * ada-mode.texi, auth.texi, autotype.texi, bovine.texi, calc.texi: * cc-mode.texi, cl.texi, dbus.texi, dired-x.texi, ebrowse.texi: * ede.texi, ediff.texi, edt.texi, efaq.texi, eieio.texi: * emacs-gnutls.texi, epa.texi, erc.texi, ert.texi: * eshell.texi, eudc.texi, flymake.texi, forms.texi, gnus-coding.texi: * gnus-faq.texi, htmlfontify.texi, idlwave.texi, ido.texi, info.texi: * message.texi, mh-e.texi, newsticker.texi, nxml-mode.texi: * octave-mode.texi, org.texi, pcl-cvs.texi, pgg.texi, rcirc.texi: * reftex.texi, remember.texi, sasl.texi, sc.texi, semantic.texi: * ses.texi, sieve.texi, smtpmail.texi, speedbar.texi, srecode.texi: * todo-mode.texi, tramp.texi, url.texi, vip.texi, viper.texi: * widget.texi, wisent.texi, woman.texi: Add @documentencoding.
* Fix copyright years by hand.Paul Eggert2014-01-011-1/+1
| | | | | These are dates that admin/update-copyright did not update, or updated incorrectly.
* Revert @documentencoding changes in the docs.Eli Zaretskii2013-12-301-2/+0
|
* Specify info encoding and language.Paul Eggert2013-12-291-0/+2
| | | | | | | | | | | | | | | | | | | | | | * emacs.texi, emacs-xtra.texi: * emacs-lisp-intro.texi: * back.texi, book-spine.texi, elisp.texi, lay-flat.texi: * ada-mode.texi, auth.texi, autotype.texi, bovine.texi, calc.texi: * cc-mode.texi, cl.texi, dbus.texi, dired-x.texi, ebrowse.texi: * ede.texi, ediff.texi, edt.texi, efaq-w32.texi, efaq.texi: * eieio.texi, emacs-gnutls.texi, emacs-mime.texi, epa.texi, erc.texi: * ert.texi, eshell.texi, eudc.texi, flymake.texi, forms.texi: * gnus-coding.texi, gnus-faq.texi, gnus.texi, htmlfontify.texi: * idlwave.texi, ido.texi, info.texi, mairix-el.texi, message.texi: * mh-e.texi, newsticker.texi, nxml-mode.texi, octave-mode.texi: * org.texi, pcl-cvs.texi, pgg.texi, rcirc.texi, reftex.texi: * remember.texi, sasl.texi, sc.texi, semantic.texi, ses.texi: * sieve.texi, smtpmail.texi, speedbar.texi, srecode.texi: * todo-mode.texi, tramp.texi, url.texi, vip.texi, viper.texi: * widget.texi, wisent.texi, woman.texi: Add @documentencoding, @documentlanguage as needed. Fixes: debbugs:16292
* Add support for auto-generating info/dirGlenn Morris2013-12-111-1/+2
| | | | | | | | | | | | | | | | | | | | * admin/update_autogen: Add option to generate info/dir. (Usage): Add -I. (info_flag): New variable. (-I): New option. (doc): Maybe check its status. (info_dir): New function. * admin/dir_top: New file. * doc/emacs/emacs.texi: * doc/lispintro/emacs-lisp-intro.texi: * doc/lispref/elisp.texi: * doc/misc/autotype.texi, doc/misc/cc-mode.texi, doc/misc/ediff.texi: * doc/misc/ert.texi, doc/misc/htmlfontify.texi, doc/misc/ido.texi: * doc/misc/octave-mode.texi, doc/misc/org.texi, doc/misc/srecode.texi: * doc/misc/todo-mode.texi, doc/misc/tramp.texi: Sync direntry with info/dir version.
* Merge from emacs-24; up to 2012-12-17T11:17:34Z!rgm@gnu.orgGlenn Morris2013-02-121-1/+1
|\
| * In doc, use standard American English style for e.g., etc., i.e.Paul Eggert2013-02-121-1/+1
| |
* | Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.caPaul Eggert2013-01-021-1/+1
|\|
| * Update copyright notices for 2013.Paul Eggert2013-01-011-1/+1
| |
* | Remove more hand-written node pointers in doc/miscGlenn Morris2012-12-221-26/+26
|/
* Hyphen and dash fixes in texinfo files.Paul Eggert2012-12-221-5/+5
|
* Don't say "buying copies from the FSF" for manuals they do not publishGlenn Morris2012-12-211-2/+1
| | | | Ref "License Notices for Documentation" in maintain.info
* Fix minor whitespace issues after "." in manual.Paul Eggert2012-12-051-24/+24
| | | | | | | | | | | | Be more systematic about using "@." (not ".") at end of sentence that ends in a capital letter, and about appending "@:" after non-ends of sentences that end in a lower case letter followed by "." followed by whitespace. Omit unnecessary use of "@:" and "@.". Similarly for "?" and "!". Be more consistent about putting a comma after "i.e." and "e.g."; this is the typical American style and it's easier to code in Texinfo. Fixes: debbugs:12973
* Cleanup uses of "-hooks".Stefan Monnier2012-10-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * doc/emacs/custom.texi (Hooks): * doc/lispref/hooks.texi (Standard Hooks): Clarify that -hooks is deprecated. * lisp/gnus/nndiary.el (nndiary-request-create-group-functions) (nndiary-request-update-info-functions) (nndiary-request-accept-article-functions): * lisp/gnus/gnus-start.el (gnus-subscribe-newsgroup-functions): * lisp/cedet/semantic/db-file.el (semanticdb-save-database-functions): * lisp/cedet/semantic/lex.el (semantic-lex-reset-functions): * lisp/cedet/semantic/edit.el (semantic-change-functions) (semantic-edits-new-change-functions) (semantic-edits-delete-change-functions) (semantic-edits-reparse-change-functions): * lisp/htmlfontify.el (hfy-post-html-hook): * lisp/filesets.el (filesets-cache-fill-content-hook): * lisp/arc-mode.el (archive-extract-hook): * lisp/progmodes/cc-mode.el (c-prepare-bug-report-hook): * lisp/net/rcirc.el (rcirc-sentinel-functions) (rcirc-receive-message-functions, rcirc-activity-functions) (rcirc-print-functions): * lisp/net/dbus.el (dbus-event-error-functions): * lisp/emacs-lisp/eieio.el (eieio-pre-method-execution-functions): * lisp/emacs-lisp/checkdoc.el (checkdoc-style-functions) (checkdoc-comment-style-functions): Don't use "-hooks" suffix. * lisp/term/sun.el (sun-raw-prefix-hooks): * lisp/mail/sendmail.el (mail-yank-hooks): * lisp/mh-e/mh-letter.el (mh-yank-hooks): Use make-obsolete-variable.
* Standardize possessive apostrophe usage in manuals, docs, and commentsGlenn Morris2012-02-281-1/+1
| | | | Ref: http://lists.gnu.org/archive/html/emacs-devel/2012-02/msg00649.html
* * doc/misc/ediff.texi (Quick Help Commands): Add a couple of index entries.Chong Yidong2012-02-261-0/+2
| | | | Fixes: debbugs:10834
* Add 2012 to FSF copyright years for Emacs filesGlenn Morris2012-01-051-1/+1
|
* Fix typos.Juanma Barranquero2011-11-141-1/+1
|
* Remove mention of `require' in ediff.texiLars Magne Ingebrigtsen2011-07-071-12/+0
| | | | | | That's not pertinent in the installed Emacs. Fixes: debbugs:9016
* Merge from emacs-23; up to 2010-06-01T01:49:15Z!monnier@iro.umontreal.caGlenn Morris2011-02-191-1/+1
|\
| * Synchronize @dircategory directives in doc/misc with info/dir.Eli Zaretskii2011-02-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ada-mode.texi: Sync @dircategory with ../../info/dir. auth.texi: Sync @dircategory with ../../info/dir. autotype.texi: Sync @dircategory with ../../info/dir. calc.texi: Sync @dircategory with ../../info/dir. cc-mode.texi: Sync @dircategory with ../../info/dir. cl.texi: Sync @dircategory with ../../info/dir. dbus.texi: Sync @dircategory with ../../info/dir. dired-x.texi: Sync @dircategory with ../../info/dir. ebrowse.texi: Sync @dircategory with ../../info/dir. ede.texi: Sync @dircategory with ../../info/dir. ediff.texi: Sync @dircategory with ../../info/dir. edt.texi: Sync @dircategory with ../../info/dir. eieio.texi: Sync @dircategory with ../../info/dir. emacs-mime.texi: Sync @dircategory with ../../info/dir. epa.texi: Sync @dircategory with ../../info/dir. erc.texi: Sync @dircategory with ../../info/dir. eshell.texi: Sync @dircategory with ../../info/dir. eudc.texi: Sync @dircategory with ../../info/dir. flymake.texi: Sync @dircategory with ../../info/dir. forms.texi: Sync @dircategory with ../../info/dir. gnus.texi: Sync @dircategory with ../../info/dir. idlwave.texi: Sync @dircategory with ../../info/dir. mairix-el.texi: Sync @dircategory with ../../info/dir. message.texi: Sync @dircategory with ../../info/dir. mh-e.texi: Sync @dircategory with ../../info/dir. newsticker.texi: Sync @dircategory with ../../info/dir. nxml-mode.texi: Sync @dircategory with ../../info/dir. org.texi: Sync @dircategory with ../../info/dir. pcl-cvs.texi: Sync @dircategory with ../../info/dir. pgg.texi: Sync @dircategory with ../../info/dir. rcirc.texi: Sync @dircategory with ../../info/dir. reftex.texi: Sync @dircategory with ../../info/dir. remember.texi: Sync @dircategory with ../../info/dir. sasl.texi: Sync @dircategory with ../../info/dir. sc.texi: Sync @dircategory with ../../info/dir. semantic.texi: Sync @dircategory with ../../info/dir. ses.texi: Sync @dircategory with ../../info/dir. sieve.texi: Sync @dircategory with ../../info/dir. smtpmail.texi: Sync @dircategory with ../../info/dir. speedbar.texi: Sync @dircategory with ../../info/dir. trampver.texi [emacs]: Set emacsname to "Emacs". tramp.texi: Sync @dircategory with ../../info/dir. url.texi: Sync @dircategory with ../../info/dir. vip.texi: Sync @dircategory with ../../info/dir. viper.texi: Sync @dircategory with ../../info/dir. widget.texi: Sync @dircategory with ../../info/dir. woman.texi: Sync @dircategory with ../../info/dir.
* | Add @top to some misc/*.texi files.Glenn Morris2011-02-121-1/+1
| | | | | | | | | | * ada-mode.texi, dired-x.texi, ebrowse.texi, ediff.texi, eudc.texi: * idlwave.texi, reftex.texi, sc.texi, speedbar.texi: Add @top.
* | Convert consecutive FSF copyright years to ranges.Glenn Morris2011-01-241-2/+1
| |
* | Merge from emacs-23Stefan Monnier2011-01-141-1/+1
|\|
| * Add 2011 to FSF/AIST copyright years.Glenn Morris2011-01-021-1/+1
| |
* | Don't be so lax with spelling.Glenn Morris2010-11-021-5/+2
|/ | | | | | * lisp/net/dbus.el (dbus-name-owner-changed-handler): Doc fix. * doc/misc/ediff.texi (Quick Help Commands, Miscellaneous): Spelling fix.
* Add 2010 to copyright years.Glenn Morris2010-01-131-1/+1
|
* 2009-08-15 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2009-08-151-98/+104
| | | | | | * ediff.texi (ediff-current-file): added information about this new function. * viper.text: Added information about C-s in viper's search command.
* (Session Commands): Fix typo.Chong Yidong2009-04-131-1/+1
|
* consistently use @insertcopying, @direntry, @contentsKarl Berry2009-02-161-3/+3
|
* Add 2009 to copyright years.Glenn Morris2009-01-081-1/+1
|
* Relicense all texi files under FDL 1.3 or later.Glenn Morris2008-11-191-1/+1
|
* version timestamp updateMichael Kifer2008-11-161-2/+3
|
* * bitmaps/README:Dan Nicolaescu2008-07-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * xfns.c: * termcap.c: * term.c: * syswait.h: * systty.h: * systime.h: * syssignal.h: * sysdep.c: * process.h: * process.c: * print.c: * ndir.h: * lread.c: * keyboard.c: * getpagesize.h: * floatfns.c: * fileio.c: * emacs.c: * doc.c: * dispnew.c: * dired.c: * data.c: * callproc.c: * buffer.c: * README: * Makefile.in: * s/template.h: * s/msdos.h: * m/vax.h: Remove VMS support. * s/vms.h: * vlimit.h: * uaf.h: * temacs.opt: * param.h: * ioctl.h: Remove file. * descrip.mms: * compile.com: Remove file. * Create.c: Remove VMS support. * message.el (Module): * gnus-start.el (Module): * gnus-registry.el (Module): * textmodes/texinfmt.el: * nxml/nxml-enc.el: * mail/feedmail.el: * international/mule.el: * international/latexenc.el: * emulation/viper-util.el: * emulation/viper-init.el: * emulation/viper-ex.el: * emacs-lisp/bytecomp.el: * version.el: * subr.el: * startup.el: * sort.el: * shadowfile.el: * recentf.el: * printing.el: * paths.el: * minibuffer.el: * ls-lisp.el: * loadup.el: * hippie-exp.el: * finder.el: * files.el: * ediff-util.el: * ediff-ptch.el: * ediff-init.el: * ediff-diff.el: * dired.el: * dired-aux.el: * cus-edit.el: * bindings.el: * arc-mode.el: * add-log.el: Remove VMS support. * obsolete/vmsproc.el: * obsolete/vms-pmail.el: * obsolete/vms-patch.el: Remove file. * etags.c: * emacsclient.c: Remove VMS support. * termcap.src: Remove file. * README: * PROBLEMS: * MACHINES: Remove VMS info. * ediff.texi: Remove VMS support. * os.texi: * intro.texi: * files.texi: Remove VMS support. * emacs.texi: Remove VMS support. * make-dist: * README: Remove VMS support. * vms: Remove directory.
* Remove references to external license, since doclicense is included.Glenn Morris2008-06-151-9/+3
|
* Update Back-Cover Text as per maintain.info.Glenn Morris2008-06-131-3/+3
|
* Merge from emacs--rel--22Miles Bader2008-01-221-1/+1
| | | | Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1006
* (setfilename): Go up one more level to ../../info.Glenn Morris2007-09-061-1/+1
|
* Move here from ../../manGlenn Morris2007-09-061-0/+2546
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-15 08:20:13 +0000