[Pkg-owncloud-commits] [owncloud-doc] 41/80: Fix several formatting issues
David Prévot
taffit at moszumanska.debian.org
Fri Jul 4 02:54:52 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository owncloud-doc.
commit ccc1ff969170b1a45cd2933b48ad10cb314f8846
Author: RandolfCarter <RandolphCarter at fantasymail.de>
Date: Sat Feb 22 02:26:35 2014 +0100
Fix several formatting issues
Conflicts:
admin_manual/installation/installation_source.rst
---
admin_manual/installation/installation_source.rst | 68 +++++++++++------------
1 file changed, 34 insertions(+), 34 deletions(-)
diff --git a/admin_manual/installation/installation_source.rst b/admin_manual/installation/installation_source.rst
index ab05157..f0bc6da 100644
--- a/admin_manual/installation/installation_source.rst
+++ b/admin_manual/installation/installation_source.rst
@@ -77,10 +77,9 @@ For preview generation (*optional*):
on how to install/enable these modules.
* Make sure your distribution's php version fulfils the version requirements
- specified above. If it doesn't, there might be custom repositories you can use.
- If you are e.g. running Ubuntu 10.04 LTS, you can update your
- PHP using a custom `PHP PPA`_:
- ::
+ specified above. If it doesn't, there might be custom repositories you can
+ use. If you are e.g. running Ubuntu 10.04 LTS, you can update your PHP using
+ a custom `PHP PPA`_: ::
sudo add-apt-repository ppa:ondrej/php5
sudo apt-get update
@@ -94,8 +93,7 @@ Example installation on Ubuntu 12.04.4 LTS Server
*************************************************
On a machine running a pristine Ubuntu 12.04.4 LTS server, you would install the
required and recommended modules for a typical ownCloud installation, using
-Apache and MySQL by issuing the following commands in a terminal:
-::
+Apache and MySQL by issuing the following commands in a terminal:::
sudo apt-get install apache2 mysql-server libapache2-mod-php5
sudo apt-get install php5-gd php5-json php5-mysql php5-curl
@@ -121,7 +119,7 @@ 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.
-* Navigate to `http://owncloud.org/install`
+* Navigate to the `ownCloud Installation Page`_
* Click "Tar or Zip file"
* In the opening dialog, chose the "Linux" link.
* This will start the download of a file named owncloud-x.y.z.tar.bz2 (where
@@ -129,10 +127,7 @@ ownCloud's built-in WebDAV support.
* Save this file on the machine you want to install ownCloud on.
* If that's a different machine than the one you are currently working on, use
e.g. FTP to transfer the downloaded archive file there.
-* Note down the directory where you put the file.
-* Extract the archive contents. Open a terminal on the machine
- you plan to run ownCloud on, and run:
- ::
+* Extract the archive contents. Open a terminal and run::
cd path/to/downloaded/archive
tar -xjf owncloud-x.y.z.tar.bz2
@@ -143,16 +138,16 @@ ownCloud's built-in WebDAV support.
* Copy the ownCloud files to their final destination in the document root of your
webserver (you can skip this step if you already downloaded and extracted the
- files there):
- ::
+ files there)::
- sudo cp -r owncloud /path/to/your/webserver/document-root
+ sudo cp -r owncloud /path/to/your/webservers/document-root
+ where ``/path/to/your/webservers/document-root``, needs to be replaced by the
+ actual path where the document root of your webserver is configured to be.
- * If you don't know where your webserver's document root is located, consult its
- documentation. For Apache on Ubuntu 12.04 LTS for example, this would usually be
- :code:`/var/www`. So above command should look like this:
- ::
+ * If you don't know where your webserver's document root is located, consult
+ its documentation. For Apache on Ubuntu 12.04 LTS for example, this would
+ usually be ``/var/www``. So the concrete command to run would be::
sudo cp -r owncloud /var/www
@@ -170,12 +165,18 @@ The following command will change the ownership of the whole folder to that user
* For Debian-based distributions (like Ubuntu, Debian or Linux Mint) and Gentoo, run:
::
- sudo chown -R www-data:www-data /path/to/your/owncloud
+* The generic command to run is::
+
+ sudo chown -R <php-user>:<php-user> /path/to/your/webservers/document-root/owncloud
* Continuing the example from above, for Ubuntu 12.04 LTS, where the install location
was :code:`/var/www`, you would run:
::
+* For Ubuntu 12.04 LTS server, where the owncloud folder was copied into the
+ apache document root at ``/var/www``, and the user running apache and php
+ scripts is called ``www-data``, this would mean you need to run::
+
sudo chown -R www-data:www-data /var/www/owncloud
* For ArchLinux should run (as root):
@@ -212,8 +213,7 @@ Enabling SSL
An Apache installed under Ubuntu comes already set-up with a simple
self-signed certificate. All you have to do is to enable the ssl module and
-the according site. Open a terminal and run
-::
+the according site. Open a terminal and run::
sudo a2enmod ssl
sudo a2ensite default-ssl
@@ -235,14 +235,12 @@ Configuring ownCloud
Since there was a change in the way versions 2.2 and 2.4 are configured,
you'll have to find out which Apache version you are using.
-Usually you can do this by running one of the following commands:
-::
+Usually you can do this by running one of the following commands::
sudo apachectl -v
apache2 -v
-Example output:
-::
+Example output: ::
Server version: Apache/2.2.22 (Ubuntu)
Server built: Jul 12 2013 13:37:10
@@ -278,13 +276,11 @@ Example config for Apache 2.4:
:code:`/etc/apache2/sites-available/default-ssl`).
* Edit the site file with your favorite editor (note that you'll need root
permissions to modify that file). For Ubuntu 12.04 LTS, you could for example run
- the following command in a Terminal:
- ::
+ the following command in a Terminal::
sudo nano /etc/apache2/sites-available/default-ssl
-* Add the entry shown above immediately before the line containing
- ::
+* Add the entry shown above immediately before the line containing::
</VirtualHost>
@@ -319,8 +315,7 @@ Example config for Apache 2.4:
If you need the WebDAV support in the rest of your configuration, you can turn it off
specifically for the ownCloud entry by adding the following line in the
configuration of your ownCloud. In above "<Directory ..." code, add the following line
- directly after the "allow from all" / "Require all granted" line):
- ::
+ directly after the ``allow from all`` / ``Require all granted`` line): ::
Dav Off
@@ -329,8 +324,7 @@ Example config for Apache 2.4:
If you have turned on authentication on a parent folder (via e.g. an "AuthType Basic"
directive), you can turn off the authentication specifically for the ownCloud entry;
to do so, in above "<Directory ..." code, add the following line directly after the
- "allow from all" / "Require all granted" line):
- ::
+ ``allow from all`` / ``Require all granted`` line): ::
Satisfy Any
@@ -585,8 +579,9 @@ Follow the Install Wizard
* Open your web browser
* Navigate to your ownCloud instance.
+
* If you are installing ownCloud on the same machine as you are accessing the
- install wizard from, the url will be: https://localhost/owncloud
+ install wizard from, the url will be https://localhost/owncloud
* If you are installing ownCloud on a different machine, you'll have to access
it by its hostname or IP address, e.g. https://example.com/owncloud
* If you are using a self-signed certificate, you will be presented with a
@@ -601,6 +596,7 @@ Follow the Install Wizard
to a location outside of the document root.
* If following the Ubuntu-Apache-Mysql walk-through:
+
* choose mysql as Database backend (you might not be presented with any other
choice, if only mysql is available anyway).
* As Database host, enter ``localhost``.
@@ -614,6 +610,7 @@ Follow the Install Wizard
permissions only on its own database.
* In general, you have the following choices regarding the database:
+
* For basic installs we recommend SQLite as it is easy to setup (ownCloud will do
it for you). The performance when using sqlite is however inferior to the two
other options.
@@ -621,6 +618,7 @@ Follow the Install Wizard
* Note that you will only be able to choose among the php database connectors
which are actually installed on the system (see package requirements above).
* Regarding the database name and user account you have two options:
+
* You can specify either an admin/root user, and the name of a database
which does not yet exist. This lets ownCloud create its own database and
database user account.
@@ -632,6 +630,8 @@ Follow the Install Wizard
"Welcome to ownCloud" screen.
.. _PHP PPA: https://launchpad.net/~ondrej/+archive/php5
+.. _ownCloud Installation Page: http://owncloud.org/install
+.. _options for free SSL certificates: https://www.sslshopper.com/article-free-ssl-certificates-from-a-free-certificate-authority.html
.. _github gist for further instructions: https://gist.github.com/2200407
.. _Nginx HTTP SSL Module documentation: http://wiki.nginx.org/HttpSslModule
.. _MySQL Schema Object Names documentation: http://dev.mysql.com/doc/refman/5.5/en/identifiers.html
--
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