Merge branch 'hotfix'

This commit is contained in:
Bastien Guerry 2012-04-09 12:35:15 +02:00
commit 00f59ff30b
1 changed files with 11 additions and 12 deletions

View File

@ -9570,7 +9570,7 @@ collaboration across organizational boundaries. For project management you
can create gantt and resource charts by using TaskJuggler export. To
incorporate entries with associated times like deadlines or appointments into
a desktop calendar program like iCal, Org mode can also produce extracts in
the iCalendar format. Currently Org mode only supports export, not import of
the iCalendar format. Currently, Org mode only supports export, not import of
these different formats.
Org supports export of selected regions when @code{transient-mark-mode} is
@ -10906,10 +10906,10 @@ one format (say @samp{csv}) to another format (say @samp{ods} or @samp{xls}).
If you have a working installation of LibreOffice, a document converter is
pre-configured for you and you can use it right away. If you would like to
use @file{unoconv} as your preferred converter, customize the variable
@code{org-export-odt-convert-process} to point to @code{unoconv}. If you
would like to use a converter of your own choosing or tweak the default
settings of the default @file{LibreOffice} and @samp{unoconv} converters
@xref{Configuring a document converter}.
@code{org-export-odt-convert-process} to point to @code{unoconv}. You can also
use a converter of your own choice or tweak the default settings of the default
@file{LibreOffice} and @samp{unoconv} converters
(@xref{Configuring a document converter}).
@subsubsection Automatically exporting to other formats
@anchor{x-export-to-other-formats}
@ -11355,10 +11355,9 @@ the variable @code{org-export-odt-convert-processes}. Also specify how the
converter can be invoked via command-line to effect the conversion.
@item Configure its capabilities
@vindex org-export-odt-convert-capabilities
@anchor{x-odt-converter-capabilities}
Specify the set of formats the converter can handle by customizing the
variable @code{org-export-odt-convert-capabilities}. Use the default value
for this variable as a guide for configuring your converter. As suggested by