Merge pull request #193 from owncloud/fixing-stable6

[WIP] fixing typos and spelling
This commit is contained in:
Morris Jobke
2013-11-25 00:21:14 -08:00
3 changed files with 14 additions and 13 deletions

View File

@@ -177,7 +177,7 @@ User Display Name Field:
The attribute that should be used as display name in ownCloud. Prior to
ownCloud 5 it was used as internal user name. This is not the case anymore.
It also means that display names are not permanent in ownCloud, i.e. if the
attribute's value changes in LDAP, it changes in ownCloud too. Display names
attribute value changes in LDAP, it changes in ownCloud too. Display names
to not need to be unique, but you rather want to specify a more or less unique
attribute here to avoid confusion.
@@ -185,7 +185,7 @@ User Display Name Field:
Base User Tree:
The base DN of LDAP, from where all users can be reached. It needs to be given
completely despite to the Base DN from the Basic settings. You can specifiy
completely despite to the Base DN from the Basic settings. You can specify
multiple base trees, one in each line.
* Example:
@@ -215,7 +215,7 @@ Group Display Name Field:
Base Group Tree:
The base DN of LDAP, from where all groups can be reached.
It needs to be given completely despite to the Base DN from the Basic
settings. You can specifiy multiple base trees, one in each line.
settings. You can specify multiple base trees, one in each line.
* Example:
@@ -269,7 +269,7 @@ User Home Folder Naming Rule:
By default, the ownCloud creates the user
directory, where all files and meta data are kept, according to the ownCloud
user name. You may want to override this setting and name it after an
attribute's value. The attribute given can also return an absolute path, e.g.
attribute value. The attribute given can also return an absolute path, e.g.
``/mnt/storage43/alice``. Leave it empty for default behavior.
* Example: *cn*
@@ -299,7 +299,7 @@ Internal Username:
The internal username is also the default name for the user home folder in
ownCloud. It is also a part of remote URLs, for instance for all \*DAV services.
With this setting the default behaviour can be overriden. To achieve a similar
With this setting the default behaviour can be overridden. To achieve a similar
behaviour as before ownCloud 5 enter the user display name attribute in the
following field.
@@ -309,7 +309,7 @@ Internal Username:
* Example: *uid*
Override UUID detection
By default, ownCloud autodetects the UUID attribute. The UUID attribute is
By default, ownCloud auto-detects the UUID attribute. The UUID attribute is
used to doubtlessly identify LDAP users and groups. Also, the internal
username will be created based on the UUID, if not specified otherwise above.
@@ -461,4 +461,4 @@ When ownCloud is not able to contact the main server, he will be treated as
offline and no connection attempts will be done for the time specified in
**Cache Time-To-Live**. If a backup server is configured, it will be connected
instead. If you plan a maintained downtime, check **Disable Main Server** for
the time being to avoid unnecessary connection attempts every now and then.
the time being to avoid unnecessary connection attempts every now and then.

View File

@@ -19,7 +19,8 @@ You can choose between the following options:
Cron-Jobs
---------
OwnCloud requires various automated background jobs to be run. There are three methods to achieve this. The default way is AJAX and the recommended way is cron.
OwnCloud requires various automated background jobs to be run. There are three methods to achieve this.
The default way is AJAX and the recommended way is cron.
AJAX
~~~~
@@ -53,7 +54,7 @@ may have.
**Example**
To run a cron job on a *nix system, e.g. every 15min, under the default webserver
To run a cron job on a *nix system, e.g. every 15min, under the default web server
user, e.g. **www-data**, you need to set-up the following cron job to call the
**cron.php** script. Please check the crontab man page for the exact command syntax.

View File

@@ -20,7 +20,7 @@ imagick:
ownCloud needs the imagick php extension to generate previews from office, pdf
and svg files. For further information on how to install the imagick php
extension on your system take a look at the `PHP documentation <http://www.php.net/manual/en/imagick.installation.php>`_.
If imagick is not installed, ownCloud will show filetype icons instead of previews.
If imagick is not installed, ownCloud will show file type icons instead of previews.
LibreOffice / OpenOffice:
~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -41,7 +41,7 @@ Parameters
----------
Disabling previews:
~~~~~~~~~~~~~~~~~~~
Under certian circumstances like a big userbase or limited ressources you might
Under certain circumstances like a big user base or limited resources you might
want to consider disabling previews.
.. code-block:: php
@@ -110,14 +110,14 @@ If you want to disable the maximum scaling factor, you can set the config value
LibreOffice / OpenOffice:
~~~~~~~~~~~~~~~~~~~~~~~~~
You can set a custom path for the LibreOffice binary. If LibreOffice is not yet
available on your systen, you can also use OpenOffice instead.
available on your system, you can also use OpenOffice instead.
.. code-block:: php
<?php
'preview_libreoffice_path' => '/usr/bin/libreoffice',
You can set custom LibreOffice / OpenOffice command line paramters by setting
You can set custom LibreOffice / OpenOffice command line parameters by setting
the preview_office_cl_parameters option.
.. code-block:: php