source/text/shared/01/01170000.xhp             |    2 +-
 source/text/shared/autopi/01170000.xhp         |    4 ++--
 source/text/shared/guide/hyperlink_rel_abs.xhp |    2 +-
 source/text/shared/guide/start_parameters.xhp  |    6 +++---
 source/text/shared/optionen/01000000.xhp       |    4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 58fe67c610ff2f7e67266424cb657129e3311975
Author: Adolfo Jayme Barrientos <fit...@ubuntu.com>
Date:   Sun Mar 19 13:07:18 2017 -0600

    Update references to Apple’s computer OS to “macOS”
    
    I know the capitalization is ridiculous, but that’s how they write it now.
    
    Change-Id: I8043b41353a327dfe1ef19636ebb1573e6a11107

diff --git a/source/text/shared/01/01170000.xhp 
b/source/text/shared/01/01170000.xhp
index a111b05fc..e992d9c74 100644
--- a/source/text/shared/01/01170000.xhp
+++ b/source/text/shared/01/01170000.xhp
@@ -34,7 +34,7 @@
 <bookmark xml-lang="en-US" branch="index" 
id="bm_id3154545"><bookmark_value>exiting;$[officename]</bookmark_value>
 </bookmark><comment>mw made "exiting..." a two level entry</comment>
 <bookmark xml-lang="en-US" branch="hid/.uno:Quit" id="bm_id3155619" 
localize="false"/><paragraph role="heading" id="hd_id3154545" xml-lang="en-US" 
level="1" l10n="U" oldref="1"><link href="text/shared/01/01170000.xhp" 
name="Exit">Exit</link></paragraph>
-<paragraph role="paragraph" id="par_id3151299" xml-lang="en-US"><ahelp 
hid=".">Closes all $[officename] programs and prompts you to save your 
changes.</ahelp> This command does not exist on Mac OS X systems.</paragraph>
+<paragraph role="paragraph" id="par_id3151299" xml-lang="en-US"><ahelp 
hid=".">Closes all $[officename] programs and prompts you to save your 
changes.</ahelp> This command does not exist on macOS systems.</paragraph>
 </section>
 </section>
 <section id="howtoget">
diff --git a/source/text/shared/autopi/01170000.xhp 
b/source/text/shared/autopi/01170000.xhp
index b95bd03e2..765894f4b 100644
--- a/source/text/shared/autopi/01170000.xhp
+++ b/source/text/shared/autopi/01170000.xhp
@@ -52,8 +52,8 @@
 <paragraph role="heading" id="hd_id9215979" xml-lang="en-US" level="3" 
l10n="NEW">KDE Address book</paragraph>
 <paragraph role="paragraph" id="par_id585650" xml-lang="en-US" 
l10n="NEW"><ahelp hid=".">Select this option if you already use an address book 
in KDE Address book.</ahelp></paragraph>
 <bookmark xml-lang="en-US" 
branch="hid/modules/sabpilot/ui/selecttypepage/macosx" id="bm_id926849" 
localize="false"/>
-<paragraph role="heading" id="hd_id4791405" xml-lang="en-US" level="3" 
l10n="NEW">OS X Address book</paragraph>
-<paragraph role="paragraph" id="par_id6873683" xml-lang="en-US" 
l10n="NEW"><ahelp hid=".">Select this option if you already use an address book 
in OS X Address book.</ahelp></paragraph>
+<paragraph role="heading" id="hd_id4791405" xml-lang="en-US" level="3">macOS 
Address book</paragraph>
+<paragraph role="paragraph" id="par_id6873683" xml-lang="en-US"><ahelp 
hid=".">Select this option if you already use an address book in macOS Address 
book.</ahelp></paragraph>
 <bookmark xml-lang="en-US" 
branch="hid/modules/sabpilot/ui/selecttypepage/evolution" id="bm_id827051" 
localize="false"/>
 <paragraph role="heading" id="hd_id4517654" xml-lang="en-US" level="3" 
l10n="NEW">Evolution</paragraph>
 <paragraph role="paragraph" id="par_id4368724" xml-lang="en-US" 
l10n="NEW"><ahelp hid=".">Select this option if you already use an address book 
in Evolution.</ahelp></paragraph>
diff --git a/source/text/shared/guide/hyperlink_rel_abs.xhp 
b/source/text/shared/guide/hyperlink_rel_abs.xhp
index 2e33ca3c2..28b8f6da8 100644
--- a/source/text/shared/guide/hyperlink_rel_abs.xhp
+++ b/source/text/shared/guide/hyperlink_rel_abs.xhp
@@ -45,7 +45,7 @@
 <paragraph role="listitem" id="par_id3145382" xml-lang="en-US">You should 
create the same directory structure on your hard disk as that which exists in 
the web space hosted by your Internet provider. Call the root directory for the 
homepage on your hard disk "homepage", for example. The start file is then 
"index.html", the full path being "C:\homepage\index.html" (assuming Windows 
operating system). The URL on your Internet provider's server might then be as 
follows: "http://www.myprovider.com/mypage/index.html";. With relative 
addressing, you indicate the link relative to the location of the output 
document. For example, if you placed all the graphics for your homepage in a 
subfolder called "C:\homepage\images", you would need to give the following 
path to access the graphic "picture.gif": "images\picture.gif". This is the 
relative path, starting from the location of the file "index.html". On the 
provider's server, you would place the picture in the folder "mypage/images". 
When you 
 transfer the document "index.html" to the provider's server through the 
<emph>File - Save As</emph> dialog, and if you have marked the option 
<emph>Copy local images to Internet</emph> under <switchinline 
select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - 
Preferences</emph></caseinline><defaultinline><emph>Tools - 
Options</emph></defaultinline></switchinline><emph> - Load/Save - HTML 
Compatibility</emph>, $[officename] will automatically copy the graphic to the 
correct directory on the server.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="listitem" id="par_id3159158" xml-lang="en-US" l10n="U" 
oldref="49">An absolute path such as "C:\homepage\graphics\picture.gif" would 
no longer function on the provider server. Neither a server nor the computer of 
a reader needs to have a C hard drive: operating systems such as Unix or MacOS 
do not recognize drive letters, and even if the folder homepage\graphics 
existed, your picture would not be available. It is better to use relative 
addressing for file links.</paragraph>
+<paragraph role="listitem" id="par_id3159158" xml-lang="en-US">An absolute 
path such as "C:\homepage\graphics\picture.gif" would no longer function on the 
provider server. Neither a server nor the computer of a reader needs to have a 
C hard drive: operating systems such as Unix or macOS do not recognize drive 
letters, and even if the folder homepage\graphics existed, your picture would 
not be available. It is better to use relative addressing for file 
links.</paragraph>
 </listitem>
 <listitem>
 <paragraph role="listitem" id="par_id3154046" xml-lang="en-US" l10n="U" 
oldref="50">A link to a web page, for example, "www.example.com" or 
"www.myprovider.com/mypage/index.html" is an absolute link.</paragraph>
diff --git a/source/text/shared/guide/start_parameters.xhp 
b/source/text/shared/guide/start_parameters.xhp
index ad4c25418..75a961769 100644
--- a/source/text/shared/guide/start_parameters.xhp
+++ b/source/text/shared/guide/start_parameters.xhp
@@ -39,7 +39,7 @@
         <paragraph role="heading" id="hd_id3154898" xml-lang="en-US" 
level="2">Starting $[officename] Software From the Command Line</paragraph>
         <list type="ordered">
             <listitem>
-                <paragraph role="listitem" id="par_id3156152" 
xml-lang="en-US">Under Windows, select <emph>Run</emph> from the Windows Start 
menu, or open a shell under Linux, *BSD, or Mac OS X platforms.</paragraph>
+                <paragraph role="listitem" id="par_id3156152" 
xml-lang="en-US">Under Windows, select <emph>Run</emph> from the Windows Start 
menu, or open a shell under Linux, *BSD, or macOS platforms.</paragraph>
             </listitem>
             <listitem>
                 <paragraph role="listitem" id="par_id3152472" 
xml-lang="en-US">Under Windows, type the following text in the <emph>Open 
</emph>text field and click <emph>OK</emph>. </paragraph>
@@ -158,7 +158,7 @@
                <paragraph id="par_id2016120409226160" role="tablecontent" 
localize="false" 
xml-lang="en-US"><emph>--nstemporarydirectory</emph></paragraph>
            </tablecell>
            <tablecell>
-               <paragraph id="par_id2016120409236546" role="tablecontent" 
xml-lang="en-US">(MacOS X sandbox only) Returns path of the temporary directory 
for the current user and exits. Overrides all other arguments.</paragraph>
+               <paragraph id="par_id2016120409236546" role="tablecontent" 
xml-lang="en-US">(macOS sandbox only) Returns path of the temporary directory 
for the current user and exits. Overrides all other arguments.</paragraph>
            </tablecell>
       </tablerow>
     </table>
@@ -526,7 +526,7 @@
                <paragraph id="par_id2016120401411383" role="tablecontent" 
localize="false" xml-lang="en-US"><emph>-psn</emph></paragraph>
            </tablecell>
            <tablecell>
-               <paragraph id="par_id2016120401435616" role="tablecontent" 
xml-lang="en-US">Ignored (MacOS X only)</paragraph>
+               <paragraph id="par_id2016120401435616" role="tablecontent" 
xml-lang="en-US">Ignored (macOS only)</paragraph>
            </tablecell>
        </tablerow>
         <tablerow>
diff --git a/source/text/shared/optionen/01000000.xhp 
b/source/text/shared/optionen/01000000.xhp
index 38d7765f7..b6d8ef6fa 100644
--- a/source/text/shared/optionen/01000000.xhp
+++ b/source/text/shared/optionen/01000000.xhp
@@ -43,7 +43,7 @@
 <paragraph xml-lang="en-US" id="par_id3125863" role="paragraph" l10n="U" 
oldref="13"><ahelp hid="HID_OFADLG_TREELISTBOX" visibility="hidden">Select an 
entry to edit.</ahelp></paragraph>
       <section id="howtoget">
          <embed href="text/shared/00/00000406.xhp#optionen"/>
-         <paragraph xml-lang="en-US" id="par_id1013200911280529" role="note" 
l10n="NEW">Note for Mac OS X users: The Help mentions the menu path Tools - 
Options at numerous places. Replace this path with %PRODUCTNAME - Preferences 
on your Mac OS X main menu. Both menu entries open the Options dialog 
box.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id1013200911280529" 
role="note">Note for macOS users: The Help mentions the menu path Tools - 
Options at numerous places. Replace this path with %PRODUCTNAME - Preferences 
on your macOS main menu. Both menu entries open the Options dialog 
box.</paragraph>
       </section>
       <paragraph xml-lang="en-US" id="hd_id3159149" role="heading" level="2" 
l10n="U" oldref="4"><link href="text/shared/optionen/01010000.xhp" 
name="$[officename]">%PRODUCTNAME</link></paragraph>
       <embed href="text/shared/optionen/01010000.xhp#optionenallgemein"/>
@@ -80,4 +80,4 @@
                  oldref="21"><link href="text/shared/optionen/01160000.xhp" 
name="Data Sources">%PRODUCTNAME Database</link></paragraph>
       <embed href="text/shared/optionen/01160000.xhp#daten"/>
    </body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to