[Pkg-owncloud-commits] [owncloud-doc] 11/14: Fix several warnings and error caused by wrong RST syntax
David Prévot
taffit at moszumanska.debian.org
Wed Jun 11 20:20:24 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 abeb0ed8bbf7e94432d92ac94645a6d69da5a7cf
Author: Morris Jobke <hey at morrisjobke.de>
Date: Mon Jun 9 11:03:03 2014 +0200
Fix several warnings and error caused by wrong RST syntax
Conflicts:
admin_manual/configuration/xsendfile.rst
admin_manual/installation/installation_linux.rst
admin_manual/installation/installation_source.rst
user_manual/pim/calendar.rst
---
admin_manual/configuration/configuration_apps.rst | 3 ++-
.../configuration/configuration_database.rst | 24 +++++++++++-----------
admin_manual/configuration/configuration_users.rst | 3 ++-
.../configuration/configuring_big_file_upload.rst | 3 +--
admin_manual/installation/installation_linux.rst | 2 +-
admin_manual/installation/installation_source.rst | 8 ++++----
admin_manual/issues/index.rst | 2 +-
user_manual/bookmarks.rst | 6 ++++--
user_manual/files/filesweb.rst | 12 +++++++----
user_manual/pim/contacts.rst | 7 +++++++
user_manual/pim/sync_thunderbird.rst | 7 +++++--
11 files changed, 47 insertions(+), 30 deletions(-)
diff --git a/admin_manual/configuration/configuration_apps.rst b/admin_manual/configuration/configuration_apps.rst
index 3383938..1652889 100644
--- a/admin_manual/configuration/configuration_apps.rst
+++ b/admin_manual/configuration/configuration_apps.rst
@@ -8,7 +8,8 @@ With ownCloud installation, you will find some apps enabled by default. To see w
are enabled, click on Apps button on the web interface navigation to go into applications page:
.. figure:: ../images/oc_admin_app_page.png
-Administrator application page
+
+ Administrator application page
In this page, you can enable or disable applications simply by clicking on their names.
Enabled applications will be shown in **bold** while disabled ones will be shown in normal font.
diff --git a/admin_manual/configuration/configuration_database.rst b/admin_manual/configuration/configuration_database.rst
index 2bbd9a6..dd7f70b 100644
--- a/admin_manual/configuration/configuration_database.rst
+++ b/admin_manual/configuration/configuration_database.rst
@@ -84,7 +84,7 @@ You can quit the prompt by entering::
An ownCloud instance configured with MySQL would contain the hostname on which
the database is running, a valid username and password to access it, and the
name of the database. The :file:`config/config.php` as created by the
-:doc:`installation/installation_wizard` would therefore contain entries like
+:doc:`../installation/installation_wizard` would therefore contain entries like
this:
.. code-block:: php
@@ -117,7 +117,7 @@ first time.
An ownCloud instance configured to use sqlite only needs to contain the
reference to a writable data directory (which is required for successful
operation of ownCloud in general anyway). The :file:`config/config.php` as
-created by the :doc:`installation/installation_wizard` could therefore contain
+created by the :doc:`../installation/installation_wizard` could therefore contain
entries like this:
@@ -178,7 +178,7 @@ You can quit the prompt by entering::
An ownCloud instance configured with PostgreSQL would contain the hostname on
which the database is running, a valid username and password to access it, and
the name of the database. The :file:`config/config.php` as created by the
-:doc:`installation/installation_wizard` would therefore contain entries like
+:doc:`../installation/installation_wizard` would therefore contain entries like
this:
.. code-block:: php
@@ -252,7 +252,7 @@ You can quit the prompt by entering::
An ownCloud instance configured with Oracle would contain the hostname on which
the database is running, a valid username and password to access it, and the
name of the database. The :file:`config/config.php` as created by the
-:doc:`installation/installation_wizard` would therefore contain entries like
+:doc:`../installation/installation_wizard` would therefore contain entries like
this:
.. code-block:: php
@@ -306,15 +306,15 @@ command line interface:
SQLite 3.7.15.1 2012-12-19 20:39:10 6b85b767d0ff7975146156a99ad673f2c1a23318
sqlite> .quit
-**MySQL**::
+**MySQL**:
Assuming the database server is installed on the same sytem you're running,
-the command from, use:
+the command from, use::
mysql -uUSERNAME -p
To acess a MySQL installation on a different machine, add the -h option with
-the respective host name:
+the respective host name::
mysql -uUSERNAME -p -h HOSTNAME
@@ -329,15 +329,15 @@ the respective host name:
1 row in set (0.00 sec)
mysql> quit
-**PostgreSQL**::
+**PostgreSQL**:
Assuming the database server is installed on the same sytem you're running
-the command from, use:
+the command from, use::
psql -Uusername -downcloud
To acess a MySQL installation on a different machine, add the -h option with
-the respective host name:
+the respective host name::
psql -Uusername -downcloud -h HOSTNAME
@@ -348,9 +348,9 @@ the respective host name:
(1 row)
postgres=# \q
-**Oracle**::
+**Oracle**:
-On the machine where your Oracle database is installed, type
+On the machine where your Oracle database is installed, type::
sqlplus username
diff --git a/admin_manual/configuration/configuration_users.rst b/admin_manual/configuration/configuration_users.rst
index a6078b5..5bc15a8 100644
--- a/admin_manual/configuration/configuration_users.rst
+++ b/admin_manual/configuration/configuration_users.rst
@@ -6,7 +6,8 @@ user management page, click your username on the web interface and select *Users
A page similar to the image below will be shown:
.. figure:: ../images/oc_admin_user_manage.png
-Users management page
+
+ Users management page
A fictive use case will help you understand the concept of users, user groups
and group admins.
diff --git a/admin_manual/configuration/configuring_big_file_upload.rst b/admin_manual/configuration/configuring_big_file_upload.rst
index 24f4b3f..5badede 100644
--- a/admin_manual/configuration/configuring_big_file_upload.rst
+++ b/admin_manual/configuration/configuring_big_file_upload.rst
@@ -14,8 +14,7 @@ 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
----------------------------
diff --git a/admin_manual/installation/installation_linux.rst b/admin_manual/installation/installation_linux.rst
index a266134..497e5e0 100644
--- a/admin_manual/installation/installation_linux.rst
+++ b/admin_manual/installation/installation_linux.rst
@@ -19,7 +19,7 @@ or else the installation process might fail.
**Archlinux:** The are two packages for ownCloud: `stable version`_ in the official community repository and `development version`_ in AUR.
-.. _stable version: https://www.archlinux.org/packages/community/any/owncloud/
+.. _stable version: https://www.archlinux.org/packages/community/any/owncloud
.. _development version: http://aur.archlinux.org/packages.php?ID=38767
diff --git a/admin_manual/installation/installation_source.rst b/admin_manual/installation/installation_source.rst
index 793a4da..3789772 100644
--- a/admin_manual/installation/installation_source.rst
+++ b/admin_manual/installation/installation_source.rst
@@ -178,7 +178,7 @@ that user.
* The generic command to run is::
- sudo chown -R <php-user>:<php-user> /path/to/your/webservers/document-root/owncloud
+ sudo chown -R <php-user>:<php-user> /path/to/your/webservers/document-root/owncloud
where ``<php-user>`` is to be replaced by the user running php scripts, and
``/path/to/your/webservers/document-root/owncloud`` by the folder where the
@@ -596,11 +596,11 @@ Ubuntu-Apache-MySQL walk-through:
* Make sure to click the "Advanced" Button to see the database settings
* Choose MySQL as Database backend (you might not be presented with any other
-choice if you haven't installed any other database systems).
+ choice if you haven't installed any other database systems).
* As Database host, enter ``localhost``.
* As Database user enter ``root``.
-* As Database password, enter the password you entered during installation of
-the MySQL server package.
+* As Database password, enter the password you entered during installation of the
+ MySQL server package.
* As Database name, enter an arbitrary name as you see fit
Continue by following the :doc:`installation_wizard`.
diff --git a/admin_manual/issues/index.rst b/admin_manual/issues/index.rst
index c5712bc..0b687f5 100644
--- a/admin_manual/issues/index.rst
+++ b/admin_manual/issues/index.rst
@@ -14,6 +14,6 @@ If you can't find a solution, please file an issue:
* If the issue with with an ownCloud app, report it to where that app is developed
* If the app is listed `here <https://github.com/owncloud>`_ report it to the correct repository
- * If the app is listed `here <https://github.com/owncloud/apps>`_ report it to the apps repository
+ * If the app is listed `in the apps repository <https://github.com/owncloud/apps>`_ report it there
Please note that the mailing list should not be used for bug reports, as it is hard to track them there.
diff --git a/user_manual/bookmarks.rst b/user_manual/bookmarks.rst
index d74f096..1425b7a 100644
--- a/user_manual/bookmarks.rst
+++ b/user_manual/bookmarks.rst
@@ -15,7 +15,8 @@ you can enter the website address (or URL), the title of your bookmark, and
a set of tags separated from each other by a space.
.. figure:: images/bookmark_addurl.png
-Adding a bookmark manually
+
+ Adding a bookmark manually
In this example, we have added the page `http://wikipedia.org` with the title "Wikipedia"
and some tags describing what Wikipedia is for an easier search later on.
@@ -47,7 +48,8 @@ The Bookmarklet
---------------
.. figure:: images/bookmark_setting.png
-Bookmarklet link
+
+ Bookmarklet link
The creator of this app understands that people won't want to
open the ownCloud boorkmarks page to add a bookmark every time they see a cool site.
diff --git a/user_manual/files/filesweb.rst b/user_manual/files/filesweb.rst
index a409dc2..1edfcee 100644
--- a/user_manual/files/filesweb.rst
+++ b/user_manual/files/filesweb.rst
@@ -6,7 +6,8 @@ you can view (if a common type), move, rename, download, share and delete your f
enabled, you can also revert a file to specific version. See :doc:`versioncontrol` for details.
.. figure:: ../images/oc_filesweb.png
-Files app on ownCloud web interface
+
+ Files app on ownCloud web interface
With ownCloud 6, you can now see file thumbnails next to the filenames. By hovering your cursor on a file, you
will be provided with some file operations. You can use rename, download, share buttons to perform those actions
@@ -20,7 +21,8 @@ To navigate through folders in your ownCloud, you can simply click on a folder n
will show your current directory:
.. figure:: ../images/oc_filesweb_navigate.png
-Navigation bar
+
+ Navigation bar
You can click on one of the upper directories to navigate up or use home icon to navigate back into your root
folder.
@@ -33,7 +35,8 @@ You can create files by simply clicking on *New* button on files app. The *New*
options to choose from:
.. figure:: ../images/oc_filesweb_new.png
-New button options
+
+ New button options
* *Text file* will create a simple text file and add into the current folder in your ownCloud.
* *Folder* will create a folder in current folder.
@@ -68,7 +71,8 @@ Any file/folder on ownCloud can be shared to download with a local user, group o
To share a file/folder, hover your cursor on an item in the files app and click *Share*. You will be provided with some options:
.. figure:: ../images/oc_files_share.png
-Share dialog
+
+ Share dialog
* The first field is to share this file/folder with local users/groups. This is very useful
if you are in a company and want to create a quick share with a collegue.
diff --git a/user_manual/pim/contacts.rst b/user_manual/pim/contacts.rst
index 25fea2e..39ccedf 100755
--- a/user_manual/pim/contacts.rst
+++ b/user_manual/pim/contacts.rst
@@ -20,11 +20,13 @@ more faster way of creating contacts.
Just below the contact list, click on the gear button:
.. image:: ../images/contact_bottombar.png
+
Contact settings icon
Once you've clicked it, an up arrow button which lets you upload files will be shown:
.. image:: ../images/contact_uploadbutton.png
+
Contact file upload icon
After choosing an addressbook to import into, click on the arrow. The upload window will be opened and let you choose your files.
@@ -37,6 +39,7 @@ After you are done just click on the open button
After the upload it should look something like this in which all the names and contacts will be sorted alphabetically
.. image:: ../images/contact_vcfpick.jpg
+
Picking VCF files
After upload, the interface will automatically place your contacts into ownCloud.
@@ -54,6 +57,7 @@ Just click on a field and start typing the information.
You can use the "Add Field" button to add another types of information for this contact.
.. image:: ../images/contact_emptycontact.png
+
Empty contact view
When you want to remove an information of your contact, just click on little delete icon
@@ -65,6 +69,7 @@ Adding picture to the contact
There are two methods in which you can give a picture id to the specific contact
.. image:: ../images/contact_picture.jpg
+
Contact picture options
1) **Direct upload**
@@ -74,6 +79,7 @@ After you have selected the picture for the contact you get
an option to crop the picture to suit your requirements
.. image:: ../images/contact_crop.jpg
+
Cropping contact picture
You can crop the picture however you wish and then press OK.
@@ -90,6 +96,7 @@ you will have access to the application's settings.
Then, you will be shown all available addressbooks to access the options.
.. image:: ../images/contact_del_ab.png
+
Addressbook options
There, you have the ability to add, delete, download or share your addressbooks.
diff --git a/user_manual/pim/sync_thunderbird.rst b/user_manual/pim/sync_thunderbird.rst
index 61d90ab..76ac988 100755
--- a/user_manual/pim/sync_thunderbird.rst
+++ b/user_manual/pim/sync_thunderbird.rst
@@ -9,7 +9,8 @@ As someone who is new to ownCloud, New to SoGo Connector, and new to Thunderbird
#. `Thunderbird <http://www.mozilla.org/en-US/thunderbird/>`_ for your OS unless it comes with your OS distribution (Linux)
#. `Sogo Connector <http://www.sogo.nu/english/downloads/frontends.html>`_ (latest release)
- With an installed Thunderbird mailtool, and installed SoGo Connector:
+With an installed Thunderbird mailtool, and installed SoGo Connector:
+
#. Thunderbird Addressbook is in the Thunderbird "Tools" Menu
#. In the Thunderbird Addressbook application:
@@ -18,10 +19,12 @@ As someone who is new to ownCloud, New to SoGo Connector, and new to Thunderbird
- "**URL:**" is found in your OwnCloud Contacts area, that little Gear symbol
.. image:: ../images/contact_thunderbird-Symbol_Gear.jpg
+
in the -bottom left- of the Contacts View (same symbol as found in the -top right- in the Calendar view). Then look for a little impeller symbol
.. image:: ../images/contact_thunderbird-Symbol_Impeller.jpg
-which will display the URL you need for your installation to work.
+
+which will display the URL you need for your installation to work.
.. image:: ../images/contact_thunderbird-URL_config.jpg
--
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