[Oval-commits] r426 - trunk/ovaldi/debian/patches

[Pavel Vinogradov]

Author: blaze-guest
Date: 2010-01-10 05:56:08 +0000 (Sun, 10 Jan 2010)
New Revision: 426

Modified:
   trunk/ovaldi/debian/patches/debian.manpage.patch
Log:
Update patch for ovaldi manpage

Modified: trunk/ovaldi/debian/patches/debian.manpage.patch
===================================================================
--- trunk/ovaldi/debian/patches/debian.manpage.patch	2010-01-10 05:29:49 UTC (rev 425)
+++ trunk/ovaldi/debian/patches/debian.manpage.patch	2010-01-10 05:56:08 UTC (rev 426)
@@ -1,78 +1,73 @@
-#Description: Add usage example and point to real location of xml and xsd files
-#  Add usage example with sample definition shipped with package.
-#  .
-#  Use "current directory" instead of "Interpreter directory"
-#  .
-#  Point to /usr/share/ovaldi/xml instead of Interpreter directory
-#Forwarded: no
-#Author: Pavel Vinogradov <Pavel.Vinogradov at nixdev.net>
-#Last-Update: 2009-09-16
-diff -urN ovaldi.mitre/docs/ovaldi.1 ovaldi.debian/docs/ovaldi.1
---- ovaldi.mitre/docs/ovaldi.1	2008-04-20 20:16:55.000000000 +0500
-+++ ovaldi.debian/docs/ovaldi.1	2008-04-20 20:43:14.000000000 +0500
-@@ -21,12 +21,12 @@
+diff -urN ovaldi-5.6.4/docs/ovaldi.1 ovaldi-5.6.4.debian/docs/ovaldi.1
+--- ovaldi-5.6.4/docs/ovaldi.1	2010-01-05 04:58:38.000000000 +0400
++++ ovaldi-5.6.4.debian/docs/ovaldi.1	2010-01-10 09:53:13.000000000 +0400
+@@ -20,12 +20,12 @@
  .B \-o filename
- Specifies the pathname of the OVAL Definition file to use.  If none is
- specified than the Interpreter will default to "definitions.xml" in the
--Interpreter directory.
+ Specifies the pathname of the OVAL Definition document to use.  If none is
+ specified then the OVAL Interpreter will default to "definitions.xml" in the
+-OVAL Interpreter directory.
 +current directory.
  .TP
  .B \-v filename
- Specifies the pathname of the external variable file to use.  If none is
- specified than the Interpreter will default to "external-variables.xml" in
--the Interpreter directory.
+ Specifies the pathname of the OVAL Variables document to use.  If none is
+ specified then the OVAL Interpreter will default to "external-variables.xml" in
+-the OVAL Interpreter directory.
 +the current directory.
  .TP
  .B \-e definition id list
- Specifies a list of definition ids to evaluate in the input oval-definitions
-@@ -54,7 +54,7 @@
- Specifies the pathname of the oval-definitions-schematron.xsl
- to be used for Schematron validation. If none is specified 
- then the Interpreter will default to "oval-definitions-schematron.xsl"
--in the Interpreter directory.
-+in the /usr/share/ovaldi/xml directory.
+ Specifies a list of OVAL Definition ids to evaluate in the input OVAL 
+@@ -53,7 +53,8 @@
+ .B \-c filename
+ Specifies the pathname of the oval-definitions-schematron.xsl to be used for
+ Schematron validation. If none is specified then the OVAL Interpreter will 
+-default to "oval-definitions-schematron.xsl" in the OVAL Interpreter directory.
++default to "oval-definitions-schematron.xsl" in the /usr/share/ovaldi/xml
++directory.
  .TP
- .B \-i filename
- Specifies the pathname of a System Characteristics file that is to be used
-@@ -71,7 +71,7 @@
- Specifies the pathname of the file to which analysis results are to be
- saved.  This data is stored according to the format defined by the OVAL
- Results Schema.  If none is specified than the Interpreter will default to
--"results.xml" in the Interpreter directory.
-+"results.xml" in the current directory.
+ .B \-a dir name
+ Specifies the pathname of the directory that contains the OVAL Language Schema
+@@ -74,7 +75,7 @@
+ Specifies the pathname of the file to which analysis results are to be saved.
+ This data is stored according to the format defined by the OVAL Results Schema.
+ If none is specified than the OVAL Interpreter will default to "results.xml" in
+-the OVAL Interpreter directory.
++the current directory.
  .TP
  .B \-s
- If set do not apply the xsl to the OVAL Results xml.
-@@ -79,12 +79,12 @@
+ If set do not apply the XSL to the OVAL Results xml.
+@@ -82,12 +83,12 @@
  .B \-t filename
- Specifies the pathname of the xsl file which should be used to
- transform the oval results. If none is specified then the Interpreter
--will default to "results_to_html.xsl" in the Interpreter directory.
-+will default to "results_to_html.xsl" in the /usr/share/ovaldi/xml directory.
+ Specifies the pathname of the XSL file which should be used to transform the 
+ OVAL Results document. If none is specified then the OVAL Interpreter will 
+-default to "results_to_html.xsl" in the OVAL Interpreter directory.
++default to "results_to_html.xsl" in the /usr/share/ovaldi/xml directory.
  .TP
  .B \-x filename
- Specifies the pathname of the file which xsl transform results
- are to be saved.  If none is specified then the Interpreter
--will default to "results.html" in the Interpreter directory.
-+will default to "results.html" in the current directory.
+ Specifies the pathname of the file which XSL transform results are to be saved.
+ If none is specified then the OVAL Interpreter will default to "results.html" 
+-in the OVAL Interpreter directory.
++in the current directory.
  .TP
- .B \-p
- Verbose output. Print all information and error message to the console.
-@@ -96,13 +96,15 @@
- available from the OVAL Web site.
+ .B \-l <integer>
+ Logging level.  Log messages at the specified level. 
+@@ -107,15 +108,17 @@
+ from the OVAL Web site.
  .SH EXAMPLES
  .TP
--Run the interpreter against the Linux definitions file, without verifying MD5 checksum:
-+Run the interpreter against the Debian example definitions file, without verifying MD5 checksum:
+-Run the OVAL Interpreter against an OVAL Definitions document, without 
++Run the OVAL Interpreter against an Debian example definitions document, without 
+ verifying MD5 checksum:
  .B ovaldi
+-\-a /usr/share/ovaldi
 -\-o linux.definitions.xml
++\-a /usr/share/ovaldi/xml
 +\-o /usr/share/doc/ovaldi/examples/package_example.xml
  \-m
  .SH FILES
  .TP
 -/usr/share/ovaldi/*.xsd
 +/usr/share/ovaldi/xml/*.xsd
- The schema files for the OVAL language.
+ The OVAL Language scheam files.
 -.SH AUTHOR
 +.SH AUTHORS
  Man page written by Jonathan Baker (bakerj at mitre.org)