diff --git a/DITA/UserManual.ditamap b/DITA/UserManual.ditamap index 52c454af57..c637e36db0 100644 --- a/DITA/UserManual.ditamap +++ b/DITA/UserManual.ditamap @@ -37,6 +37,7 @@ + @@ -129,6 +130,7 @@ + diff --git a/DITA/chapter.configure-application.ditamap b/DITA/chapter.configure-application.ditamap index 75c0103f44..8408f1abd3 100644 --- a/DITA/chapter.configure-application.ditamap +++ b/DITA/chapter.configure-application.ditamap @@ -47,7 +47,7 @@ - + @@ -72,7 +72,7 @@ - + diff --git a/DITA/reusables/reusables.ditamap b/DITA/reusables/reusables.ditamap new file mode 100644 index 0000000000..fbc796e887 --- /dev/null +++ b/DITA/reusables/reusables.ditamap @@ -0,0 +1,12 @@ + + + + Reusable content + + + + + + + + diff --git a/DITA/reusables/topics/reusable.menu-elements.dita b/DITA/reusables/topics/reusable.menu-elements.dita new file mode 100644 index 0000000000..8e00f983fc --- /dev/null +++ b/DITA/reusables/topics/reusable.menu-elements.dita @@ -0,0 +1,43 @@ + + + + Reusable menu elements + +

Don't use the ids that start with 'z_'. They are used internally for creating conref start + and end ids which are then used to create a single conkeyrefable element.

+

Preferences page

+

+ Options + Preferences + + + Window + Preferences + oXygen XML Editor + + + Window + Preferences + oXygen XML Author + + + Window + Preferences + oXygen XML Deveoper + +

+

+ + + + + + +

+

+ + diff --git a/DITA/tasks/creating-from-templates.dita b/DITA/tasks/creating-from-templates.dita index bc68fa97f6..2a483f69a8 100644 --- a/DITA/tasks/creating-from-templates.dita +++ b/DITA/tasks/creating-from-templates.dita @@ -15,7 +15,8 @@
  • User defined templates - The user can add template files in the templates folder of the - install directory. Also in the option page Options Preferences diff --git a/DITA/topics/preferences-editor.dita b/DITA/topics/preferences-editor.dita index f5f94b75ce..63bc5c8700 100644 --- a/DITA/topics/preferences-editor.dita +++ b/DITA/topics/preferences-editor.dita @@ -11,7 +11,8 @@ -

    To open the Editor preferences page, go to +

    To open the Editor preferences page, go to + Options Window Preferences diff --git a/DITA/topics/preferences-encoding.dita b/DITA/topics/preferences-encoding.dita index 950b66a652..a71b50aea1 100644 --- a/DITA/topics/preferences-encoding.dita +++ b/DITA/topics/preferences-encoding.dita @@ -14,22 +14,21 @@

    To open the Encoding preferences page, go to - Options - Preferences + Encoding . The following encoding preferences are available:

    • Encoding for non XML files - This - setting specifies the default character encoding used to open non-XML - documents. More precisely, this is the encoding used for files opened in - editors other than the XML editor. The file types opened by each editor are specified in - . For XML files, the default encoding is UTF-8, and - other encodings must be declared explicitly in the XML declaration (for example - <?xml version="1.0" encoding="UTF-16"?>). Most other text - formats do not have a default character encoding, nor a standard method of indicating the - character encoding. + setting specifies the default character encoding used to open non-XML documents. + More precisely, this is the encoding used for files + opened in editors other than the XML editor. The file types opened by each editor are + specified in . For XML files, the default + encoding is UTF-8, and other encodings must be declared explicitly in the XML declaration + (for example <?xml version="1.0" encoding="UTF-16"?>). Most + other text formats do not have a default character encoding, nor a standard method of + indicating the character encoding. This option sets which encoding will be used for reading and writing these files.