[interchange-docs] xmldocs - docelic modified refs/Jobs

docs at icdevgroup.org docs at icdevgroup.org
Thu Jul 5 15:29:06 EDT 2007


User:      docelic
Date:      2007-07-05 19:29:06 GMT
Modified:  refs     Jobs
Log:
* remove parts of cvs conflict.

Revision  Changes    Path
1.9       +0 -9      xmldocs/refs/Jobs


rev 1.9, prev_rev 1.8
Index: Jobs
===================================================================
RCS file: /var/cvs/xmldocs/refs/Jobs,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Jobs	5 Jul 2007 18:55:49 -0000	1.8
+++ Jobs	5 Jul 2007 19:29:06 -0000	1.9
@@ -113,7 +113,6 @@
 user agent string will be set to <literal>commandline</literal>.
 __END__
 
-<<<<<<< Jobs
 __NAME__ example: Define catalog-level Jobs directive
 Specify directory that will hold the job files, and set up a log file to
 for job runs. Also specify an email address to which any output jobs
@@ -129,12 +128,7 @@
 
 __NAME__ example: Run jobs manually
 Invoke from the command line:
-=======
-__NAME__ example: periodically save database contents to text files
-The following crontab triggers the <literal>db</literal> job every day at 2:12 am.
->>>>>>> 1.7
 <programlisting>
-<<<<<<< Jobs
 su -c '/PATH/TO/interchange --quiet --runjobs=CATALOG_NAME=DIRECTORY_NAME' USERNAME
 </programlisting>
 __END__
@@ -142,9 +136,6 @@
 __NAME__ example: Run jobs automatically from Unix crontab
 <programlisting>
 12 2 * * * su -c '/PATH/TO/interchange --quiet --runjobs=CATALOG_NAME=DIRECTORY_NAME' USERNAME
-=======
-12 2 * * * /usr/sbin/interchange --runjobs=standard=db
->>>>>>> 1.7
 </programlisting>
 __END__
 








More information about the docs mailing list