[phpwebapp-commits] CVS: books README-1,NONE,1.1 books.conf,1.1.1.1,1.2 authenticate.php,1.1.1.1,1.2
Brought to you by:
dashohoxha
Menu
▾
▴
[phpwebapp-commits] CVS: books README-1,NONE,1.1 books.conf,1.1.1.1,1.2 authenticate.php,1.1.1.1,1.2 ToDo.txt,1.1.1.1,1.2
|
From: Dashamir H. <das...@us...> - 2005-11-03 10:43:47
|
Update of /cvsroot/phpwebapp/books In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4955 Modified Files: books.conf authenticate.php ToDo.txt Added Files: README-1 Log Message: --- NEW FILE: README-1 --- 'books' is a copy of DocBookWiki which is used to keep the documentation books of the phpWebApp framework (phpwebapp_manual, phpwebapp_tutorial, phpwebapp_design). The documentation that is created and maintained by 'books' is then displayed by 'documentation'. I need to modify 'books' to suit best this specific purpose and I want to keep track of the changes, so I have imported it in CVS as another module. But I also want to merge time after time the latest changes/improvments of DocBookWiki without loosing the local modifications. For this reason I use the vendor tag of the `cvs import` command. This file describes how this is done. Importing for the first time ---------------------------- * Get the latest release of DocBookWiki, e.g. book-0.8.1.tar.gz and unpack it: --scr bash$ tar xfz book-0.8.1.tar.gz bash$ mv book-0.8.1/ books/ ---- * Remove the CVS directories, which point to the anonymous CVS at SourceForge: --scr bash$ cd books/ bash$ find . -name CVS | xargs rm -rf ---- * Import in another CVS repository, using 'DocBookWiki' as vendor tag and 'books_0_8_x' as vendor release: --scr bash$ cvs -H import bash$ cd books/ bash$ cvs -z3 -q -d:ext:das...@cv...:/cvsroot/phpwebapp import books DocBookWiki books_0_8_x ---- Updating the latest changes of DocBookWiki with the import command ------------------------------------------------------------------ After customising 'books', now suppose that we want to merge the latest changes from the DocBookWiki project. This can be done like this: * Get the latest release from DocBookWiki, say books-0.8.y.tar.gz and untar it somewhere: --scr bash$ tar xfz books-0.8.y.tar.gz ---- * Import it in the same repository and module, with the same vendor tag (DocBookWiki), but with a different release tag (books_0_8_y): --scr bash$ cd books-0.8.y/ bash$ cvs -z3 -q -d:ext:das...@cv...:/cvsroot/phpwebapp import books DocBookWiki books_0_8_y ---- This will update the vendor branch with the latest changes from DocBookWiki. * Now merge these changes to the head revision: --scr bash$ cd ../books/ bash$ cvs -z3 -q update -jbooks_0_8_x -jbooks_0_8_y ---- or --scr bash$ cvs -z3 -q -d:ext:das...@cv...:/cvsroot/phpwebapp checkout books -jbooks_0_8_x -jbooks_0_8_y ---- For more information see the CVS manual (`info cvs`), "Tracking third-party sources". Index: books.conf =================================================================== RCS file: /cvsroot/phpwebapp/books/books.conf,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** books.conf 3 Nov 2005 08:11:45 -0000 1.1.1.1 --- books.conf 3 Nov 2005 10:43:32 -0000 1.2 *************** *** 24,28 **** ### readers at the end of each section. They are stored separately ### from the book content, in a database. ! WEBNOTES='false' ### If true, webnotes need to be approved before being displayed, --- 24,28 ---- ### readers at the end of each section. They are stored separately ### from the book content, in a database. ! WEBNOTES='true' ### If true, webnotes need to be approved before being displayed, Index: authenticate.php =================================================================== RCS file: /cvsroot/phpwebapp/books/authenticate.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** authenticate.php 3 Nov 2005 08:11:45 -0000 1.1.1.1 --- authenticate.php 3 Nov 2005 10:43:32 -0000 1.2 *************** *** 29,33 **** $passwd = $_SERVER["PHP_AUTH_PW"]; ! if ($user=='superuser' and $passwd=='su') { define('SU', 'true'); --- 29,33 ---- $passwd = $_SERVER["PHP_AUTH_PW"]; ! if ($user=='superuser' and crypt($passwd,'6ueNQisonyc2o')=='6ueNQisonyc2o') { define('SU', 'true'); Index: ToDo.txt =================================================================== RCS file: /cvsroot/phpwebapp/books/ToDo.txt,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** ToDo.txt 3 Nov 2005 08:11:44 -0000 1.1.1.1 --- ToDo.txt 3 Nov 2005 10:43:32 -0000 1.2 *************** *** 1,39 **** - - Improve the installation, so that it becomes platform independent. - - Try to install swish-e locally. - - - Automatic notification on commit (for subversion). - - Installation of ViewCVS for Subversion. - - - Update 'webnotes'. - - - docbookwiki_guide_en.xml still has problems, generation of pdf fails - - - Changing the structure of a book takes a long time (is very slow). - Maybe there is any problem or maybe it can be optimized. - - - In TextWiki mode: - + there is a small bug with nested lists - + the tag </xmp> inside --code is not displayed in html (because - it is inside an <xmp> element); it should be written < /xmp> - or </ xmp> - + the closing tag \</tagname\> has problems; it should be writen - \</ tagname\> or \< /tagname\> - - - The reader can hide or show user notes. - - The user that has approve rights can see a list of nodes that - he can approve (the modified ones). - - - Keep binary files (media, images etc.) in CVS as well. - - - Search about character encoding and fix some problems related - to them (change encoding to UTF-8 or ISO-8859-15). - - - See whether the certificates (https) can be used for authenticating - editors, admins, etc., instead of (username,password). - - - Make UML Diagrams that document the design of the application. - - - Improvments: --- 1,2 ---- *************** *** 89,94 **** - Installation of ViewCVS for Subversion. - - Update 'webnotes'. - - Fix chown.c (for some reason it was not working, and it was preventing the work in the other parts of the application, --- 52,55 ---- *************** *** 109,119 **** Maybe there is any problem or maybe it can be optimized. ! - In TextWiki mode: ! + there is a small bug with nested lists ! + the tag </xmp> inside --code is not displayed in html (because ! it is inside an <xmp> element); it should be written < /xmp> ! or </ xmp> ! + the closing tag \</tagname\> has problems; it should be writen ! \</ tagname\> or \< /tagname\> Done: --- 70,75 ---- Maybe there is any problem or maybe it can be optimized. ! - In TextWiki mode there is a small bug with nested lists. ! Done: |
