diff --git a/doc/architecture.rst b/doc/architecture.rst index 59c7e67a19..2e31bb5752 100644 --- a/doc/architecture.rst +++ b/doc/architecture.rst @@ -77,7 +77,7 @@ a synchronization process. Before the 1.3.0 release of the Desktop Client, the synchronization process might create false conflict files if time deviates. Original and changed files -conflict only in their timestamp, but not in their content. This behaviour was +conflict only in their timestamp, but not in their content. This behavior was changed to employ a binary check if files differ. Like files, directories also hold a unique ID that changes whenever one of the diff --git a/doc/autoupdate.rst b/doc/autoupdate.rst index a9b38f0c02..221423de64 100644 --- a/doc/autoupdate.rst +++ b/doc/autoupdate.rst @@ -3,7 +3,7 @@ The Automatic Updater ===================== The Automatic Updater ensures that you always have the -latest features and bugfixes for your ownCloud synchronization client. +latest features and bug fixes for your ownCloud synchronization client. The Automatic Updater updates only on Mac OS X and Windows computers; Linux users only need to use their normal package managers. However, on Linux systems diff --git a/doc/building.rst b/doc/building.rst index 477e48a12c..7001e49562 100644 --- a/doc/building.rst +++ b/doc/building.rst @@ -54,7 +54,7 @@ distribution. Make sure the repositories for source packages are enabled. Mac OS X -------- -In additon to needing XCode (along with the command line tools), developing in +In addition to needing XCode (along with the command line tools), developing in the Mac OS X environment requires extra dependencies. You can install these dependencies through MacPorts_ or Homebrew_. These dependencies are required only on the build machine, because non-standard libs are deployed in the app diff --git a/doc/visualtour.rst b/doc/visualtour.rst index a8b28d309b..c51da8109c 100644 --- a/doc/visualtour.rst +++ b/doc/visualtour.rst @@ -138,7 +138,7 @@ Network .. index:: proxy settings, SOCKS, bandwith, throttling, limiting -This tab consollidates ``Proxy Settings`` and ``Bandwith Limiting``: +This tab consolidates ``Proxy Settings`` and ``Bandwith Limiting``: .. image:: images/settings_network.png :scale: 50 % @@ -152,7 +152,7 @@ Proxy Settings On Linux, this will only pick up the value of the variable ``http_proxy``. * ``Specify proxy manually as``: Allows to specify custom proxy settings. If you require to go through a HTTP(S) proxy server such as Squid or Microsoft - Forefront TMG, pick ``HTTP(S)``. ``SOCKSv5`` on the other hand is particulary + Forefront TMG, pick ``HTTP(S)``. ``SOCKSv5`` on the other hand is particularly useful in special company LAN setups, or in combination with the OpenSSH dynamic application level forwarding feature (see ``ssh -D``). * ``Host``: Enter the host name or IP address of your proxy server, followed