diff options
| author | Yousuf Philips <philipz85@hotmail.com> | 2016-03-07 12:06:10 +0400 |
|---|---|---|
| committer | Olivier Hallot <ohallot@collabora.co.uk> | 2016-03-09 21:50:55 +0000 |
| commit | 17d37456a2c3e912a137b7af643de8aa4aa34bbb (patch) | |
| tree | 8e6588ae1d17dba567bb6cbd00210cbbac277ff3 /source/text/swriter/01/04190000.xhp | |
| parent | dec91da1bdf9b9abbb0d54551cf6722c7aeb3ce8 (diff) | |
tdf#92825 Rearrange Writer's insert menu
fix merge conflict
Change-Id: I8c67b61fdc6042291890bf80b47d762dd89d76d4
Reviewed-on: https://gerrit.libreoffice.org/22972
Reviewed-by: Olivier Hallot <ohallot@collabora.co.uk>
Tested-by: Olivier Hallot <ohallot@collabora.co.uk>
Diffstat (limited to 'source/text/swriter/01/04190000.xhp')
| -rw-r--r-- | source/text/swriter/01/04190000.xhp | 38 |
1 files changed, 18 insertions, 20 deletions
diff --git a/source/text/swriter/01/04190000.xhp b/source/text/swriter/01/04190000.xhp index 374771331b..86f20609f5 100644 --- a/source/text/swriter/01/04190000.xhp +++ b/source/text/swriter/01/04190000.xhp @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - - +<helpdocument version="1.0"> <!-- * This file is part of the LibreOffice project. * @@ -17,27 +16,26 @@ * License, Version 2.0 (the "License"); you may not use this file * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . - --> - -<helpdocument version="1.0"> +--> + <meta> -<topic id="textswriter0104190000xml" indexer="include" status="PUBLISH"> -<title id="tit" xml-lang="en-US">Insert (File)</title> -<filename>/text/swriter/01/04190000.xhp</filename> -</topic> -<history> -<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created> -</history> + <topic id="textswriter0104190000xml" indexer="include" status="PUBLISH"> + <title id="tit" xml-lang="en-US">Insert (File)</title> + <filename>/text/swriter/01/04190000.xhp</filename> + </topic> </meta> + <body> -<bookmark xml-lang="en-US" branch="hid/.uno:InsertDoc" id="bm_id6224917" localize="false"/><!-- HID added by script --> -<bookmark xml-lang="en-US" branch="hid/.uno:InsertDoc" id="bm_id3151180" localize="false"/> -<paragraph role="heading" id="hd_id3147562" xml-lang="en-US" level="1" l10n="U" oldref="1">Insert (File)</paragraph> -<paragraph role="paragraph" id="par_id3145411" xml-lang="en-US" l10n="U" oldref="2"><variable id="datei"><ahelp hid=".uno:InsertDoc">Inserts a text file at the current cursor position.</ahelp> -</variable></paragraph> + +<bookmark xml-lang="en-US" branch="hid/.uno:InsertDoc" id="bm_id6224917" localize="false"/> + +<paragraph id="hd_id3147562" role="heading" level="1" xml-lang="en-US">Insert (Document)</paragraph> +<paragraph id="par_id3145411" role="paragraph" xml-lang="en-US"><variable id="datei"><ahelp hid=".">Inserts the contents of another document into the current document at the cursor position.</ahelp> </variable></paragraph> + <section id="howtoget"> - <embed href="text/swriter/00/00000404.xhp#einfdatei"/> +<embed href="text/swriter/00/00000404.xhp#einfdatei"/> </section> -<paragraph role="tip" id="par_idN105BD" xml-lang="en-US" l10n="NEW">To always have the latest version of the contents of a file, insert a section into your document, and then insert a link to the text file in the section. See <link href="text/swriter/01/04020100.xhp">insert a section</link> for details.</paragraph> +<paragraph id="par_idN105BD" role="tip" xml-lang="en-US">To always have the latest version of the contents of a file, insert a section into your document, and then insert a link to the text file in the section. See <link href="text/swriter/01/04020100.xhp">insert a section</link> for details.</paragraph> </body> -</helpdocument> + +</helpdocument>
\ No newline at end of file |