commit ecaa2485a9bcf32e1a0bb56905b58a01432789fa Author: Sebastian Hahn sebastian@torproject.org Date: Wed Feb 11 12:41:26 2015 +0100

People like spelling it OS X --- docs/en/faq.wml | 4 ++-- docs/torbutton/en/design/design.xml | 4 ++-- docs/torbutton/en/design/index.html.en | 4 ++-- download/en/download.wml | 4 ++-- projects/en/gettor.wml | 2 +- projects/torbrowser/design/index.html.en | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/docs/en/faq.wml b/docs/en/faq.wml index be15a45..c946740 100644 --- a/docs/en/faq.wml +++ b/docs/en/faq.wml @@ -1050,7 +1050,7 @@ and send an email to '<tt>gettor@torproject.org</tt>' with one of the following words in the body of the message: <tt>windows</tt>, <tt>osx</tt> or <tt>linux</tt> (case insensitive). You will receive a reply with links from popular cloud services to -download Tor Browser for Windows, Mac OSX or Linux, depending on the +download Tor Browser for Windows, Mac OS X or Linux, depending on the option you chose. Currently, the only cloud service supported is Dropbox. If you send a blank message or anything different from the options mentioned, you will receive a help message with detailed @@ -2443,7 +2443,7 @@ too. may be torrc.client and torrc.relay.</li> <li>Modify the Tor client and relay startup scripts to include '-f /path/to/correct/torrc'.</li> - <li>In Linux/BSD/OSX, changing the startup scripts to Tor.client + <li>In Linux/BSD/Mac OS X, changing the startup scripts to Tor.client and Tor.relay may make separation of configs easier.</li> </ul>

diff --git a/docs/torbutton/en/design/design.xml b/docs/torbutton/en/design/design.xml index 588d6f4..d50f267 100644 --- a/docs/torbutton/en/design/design.xml +++ b/docs/torbutton/en/design/design.xml @@ -244,8 +244,8 @@ Browser window resolution information provides something like information contributes about another factor of 5 (for about 5 resolutions in typical use). In addition, the dimensions and position of the desktop taskbar are available, which can reveal hints on OS information. This boosts the count -by a factor of 5 (for each of the major desktop taskbars - Windows, OSX, KDE -and Gnome, and None). Subtracting the browser content window +by a factor of 5 (for each of the major desktop taskbars - Windows, Mac +OS X, KDE and Gnome, and None). Subtracting the browser content window size from the browser outer window size provide yet more information. Firefox toolbar presence gives about a factor of 8 (3 toolbars on/off give 2<superscript>3</superscript>=8). Interface effects such as title bar font size diff --git a/docs/torbutton/en/design/index.html.en b/docs/torbutton/en/design/index.html.en index 4a6efd0..82ecd64 100644 --- a/docs/torbutton/en/design/index.html.en +++ b/docs/torbutton/en/design/index.html.en @@ -148,8 +148,8 @@ Browser window resolution information provides something like information contributes about another factor of 5 (for about 5 resolutions in typical use). In addition, the dimensions and position of the desktop taskbar are available, which can reveal hints on OS information. This boosts the count -by a factor of 5 (for each of the major desktop taskbars - Windows, OSX, KDE -and Gnome, and None). Subtracting the browser content window +by a factor of 5 (for each of the major desktop taskbars - Windows, Mac +OS X, KDE and Gnome, and None). Subtracting the browser content window size from the browser outer window size provide yet more information. Firefox toolbar presence gives about a factor of 8 (3 toolbars on/off give 2³=8). Interface effects such as title bar font size diff --git a/download/en/download.wml b/download/en/download.wml index f9490e2..d5b7f7a 100644 --- a/download/en/download.wml +++ b/download/en/download.wml @@ -90,7 +90,7 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo (<a class="osx-tbb-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32>-osx32_<lang>.dmg.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> </div> <a class="additional" href="<page projects/torbrowser>#downloads-alpha">Download Unstable</a><br /> -# Comment out until 64-bit OSX bundles are available again +# Comment out until 64-bit Mac OS X bundles are available again # <a class="button osx-tbb64" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-<lang>.zip"><span class="strong">Download</span><span class="normal"><button-osx-tbb64></span></a> # <select name="language" id="osx-tbb64" class="lang">

@@ -98,7 +98,7 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo # </select> # <div class="sig"> # <a class="lang-alt" href="<page projects/torbrowser>#downloads">Other Languages</a> -#<!-- OSX 64. -EC +#<!-- Mac OS X 64. -EC # (<a class="osx-tbb64-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> # </div> # <a href="<page projects/torbrowser-details>#build">Source Code</a><br /> diff --git a/projects/en/gettor.wml b/projects/en/gettor.wml index 67fd9fb..4a5d6fd 100644 --- a/projects/en/gettor.wml +++ b/projects/en/gettor.wml @@ -32,7 +32,7 @@ one of the following options in the body of the message:</p> </li> <li><strong>linux</strong>: If the user needs Tor Browser for Linux. </li> - <li><strong>osx</strong>: If the user needs Tor Browser for Mac OSX. + <li><strong>osx</strong>: If the user needs Tor Browser for Mac OS X. </li> </ul>

diff --git a/projects/torbrowser/design/index.html.en b/projects/torbrowser/design/index.html.en index 1bd9530..e063944 100644 --- a/projects/torbrowser/design/index.html.en +++ b/projects/torbrowser/design/index.html.en @@ -1206,7 +1206,7 @@ details such as screen orientation or type. We patch Firefox to <a class="ulink" href="https://gitweb.torproject.org/tor-browser.git/commitdiff/30dc2c4290698af81ceafae9d628a34c53faabe1" target="_top">report a fixed set of system colors to content window CSS</a>, and <a class="ulink" href="https://gitweb.torproject.org/tor-browser.git/commitdiff/8f6e979d30598569dea14ac6f4eef4e96543b3d7" target="_top">prevent -detection of font smoothing on OSX</a>. We also always +detection of font smoothing on Mac OS X</a>. We also always <a class="ulink" href="https://gitweb.torproject.org/tor-browser.git/commitdiff/09561f0e5452305b9efcb4e6169c613c8db33246" target="_top">report landscape-primary</a> for the screen orientation.

@@ -1831,4 +1831,4 @@ not directly provide the link sharing capabilities that Web-Send does, it is a better solution to the privacy issues associated with federated login than Web-Send is.

- </p></li></ol></div></div></div></div></body></html> \ No newline at end of file + </p></li></ol></div></div></div></div></body></html>