[Pkg-owncloud-commits] [owncloud-doc] 01/44: fixing typos and spelling + respect max characters of 80
David Prévot
taffit at moszumanska.debian.org
Sun Dec 15 00:06:44 UTC 2013
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch dfsg_clean
in repository owncloud-doc.
commit 77ff76225e95636b4c628d0b2e4c837353b8ccc8
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date: Mon Nov 25 09:26:46 2013 +0100
fixing typos and spelling + respect max characters of 80
---
.../configuration/configuration_3rdparty.rst | 4 ++-
admin_manual/configuration/configuration_apps.rst | 10 +++++---
.../configuration/configuration_encryption.rst | 2 +-
.../configuration/configuration_knowledgebase.rst | 9 ++++---
.../configuration/configuration_logging.rst | 2 +-
admin_manual/configuration/configuration_mail.rst | 7 +++---
.../configuration/configuring_big_file_upload.rst | 13 +++++-----
.../configuration/custom_mount_config_gui.rst | 9 +++++--
admin_manual/configuration/xsendfile.rst | 16 +++++++-----
admin_manual/index.rst | 5 ++--
.../installation/installation_appliance.rst | 2 +-
admin_manual/installation/installation_linux.rst | 5 ++--
admin_manual/installation/installation_macos.rst | 2 +-
admin_manual/installation/installation_others.rst | 8 +++---
admin_manual/installation/installation_source.rst | 29 ++++++++++++----------
admin_manual/installation/installation_ucs.rst | 4 +--
admin_manual/installation/installation_windows.rst | 2 +-
admin_manual/maintenance/backup.rst | 3 ++-
admin_manual/maintenance/restore.rst | 3 ++-
admin_manual/maintenance/update.rst | 14 +++++++----
20 files changed, 90 insertions(+), 59 deletions(-)
diff --git a/admin_manual/configuration/configuration_3rdparty.rst b/admin_manual/configuration/configuration_3rdparty.rst
index 83f46f9..a2bceac 100644
--- a/admin_manual/configuration/configuration_3rdparty.rst
+++ b/admin_manual/configuration/configuration_3rdparty.rst
@@ -8,7 +8,9 @@ the **/3rdparty** folder.
Parameters
----------
-If you want to change the default location of the 3rd-party folder you can use the **3rdpartyroot** parameter to define the absolute file system path to the folder. The **3rdpartyurl** parameter is used to define the http web path to that folder, starting at the ownCloud web root.
+If you want to change the default location of the 3rd-party folder you can use the **3rdpartyroot** parameter to define
+the absolute file system path to the folder. The **3rdpartyurl** parameter is used to define the http web path to that
+folder, starting at the ownCloud web root.
.. code-block:: php
diff --git a/admin_manual/configuration/configuration_apps.rst b/admin_manual/configuration/configuration_apps.rst
index d563d1c..cdd157d 100644
--- a/admin_manual/configuration/configuration_apps.rst
+++ b/admin_manual/configuration/configuration_apps.rst
@@ -3,7 +3,8 @@ Apps Configuration
After you have installed ownCloud you might realize that it would be nice to
provide an additional function on top of the core functionality in your ownCloud installation.
-The first step should be to check out the `ownCloud apps store <http://apps.owncloud.com/>`_. There you will find a lot of ready-to-use apps provided by the ownCloud community.
+The first step should be to check out the `ownCloud apps store <http://apps.owncloud.com/>`_. There you will find a
+lot of ready-to-use apps provided by the ownCloud community.
Parameters
----------
@@ -18,7 +19,8 @@ for available apps and/or where user specific apps should be installed.The key
web root. The key **writable** indicates if a user can install apps in that
folder.
-.. note:: If you want to make sure that the default **/apps/** folder only contains apps shipped with ownCloud, you should follow the example and set-up a **/apps2/** folder which will be used to store all apps downloaded by users
+.. note:: If you want to make sure that the default **/apps/** folder only contains apps shipped with ownCloud, you
+ should follow the example and set-up a **/apps2/** folder which will be used to store all apps downloaded by users
.. code-block:: php
@@ -42,7 +44,7 @@ Use your own appstore
~~~~~~~~~~~~~~~~~~~~~
If you want to allow the installation of apps from the apps store you have to
set **appstoreenabled** parameter, but this can only be done if at least one
-of the configured apps directories is writeable.
+of the configured apps directories is writable.
The **appstoreurl** is used to set the http path to the ownCloud apps store. The appstore server has to use :abbr:`OCS (Open Collaboration Services)`.
@@ -62,4 +64,4 @@ by setting the **appcodechecker** parameter.
<?php
- "appcodechecker" => false,
\ No newline at end of file
+ "appcodechecker" => false,
diff --git a/admin_manual/configuration/configuration_encryption.rst b/admin_manual/configuration/configuration_encryption.rst
index 86b0d39..754dcce 100644
--- a/admin_manual/configuration/configuration_encryption.rst
+++ b/admin_manual/configuration/configuration_encryption.rst
@@ -52,6 +52,6 @@ at the back-end. Since the encryption password must be the same as the user's lo
this will result in a non-functional encryption system. If the recovery feature was enabled,
the administrator will be able to recover the user's files directly over the recovery feature.
See the description above. Otherwise the user will be informed that his log-in password and
-his encryption password no longer matchs after his next log-in. In this case the user will be
+his encryption password no longer matches after his next log-in. In this case the user will be
able to adjust his encryption password in the personal settings by providing both, his old and
his new log-in password.
diff --git a/admin_manual/configuration/configuration_knowledgebase.rst b/admin_manual/configuration/configuration_knowledgebase.rst
index 959de06..420cc15 100644
--- a/admin_manual/configuration/configuration_knowledgebase.rst
+++ b/admin_manual/configuration/configuration_knowledgebase.rst
@@ -1,12 +1,15 @@
Knowledge Base Configuration
============================
The usage of ownCloud is more or less self explaining but nevertheless a user
-might run into a problem where he needs to consult the documentation or knowledge base. To ease access to the ownCloud documentation and knowledge base, a help menu item is shown in the settings menu by default.
+might run into a problem where he needs to consult the documentation or knowledge base. To ease access to the ownCloud
+documentation and knowledge base, a help menu item is shown in the settings menu by default.
Parameters
----------
-If you want to disable the ownCloud help menu item you can use the **knowledgebaseenabled** parameter inside the :file:`config/config.php`. The **knowledgebaseurl** parameter is used to set the http path to the ownCloud help page. The server should support :abbr:`OCS (Open Collaboration Services)`.
+If you want to disable the ownCloud help menu item you can use the **knowledgebaseenabled** parameter inside the
+:file:`config/config.php`. The **knowledgebaseurl** parameter is used to set the http path to the ownCloud help page.
+The server should support :abbr:`OCS (Open Collaboration Services)`.
.. code-block:: php
@@ -15,4 +18,4 @@ If you want to disable the ownCloud help menu item you can use the **knowledgeba
"knowledgebaseenabled" => true,
"knowledgebaseurl" => "http://api.apps.owncloud.com/v1",
-.. note:: Disabling the help menu item might increase the number of support request you have to answer in the future
\ No newline at end of file
+.. note:: Disabling the help menu item might increase the number of support request you have to answer in the future
diff --git a/admin_manual/configuration/configuration_logging.rst b/admin_manual/configuration/configuration_logging.rst
index 1d75808..effe2e0 100644
--- a/admin_manual/configuration/configuration_logging.rst
+++ b/admin_manual/configuration/configuration_logging.rst
@@ -47,7 +47,7 @@ date format in the example the date/time format will be written in the format
syslog
~~~~~~
-All log information will be send to the default syslog deamon of a system.
+All log information will be send to the default syslog daemon of a system.
.. code-block:: php
diff --git a/admin_manual/configuration/configuration_mail.rst b/admin_manual/configuration/configuration_mail.rst
index a52d641..3ff6b62 100644
--- a/admin_manual/configuration/configuration_mail.rst
+++ b/admin_manual/configuration/configuration_mail.rst
@@ -53,7 +53,7 @@ necessary that you increase the SMTP timeout to e.g. 30s:
"mail_smtptimeout" => 30,
-If the SMTP server accepts unsecure connections, the default setting can be
+If the SMTP server accepts insecure connections, the default setting can be
used:
.. code-block:: php
@@ -139,7 +139,7 @@ Sendmail
~~~~~~~~
If you want to use the well known Sendmail program to send email, it is
necessary to have an installed and working email system on your \*nix server.
-The sendmail binary (**/usr/sbin/sendmail**) is ususally part of that system.
+The sendmail binary (**/usr/sbin/sendmail**) is usually part of that system.
ownCloud should be able to send email out of the box.
.. code-block:: php
@@ -194,7 +194,8 @@ email sender address, e.g.::
john at domain.dom
Next you need to enter your login and an *invalid* password. As soon as you
-press the login button the login mask reappears and a **I’ve forgotten my password** link will be shown above the login field. Click on that link, re-enter your login and press the **Reset password** button - that's all.
+press the login button the login mask reappears and a **I’ve forgotten my password** link will be shown above the login
+field. Click on that link, re-enter your login and press the **Reset password** button - that's all.
Trouble shooting
----------------
diff --git a/admin_manual/configuration/configuring_big_file_upload.rst b/admin_manual/configuration/configuring_big_file_upload.rst
index 709cc12..05e5d03 100644
--- a/admin_manual/configuration/configuring_big_file_upload.rst
+++ b/admin_manual/configuration/configuring_big_file_upload.rst
@@ -13,32 +13,33 @@ Other recommendable preconditions:
----------------------------------
* Make sure, that the latest version of php (at least 5.4.9) is installed
-* Disable user quota. This means: set the user quota of the account, you are currently logged in, to "unlimited". This is important, because you possibly could not watch otherwise, whether the desired changes take effect.
+* Disable user quota. This means: set the user quota of the account, you are currently logged in, to "unlimited".
+This is important, because you possibly could not watch otherwise, whether the desired changes take effect.
Enabling uploading big files
============================
-Note: The order of the following steps is important! If you swap steps or substeps described below, the settings may fail.
+Note: The order of the following steps is important! If you swap steps described below, the settings may fail.
**Go to the admin section in the ownCloud-WebUI and do the following:**
* Under "File handling" set the Maximum upload size to the desired value (e.g. 16GB)
-* Klick the "save"-Button
+* Click the "save"-Button
**Open the php.ini - file**
-* Under Debian or Suse and their derivates this file lies at /etc/php5/apache2/php.ini
+* Under Debian or SUSE and their derivatives this file lies at /etc/php5/apache2/php.ini
* On Windows, you can find this file within C:/Program Files (x86)/PHP/PHP.ini
**Do the following:**
-* Set the following three parameters inside th php.ini to the same value as choosen inside the admin-section one step before:
+* Set the following three parameters inside th php.ini to the same value as chosen inside the admin-section one step before:
* upload_max_filesize = 16G (e.g., to stay consistent with the example value above)
* post_max_size = 16G (e.g., to stay consistent with the example value above)
* output_buffering = 16384 (e.g., to stay consistent with the example value above)
whereas the "output_buffering" has to be given in MegaBytes but as a plain figure (without size-units as 'M' or 'G')
-These client configurations have been prooven by test up to filesizes of 16 GigaBytes:
+These client configurations have been proven by testing maximum file sizes of 16 GB:
* Linux 32 Bit: Ubuntu, Firefox => 16GB
* Windows 8 64 Bit: Google Chrome => 8GB
diff --git a/admin_manual/configuration/custom_mount_config_gui.rst b/admin_manual/configuration/custom_mount_config_gui.rst
index 22340f4..3431a78 100644
--- a/admin_manual/configuration/custom_mount_config_gui.rst
+++ b/admin_manual/configuration/custom_mount_config_gui.rst
@@ -54,14 +54,19 @@ to be entered:
Dropbox
~~~~~~
-Mounting a Dropbox account requires that you create an app with Dropbox and then provide the app key and secret to the external storage configuration user interface. Go to My apps at Dropbox and create an app. Select *Full Dropbox* access level. Copy the app key and app secret and paste them into the corresponding fields for the Dropbox storage.
+Mounting a Dropbox account requires that you create an app with Dropbox and then provide the app key and secret to the
+external storage configuration user interface. Go to My apps at Dropbox and create an app. Select *Full Dropbox* access
+level. Copy the app key and app secret and paste them into the corresponding fields for the Dropbox storage.
Click the *Grant access* button and you will be redirected to a Dropbox website to give ownCloud permission to access your account.
Google Drive
~~~~~~~~~~~
-Mounting a Google Drive account requires that you create an API project in the Google APIs Console. Select `Services` and enable both `Drive API` and `Drive SDK`. Next select `API Access` and click `Create an OAuth 2.0 client ID`. Fill out the Branding Information as you see fit and click Next. In Client Id Settings select `Web application` for the Application type. Next to `Your site or hostname` click more options) and add the following to the Authorized Redirect URIs:
+Mounting a Google Drive account requires that you create an API project in the Google APIs Console. Select `Services`
+and enable both `Drive API` and `Drive SDK`. Next select `API Access` and click `Create an OAuth 2.0 client ID`. Fill
+out the Branding Information as you see fit and click Next. In Client Id Settings select `Web application` for the
+Application type. Next to `Your site or hostname` click more options) and add the following to the Authorized Redirect URIs:
- http://yourowncloud/index.php/settings/personal
- http://yourowncloud/index.php/settings/admin
diff --git a/admin_manual/configuration/xsendfile.rst b/admin_manual/configuration/xsendfile.rst
index 5e4aa89..fd5e75d 100644
--- a/admin_manual/configuration/xsendfile.rst
+++ b/admin_manual/configuration/xsendfile.rst
@@ -1,10 +1,11 @@
Serving static files via web server
===================================
Since ownCloud 5 it is possible to let web servers handle static file serving.
-This should generally improve performance (web servers are optimized for this) and in some cases permits controlled file serving (i.e. pause
-and resume downloads).
+This should generally improve performance (web servers are optimized for this) and in some cases permits controlled
+file serving (i.e. pause and resume downloads).
-.. note :: This feature can currently only be activated for local files, i.e. files inside the **data/** directory and local mounts. Controlled file serving **does not work for generated zip files**. This is due to how temporary files are created.
+.. note :: This feature can currently only be activated for local files, i.e. files inside the **data/** directory
+and local mounts. Controlled file serving **does not work for generated zip files**. This is due to how temporary files are created.
Apache2 (X-Sendfile)
--------------------
@@ -48,12 +49,13 @@ For versions >=0.10 (e.g. Ubuntu 12.10)
* **SetEnv MOD_X_SENDFILE_ENABLED**: tells ownCloud scripts that they should add the X-Sendfile header when serving files
* **XSendFile**: enables web server handling of X-Sendfile headers (and therefore file serving) for the specified Directory
* **XSendFileAllowAbove (<0.10)**: enables file serving through web server on path outside the specified Directory. This is needed for PHP temporary directory where zip files are created and for configured local mounts which may reside outside data directory
-* **XSendFilePath (>=0.10)**: a white list of paths that the web server is allowed to serve outside of the specified Directory. At least PHP temporary directory concatenated with *oc-noclean* must be configured. Temporary zip files will be created inside this directory when using mod_xsendfile. Other paths which correspond to local mounts should be configured here aswell. For a more in-dept documentation of this directive refer to mod_xsendfile website linked above
+* **XSendFilePath (>=0.10)**: a white list of paths that the web server is allowed to serve outside of the specified Directory. At least PHP temporary directory concatenated with *oc-noclean* must be configured. Temporary zip files will be created inside this directory when using mod_xsendfile. Other paths which correspond to local mounts should be configured here as well. For a more in-dept documentation of this directive refer to mod_xsendfile website linked above
LigHTTPd (X-Sendfile2)
----------------------
-LigHTTPd uses similar headers to Apache2, apart from the fact that it does not handle partial downloads in the same way Apache2 does. For this reason, a different method is used for LigHTTPd.
+LigHTTPd uses similar headers to Apache2, apart from the fact that it does not handle partial downloads in the same way
+Apache2 does. For this reason, a different method is used for LigHTTPd.
Installation
~~~~~~~~~~~~
@@ -77,7 +79,9 @@ Your server configuration should include the following statements::
Nginx (X-Accel-Redirect)
------------------------
-Nginx supports handling of static files differently from Apache. Documentation can be found in the Nginx Wiki section `Mod X-Sendfile <http://wiki.nginx.org/XSendfile>`_ and section `X-Accell <http://wiki.nginx.org/X-accel>`_. The header used by Nginx is X-Accel-Redirect.
+Nginx supports handling of static files differently from Apache. Documentation can be found in the Nginx Wiki
+section `Mod X-Sendfile <http://wiki.nginx.org/XSendfile>`_ and section `X-Accell <http://wiki.nginx.org/X-accel>`_.
+The header used by Nginx is X-Accel-Redirect.
Installation
~~~~~~~~~~~~
diff --git a/admin_manual/index.rst b/admin_manual/index.rst
index 2601037..ae065f7 100644
--- a/admin_manual/index.rst
+++ b/admin_manual/index.rst
@@ -36,7 +36,8 @@ Installation
This chapter will introduce you to the installation of ownCloud in different
scenarios.
-If you want to just try ownCloud in a virtual machine without any configuration, check the section :doc:`installation/installation_appliance`, where you will find ready-to-use images.
+If you want to just try ownCloud in a virtual machine without any configuration, check the section
+:doc:`installation/installation_appliance`, where you will find ready-to-use images.
* :doc:`installation/installation_appliance`
* :doc:`installation/installation_linux`
@@ -48,7 +49,7 @@ If you want to just try ownCloud in a virtual machine without any configuration,
Configuration
=============
-This chapter covers ownCloud and Webserver configuration.
+This chapter covers ownCloud and web server configuration.
* :doc:`configuration/configuration_3rdparty`
* :doc:`configuration/configuration_apps`
diff --git a/admin_manual/installation/installation_appliance.rst b/admin_manual/installation/installation_appliance.rst
index ef6be08..dc34e27 100644
--- a/admin_manual/installation/installation_appliance.rst
+++ b/admin_manual/installation/installation_appliance.rst
@@ -24,7 +24,7 @@ These are tutorials provided by the user communities of the respective appliance
- `QNAP Guide`_ for QNAP NAS appliances
- `OpenWrt Guide`_ for the popular embedded distribution for routers and NAS devices.
-.. todo:: Tutorials for running owncloud on Synology and Dreamplug.
+.. todo:: Tutorials for running ownCloud on Synology and Dreamplug.
.. _OpenWrt Guide: http://wiki.openwrt.org/doc/howto/owncloud
.. _SUSE Studio, ownCloud on openSuSE: http://susestudio.com/a/TadMax/owncloud-in-a-box
diff --git a/admin_manual/installation/installation_linux.rst b/admin_manual/installation/installation_linux.rst
index d4478a3..1bfac01 100644
--- a/admin_manual/installation/installation_linux.rst
+++ b/admin_manual/installation/installation_linux.rst
@@ -42,9 +42,10 @@ Fedora
.. note:: ready-to-use RPM packages are available in the openSUSE Build Service `ownCloud repository`_.
-Make sure `SELinux is disabled <https://fedoraproject.org/wiki/SELinux_FAQ#How_do_I_enable_or_disable_SELinux_.3F>`_ or else the installation process will fail with the following message::
+Make sure `SELinux is disabled <https://fedoraproject.org/wiki/SELinux_FAQ#How_do_I_enable_or_disable_SELinux_.3F>`_
+or else the installation process will fail with the following message::
- Config file (config/config.php) is not writable for the webserver
+ Config file (config/config.php) is not writable for the web server
Configure Apache:
diff --git a/admin_manual/installation/installation_macos.rst b/admin_manual/installation/installation_macos.rst
index 8d2afce..42cdae5 100644
--- a/admin_manual/installation/installation_macos.rst
+++ b/admin_manual/installation/installation_macos.rst
@@ -1,7 +1,7 @@
Mac OS X
--------
-.. note:: Due to an issue_ with Mac OS Unicode support, installing ownCloud Server 5.0 on
+.. note:: Due to an issue_ with Mac OS Unicode support, installing ownCloud Server 6.0 on
Mac OS is currently not supported.
.. _issue: https://github.com/owncloud/core/issues/2377
diff --git a/admin_manual/installation/installation_others.rst b/admin_manual/installation/installation_others.rst
index 2bea011..3c4c19d 100644
--- a/admin_manual/installation/installation_others.rst
+++ b/admin_manual/installation/installation_others.rst
@@ -86,7 +86,7 @@ Nginx Configuration
}
-.. note:: You can use Owncloud without SSL/TLS support, but we strongly encourage you not to do that:
+.. note:: You can use ownCloud without SSL/TLS support, but we strongly encourage you not to do that:
- Remove the server block containing the redirect
- Change **listen 443 ssl** to **listen 80;**
@@ -105,7 +105,9 @@ Lighttpd Configuration
This assumes that you are familiar with installing PHP application on
lighttpd.
-It is important to note that the **.htaccess** files used by ownCloud to protect the **data** folder are ignored by lighttpd, so you have to secure it by yourself, otherwise your **owncloud.db** database and user data are publicly readable even if directory listing is off. You need to add two snippets to your lighttpd configuration file:
+It is important to note that the **.htaccess** files used by ownCloud to protect the **data** folder are ignored by
+lighttpd, so you have to secure it by yourself, otherwise your **owncloud.db** database and user data are publicly
+readable even if directory listing is off. You need to add two snippets to your lighttpd configuration file:
Disable access to data folder::
@@ -177,4 +179,4 @@ Here you can find a `tutorial for open Wrt`_
.. _PageKite how to: https://pagekite.net/wiki/Howto/GNULinux/OwnCloud/
.. _`http://wiki.nginx.org/HttpSslModule`: http://wiki.nginx.org/HttpSslModule
-.. _tuorial for open Wrt: http://wiki.openwrt.org/doc/howto/owncloud
+.. _tutorial for open Wrt: http://wiki.openwrt.org/doc/howto/owncloud
diff --git a/admin_manual/installation/installation_source.rst b/admin_manual/installation/installation_source.rst
index 61a9354..e505eff 100644
--- a/admin_manual/installation/installation_source.rst
+++ b/admin_manual/installation/installation_source.rst
@@ -7,7 +7,7 @@ using a classic :abbr:`LAMP (Linux, Apache, MySQL, PHP)` setup:
Prerequisites
~~~~~~~~~~~~~
-To run ownCloud, your webserver must have the following installed:
+To run ownCloud, your web server must have the following installed:
* php5 (>= 5.3)
* php5-gd
@@ -18,7 +18,7 @@ And as *optional* dependencies:
* php5-intl
* php5-sqlite (>= 3)
* php5-mysql
-* php5-pgsql (or php-pgsql depending on your distro)
+* php5-pgsql (or php-pgsql depending on your distribution)
* smbclient
* php5-curl
* curl
@@ -50,9 +50,9 @@ this `PHP PPA`_:
.. todo:: Document other distributions.
-You don’t need any WebDAV support of your webserver (i.e. apache’s mod_webdav)
+You don’t need any WebDAV support of your web server (i.e. apache’s mod_webdav)
to access your ownCloud data via WebDAV, ownCloud has a WebDAV server built in.
-In fact, you should make sure that any built-in WebDAV module of your webserver
+In fact, you should make sure that any built-in WebDAV module of your web server
is disabled (at least for the ownCloud directory), as it can interfere with
ownCloud's built-in WebDAV support.
@@ -67,11 +67,11 @@ Extract ownCloud and Copy to Your Webserver
Set the Directory Permissions
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The owner of your webserver must own the apps/, data/ and config/ directories
+The owner of your web server must own the apps/, data/ and config/ directories
in your ownCloud install. You can do this by running the following command for
the apps, data and config directories.
-For debian based distros like Ubuntu, Debian or Linux Mint and Gentoo use::
+For Debian based distributions like Ubuntu, Debian or Linux Mint and Gentoo use::
chown -R www-data:www-data /path/to/your/owncloud/install/data
@@ -88,21 +88,22 @@ Fedora users should use::
Enable .htaccess and mod_rewrite if Running Apache
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-If you are running the apache webserver, it is recommended that you enable
+If you are running the apache web server, it is recommended that you enable
**.htaccess** files as ownCloud uses them to enhance security and allows you to
use webfinger. To enable .htaccess files you need to ensure that
**AllowOverride** is set to **All** in the **Directory /var/www/** section of
-your virtual host file. This is usually in :file:`/etc/apache2/sites-enabled/000-default`. If your distro supports **a2enmod** run the following commands::
+your virtual host file. This is usually in :file:`/etc/apache2/sites-enabled/000-default`.
+If your distribution supports **a2enmod** run the following commands::
a2enmod rewrite
-In distros that do not come with a2enmod the :file:`/etc/httpd/httpd.conf` needs to be changed to enable **mod_rewrite**
+In distributions that do not come with a2enmod the :file:`/etc/httpd/httpd.conf` needs to be changed to enable **mod_rewrite**
-Then restart apache. For Ubuntu systems (or distros using updstart) use::
+Then restart apache. For Ubuntu systems (or distributions using upstartd) use::
service apache2 restart
-For systemd systems (fedora, ArchLinux, Fedora, OpenSuse) use::
+For systemd systems (fedora, ArchLinux, Fedora, OpenSUSE) use::
systemctl restart httpd.service
@@ -114,8 +115,10 @@ Open your web browser and navigate to your ownCloud instance. If you are
installing ownCloud on the same machine as you will access the install wizard
from, the url will be: http://localhost/ (or http://localhost/owncloud).
-For basic installs we recommend SQLite as it is easy to setup (ownCloud will do it for you). For larger installs you should use MySQL or PostgreSQL. Click on the Advanced options to show the configuration options. You may enter admin
-credentials and let ownCloud create its own database user, or enter a preconfigured user. If you are not using apache as the webserver, please set the data directory to a location outside of the document root. See the advanced
+For basic installs we recommend SQLite as it is easy to setup (ownCloud will do it for you). For larger installs you
+should use MySQL or PostgreSQL. Click on the Advanced options to show the configuration options. You may enter admin
+credentials and let ownCloud create its own database user, or enter a preconfigured user. If you are not using apache
+as the web server, please set the data directory to a location outside of the document root. See the advanced
install settings.
Test your Installation
diff --git a/admin_manual/installation/installation_ucs.rst b/admin_manual/installation/installation_ucs.rst
index 0923c14..06564f7 100644
--- a/admin_manual/installation/installation_ucs.rst
+++ b/admin_manual/installation/installation_ucs.rst
@@ -79,7 +79,7 @@ Click on ownCloud 5 and follow the instructions.
.. image:: /images/ucs-app-center-install.png
In the UCS App Center, you can also upgrade from ownCloud 4.5 by installing
-ownCloud 5.0. They are provided as seperate apps. It is only possible to have
+ownCloud 5.0. They are provided as separate apps. It is only possible to have
one version of ownCloud installed.
Manually by download
@@ -120,7 +120,7 @@ Postconfiguration (optional)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^
There is only one local admin user “owncloudadmin”, you can find his password in
-:file:`/etc/owncloudadmin.secret`. Use this account, if you want to change basic
+`/etc/owncloudadmin.secret`. Use this account, if you want to change basic
ownCloud settings.
In the installation process a virtual host is set up (Apache is required
diff --git a/admin_manual/installation/installation_windows.rst b/admin_manual/installation/installation_windows.rst
index 72c2115..5ddd8c3 100644
--- a/admin_manual/installation/installation_windows.rst
+++ b/admin_manual/installation/installation_windows.rst
@@ -205,7 +205,7 @@ the www root, or something else.
password and desired instance name – use the user name and password you setup
for MySQL earlier in step 3, and pick any name for the database instance.
-.. note:: The owncloud admin password and the MySQL password CANNOT be the same
+.. note:: The ownCloud admin password and the MySQL password CANNOT be the same
in any way.
11. Click next, and ownCloud should have you logged in as the admin user, and
diff --git a/admin_manual/maintenance/backup.rst b/admin_manual/maintenance/backup.rst
index cf79948..eb4a770 100644
--- a/admin_manual/maintenance/backup.rst
+++ b/admin_manual/maintenance/backup.rst
@@ -10,7 +10,8 @@ To backup an ownCloud installation there are three main things you need to retai
Backup Folders
------
-Simply copy your config and data folder (or even your whole ownCloud install and data folder) to a place outside of your ownCloud environment. You could use this command:
+Simply copy your config and data folder (or even your whole ownCloud install and data folder) to a place outside of
+your ownCloud environment. You could use this command:
rsync -Aax owncloud/ owncloud-dirbkp_`date +"%Y%m%d"`/
diff --git a/admin_manual/maintenance/restore.rst b/admin_manual/maintenance/restore.rst
index 48a4c9a..d5ab85c 100644
--- a/admin_manual/maintenance/restore.rst
+++ b/admin_manual/maintenance/restore.rst
@@ -12,7 +12,8 @@ Restore Folders
.. note:: This guide assumes that your previous backup is called "owncloud-dirbkp"
-Simply copy your config and data folder (or even your whole ownCloud install and data folder) to a place outside of your ownCloud environment. You could use this command:
+Simply copy your config and data folder (or even your whole ownCloud install and data folder) to a place outside of
+your ownCloud environment. You could use this command:
rsync -Aax owncloud-dirbkp/ owncloud/
diff --git a/admin_manual/maintenance/update.rst b/admin_manual/maintenance/update.rst
index 9f556b4..70df49f 100644
--- a/admin_manual/maintenance/update.rst
+++ b/admin_manual/maintenance/update.rst
@@ -1,11 +1,13 @@
Updating ownCloud
=================
-.. note:: If you have installed ownCloud from a repository, your package management should take care of it. Probably you will need to look for compatible third party applications yourself. **Always do backups anyway.**
+.. note:: If you have installed ownCloud from a repository, your package management should take care of it. Probably
+you will need to look for compatible third party applications yourself. **Always do backups anyway.**
Update
------
-Updating means updating ownCloud to the latest *point release*, e.g. ownCloud 4.0.6 → 4.0.7. This procedure uses the ownCloud updater plugin called "Updater": it's an internal application already present in your ownCloud installation.
+Updating means updating ownCloud to the latest *point release*, e.g. ownCloud 4.0.6 → 4.0.7. This procedure uses the
+ownCloud updater plugin called "Updater": it's an internal application already present in your ownCloud installation.
To update ownCloud, follow those steps:
@@ -15,7 +17,8 @@ To update ownCloud, follow those steps:
#. Click 'Update'.
#. Refresh the page with Ctrl+F5.
-If this procedure doesn't work (for example, ownCloud 5.0.10 doesn't show new any new version) you could try to perform a full upgrade to update to the lastest point release (see below).
+If this procedure doesn't work (for example, ownCloud 5.0.10 doesn't show new any new version) you could try to perform
+a full upgrade to update to the latest point release (see below).
Upgrade
-------
@@ -38,8 +41,9 @@ To upgrade ownCloud, follow those steps:
ls | grep -v '\(data\)\|\(config\)' | xargs rm -r
-#. Unpack the release tarball in the owncloud directory (or copy the
- files thereto). Assuming that your installation directory is called 'owncloud' and that it's inside your working directory, you could execute this command:
+#. Unpack the release tarball in the ownCloud directory (or copy the
+ files thereto). Assuming that your installation directory is called 'owncloud' and that it's inside your working
+ directory, you could execute this command:
tar xfj owncloud-latest.tar.bz2
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-doc.git
More information about the Pkg-owncloud-commits
mailing list