Index: openacs-4/packages/acs-core-docs/www/xml/developers-guide/tutorial-advanced.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/developers-guide/tutorial-advanced.xml,v
diff -u -r1.4.2.1 -r1.4.2.2
--- openacs-4/packages/acs-core-docs/www/xml/developers-guide/tutorial-advanced.xml	19 Nov 2003 14:35:15 -0000	1.4.2.1
+++ openacs-4/packages/acs-core-docs/www/xml/developers-guide/tutorial-advanced.xml	15 Dec 2003 14:18:48 -0000	1.4.2.2
@@ -61,11 +61,11 @@
 	pre-written documentation files for the tutorial app.  Log in
       as <replaceable>service0</replaceable>, create the standard
       directories, and copy the prepared documentation:</para>
-      <screen>[service0@yourserver service0]$ <userinput>cd /var/lib/aolserver/service0/packages/samplenote/</userinput>
-[service0@yourserver samplenote]$ <userinput>mkdir -p www/doc/xml</userinput>
-[service0@yourserver samplenote]$ <userinput>cd www/doc/xml</userinput>
-[service0@yourserver xml]$ <userinput>cp /var/lib/aolserver/service0/packages/acs-core-docs/www/files/samplenote/* .</userinput>
-[service0@yourserver xml]$</screen>
+      <screen>[service0 service0]$ <userinput>cd /var/lib/aolserver/service0/packages/samplenote/</userinput>
+[service0 samplenote]$ <userinput>mkdir -p www/doc/xml</userinput>
+[service0 samplenote]$ <userinput>cd www/doc/xml</userinput>
+[service0 xml]$ <userinput>cp /var/lib/aolserver/service0/packages/acs-core-docs/www/files/samplenote/* .</userinput>
+[service0 xml]$</screen>
       <para> OpenACS uses DocBook for documentation.  DocBook is
 	an XML standard for semantic markup of documentation.  That
 	means that the tags you use indicate meaning, not intended
@@ -86,7 +86,7 @@
       directory.  A Makefile is provided to generate html from the xml, and copy all of the
       supporting files.  If Docbook is set up correctly, all you need
       to do is:</para>
-      <screen>[service0@yourserver xml]$<userinput> make</userinput>
+      <screen>[service0 xml]$<userinput> make</userinput>
 cd .. ; /usr/bin/xsltproc ../../../acs-core-docs/www/xml/openacs.xsl xml/index.xml
 Writing requirements-introduction.html for sect1(requirements-introduction)
 Writing requirements-overview.html for sect1(requirements-overview)
@@ -102,7 +102,7 @@
 Writing admin-guide.html for chapter(admin-guide)
 Writing bi01.html for bibliography
 Writing index.html for book
-[service0@yourserver xml]$</screen>
+[service0 xml]$</screen>
       <para>Verify that the documentation was generated and reflects
       your changes by browsing to <computeroutput>http://<replaceable>yoursite</replaceable>:8000/samplenote/doc</computeroutput></para>
     </sect2>
@@ -114,20 +114,20 @@
       traverse the directory tree manually and add as you go.  (<ulink
       url="http://www.piskorski.com/docs/cvs-conventions.html">More on
       CVS</ulink>)</para>
-      <screen>[service0@yourserver xml]$ <userinput>cd ..</userinput>
-[service0@yourserver doc]$ <userinput>cd ..</userinput>
-[service0@yourserver www]$ <userinput>cd ..</userinput>
-[service0@yourserver samplenote]$ <userinput>cd ..</userinput>
-[service0@yourserver packages]$ <userinput>cvs add samplenote/</userinput>
+      <screen>[service0 xml]$ <userinput>cd ..</userinput>
+[service0 doc]$ <userinput>cd ..</userinput>
+[service0 www]$ <userinput>cd ..</userinput>
+[service0 samplenote]$ <userinput>cd ..</userinput>
+[service0 packages]$ <userinput>cvs add samplenote/</userinput>
 Directory /cvsroot/service0/packages/samplenote added to the repository
-[service0@yourserver packages]$ <userinput>cd samplenote/</userinput>
-[service0@yourserver samplenote]$ <userinput>cvs add www</userinput>
+[service0 packages]$ <userinput>cd samplenote/</userinput>
+[service0 samplenote]$ <userinput>cvs add www</userinput>
 Directory /cvsroot/service0/packages/samplenote/www added to the repository
-[service0@yourserver samplenote]$ <userinput>cd www</userinput>
-[service0@yourserver www]$ <userinput>cvs add doc</userinput>
+[service0 samplenote]$ <userinput>cd www</userinput>
+[service0 www]$ <userinput>cvs add doc</userinput>
 Directory /cvsroot/service0/packages/samplenote/www/doc added to the repository
-[service0@yourserver www]$ <userinput>cd doc</userinput>
-[service0@yourserver doc]$ <userinput>cvs add *</userinput>
+[service0 www]$ <userinput>cd doc</userinput>
+[service0 doc]$ <userinput>cvs add *</userinput>
 cvs add: cannot add special file `CVS'; skipping
 cvs add: scheduling file `admin-guide.html' for addition
 cvs add: scheduling file `bi01.html' for addition
@@ -152,13 +152,13 @@
 cvs add: scheduling file `user-interface.png' for addition
 Directory /cvsroot/service0/packages/samplenote/www/doc/xml added to the repository
 cvs add: use 'cvs commit' to add these files permanently
-[service0@yourserver doc]$ <userinput>cd xml</userinput>
-[service0@yourserver xml]$ <userinput>cvs add Makefile index.xml</userinput>
+[service0 doc]$ <userinput>cd xml</userinput>
+[service0 xml]$ <userinput>cvs add Makefile index.xml</userinput>
 cvs add: scheduling file `Makefile' for addition
 cvs add: scheduling file `index.xml' for addition
 cvs add: use 'cvs commit' to add these files permanently
-[service0@yourserver xml]$<userinput> cd ../../..</userinput>
-[service0@yourserver samplenote]$ <userinput>cvs commit -m "new package"</userinput>
+[service0 xml]$<userinput> cd ../../..</userinput>
+[service0 samplenote]$ <userinput>cvs commit -m "new package"</userinput>
 cvs commit: Examining .
 cvs commit: Examining www
 cvs commit: Examining www/doc
@@ -170,7 +170,7 @@
 initial revision: 1.1
 done
 <emphasis>(many lines omitted)</emphasis>
-[service0@yourserver samplenote]$</screen>
+[service0 samplenote]$</screen>
     </sect2>
   <sect2>
     <title>Delete with confirmation</title>
@@ -179,7 +179,7 @@
     <para>Add this column to the table_def in index.tcl</para>
     <programlisting>{delete "" {} {&lt;td&gt;&lt;a href="note-delete?note_id=$note_id"&gt;Delete&lt;/a&gt;&lt;/td&gt;}}</programlisting>
     <para>Create the delete confirmation/execution page.</para>
-    <screen>[service0@yourserver www]$ <userinput>emacs note-delete.tcl</userinput></screen>
+    <screen>[service0 www]$ <userinput>emacs note-delete.tcl</userinput></screen>
       <programlisting>ad_page_contract {
     A page that gets confirmation and then delete notes.
 
@@ -224,7 +224,7 @@
 script execution.</para>
 
       <para>The database commands:</para>
-      <screen>[service0@yourserver www]$ <userinput>emacs note-delete.xql</userinput></screen>
+      <screen>[service0 www]$ <userinput>emacs note-delete.xql</userinput></screen>
       <programlisting>&lt;?xml version="1.0"?&gt;
 &lt;queryset&gt;
   &lt;fullquery name="do_delete"&gt;
@@ -239,7 +239,7 @@
   &lt;/fullquery&gt;
 &lt;/queryset&gt;</programlisting>
       <para>And the adp page:</para>
-      <screen>[service0@yourserver www]$ <userinput>emacs note-delete.adp</userinput></screen>
+      <screen>[service0 www]$ <userinput>emacs note-delete.adp</userinput></screen>
       <programlisting>&lt;master&gt;
 &lt;property name="title"&gt;@title@&lt;/property&gt;
 &lt;property name="context"&gt;{@title@}&lt;/property&gt;