docs-common/bin xmldiff.pl,1.2,1.3 xmlpp,1.3,NONE
by fedora-docs-commits@redhat.com
Author: jtr
Update of /cvs/docs/docs-common/bin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7940
Modified Files:
xmldiff.pl
Removed Files:
xmlpp
Log Message:
Switched to our own XMLFORMAT tool to prepare the files for comparison.
As long as the original files have been normalized by XMLFORMAT, then
the line numbers output by XMLDIFF will be correct. Why would you *not*
work with normalized files?
Index: xmldiff.pl
===================================================================
RCS file: /cvs/docs/docs-common/bin/xmldiff.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xmldiff.pl 15 Dec 2005 05:42:45 -0000 1.2
+++ xmldiff.pl 15 Dec 2005 06:15:49 -0000 1.3
@@ -13,12 +13,12 @@
#
#Change this if xmlpp is not in your current path
-#for example: $XMLPP = "./xmlpp";
-$XMLPP = "xmlpp";
+#for example: $XMLFORMAT = "./xmlpp";
+# $XMLFORMAT = "xmlpp";
use Getopt::Std;
-getopts('tscupChHSi');
+getopts('scupChi');
if ($opt_h || @ARGV != 2) {
usage();
@@ -54,45 +54,18 @@
$diffOpts .= "--new-line-format='+ %l\n' ";
$diffOpts .= "--old-line-format='- %l\n' ";
$diffOpts .= "--unchanged-line-format=' %l\n' ";
-} elsif( $opt_H ) {
- $diffOpts .= "--changed-group-format='%<%>' ";
- $diffOpts .= " --new-group-format='%>' ";
- $diffOpts .= "--old-group-format='%<' ";
- $diffOpts .= "--new-line-format='<font color=\"green\">+ %l</font>\n' ";
- $diffOpts .= "--old-line-format='<font color=\"red\">- %l</font>\n' ";
- $diffOpts .= "--unchanged-line-format='<font color=\"gray\"> %l</font>\n' ";
}
-# Set up xmlpp options
-
-my $prettyOpts = $opt_t ? "-t " : "";
-$prettyOpts .= $opt_S ? "-S " : "";
-$prettyOpts .= $opt_H ? "-H " : "";
-$prettyOpts .= "-s -e ";
+$XMLFORMAT = "xmlformat";
$file1 = "xmlppTEMP1.$$";
$file2 = "xmlppTEMP2.$$";
my $results = 0;
-$results += system("$XMLPP $prettyOpts '$ARGV[0]' > $file1");
-$results += system("$XMLPP $prettyOpts '$ARGV[1]' > $file2");
-
-if($opt_H) {
- print "<HTML>\n";
- print " <HEAD>\n";
- print " <TITLE>XML Diff</TITLE>\n";
- print " </HEAD>\n";
- print " <BODY bgcolor=\"#FEFEFF\">\n";
- print " <PRE>";
- $results += system("/usr/bin/diff -bB $diffOpts $file1 $file2");
- # Do not add extra whitespace before the </PRE>
- print "</PRE>\n";
- print " </BODY>\n";
- print "</HTML>\n";
+$results += system("$XMLFORMAT '$ARGV[0]' > $file1");
+$results += system("$XMLFORMAT '$ARGV[1]' > $file2");
-} else {
- $results += system("/usr/bin/diff -bB $diffOpts $file1 $file2");
-}
+$results += system("/usr/bin/diff -bB $diffOpts $file1 $file2");
unlink($file1,$file2);
@@ -111,9 +84,7 @@
-C vaguely CVS like unified diff
options:
- -H HTML output
-t split attributes - good for spotting changes in attributes
- -S schema hack mode - good for diffing schemas
-i ignore element and attribute contents
EOF
--- xmlpp DELETED ---
18 years, 5 months
selinux-apache selinux-apache-it.xml,1.3,1.4
by fedora-docs-commits@redhat.com
Author: tombo
Update of /cvs/docs/selinux-apache
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7902/selinux-apache
Modified Files:
selinux-apache-it.xml
Log Message:
missed translated phrase
Index: selinux-apache-it.xml
===================================================================
RCS file: /cvs/docs/selinux-apache/selinux-apache-it.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- selinux-apache-it.xml 14 Dec 2005 06:24:15 -0000 1.3
+++ selinux-apache-it.xml 15 Dec 2005 06:12:07 -0000 1.4
@@ -728,7 +728,7 @@
</para>
</section>
<section id="sn-debugging-and-customizing">
- <title>Debugging Problems and Customizing the Policy</title>
+ <title>Problemi di debugging e personalizzazione della policy</title>
<para>
Quando applichi per la prima volta &SEL; e &APACHE;, se la tua configurazione
&APACHE; varia molto da quella predefinita di &FC; o &RHEL;, potrai
18 years, 5 months
docs-common Makefile.common,1.21,1.22
by fedora-docs-commits@redhat.com
Author: jtr
Update of /cvs/docs/docs-common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6273
Modified Files:
Makefile.common
Log Message:
Added a "make OLD=old.xml NEW=new.xml diff" target to utilize the
xmldiff tool a bit easier.
Index: Makefile.common
===================================================================
RCS file: /cvs/docs/docs-common/Makefile.common,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Makefile.common 12 Dec 2005 16:32:16 -0000 1.21
+++ Makefile.common 15 Dec 2005 06:00:02 -0000 1.22
@@ -34,6 +34,9 @@
ifeq (${FDPDIR},)
FDPDIR = ..
endif
+ifeq (${FDPBIN},)
+FDPBIN = ${FDPDIR}/docs-common/bin
+endif
ifeq (${XSLPDF},)
XSLPDF = ${FDPDIR}/docs-common/xsl/main-pdf.xsl
endif
@@ -84,9 +87,8 @@
cp ${HTMLCSS} $(DOCBASE)-$(1)/fedora.css
[ -z "${HTMLCSSEXTRA}" ] || \
cp ${HTMLCSSEXTRA} $(DOCBASE)-$(1)/watermark.png
- [ ! -d figs ] || \
- ${FDPDIR}/docs-common/bin/copy-figs -v -f '*.png' \
- -l ${LANG} figs $(DOCBASE)-$(1)
+ [ ! -d figs ] || ${FDPBIN}/copy-figs -v -f '*.png' \
+ -l ${LANG} figs $(DOCBASE)-$(1)
endef
#
html:: $(foreach LANG,${LANGUAGES},$(DOCBASE)-$(LANG)/index.html)
@@ -153,5 +155,18 @@
@echo "LANGUAGES=\"$(LANGUAGES)\""
#
#########################################################################
+# Show differences between two file revisions. To use this tool:
+# $ make OLD=old.xml NEW=new.xml diff
+# The ${DIFFS} macro can select a different output format:
+# $ make DIFFS=-C OLD=old.xml NEW=new.xml diff
+
+OLD =define-me-old.xml
+NEW =define-me-new.xml
+DIFFS =-u
+
+diff::
+ ${FDPBIN}/xmldiff ${DIFFS} ${OLD} ${NEW}
+#
+#########################################################################
# End of Makefile.common
#########################################################################
18 years, 5 months
docs-common/bin xmldiff.pl,1.1,1.2
by fedora-docs-commits@redhat.com
Author: jtr
Update of /cvs/docs/docs-common/bin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6195
Modified Files:
xmldiff.pl
Log Message:
Cleaned up tacky if-series into an elegant if-elsif checklist ;-)
Index: xmldiff.pl
===================================================================
RCS file: /cvs/docs/docs-common/bin/xmldiff.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xmldiff.pl 15 Dec 2005 03:19:56 -0000 1.1
+++ xmldiff.pl 15 Dec 2005 05:42:45 -0000 1.2
@@ -1,12 +1,12 @@
#!/usr/bin/perl
#
# Copyright (c) 2002, DecisionSoft Limited All rights reserved.
-# Please see:
-# http://software.decisionsoft.com/licence.html
+# Please see:
+# http://software.decisionsoft.com/licence.html
# for more information.
#
# Modified for the Fedora Docs Project by Tommy.Reynolds(a)MegaCoder.com
-#
+#
#
# xmldiff: xmldiff program - uses xmlpp, which must be on the ${PATH}
@@ -37,29 +37,24 @@
if( $opt_s ) {
# Standard diff, no playing around
-}
-if ( $opt_c ) {
+} elsif( $opt_c ) {
# Plain context diff
$diffOpts .= "-c ";
-}
-if( $opt_u ) {
+} elsif( $opt_u ) {
# Plain unified diff
$diffOpts .= "-u ";
-}
-if( $opt_p ) {
+} elsif( $opt_p ) {
# Colorized unified diff
# $diffOpts .= "-u ";
$diffOpts .= "--new-line-format='[1m[33m+ %l\n[m' ";
$diffOpts .= "--old-line-format='[1m[31m- %l\n[m' ";
$diffOpts .= "--unchanged-line-format='[1m[30m %l[m\n' ";
-}
-if( $opt_C ) {
+} elsif( $opt_C ) {
$diffOpts .= "--changed-group-format='\n<<<<<<<<<<<<<<\n%<==============\n%>>>>>>>>>>>>>>>\n\n' ";
$diffOpts .= "--new-line-format='+ %l\n' ";
$diffOpts .= "--old-line-format='- %l\n' ";
$diffOpts .= "--unchanged-line-format=' %l\n' ";
-}
-if( $opt_H ) {
+} elsif( $opt_H ) {
$diffOpts .= "--changed-group-format='%<%>' ";
$diffOpts .= " --new-group-format='%>' ";
$diffOpts .= "--old-group-format='%<' ";
18 years, 5 months
docs-common/bin xmlpp,1.2,1.3
by fedora-docs-commits@redhat.com
Author: jtr
Update of /cvs/docs/docs-common/bin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6168
Modified Files:
xmlpp
Log Message:
Output <!ENTITY> elements, so they can now be compared.
Index: xmlpp
===================================================================
RCS file: /cvs/docs/docs-common/bin/xmlpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xmlpp 15 Dec 2005 03:59:38 -0000 1.2
+++ xmlpp 15 Dec 2005 05:42:05 -0000 1.3
@@ -2,10 +2,10 @@
#
# Copyright (c) 2002, DecisionSoft Limited All rights reserved.
-# Please see:
+# Please see:
# http://software.decisionsoft.com/licence.html
# for more information.
-#
+#
# $Revision$
#
@@ -37,7 +37,7 @@
# expect to find attributeOrdering.txt file in same directory
# as xmlpp is being run from
-
+
my $scriptDir = $0;
if ($scriptDir =~ m#/#){
$scriptDir =~ s#/[^/]+$##;
@@ -45,22 +45,22 @@
else{
$scriptDir =".";
}
-
+
# get attribute ordering from external file
if (open(SORTLIST, "<$scriptDir/attributeOrdering.txt")) {
@sortlist = <SORTLIST>;
chomp @sortlist;
close (SORTLIST);
@specialSort = grep(/^\w+/, @sortlist);
- }
- else {
+ }
+ else {
# print STDERR "Could not open $scriptDir/attributeOrdering.txt: $!\nWARNING attribute sorting will only be alphabetic\n\n";
}
}
# set line separator to ">" speeding up parsing of XML files
-# with no line breaks
+# with no line breaks
$/ = ">";
@@ -78,7 +78,7 @@
}
if (!$opt_z && scalar(@ARGV) > 1) {
- print STDERR "Warning: Multiple files specified without -z option\n";
+ print STDERR "Warning: Multiple files specified without -z option\n";
}
my $fh;
@@ -103,71 +103,72 @@
my $input;
while ($input .= <$fh>) {
- while ($input) {
- if ($input =~ s/^<($re_name)((?:\s+$re_name\s*=\s*$re_attr)*\s*)(\/?)>(.*)$/$4/s ) {
- my %attr;
- my ($name,$attr,$selfclose) = ($1,$2,$3);
- while ($attr =~ m/($re_name)\s*=\s*($re_attr)/gs) {
- my ($name,$value) = ($1,$2);
- $value =~ s/^["'](.*)["']$/$1/s;
- $attr{$name} = $value;
- }
- if ($opt_e) {
- parseStart($name, 0, %attr);
- if ($selfclose) { parseEnd($name) }
- } else {
- parseStart($name, $selfclose, %attr);
- }
- } elsif ($input =~ s/^<\/($re_name)\s*>(.*)$/$2/s) {
- parseEnd($1);
- } elsif ($input =~ s/^<!--(.*?)-->(.*)$/$2/s) {
- parseComment($1);
- } elsif ($input =~ s/^([^<]+)(.*)$/$2/s) {
- parseDefault($1);
- } elsif ($input =~ s/^(<\?[^>]*\?>)(.*)$/$2/s) {
- parsePI("$1\n");
- } elsif ($input =~ s/^(<\!DOCTYPE[^\[>]*(\[[^\]]*\])?[^>]*>)(.*)$/$3/s) {
- parseDoctype("$1");
- } elsif ($input =~ s/^(<\!ENTITY.*>)//s) {
- } else {
- last;
- }
- }
- if (eof($fh)) {
- last;
- }
+ while ($input) {
+ if ($input =~ s/^<($re_name)((?:\s+$re_name\s*=\s*$re_attr)*\s*)(\/?)>(.*)$/$4/s ) {
+ my %attr;
+ my ($name,$attr,$selfclose) = ($1,$2,$3);
+ while ($attr =~ m/($re_name)\s*=\s*($re_attr)/gs) {
+ my ($name,$value) = ($1,$2);
+ $value =~ s/^["'](.*)["']$/$1/s;
+ $attr{$name} = $value;
+ }
+ if ($opt_e) {
+ parseStart($name, 0, %attr);
+ if ($selfclose) { parseEnd($name) }
+ } else {
+ parseStart($name, $selfclose, %attr);
+ }
+ } elsif ($input =~ s/^<\/($re_name)\s*>(.*)$/$2/s) {
+ parseEnd($1);
+ } elsif ($input =~ s/^<!--(.*?)-->(.*)$/$2/s) {
+ parseComment($1);
+ } elsif ($input =~ s/^([^<]+)(.*)$/$2/s) {
+ parseDefault($1);
+ } elsif ($input =~ s/^(<\?[^>]*\?>)(.*)$/$2/s) {
+ parsePI("$1\n");
+ } elsif ($input =~ s/^(<\!DOCTYPE[^\[>]*(\[[^\]]*\])?[^>]*>)(.*)$/$3/s) {
+ parseDoctype("$1");
+ } elsif ($input =~ s/^(<\!ENTITY[^>]*>)(.*)$/$2/s) {
+ $output .= "$1";
+ } else {
+ last;
+ }
+ }
+ if (eof($fh)) {
+ last;
+ }
}
if ($input) {
- $input =~ m/([^\n]+)/gs;
- print STDERR "WARNING: junk remaining on input: $1\n";
+ $input =~ m/([^\n]+)/gs;
+ print STDERR "WARNING: junk remaining on input: $1\n";
}
$fh->close();
if (!$opt_z) {
- if(!$opt_H){
- print "$output\n"
- } else {
- print html_escape($output)."\n"
- }
+ if(!$opt_H){
+ print "$output\n"
+ } else {
+ print html_escape($output)."\n"
+ }
} else {
- if ($input) {
- print STDERR "Not overwriting file\n";
- } else {
- open FOUT,"> $filename" or die "Cannot overwrite file: $!";
- if(!$opt_H){
- print FOUT "$output\n"
- } else {
- print FOUT html_escape($output)."\n"
- }
- close FOUT
- }
+ if ($input) {
+ print STDERR "Not overwriting file\n";
+ } else {
+ open FOUT,"> $filename" or die "Cannot overwrite file: $!";
+ if(!$opt_H){
+ print FOUT "$output\n"
+ } else {
+ print FOUT html_escape($output)."\n"
+ }
+ close FOUT
+ }
}
} while (
!$stdin && $opt_z && ($fh = open_next_file(\$filename))
);
-
+
sub parseStart {
@@ -175,21 +176,21 @@
my $selfclose = shift;
my %attr = @_;
- $textContent =~ s/\s+$//;
+ $textContent =~ s/\s+$//;
printContent($textContent);
if($inAnnotation) {
- return;
+ return;
}
if($schemaHackMode and $s =~ m/(^|:)annotation$/) {
- $inAnnotation = 1;
- $textContent = '';
- $lastTag = 1;
- return;
+ $inAnnotation = 1;
+ $textContent = '';
+ $lastTag = 1;
+ return;
}
if (length($output)) {
- $output .= "\n";
+ $output .= "\n";
}
$output .= " " x $indent;
@@ -211,59 +212,59 @@
# alphabetic order). Else create a list that has attributes needing
# special ordering.
foreach $attribute (@alphaSorted){
- $isSpecial = 0;
- foreach $sortAttrib (@specialSort){
- if ($attribute eq $sortAttrib){
- push @needSpecialSort, $attribute;
- $isSpecial = 1;
- }
- }
- if (!$isSpecial){
- push @final, $attribute;
- }
+ $isSpecial = 0;
+ foreach $sortAttrib (@specialSort){
+ if ($attribute eq $sortAttrib){
+ push @needSpecialSort, $attribute;
+ $isSpecial = 1;
+ }
+ }
+ if (!$isSpecial){
+ push @final, $attribute;
+ }
}
# now read through the specialSort list backwards looking for
- # any match in the needSpecialSort list. Unshift this onto the
+ # any match in the needSpecialSort list. Unshift this onto the
# front of the final array to maintain proper order.
foreach my $attribute (reverse @specialSort){
- foreach (@needSpecialSort){
- if ($attribute eq $_){
- unshift @final, $attribute;
- }
- }
+ foreach (@needSpecialSort){
+ if ($attribute eq $_){
+ unshift @final, $attribute;
+ }
+ }
}
@k = @final;
}
foreach my $attr (@k) {
- #
- # Remove (min|max)Occurs = 1 if schemaHackMode
- #
- if ($schemaHackMode and $attr =~ m/^(minOccurs|maxOccurs)$/ and $attr{$attr} eq "1") {
- next;
- }
-
- if ($splitAttributes) {
- $output .= "\n"." " x $indent." ";
- }
- if ($attr{$attr} =~ /'/) {
- $output .= " $attr=\"$attr{$attr}\"";
- } else {
- $output .= " $attr='$attr{$attr}'";
- }
+ #
+ # Remove (min|max)Occurs = 1 if schemaHackMode
+ #
+ if ($schemaHackMode and $attr =~ m/^(minOccurs|maxOccurs)$/ and $attr{$attr} eq "1") {
+ next;
+ }
+
+ if ($splitAttributes) {
+ $output .= "\n"." " x $indent." ";
+ }
+ if ($attr{$attr} =~ /'/) {
+ $output .= " $attr=\"$attr{$attr}\"";
+ } else {
+ $output .= " $attr='$attr{$attr}'";
+ }
}
if ($splitAttributes and @k) {
- $output .= "\n"." " x $indent;
+ $output .= "\n"." " x $indent;
}
if ($selfclose) {
- $output .= " />";
- $lastTag = 0;
+ $output .= " />";
+ $lastTag = 0;
} else {
- $output .= ">";
- $indent++;
- $lastTag = 1;
+ $output .= ">";
+ $indent++;
+ $lastTag = 1;
}
$textContent = '';
}
@@ -272,21 +273,21 @@
my $s = shift;
if($inAnnotation) {
- if($s =~ m/(^|:)annotation$/) {
- $inAnnotation = 0;
- }
- return;
+ if($s =~ m/(^|:)annotation$/) {
+ $inAnnotation = 0;
+ }
+ return;
}
if($normaliseWhiteSpace) {
- $textContent =~ s/^\s*(.*?)\s*$/$1/;
+ $textContent =~ s/^\s*(.*?)\s*$/$1/;
}
$indent--;
printContent($textContent);
if ($lastTag == 0) {
- $output .= "\n";
- $output .= " " x $indent;
- }
+ $output .= "\n";
+ $output .= " " x $indent;
+ }
$output .= "</$s>";
$textContent = '';
$lastTag = 0;
@@ -317,7 +318,7 @@
}
sub parseComment {
- my $s = shift;
+ my $s = shift;
if($inAnnotation) { return }
printContent($textContent,1);
if ($s =~ /([^\<]*)(<.*>)(.*)/ms) {
@@ -332,9 +333,9 @@
}
$s =~ s/\n\s*$/\n /msg;
if ($newLineComments) {
- $output .= "\n<!--$s-->\n";
+ $output .= "\n<!--$s-->\n";
} else {
- $output .= "<!--$s-->";
+ $output .= "<!--$s-->";
}
$textContent='';
}
@@ -345,16 +346,16 @@
my ($LF,$ret) = ("","");
if ($s =~ m/\n\s*$/) {
- $LF = "\n";
+ $LF = "\n";
}
if ($s =~ m/^[\s\n]*$/) {
- $ret = undef;
+ $ret = undef;
} else {
- $output .= "$s";
- $ret = 1;
+ $output .= "$s";
+ $ret = 1;
}
if ($printLF) {
- $output .= $LF;
+ $output .= $LF;
}
}
@@ -371,11 +372,11 @@
my $filename = shift;
$$filename = shift @ARGV;
while ($$filename and ! -f $$filename) {
- print STDERR "WARNING: Could not find file: $$filename\n";
- $$filename = shift @ARGV;
+ print STDERR "WARNING: Could not find file: $$filename\n";
+ $$filename = shift @ARGV;
}
if(!$$filename) {
- return undef;
+ return undef;
}
my $fh = new FileHandle;
$fh->open("< $$filename") or die "Can't open $$filename: $!";
18 years, 5 months
docs-common/bin xmlpp,1.1,1.2
by fedora-docs-commits@redhat.com
Author: jtr
Update of /cvs/docs/docs-common/bin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1668
Modified Files:
xmlpp
Log Message:
Ignore <!ENTITY> elements for now.
Index: xmlpp
===================================================================
RCS file: /cvs/docs/docs-common/bin/xmlpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xmlpp 15 Dec 2005 03:19:56 -0000 1.1
+++ xmlpp 15 Dec 2005 03:59:38 -0000 1.2
@@ -128,6 +128,7 @@
parsePI("$1\n");
} elsif ($input =~ s/^(<\!DOCTYPE[^\[>]*(\[[^\]]*\])?[^>]*>)(.*)$/$3/s) {
parseDoctype("$1");
+ } elsif ($input =~ s/^(<\!ENTITY.*>)//s) {
} else {
last;
}
18 years, 5 months
docs-common/bin xmldiff,1.1,1.2
by fedora-docs-commits@redhat.com
Author: jtr
Update of /cvs/docs/docs-common/bin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv845
Modified Files:
xmldiff
Log Message:
Fixed bug in locating helper script "xmlpp".
Index: xmldiff
===================================================================
RCS file: /cvs/docs/docs-common/bin/xmldiff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xmldiff 15 Dec 2005 03:19:56 -0000 1.1
+++ xmldiff 15 Dec 2005 03:38:33 -0000 1.2
@@ -1,3 +1,5 @@
#!/bin/sh
-export PATH=`dirname $0`:${PATH}
-exec perl `basename $0`.pl $@
+mydir=`dirname $0`
+me=`basename $0`
+export PATH=${mydir}:${PATH}
+exec /usr/bin/perl ${mydir}/${me}.pl $@
18 years, 5 months
docs-common/bin xmldiff, NONE, 1.1 xmldiff.pl, NONE, 1.1 xmlpp, NONE, 1.1
by fedora-docs-commits@redhat.com
Author: jtr
Update of /cvs/docs/docs-common/bin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv565
Added Files:
xmldiff xmldiff.pl xmlpp
Log Message:
Here is a very simple XMLDIFF tool that I've hacked to work reasonably
with the FDP files. Look in the "xmldiff.pl" file for information about
its origin.
--- NEW FILE xmldiff ---
#!/bin/sh
export PATH=`dirname $0`:${PATH}
exec perl `basename $0`.pl $@
--- NEW FILE xmldiff.pl ---
#!/usr/bin/perl
#
# Copyright (c) 2002, DecisionSoft Limited All rights reserved.
# Please see:
# http://software.decisionsoft.com/licence.html
# for more information.
#
# Modified for the Fedora Docs Project by Tommy.Reynolds(a)MegaCoder.com
#
#
# xmldiff: xmldiff program - uses xmlpp, which must be on the ${PATH}
#
#Change this if xmlpp is not in your current path
#for example: $XMLPP = "./xmlpp";
$XMLPP = "xmlpp";
use Getopt::Std;
getopts('tscupChHSi');
if ($opt_h || @ARGV != 2) {
usage();
}
my $diffOpts;
my $outputFmt = $opt_u + $opt_c + $opt_s + $opt_p + $opt_C;
if( $outputFmt == 0 ) {
$outputFmt = $opt_p = 1;
}
if( $outputFmt > 1 ) {
print STDERR "Error: Only one mode may be specified\n";
usage();
}
if( $opt_s ) {
# Standard diff, no playing around
}
if ( $opt_c ) {
# Plain context diff
$diffOpts .= "-c ";
}
if( $opt_u ) {
# Plain unified diff
$diffOpts .= "-u ";
}
if( $opt_p ) {
# Colorized unified diff
# $diffOpts .= "-u ";
$diffOpts .= "--new-line-format='[1m[33m+ %l\n[m' ";
$diffOpts .= "--old-line-format='[1m[31m- %l\n[m' ";
$diffOpts .= "--unchanged-line-format='[1m[30m %l[m\n' ";
}
if( $opt_C ) {
$diffOpts .= "--changed-group-format='\n<<<<<<<<<<<<<<\n%<==============\n%>>>>>>>>>>>>>>>\n\n' ";
$diffOpts .= "--new-line-format='+ %l\n' ";
$diffOpts .= "--old-line-format='- %l\n' ";
$diffOpts .= "--unchanged-line-format=' %l\n' ";
}
if( $opt_H ) {
$diffOpts .= "--changed-group-format='%<%>' ";
$diffOpts .= " --new-group-format='%>' ";
$diffOpts .= "--old-group-format='%<' ";
$diffOpts .= "--new-line-format='<font color=\"green\">+ %l</font>\n' ";
$diffOpts .= "--old-line-format='<font color=\"red\">- %l</font>\n' ";
$diffOpts .= "--unchanged-line-format='<font color=\"gray\"> %l</font>\n' ";
}
# Set up xmlpp options
my $prettyOpts = $opt_t ? "-t " : "";
$prettyOpts .= $opt_S ? "-S " : "";
$prettyOpts .= $opt_H ? "-H " : "";
$prettyOpts .= "-s -e ";
$file1 = "xmlppTEMP1.$$";
$file2 = "xmlppTEMP2.$$";
my $results = 0;
$results += system("$XMLPP $prettyOpts '$ARGV[0]' > $file1");
$results += system("$XMLPP $prettyOpts '$ARGV[1]' > $file2");
if($opt_H) {
print "<HTML>\n";
print " <HEAD>\n";
print " <TITLE>XML Diff</TITLE>\n";
print " </HEAD>\n";
print " <BODY bgcolor=\"#FEFEFF\">\n";
print " <PRE>";
$results += system("/usr/bin/diff -bB $diffOpts $file1 $file2");
# Do not add extra whitespace before the </PRE>
print "</PRE>\n";
print " </BODY>\n";
print "</HTML>\n";
} else {
$results += system("/usr/bin/diff -bB $diffOpts $file1 $file2");
}
unlink($file1,$file2);
exit( $results );
sub usage {
print STDERR <<EOF;
usage: $0 [ mode ] [ options ] oldfile.xml newfile.xml
mode must be one of:
-p coloured unified diff [default]
-c context diff
-u unified diff
-s standard diff output
-C vaguely CVS like unified diff
options:
-H HTML output
-t split attributes - good for spotting changes in attributes
-S schema hack mode - good for diffing schemas
-i ignore element and attribute contents
EOF
exit 1;
}
***** Error reading new file: [Errno 2] No such file or directory: 'xmlpp'
18 years, 5 months
install-guide fedora-install-guide-techref-en.xml, NONE, 1.1 Makefile, 1.15, 1.16 fedora-install-guide-adminoptions-en.xml, 1.1, 1.2 fedora-install-guide-en.xml, 1.31, 1.32
by fedora-docs-commits@redhat.com
Author: elliss
Update of /cvs/docs/install-guide
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20651
Modified Files:
Makefile fedora-install-guide-adminoptions-en.xml
fedora-install-guide-en.xml
Added Files:
fedora-install-guide-techref-en.xml
Log Message:
- Added a first draft "Technical References" section, to address #173582
- Minor edits of Management Options section
--- NEW FILE fedora-install-guide-techref-en.xml ---
<!-- $Id: -->
<chapter id="ch-techref">
<title>Appendix: Technical References</title>
<para>
This document provides a reference for using the &FED; installation
software, known as <command>anaconda</command>. To learn more about
<command>anaconda</command>, visit the project webpage:
<ulink url="http://www.fedoraproject.org/wiki/Anaconda"/>.
</para>
<para>
Both <command>anaconda</command> and &FED; systems use a common set
of software components. For detailed information on key
technologies, refer to the websites listed below:
</para>
<variablelist>
<varlistentry>
<term>Boot Loader</term>
<listitem>
<para>
By default, &FED; uses the <command>GRUB</command> boot
loader. Refer to
<ulink url="http://www.gnu.org/software/grub/"/> for more
information.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>Disk Partitioning</term>
<listitem>
<para>
&FED; uses <command>parted</command> to partition disks. Refer
to <ulink url="http://www.gnu.org/software/parted/"/> for more
information.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>Graphics System</term>
<listitem>
<para>
Both the installation system and &FED; itself use the
<command>Xorg</command> suite to provide graphical displays.
Refer to <ulink url="http://www.x.org/"/> for more
information.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>Remote Display</term>
<listitem>
<para>
&FC; and <command>anaconda</command> include VNC to provide
remote display capabilities. For more information about VNC,
refer to the documentation on the RealVNC website
<ulink url="http://www.realvnc.com/documentation/"/>.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>Firewall</term>
<listitem>
<para>
&FED; uses the <command>netfilter</command> framework. The
Netfilter project website provides documentation for
<command>netfilter</command>, and the
<command>iptables</command> administration facilities:
<ulink url="http://netfilter.org/documentation/index.html"/>.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>Access Control</term>
<listitem>
<para>
&SEL; provides Mandatory Access Control (MAC) capabilities
that supplement the standard Linux security systems. Refer to
the &SEL; FAQ for more information:
<ulink url="http://fedora.redhat.com/docs/selinux-faq/"/>.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>Software Installation</term>
<listitem>
<para>
&FED; uses <command>yum</command> to manage the RPM packages
that make up the system. Refer to
<ulink url="http://fedora.redhat.com/docs/yum/"/> for more
information.
</para>
</listitem>
</varlistentry>
</variablelist>
</chapter>
<!--
Local variables:
mode: xml
sgml-parent-document:("fedora-install-guide-en.xml" "book" "chapter")
fill-column: 72
End:
-->
Index: Makefile
===================================================================
RCS file: /cvs/docs/install-guide/Makefile,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Makefile 12 Dec 2005 02:21:54 -0000 1.15
+++ Makefile 14 Dec 2005 22:59:52 -0000 1.16
@@ -14,7 +14,7 @@
DOCBASE = fedora-install-guide
define XMLEXTRAFILES_template
-XMLEXTRAFILES-$(1)=fedora-install-guide-abouttoinstall-$(1).xml fedora-install-guide-acknowledgements-$(1).xml fedora-install-guide-adminoptions-$(1).xml fedora-install-guide-beginninginstallation-$(1).xml fedora-install-guide-bootloader-$(1).xml fedora-install-guide-diskpartitioning-$(1).xml fedora-install-guide-$(1).xml fedora-install-guide-firstboot-$(1).xml fedora-install-guide-installingpackages-$(1).xml fedora-install-guide-intro-$(1).xml fedora-install-guide-locale-$(1).xml fedora-install-guide-networkconfig-$(1).xml fedora-install-guide-nextsteps-$(1).xml fedora-install-guide-other-instmethods-$(1).xml fedora-install-guide-packageselection-$(1).xml fedora-install-guide-rootpassword-$(1).xml fedora-install-guide-timezone-$(1).xml fedora-install-guide-upgrading-$(1).xml
+XMLEXTRAFILES-$(1)=fedora-install-guide-abouttoinstall-$(1).xml fedora-install-guide-acknowledgements-$(1).xml fedora-install-guide-adminoptions-$(1).xml fedora-install-guide-beginninginstallation-$(1).xml fedora-install-guide-bootloader-$(1).xml fedora-install-guide-diskpartitioning-$(1).xml fedora-install-guide-$(1).xml fedora-install-guide-firstboot-$(1).xml fedora-install-guide-installingpackages-$(1).xml fedora-install-guide-intro-$(1).xml fedora-install-guide-locale-$(1).xml fedora-install-guide-networkconfig-$(1).xml fedora-install-guide-nextsteps-$(1).xml fedora-install-guide-other-instmethods-$(1).xml fedora-install-guide-packageselection-$(1).xml fedora-install-guide-rootpassword-$(1).xml fedora-install-guide-techref-$(1).xml fedora-install-guide-timezone-$(1).xml fedora-install-guide-upgrading-$(1).xml
endef
$(foreach LANG,${LANGUAGES},$(eval $(call XMLEXTRAFILES_template,${LANG})))
Index: fedora-install-guide-adminoptions-en.xml
===================================================================
RCS file: /cvs/docs/install-guide/fedora-install-guide-adminoptions-en.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fedora-install-guide-adminoptions-en.xml 12 Dec 2005 02:21:54 -0000 1.1
+++ fedora-install-guide-adminoptions-en.xml 14 Dec 2005 22:59:52 -0000 1.2
@@ -46,28 +46,8 @@
</para>
</section>
- <section id="sn-mode-expert">
- <title>Installing &FC; with Expert Mode</title>
-
- <para>
- The expert mode enables you to run the installation process with
- additional options for hardware configuration.
- </para>
-
- <para>
- To run the installation process in expert mode, enter:
- </para>
-<screen>
- <userinput>linux expert</userinput>
-</screen>
- <para>
- <remark role="FIXME">This is untested.
- </remark>
- </para>
- </section>
-
<section id="sn-automating-installation">
- <title>Automating the Installation</title>
+ <title>Automating the Installation with Kickstart</title>
<para>
<remark role="FIXME">Kickstart.
@@ -85,7 +65,7 @@
</section>
<section id="sn-bootoptions-interface">
- <title>Interface Options</title>
+ <title>Configuring the Installation Interface</title>
<para>
To run the installation process in text mode, enter:
@@ -107,6 +87,26 @@
</remark>
</para>
</section>
+
+ <section id="sn-mode-expert">
+ <title>Installing &FC; with Expert Mode</title>
+
+ <para>
+ The expert mode enables you to run the installation process with
+ additional options for hardware configuration.
+ </para>
+
+ <para>
+ To run the installation process in expert mode, enter:
+ </para>
+<screen>
+ <userinput>linux expert</userinput>
+</screen>
+ <para>
+ <remark role="FIXME">This is untested.
+ </remark>
+ </para>
+ </section>
</section>
<section id="sn-memtest">
<title>Performing a Memory (RAM) Test</title>
@@ -124,7 +124,7 @@
To load the <command>memtest86</command> memory test utility,
enter <userinput>memtest86</userinput> at the
<prompt>boot:</prompt>
- . The utility immediately starts the first test. By default,
+ prompt. The utility immediately starts the first test. By default,
<command>memtest86</command> carries out a total of ten tests.
</para>
Index: fedora-install-guide-en.xml
===================================================================
RCS file: /cvs/docs/install-guide/fedora-install-guide-en.xml,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- fedora-install-guide-en.xml 12 Dec 2005 02:21:54 -0000 1.31
+++ fedora-install-guide-en.xml 14 Dec 2005 22:59:52 -0000 1.32
@@ -6,8 +6,8 @@
<!ENTITY DOCNAME "fedora-install-guide">
<!ENTITY DOCLANG "en">
-<!ENTITY DOCVERSION "1.0.7">
-<!ENTITY DOCDATE "2005-12-12">
+<!ENTITY DOCVERSION "1.0.8">
+<!ENTITY DOCDATE "2005-12-14">
<!ENTITY BOOKID "&DOCNAME;-&DOCLANG;-&DOCVERSION; (&DOCDATE;)">
<!ENTITY LEGALNOTICE SYSTEM "../docs-common/common/legalnotice-en.xml">
@@ -15,7 +15,7 @@
<!-- Bugzilla bug number for the draft notice -->
<!ENTITY BUG-NUM "129911">
<!ENTITY FCLOCALVER "5">
-<!ENTITY DOCLOCALVER "1.0.7"> <!-- what's this for again? -->
+<!ENTITY DOCLOCALVER "1.0.8"> <!-- what's this for again? -->
<!ENTITY INTRODUCTION SYSTEM "fedora-install-guide-intro-en.xml">
@@ -34,6 +34,7 @@
<!ENTITY FIRSTBOOT SYSTEM "fedora-install-guide-firstboot-en.xml">
<!ENTITY NEXTSTEPS SYSTEM "fedora-install-guide-nextsteps-en.xml">
<!ENTITY ADMINOPTIONS SYSTEM "fedora-install-guide-adminoptions-en.xml">
+<!ENTITY TECHREF SYSTEM "fedora-install-guide-techref-en.xml">
<!ENTITY ACKNOWLEDGEMENTS SYSTEM "fedora-install-guide-acknowledgements-en.xml">
]>
@@ -185,6 +186,16 @@
</para>
</revdescription>
</revision>
+ <revision>
+ <revnumber>1.0.8</revnumber>
+ <date>2005-12-14</date>
+ <authorinitials>StuartEllis</authorinitials>
+ <revdescription>
+ <para>
+ Added Technical References section.
+ </para>
+ </revdescription>
+ </revision>
</revhistory>
</bookinfo>
@@ -220,6 +231,8 @@
&ADMINOPTIONS;
+ &TECHREF;
+
&ACKNOWLEDGEMENTS;
<index id="generated-index">
18 years, 5 months
documentation-guide docs-getting-files-en.xml,1.9,1.10
by fedora-docs-commits@redhat.com
Author: jtr
Update of /cvs/docs/documentation-guide
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6139
Modified Files:
docs-getting-files-en.xml
Log Message:
Fixed minor typo's. Added admonition about preferring PNG to JPG.
Index: docs-getting-files-en.xml
===================================================================
RCS file: /cvs/docs/documentation-guide/docs-getting-files-en.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- docs-getting-files-en.xml 13 Dec 2005 21:56:24 -0000 1.9
+++ docs-getting-files-en.xml 14 Dec 2005 15:55:34 -0000 1.10
@@ -200,7 +200,7 @@
<para>
The building system heavily leverages the <application>make(1)</application> tool and shell scripts to automate these activities, but authors need <emphasis>no</emphasis> prior experience with either shell scripts or a <filename>Makefile</filename>.
While individual documents do have their own <filename>Makefile</filename>, it is only a few lines long and very simple.
- The document <filename>Makefile</filename> content is designed for cut's paste.
+ The document <filename>Makefile</filename> content is designed for cut'n paste.
</para>
<para>
As an example, <xref linkend="ch-getting-files-build-system-makefile"/> shows the whole <filename>Makefile</filename> for a simple document having only one file and one language.
@@ -351,12 +351,24 @@
</para>
</section>
<section id="ch-getting-files-build-system-images">
- <title>Finding Document Image Files</title>
+ <title>Using Document Image Files</title>
<para>
Image files, such as <filename>.PNG</filename>, are often used in documents.
While your image files may be placed anywhere you like, we recommend that you store your image files in a <filename>figs/</filename> subdirectory within your document directory.
In other words, place your image <filename>picture.png</filename> in the <filename>mydoc/figs/picture.png</filename> file.
</para>
+ <note>
+ <title>Use PNG Images, Not JPG</title>
+ <para>
+ Depending on the output media, sometimes images may be scaled,
+ streteched, or squashed.
+ To minimize any distortions, we recommend that you use only
+ <wordasword>PDF</wordasword> images and avoid <wordasword>JPG</wordasword> files.
+ </para>
+ <para>
+ You may find the <systemitem class="filesystem">convert(1)</systemitem> program, from the <application>ImageMagick</application> <abbrev>RPM</abbrev> package, provides a convenient way to reformat any <wordasword>JPG</wordasword> images you already have.
+ </para>
+ </note>
<para>
You may organize your image files into as many subdirectories under <filename>figs/</filename> as you choose.
The document building system will recreate your image subdirectory structure in the output documents.
@@ -365,6 +377,7 @@
In addition, we recommend that you follow our convention on naming the image.
For example, an image often contains a caption or other text.
This text should be translated along with the document content, so keeping <filename>words-en.png</filename> separate from <filename>words-ru.png</filename> is a good practice.
+ An image file with no text can be named just <filename>picture.png</filename>, for example.
</para>
<para>
Sometimes, a document may require images that do not follow the naming convention.
18 years, 5 months