Merge remote branch 'origin/stable45'

user_manual/calendars.rst

@@ -43,7 +43,7 @@ Mozilla Lightning users need to this URL scheme::
    The full URL (which on the picture can't be seen because of the
    short edit field) is then::
 
-  https://localhost/owncloud/remote.php/caldav/calendars/test/defaultcalendar
+       https://localhost/owncloud/remote.php/caldav/calendars/test/defaultcalendar
 
 .. _URL-encoding: http://en.wikipedia.org/wiki/Percent-encoding
 

user_manual/connecting_browser.rst

@@ -1,4 +0,0 @@
-Connecting to ownCloud
-======================
-
-.. todo:: describe how to connect via the browser

user_manual/index.rst

@@ -7,7 +7,7 @@ Contents
    :maxdepth: 2
 
    introduction
-   connecting_browser
+   webinterface
    connecting_webdav
    files
    calendars

user_manual/webinterface.rst

@@ -0,0 +1,55 @@
+The ownCloud Web Interface 
+==========================
+
+You can connect to ownCloud with your web browser by pointing
+it to the address that you have received from your service
+provider. In case you are administering the server yourself,
+have a look at ownCloud Administrators Manual.
+
+When you enter the URL, you will receive a page that is similar
+to the one depicted below:
+
+.. figure:: images/oc_connect.png
+   :scale: 50
+
+   The ownCloud login screen
+
+Login with the user name and password with you have received from
+your service provider. If you have set up the server yourself,
+log in with the user name which you have created during the
+setup process. You can add further users through the settings,
+or by hooking up a user backend, such as LDAP.
+
+Overview
+--------
+
+After clicking the :guilabel:`Log in` button, you will be redirected
+to ownCloud's main web interface:
+
+.. figure:: images/oc_ui.png
+   :scale: 50
+
+   The ownCloud main interface with the essential elements numbered
+
+The web interface comprises of the following items:
+
+1. **Navigation bar**: Allows navigation between different parts of ownCloud,
+   provided by apps. Not all apps depicted in this screen shot are installed
+   and enabled by default.
+2. **Application view**: This is where apps show their content. By default, this
+   will show the files and directory (file view) of your user on the ownCloud
+   installation.
+3. **Upload/Create button**: This allows you to create new files or upload
+   existing ones from your device. Note that you can also drop files from
+   Explorer or Finder onto the ownCloud file view and they will get uploaded to
+   ownCloud.
+4. **Search/Logout**: Search allows you to look for files and
+   directories. Currently, ownCloud does not provide a full text search, but
+   this may change in future releases.
+5. **Settings**: This button provides access to the settings menu, where you can
+   change your personal settings, such as the interface language or your
+   password. You can also retrieve the WebDAV URL (see next chapter) and show
+   your quota. Administrators will also get access to user management
+   (:guilabel:`Users`), the apps settings (:guilabel:`Apps`) and administrative
+   settings (:guilabel:`Admin`) including access to ownCloud's log.
+