diff --git a/LDP/guide/docbook/LDP-Author-Guide/ag-distribute.xml b/LDP/guide/docbook/LDP-Author-Guide/ag-distribute.xml index 39f3492b..8a6fd44a 100644 --- a/LDP/guide/docbook/LDP-Author-Guide/ag-distribute.xml +++ b/LDP/guide/docbook/LDP-Author-Guide/ag-distribute.xml @@ -263,46 +263,5 @@ publication. - diff --git a/LDP/guide/docbook/LDP-Author-Guide/ag-overview.xml b/LDP/guide/docbook/LDP-Author-Guide/ag-overview.xml index 98c5b0fc..291189eb 100644 --- a/LDP/guide/docbook/LDP-Author-Guide/ag-overview.xml +++ b/LDP/guide/docbook/LDP-Author-Guide/ag-overview.xml @@ -85,7 +85,8 @@ Once your document has been through each of the reviews a Review - Coordinator will add it to the CVS, update the version number to 1.0 + Coordinator will approve addint it to the git repository, update the + version number to 1.0 and have the document published on the public Web site. For more information about your final submission to the LDP, please read . diff --git a/LDP/guide/docbook/LDP-Author-Guide/ag-submit.xml b/LDP/guide/docbook/LDP-Author-Guide/ag-submit.xml deleted file mode 100644 index 61502bfe..00000000 --- a/LDP/guide/docbook/LDP-Author-Guide/ag-submit.xml +++ /dev/null @@ -1,64 +0,0 @@ - - -
- Submission to LDP for publication - The final step - This section contains information on what to do after your - document has received both a technical and language review by the - LDP volunteers. - - - - As part of the review process a Review Coordinator will add your - document to the git repository (including any associated image files) and - notify the submit mailing list that your document is ready for - publication. - - - - Subsequent updates to your document can be made via git if you like. Please read - for more information. - - diff --git a/LDP/guide/docbook/LDP-Author-Guide/cvs-why.xml b/LDP/guide/docbook/LDP-Author-Guide/cvs-why.xml deleted file mode 100644 index 7119e842..00000000 --- a/LDP/guide/docbook/LDP-Author-Guide/cvs-why.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - The LDP provides optional CVS access to its authors. This enables - collaborative writing and has the following positive effects: - - - - - CVS will keep an off-site backup of your documents. In - the event that you hand over a document to another author, - they can just retrieve the document from CVS and continue - on. In the event you need to go back to a previous version of - a document, you can retrieve it as well. - - - However difficult from an organizational point of view, it's great to have multiple people working on the same - document. CVS enables you to do this. You can have CVS tell you what changes were made by another author - while you were editing your copy, and - integrate those changes. - - - CVS keeps a log of what changes were made. These logs (and - a date stamp) can be placed automatically inside your documents - when they are published. - - - - CVS can be combined with scripts to automatically - update the LDP web site with new documentation as it's written - and submitted. This is not in place yet, but it is a goal. - Currently, CVS updates signal the HOWTO coordinator to - update the LDP web page, meaning that if you use CVS, you're not - required to e-mail your XML code. (Although you do - still need to send the submit list an email when you - are ready for your document to be published, because the whole publishing process has not been fully automated yet.) - - - -Access to our CVS repository -Only authors with at least three submissions get access to our CVS, see . - diff --git a/LDP/guide/docbook/LDP-Author-Guide/cvs.xml b/LDP/guide/docbook/LDP-Author-Guide/cvs.xml deleted file mode 100644 index 4922653d..00000000 --- a/LDP/guide/docbook/LDP-Author-Guide/cvs.xml +++ /dev/null @@ -1,242 +0,0 @@ - - -Concurrent Version System (CVS) - -&cvs-why; - - - You can browse the LDP CVS repository via the web at http://cvs.tldp.org/. - - -
- Getting a CVS account - - - CVS accounts will not be granted to all applicants - To be granted a CVS account you must qualify under one of the following categories: - - - authors with documents already in the collection who have made a minimum of three submits to the LDP through submit@en.tldp.org - - - technical and language reviewers approved by one of the Review Coordinators - - - new authors in the review process (also requires approval from one of the Review Coordinators) - - - Please do not apply for a CVS account if you do not qualify. - - - - If you qualify for a CVS account you may apply for one contacting CVS master Sergiusz - Include information about which documents you maintain. - -
- -
- Using CVS -
- Setting Up Your CVS Account - First you'll need to get an account at the LDP's CVS - Repository. Please see the notes above on obtaining an account. This repository houses various documents including - HOWTOs and Guides. Documents are sorted by the type of document (for - example a HOWTO or a Guide), and by the markup language the document - uses (for example DocBook or LinuxDoc). - - - When your account is ready you can log in using one of the following commands. In all instances your_userid should be replaced by the user name you were issued in the response email. You will be prompted for a password after this first step. - - - Initializing Your CVS Account - - - Linux system - - - cvs -d :pserver:your_userid@cvs.tldp.org:/cvsroot login - - - - - Windows system - - set CVSROOT=":pserver:your_userid@cvs.tldp.org:/cvsroot" - - cvs -d %CVSROOT% login - - - - - Wait patiently while the system tries to log you in. It can often take more - that 10-20 seconds for the system to either accept (or reject) - your password. Once you've - used cvs login for the first time and have - been given access to the system, your password is stored in - .cvspass and you will not - have to use cvs login - again. Just set the CVSROOT with the export command listed above - and continue on. If TLDP's CVS server is the only one you work with, you might also add an export CVSROOT line to your ~/.bashrc shell configuration file. - -
- -
- Getting the Documents - - You can get the entire repository (about 150 MB) with: cvs checkout LDP - - - Or you can get the source for your own document with: - cvs checkout LDP/howto/docbook/YOUR-HOWTO.xml OR - cvs checkout LDP/guide/docbook/YOURGUIDE - - - Windows users will need to use a modified version of this command. Instead they should use: - cvs -d %CVSROOT% checkout LDP/howto/docbook/YOUR-HOWTO.xml - - - Keep an overview - checkout will add the full directory structure - from tldp.org on down. Although it doesn't really matter where - you put these files on your local file system you may not want to - bury the directories too deeply. - -
- -
- CVS Commands - - CVS Commands: a brief reminder - - - commit - - This CVS command will upload your changes to the CVS server. - Please be sure to include a useful description of the changes that have been made to your document. - If you want to bypass the editor screen you can use - - cvs - - - - Ready for publication warningYou must still email submit@en.tldp.org - when you are ready to have your changes - appear on the live site. Your email should include the relative - path to the file(s) in the LDP CVS tree that you wish to - update. - - - - - - - add - - You can add new files to your CVS repository. These may be image - files or additional XML files. First check that your HOWTO is in - its own directory. You may want to coordinate with the - people at submit@en.tldp.org to ensure you can - add graphics or other files to your HOWTO. - - - - Copy the files you want to add into your local CVS repository - (where all of your downloaded/working files are). Then: - cvs add filename - - After you've added the files, you still need to commit them to the - repository (see above). - - - - - remove - - - - - - - - $Id$ - - While this is not a CVS command it can be used to - automatically insert information about the file including the - time and date it was last modified, the version number it was - assigned by the CVS and the filename of this particular file. - The output will look like this: - $Id: cvs.xml,v 1.9 2002/04/21 09:44:26 serek Exp - $ - - - - - - - If you need to change a file name, you - still need to use the add command. First remove the copy of the - file from your local disk. Then remove it from the CVS tree with: - cvs remove filename. - As with the add command, you need to >commit your - removed file. Finally, now that the old file has been removed, add - your new file using the instructions above (first add and then - commit the additional file). - - -
- Recovering old versions - - There you are, typing away, when you screw up. Real bad. - Doesn't matter what it is, but suffice it to say that you've - toasted not only the version on your local drive, but - created a new version on the CVS server. What you need - to do is go back in time and resurrect an older - version of your file. - - - To do this, you'll need to know the version number of the - file you want to retrieve. cvs diff - will give a list of revisions if there are differences. You - can pick the revision number, subtract one, and that is - probably the revision you want to look at. - - - The command -cvs -Q update -p -r revision - filename - will output to stdout - the contents of the revision version - of filename. You can pipe it to - more or redirect the output to a file. - Conveniently, you can redirect stdout to a file called - filename. Your local file - is now the revision you want, and - cvs update - will update the CVS server with the new (old) - version of filename. - -
-
-
- -
-CVS Resources - If you're completely new to CVS, there are a few web pages - you may want to look at which can help you out: - - - - http://cvshome.org/docs/blandy.html - - - - http://www.loria.fr/~molli/cvs/doc/cvs_toc.html - - -
- diff --git a/LDP/guide/docbook/LDP-Author-Guide/git.xml b/LDP/guide/docbook/LDP-Author-Guide/git.xml index 5919a601..cef492f3 100644 --- a/LDP/guide/docbook/LDP-Author-Guide/git.xml +++ b/LDP/guide/docbook/LDP-Author-Guide/git.xml @@ -79,23 +79,4 @@ Once the push request is accepted, you can remove the branch using git branch -D MyNewBranch
- diff --git a/LDP/guide/docbook/LDP-Author-Guide/references.xml b/LDP/guide/docbook/LDP-Author-Guide/references.xml index c45259c0..de058ca6 100644 --- a/LDP/guide/docbook/LDP-Author-Guide/references.xml +++ b/LDP/guide/docbook/LDP-Author-Guide/references.xml @@ -404,36 +404,6 @@ url="http://tldp.org/HOWTO/HOWTO-INDEX/" /> - -Software: CVS - - -CVS: Project Management - -ByronClark - - - -CVS - -Ashley J.S.Mills -Alan P.Sexton - - - -CVS--Concurrent Versions System - -PascalMolli - - - -Learning About CVS - - - - - Software: Emacs diff --git a/LDP/guide/docbook/sag/ch01.sgml b/LDP/guide/docbook/sag/ch01.sgml index 6f5092af..dae5107d 100644 --- a/LDP/guide/docbook/sag/ch01.sgml +++ b/LDP/guide/docbook/sag/ch01.sgml @@ -103,7 +103,7 @@ This is because Linux is only the kernel, not the applications that run on it. Most of the basic command line utilities were written by the Free Software Foundation while developing their GNU operating system. - Among those utilities are some of the most basic commands like cp, mv + Among those utilities are some of the most basic commands like cp, mv, lsof, and dd. In a nutshell, what happened was, the FSF diff --git a/LDP/guide/docbook/sag/ch02.sgml b/LDP/guide/docbook/sag/ch02.sgml index 82176387..9c988809 100644 --- a/LDP/guide/docbook/sag/ch02.sgml +++ b/LDP/guide/docbook/sag/ch02.sgml @@ -136,7 +136,7 @@ The single most important service in a UNIX system is provided by init - init init + init. init is started as the first process of every UNIX system, as the last thing the kernel does when it boots. When init starts, it continues the boot process by doing various startup @@ -215,7 +215,7 @@ getty for each terminal upon which logins are to be allowed. getty reads the username and runs the login - loginprogram, which reads the password. + login program, which reads the password. If the username and password are correct, login runs the shell. When the shell terminates, i.e., the user logs out, or when login terminated because the username and