Merged branch devel-addressbook from r443 back to trunk

git-svn-id: https://svn.roundcube.net/trunk@543 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 15 insertions, 15 deletions

diff --git a/roundcubemail/README b/roundcubemail/README
index 417e59c9f..2eb7eaad2 100644
--- a/roundcubemail/README
+++ b/roundcubemail/README
@@ -29,6 +29,18 @@ The current development skin uses icons designed by Stephen Horlander and Kevin
 Gerich for Mozilla.org.
 
 
+Installation:
+-------------
+For detailed instructions on how to install RoundCube webmail on your server,
+please refer to the INSTALL document in the same directory as this document.
+
+
+Licensing: 
+----------
+This product is distributed under the GPL. Please read through the file
+LICENSE for more information about our license.
+
+
 How it works:
 -------------
 The main authority for the RoundCube access is the IMAP server. If
@@ -42,32 +54,20 @@ will be allowed.
 
 Code Layout:
 ------------
-
 Basic sequence (index.php):
-  - index.php -> load_gui -> parse_template
+  - index.php -> rcmail_load_gui -> new rcmail_template -> rcmail_template::send
   - authentication details in this sequence
 
 Tasks
   - index.php limits tasks to set list
   - can see task in roundcube link when you mouse over it
   - task templates stored in skins/default/templates
-  - templates "roundcube:" tokens that get replaced in parse_template
+  - templates "roundcube:" tokens that get replaced in rcmail_template class
 
 program/include/rcube_shared.inc
   - defines rcube_html_page, class that lays out a roundcube web page
   - defines form control classes
-
-
-Installation:
--------------
-For detailed instructions on how to install RoundCube webmail on your server,
-please refer to the INSTALL document in the same directory as this document.
-
-
-Licensing: 
-----------
-This product is distributed under the GPL. Please read through the file
-LICENSE for more information about our license.
+  - provides common functions
 
 
 Contact: