From 13f7c502149f184089117a061f5238901df45f8b Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Thu, 26 Sep 2002 19:33:30 +0000 Subject: syncing with HEAD some more (This used to be commit 805a89fbb771659ce9d397daad59f47d8b5fefcc) --- docs/docbook/dbsgml/40chg.txt | 45 - docs/docbook/dbsgml/41chg.txt | 7 - docs/docbook/dbsgml/50issues.txt | 39 - docs/docbook/dbsgml/ChangeLog | 85 - docs/docbook/dbsgml/cals-tbl.dtd | 330 -- docs/docbook/dbsgml/catalog | 63 - docs/docbook/dbsgml/dbcent.mod | 181 - docs/docbook/dbsgml/dbgenent.mod | 39 - docs/docbook/dbsgml/dbhier.mod | 2100 -------- docs/docbook/dbsgml/dbnotn.mod | 97 - docs/docbook/dbsgml/dbpool.mod | 7396 ---------------------------- docs/docbook/dbsgml/docbook.cat | 63 - docs/docbook/dbsgml/docbook.dcl | 106 - docs/docbook/dbsgml/docbook.dtd | 117 - docs/docbook/dbsgml/ent/ISOamsa | 66 - docs/docbook/dbsgml/ent/ISOamsb | 52 - docs/docbook/dbsgml/ent/ISOamsc | 20 - docs/docbook/dbsgml/ent/ISOamsn | 70 - docs/docbook/dbsgml/ent/ISOamso | 29 - docs/docbook/dbsgml/ent/ISOamsr | 94 - docs/docbook/dbsgml/ent/ISObox | 62 - docs/docbook/dbsgml/ent/ISOcyr1 | 77 - docs/docbook/dbsgml/ent/ISOcyr2 | 36 - docs/docbook/dbsgml/ent/ISOdia | 24 - docs/docbook/dbsgml/ent/ISOgrk1 | 59 - docs/docbook/dbsgml/ent/ISOgrk2 | 30 - docs/docbook/dbsgml/ent/ISOgrk3 | 53 - docs/docbook/dbsgml/ent/ISOgrk4 | 53 - docs/docbook/dbsgml/ent/ISOlat1 | 72 - docs/docbook/dbsgml/ent/ISOlat2 | 131 - docs/docbook/dbsgml/ent/ISOnum | 91 - docs/docbook/dbsgml/ent/ISOpub | 100 - docs/docbook/dbsgml/ent/ISOtech | 73 - docs/docbook/dbsgml/readme.txt | 12 - docs/docbook/manpages/pdbedit.8.sgml | 36 +- docs/docbook/projdoc/OS2-Client-HOWTO.sgml | 142 - docs/docbook/projdoc/Printing.sgml | 2 +- docs/docbook/projdoc/Samba-BDC-HOWTO.sgml | 116 +- docs/docbook/projdoc/Samba-LDAP-HOWTO.sgml | 89 +- docs/docbook/projdoc/cups.sgml | 445 -- docs/docbook/projdoc/security_level.sgml | 2 +- docs/docbook/scripts/README.ldp_print | 60 - docs/docbook/scripts/collateindex.pl | 595 --- docs/docbook/scripts/fix_print_html.lib | 172 - docs/docbook/scripts/ldp_print | 71 - docs/docbook/scripts/make-article.pl | 25 - docs/docbook/stylesheets/ldp.dsl.in | 256 - 47 files changed, 98 insertions(+), 13785 deletions(-) delete mode 100644 docs/docbook/dbsgml/40chg.txt delete mode 100644 docs/docbook/dbsgml/41chg.txt delete mode 100644 docs/docbook/dbsgml/50issues.txt delete mode 100644 docs/docbook/dbsgml/ChangeLog delete mode 100644 docs/docbook/dbsgml/cals-tbl.dtd delete mode 100644 docs/docbook/dbsgml/catalog delete mode 100755 docs/docbook/dbsgml/dbcent.mod delete mode 100644 docs/docbook/dbsgml/dbgenent.mod delete mode 100755 docs/docbook/dbsgml/dbhier.mod delete mode 100755 docs/docbook/dbsgml/dbnotn.mod delete mode 100755 docs/docbook/dbsgml/dbpool.mod delete mode 100644 docs/docbook/dbsgml/docbook.cat delete mode 100644 docs/docbook/dbsgml/docbook.dcl delete mode 100755 docs/docbook/dbsgml/docbook.dtd delete mode 100644 docs/docbook/dbsgml/ent/ISOamsa delete mode 100644 docs/docbook/dbsgml/ent/ISOamsb delete mode 100644 docs/docbook/dbsgml/ent/ISOamsc delete mode 100644 docs/docbook/dbsgml/ent/ISOamsn delete mode 100644 docs/docbook/dbsgml/ent/ISOamso delete mode 100644 docs/docbook/dbsgml/ent/ISOamsr delete mode 100644 docs/docbook/dbsgml/ent/ISObox delete mode 100644 docs/docbook/dbsgml/ent/ISOcyr1 delete mode 100644 docs/docbook/dbsgml/ent/ISOcyr2 delete mode 100644 docs/docbook/dbsgml/ent/ISOdia delete mode 100644 docs/docbook/dbsgml/ent/ISOgrk1 delete mode 100644 docs/docbook/dbsgml/ent/ISOgrk2 delete mode 100644 docs/docbook/dbsgml/ent/ISOgrk3 delete mode 100644 docs/docbook/dbsgml/ent/ISOgrk4 delete mode 100644 docs/docbook/dbsgml/ent/ISOlat1 delete mode 100644 docs/docbook/dbsgml/ent/ISOlat2 delete mode 100644 docs/docbook/dbsgml/ent/ISOnum delete mode 100644 docs/docbook/dbsgml/ent/ISOpub delete mode 100644 docs/docbook/dbsgml/ent/ISOtech delete mode 100644 docs/docbook/dbsgml/readme.txt delete mode 100644 docs/docbook/projdoc/OS2-Client-HOWTO.sgml delete mode 100644 docs/docbook/projdoc/cups.sgml delete mode 100644 docs/docbook/scripts/README.ldp_print delete mode 100644 docs/docbook/scripts/collateindex.pl delete mode 100644 docs/docbook/scripts/fix_print_html.lib delete mode 100755 docs/docbook/scripts/ldp_print delete mode 100644 docs/docbook/scripts/make-article.pl delete mode 100644 docs/docbook/stylesheets/ldp.dsl.in (limited to 'docs/docbook') diff --git a/docs/docbook/dbsgml/40chg.txt b/docs/docbook/dbsgml/40chg.txt deleted file mode 100644 index 2d2467d9eb..0000000000 --- a/docs/docbook/dbsgml/40chg.txt +++ /dev/null @@ -1,45 +0,0 @@ -19 June 2000 - -Changes from DocBook V3.1 to DocBook V4.1: - -Markup: - -- RFE 17: Added a common attribute 'Condition' for generic effectivity -- RFE 38: The nav.class elements (ToC|LoT|Index|Glossary|Bibliography) are - now allowed at the beginning and end of components and sections -- RFE 58: The 'optmult' and 'reqmult' attribute values have been - removed from Group -- RFE 65: Added several class attribute values to Filename and SystemItem - at the request of the Linux community -- RFE 73: Removed BookBiblio and SeriesInfo -- RFE 81: Added SidebarInfo to Sidebar -- RFE 87: Added 'xmlpi' and 'emptytag' as class values of SGMLTag -- RFE 92: Added 'CO' to Synopsis and LiteralLayout -- RFE 99: Added SimpleMsgEntry as an alternative to MsgEntry in order - to provide a simpler MsgSet construct -- RFE 103: Added RevDescription as an alternative to RevRemark in - RevHistory; this allows longer descriptive text in a revision -- RFE 104: Added 'Specification' to the list of document classes on Article -- RFE 108: Allow admonitions in Answers -- RFE 110: Allow a RevHistory on QandAEntry -- RFE 115: Allow optional Title on OrderedList and ItemizedList -- RFE 116: Added LineNumbering attribute to linespecific environments for - presentation of line numbers -- Added a common attribute 'Security' for effectivity -- Added synopsis markup for modern programming languages (e.g, object - oriented languages like Java, C++, and IDL) -- Renamed DocInfo to PrefaceInfo, ChapterInfo, AppendixInfo, etc. -- Comment was renamed Remark -- InterfaceDefinition was removed - -Other: - -- RFE 88: Added PEs to include/ignore dbnotn.mod and dbcent.mod -- RFE 102: Fixed some outstanding namecase problems -- RFE 105: Added PNG notation -- RFE 106: Removed some odd *.content PEs that interfered with - customization layers -- RFE 109: Added FPI to content of dbgenent.mod (for consistency) -- RFE 111: Added the Euro symbol -- Fixed bug in cals-tbl.dtd; a model group was used for the element - declaration, but the attlist declaration used "Table" literally. diff --git a/docs/docbook/dbsgml/41chg.txt b/docs/docbook/dbsgml/41chg.txt deleted file mode 100644 index d2a9147887..0000000000 --- a/docs/docbook/dbsgml/41chg.txt +++ /dev/null @@ -1,7 +0,0 @@ -19 June 2000 - -Changes from DocBook V4.0 to DocBook V4.1: - -No user-visible changes; removed some 4.0 future use comments that had -accidentally been left in the DTD and fixed a couple of incorrect FPIs. -See 40chg.txt for a list of the significant changes. diff --git a/docs/docbook/dbsgml/50issues.txt b/docs/docbook/dbsgml/50issues.txt deleted file mode 100644 index 31497420f0..0000000000 --- a/docs/docbook/dbsgml/50issues.txt +++ /dev/null @@ -1,39 +0,0 @@ -19 June 2000 - -Backwards-incompatible changes to DocBook that are planned for V5.0: - -- DocBook V5.0 will be an XML DTD. This will require a wide range of - changes. As a result, DocBook V5.0 will more closely resemble - The XML version of DocBook V4.1 than the SGML version. - -- Parameter entity reorganization may greatly reduce many - content models. The goal of this effort is to remove a large - number of spurious elements that snuck into content models - during the first PE reorg, in practice these changes should have - very little "real world" impact. - -- The Coords attribute will be removed from AreaSet. - -- ArtHeader will be dropped from BiblioEntry - -- Contents attribute will be removed from BookInfo and SetInfo - -- The %indexdivcomponent.mix; will be restricted. Numbered figures - and other elements inappropriate for an Index or SetIndex will be - removed. - -- RevHistory will be removed from GlossTerm - -- Constant Class will be removed from SystemItem - -- Graphic and InlineGraphic will be removed - -- Tables will be restricted from full CALS to the OASIS Exchange model - -- An experimental XML Schema version of DocBook 5.0 will be - produced in parallel with the DTD version. It will be - backwards-incompatible in an unspecified number of ways. The - goal of the effort will be that most DocBook documents that - validate under the DTD will also validate under the Schema, - but the committee does not feel bound to guarantee this - condition. diff --git a/docs/docbook/dbsgml/ChangeLog b/docs/docbook/dbsgml/ChangeLog deleted file mode 100644 index c4673db15a..0000000000 --- a/docs/docbook/dbsgml/ChangeLog +++ /dev/null @@ -1,85 +0,0 @@ -2000-06-19 Norman Walsh - - * 40chg.txt: Added notes about comment and interfacedefinition - - * 41chg.txt: New file. - - * 50issues.txt, dbcent.mod, dbgenent.mod, dbhier.mod, dbnotn.mod, dbpool.mod, docbook.cat, docbook.dcl, readme.txt: - Updated version numbers to 4.1 - - * dbhier.mod, dbpool.mod: Removed 4.0 future use comments - - * docbook.cat: Fixed version number in comment - - * docbook.dtd: DocBook V4.1 released. - -2000-05-18 Norman Walsh - - * 40chg.txt, dbcent.mod, dbgenent.mod, dbhier.mod, dbnotn.mod, dbpool.mod, docbook.cat, docbook.dcl, docbook.dtd, readme.txt: - Removed references to beta6 - - * docbook.dtd: DocBook V4.0 released. - -2000-04-10 Norman Walsh - - * 40chg.txt, dbcent.mod, dbgenent.mod, dbhier.mod, dbnotn.mod, dbpool.mod, docbook.cat, docbook.dcl, docbook.dtd, readme.txt: - Updated release date and version to 4.0beta6 - - * dbpool.mod: Added support for EBNF hook; fixed equation content bug - -2000-04-03 Norman Walsh - - * 40chg.txt: Added note about renaming DocInfo to *Info. - - * 40chg.txt, dbcent.mod, dbgenent.mod, dbhier.mod, dbnotn.mod, dbpool.mod, docbook.cat, docbook.dcl, docbook.dtd, readme.txt: - Updated version numbers - -2000-03-24 Norman Walsh - - * 40chg.txt, dbcent.mod, dbgenent.mod, dbhier.mod, dbnotn.mod, dbpool.mod, docbook.cat, docbook.dcl, docbook.dtd, readme.txt: - Updated version numbers - - * 50issues.txt: Added note about PE reorg - - * dbefsyn.mod: Removed - - * dbpool.mod: Removed ELEMENT from comments to ease text searching of the DTD. - Merged dbefsyn.mod into dbpool.mod - Added Modifier as an optional element at the end of MethodSynopsis - and MethodParam. - -2000-03-07 Norman Walsh - - * 40chg.txt, dbcent.mod, dbgenent.mod, dbhier.mod, dbnotn.mod, dbpool.mod, docbook.cat, docbook.dcl, docbook.dtd, readme.txt: - Updated internal versions to beta3 - -2000-03-03 Norman Walsh - - * dbpool.mod: Removed erroneous comment about inline synopses - -2000-03-02 Norman Walsh - - * 30chg.txt, 31chg.txt, 40issues.txt, 50issues.txt, announce.txt, cals-tbl.dtd, dbcent.mod, dbgenent.mod, dbhier.mod, dbnotn.mod, dbpool.mod, docbook.cat, docbook.dcl, docbook.dtd, readme.txt: - Version 3.1 - - * 30chg.txt, 40issues.txt, announce.txt, cals-tbl.dtd, dbgenent.mod, dbhier.mod, dbpool.mod, docbook.cat, docbook.dcl, docbook.dtd: - branches: 1.1.1; - Initial revision - - * 30chg.txt, 40issues.txt, announce.txt, cals-tbl.dtd, dbgenent.mod, dbhier.mod, dbpool.mod, docbook.cat, docbook.dcl, docbook.dtd: - New file. - - * 31chg.txt, 40chg.txt, 40issues.txt, 50issues.txt, cals-tbl.dtd, dbcent.mod, dbefsyn.mod, dbgenent.mod, dbhier.mod, dbnotn.mod, dbpool.mod, docbook.cat, docbook.dcl, docbook.dtd, readme.txt: - Version 4.0beta2 - - * 50issues.txt: Added warning about exchange table model - - * dbefsyn.mod, dbpool.mod: Added ooclass, oointerface, and ooexception as wrappers for modifiers - and names in classsynopsis. Also allow them inline. - - Fixed SGML PE parsing problem with hook PEs. - - * dbhier.mod, dbpool.mod: Added hook PEs for future module extension - - * dbpool.mod, docbook.dtd: Removed reference to sgml-features PE - diff --git a/docs/docbook/dbsgml/cals-tbl.dtd b/docs/docbook/dbsgml/cals-tbl.dtd deleted file mode 100644 index 78c7d5a3ae..0000000000 --- a/docs/docbook/dbsgml/cals-tbl.dtd +++ /dev/null @@ -1,330 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/docs/docbook/dbsgml/catalog b/docs/docbook/dbsgml/catalog deleted file mode 100644 index 521e8201c8..0000000000 --- a/docs/docbook/dbsgml/catalog +++ /dev/null @@ -1,63 +0,0 @@ - -- ...................................................................... -- - -- Catalog data for DocBook V4.1 ........................................ -- - -- File docbook.cat ..................................................... -- - - -- Please direct all questions, bug reports, or suggestions for - changes to the docbook@lists.oasis-open.org mailing list. For more - information, see http://www.oasis-open.org/. - -- - - -- This is the catalog data file for DocBook V4.1. It is provided as - a convenience in building your own catalog files. You need not use - the filenames listed here, and need not use the filename method of - identifying storage objects at all. See the documentation for - detailed information on the files associated with the DocBook DTD. - See SGML Open Technical Resolution 9401 for detailed information - on supplying and using catalog data. - -- - - -- ...................................................................... -- - -- SGML declaration associated with DocBook ............................. -- - -DTDDECL "-//OASIS//DTD DocBook V4.1//EN" "docbook.dcl" - - -- ...................................................................... -- - -- DocBook driver file .................................................. -- - -PUBLIC "-//OASIS//DTD DocBook V4.1//EN" "docbook.dtd" - - -- ...................................................................... -- - -- DocBook modules ...................................................... -- - -PUBLIC "-//USA-DOD//DTD Table Model 951010//EN" "cals-tbl.dtd" -PUBLIC "-//OASIS//ELEMENTS DocBook Information Pool V4.1//EN" "dbpool.mod" -PUBLIC "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.1//EN" "dbhier.mod" -PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V4.1//EN" "dbgenent.mod" -PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.1//EN" "dbnotn.mod" -PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.1//EN" "dbcent.mod" - - -- ...................................................................... -- - -- ISO entity sets ...................................................... -- - -PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "ent/ISOdia" -PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "ent/ISOnum" -PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "ent/ISOpub" -PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "ent/ISOtech" -PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "ent/ISOlat1" -PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "ent/ISOlat2" -PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "ent/ISOgrk1" -PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "ent/ISOgrk2" -PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "ent/ISOgrk3" -PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "ent/ISOgrk4" -PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "ent/ISOamsa" -PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "ent/ISOamsb" -PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "ent/ISOamsc" -PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "ent/ISOamsn" -PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "ent/ISOamso" -PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "ent/ISOamsr" -PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "ent/ISObox" -PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "ent/ISOcyr1" -PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "ent/ISOcyr2" - - -- End of catalog data for DocBook V4.1 ................................. -- - -- ...................................................................... -- diff --git a/docs/docbook/dbsgml/dbcent.mod b/docs/docbook/dbsgml/dbcent.mod deleted file mode 100755 index 7f05211019..0000000000 --- a/docs/docbook/dbsgml/dbcent.mod +++ /dev/null @@ -1,181 +0,0 @@ - - - - - - - - - - - - - - -%ISOamsa; -]]> - - - -%ISOamsb; -]]> - - - -%ISOamsc; -]]> - - - -%ISOamsn; -]]> - - - -%ISOamso; -]]> - - - -%ISOamsr; -]]> - - - -%ISObox; -]]> - - - -%ISOcyr1; -]]> - - - -%ISOcyr2; -]]> - - - -%ISOdia; -]]> - - - -%ISOgrk1; -]]> - - - -%ISOgrk2; -]]> - - - -%ISOgrk3; -]]> - - - -%ISOgrk4; -]]> - - - -%ISOlat1; -]]> - - - -%ISOlat2; -]]> - - - -%ISOnum; -]]> - - - -%ISOpub; -]]> - - - -%ISOtech; -]]> diff --git a/docs/docbook/dbsgml/dbgenent.mod b/docs/docbook/dbsgml/dbgenent.mod deleted file mode 100644 index b60c5b2714..0000000000 --- a/docs/docbook/dbsgml/dbgenent.mod +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - diff --git a/docs/docbook/dbsgml/dbhier.mod b/docs/docbook/dbsgml/dbhier.mod deleted file mode 100755 index 10e1f3f33f..0000000000 --- a/docs/docbook/dbsgml/dbhier.mod +++ /dev/null @@ -1,2100 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -]]> - - - - - - - - - - - - - - - - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - - -]]> -]]> -]]> - - - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - - -]]> -]]> -]]> - - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> -]]> - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> -]]> - - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - - -]]> - - - -]]> - -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> - -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> -]]> - - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> -]]> - - - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> -]]> - - - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> -]]> - - - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> -]]> - - - - - - - - - - - - -]]> - - - -]]> -]]> - - - diff --git a/docs/docbook/dbsgml/dbnotn.mod b/docs/docbook/dbsgml/dbnotn.mod deleted file mode 100755 index b980630bba..0000000000 --- a/docs/docbook/dbsgml/dbnotn.mod +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/docs/docbook/dbsgml/dbpool.mod b/docs/docbook/dbsgml/dbpool.mod deleted file mode 100755 index 3867d070e8..0000000000 --- a/docs/docbook/dbsgml/dbpool.mod +++ /dev/null @@ -1,7396 +0,0 @@ - - - - - - - - - - - - - - - - -]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -]]> - - - - - - - - - - - - - - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - - - - - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> -]]> - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> -]]> - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> -]]> - - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> -]]> - - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> -]]> - - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> - -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> -]]> - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> -]]> - - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> -]]> - - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - -]]> - - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> -]]> - - - - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> - -]]> - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - - -]]> -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> - -]]> - - - - - - - -]]> - - - -]]> - - -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> -]]> - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> - - -]]> - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> -]]> - - - - - - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -%calstbls; -]]> - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - - - - - -]]> - - - -]]> - - -]]> - - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - -]]> - - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - -]]> - - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> -]]> - - - - - - - - - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> - ]]> - - - - - - - -]]> - - - -]]> - ]]> - - - - - - - -]]> - - - -]]> - ]]> - - - - - - - -]]> - - - -]]> - ]]> - - - - - - - -]]> - - - -]]> - ]]> - - - - - - - -]]> - - - -]]> - ]]> - - - - - - - -]]> - - - -]]> - ]]> - - - - - - - -]]> - - - -]]> - ]]> - - - - - - - - - -]]> - - - -]]> - ]]> -]]> - - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> - ]]> - - - - - - - -]]> - - - -]]> - ]]> - - - - - - - - - -]]> - - - -]]> - ]]> - - -]]> - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - - -]]> - - - -]]> - -]]> - - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - - - - -]]> - - - -]]> - ]]> - - - - - - - -]]> - - - -]]> - ]]> - - - ]]> - - - - -]]> - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> - ]]> - - - - - - - -]]> - - - -]]> - ]]> - - - - - - - -]]> - - - -]]> - ]]> - - - - - - - - - -]]> - - - -]]> - ]]> -]]> - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> - ]]> - - - - - - - -]]> - - - -]]> - ]]> -]]> - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - -]]> - - - - -]]> -]]> - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - - -]]> - - - -]]> - -]]> - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - - -]]> - - - -]]> - -]]> - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - - - - - -]]> - - - -]]> - ]]> - - - - - - - -]]> - - - -]]> - ]]> - - - - - - - -]]> - - - -]]> - ]]> - - - - - - - -]]> - - - -]]> - ]]> - - - - - - - -]]> - - - -]]> - ]]> - - - - - - - -]]> - - - -]]> - ]]> -]]> - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> - ]]> - - -]]> - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> - ]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> -]]> - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - - -]]> - - - -]]> -]]> - - - -]]> - - - - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - -]]> - - - -]]> -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> - - - - - - - - - - -]]> - - - -]]> -]]> - - - - - - - -]]> - - - - -]]> -]]> -]]> - - - - - - - -]]> - - - -]]> -]]> -]]> - - - diff --git a/docs/docbook/dbsgml/docbook.cat b/docs/docbook/dbsgml/docbook.cat deleted file mode 100644 index 0f285d0d75..0000000000 --- a/docs/docbook/dbsgml/docbook.cat +++ /dev/null @@ -1,63 +0,0 @@ - -- ...................................................................... -- - -- Catalog data for DocBook V4.1 ........................................ -- - -- File docbook.cat ..................................................... -- - - -- Please direct all questions, bug reports, or suggestions for - changes to the docbook@lists.oasis-open.org mailing list. For more - information, see http://www.oasis-open.org/. - -- - - -- This is the catalog data file for DocBook V4.1. It is provided as - a convenience in building your own catalog files. You need not use - the filenames listed here, and need not use the filename method of - identifying storage objects at all. See the documentation for - detailed information on the files associated with the DocBook DTD. - See SGML Open Technical Resolution 9401 for detailed information - on supplying and using catalog data. - -- - - -- ...................................................................... -- - -- SGML declaration associated with DocBook ............................. -- - -DTDDECL "-//OASIS//DTD DocBook V4.1//EN" "docbook.dcl" - - -- ...................................................................... -- - -- DocBook driver file .................................................. -- - -PUBLIC "-//OASIS//DTD DocBook V4.1//EN" "docbook.dtd" - - -- ...................................................................... -- - -- DocBook modules ...................................................... -- - -PUBLIC "-//USA-DOD//DTD Table Model 951010//EN" "cals-tbl.dtd" -PUBLIC "-//OASIS//ELEMENTS DocBook Information Pool V4.1//EN" "dbpool.mod" -PUBLIC "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.1//EN" "dbhier.mod" -PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V4.1//EN" "dbgenent.mod" -PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.1//EN" "dbnotn.mod" -PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.1//EN" "dbcent.mod" - - -- ...................................................................... -- - -- ISO entity sets ...................................................... -- - -PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "ISOdia" -PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "ISOnum" -PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "ISOpub" -PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "ISOtech" -PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "ISOlat1" -PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "ISOlat2" -PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "ISOgrk1" -PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "ISOgrk2" -PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "ISOgrk3" -PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "ISOgrk4" -PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "ISOamsa" -PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "ISOamsb" -PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "ISOamsc" -PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "ISOamsn" -PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "ISOamso" -PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "ISOamsr" -PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "ISObox" -PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "ISOcyr1" -PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "ISOcyr2" - - -- End of catalog data for DocBook V4.1 ................................. -- - -- ...................................................................... -- diff --git a/docs/docbook/dbsgml/docbook.dcl b/docs/docbook/dbsgml/docbook.dcl deleted file mode 100644 index c76de206cf..0000000000 --- a/docs/docbook/dbsgml/docbook.dcl +++ /dev/null @@ -1,106 +0,0 @@ - diff --git a/docs/docbook/dbsgml/docbook.dtd b/docs/docbook/dbsgml/docbook.dtd deleted file mode 100755 index 4d784cc43f..0000000000 --- a/docs/docbook/dbsgml/docbook.dtd +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - - - - - - - - -%dbnotn; -]]> - - - - - - - -%dbcent; -]]> - - - - - - - - -%dbpool; -]]> - - - - -]]> - - - - - -%dbhier; -]]> - - - - - - -%dbgenent; -]]> - - - diff --git a/docs/docbook/dbsgml/ent/ISOamsa b/docs/docbook/dbsgml/ent/ISOamsa deleted file mode 100644 index b77154cb02..0000000000 --- a/docs/docbook/dbsgml/ent/ISOamsa +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/docs/docbook/dbsgml/ent/ISOamsb b/docs/docbook/dbsgml/ent/ISOamsb deleted file mode 100644 index 43944a732f..0000000000 --- a/docs/docbook/dbsgml/ent/ISOamsb +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/docs/docbook/dbsgml/ent/ISOamsc b/docs/docbook/dbsgml/ent/ISOamsc deleted file mode 100644 index 06222d58cf..0000000000 --- a/docs/docbook/dbsgml/ent/ISOamsc +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - diff --git a/docs/docbook/dbsgml/ent/ISOamsn b/docs/docbook/dbsgml/ent/ISOamsn deleted file mode 100644 index 0c8327a326..0000000000 --- a/docs/docbook/dbsgml/ent/ISOamsn +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/docs/docbook/dbsgml/ent/ISOamso b/docs/docbook/dbsgml/ent/ISOamso deleted file mode 100644 index ad9b329e54..0000000000 --- a/docs/docbook/dbsgml/ent/ISOamso +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/docs/docbook/dbsgml/ent/ISOamsr b/docs/docbook/dbsgml/ent/ISOamsr deleted file mode 100644 index 3f26c345c0..0000000000 --- a/docs/docbook/dbsgml/ent/ISOamsr +++ /dev/null @@ -1,94 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/docs/docbook/dbsgml/ent/ISObox b/docs/docbook/dbsgml/ent/ISObox deleted file mode 100644 index 643e926eda..0000000000 --- a/docs/docbook/dbsgml/ent/ISObox +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/docs/docbook/dbsgml/ent/ISOcyr1 b/docs/docbook/dbsgml/ent/ISOcyr1 deleted file mode 100644 index 97b961b1f0..0000000000 --- a/docs/docbook/dbsgml/ent/ISOcyr1 +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/docs/docbook/dbsgml/ent/ISOcyr2 b/docs/docbook/dbsgml/ent/ISOcyr2 deleted file mode 100644 index 480b01c1df..0000000000 --- a/docs/docbook/dbsgml/ent/ISOcyr2 +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/docs/docbook/dbsgml/ent/ISOdia b/docs/docbook/dbsgml/ent/ISOdia deleted file mode 100644 index 3b6f98d6ba..0000000000 --- a/docs/docbook/dbsgml/ent/ISOdia +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/docs/docbook/dbsgml/ent/ISOgrk1 b/docs/docbook/dbsgml/ent/ISOgrk1 deleted file mode 100644 index dea16bf8ef..0000000000 --- a/docs/docbook/dbsgml/ent/ISOgrk1 +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/docs/docbook/dbsgml/ent/ISOgrk2 b/docs/docbook/dbsgml/ent/ISOgrk2 deleted file mode 100644 index 657bb99935..0000000000 --- a/docs/docbook/dbsgml/ent/ISOgrk2 +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/docs/docbook/dbsgml/ent/ISOgrk3 b/docs/docbook/dbsgml/ent/ISOgrk3 deleted file mode 100644 index f76c3a084f..0000000000 --- a/docs/docbook/dbsgml/ent/ISOgrk3 +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/docs/docbook/dbsgml/ent/ISOgrk4 b/docs/docbook/dbsgml/ent/ISOgrk4 deleted file mode 100644 index e4427a0cb5..0000000000 --- a/docs/docbook/dbsgml/ent/ISOgrk4 +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/docs/docbook/dbsgml/ent/ISOlat1 b/docs/docbook/dbsgml/ent/ISOlat1 deleted file mode 100644 index 0d7d0a7d93..0000000000 --- a/docs/docbook/dbsgml/ent/ISOlat1 +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/docs/docbook/dbsgml/ent/ISOlat2 b/docs/docbook/dbsgml/ent/ISOlat2 deleted file mode 100644 index 4bcb337832..0000000000 --- a/docs/docbook/dbsgml/ent/ISOlat2 +++ /dev/null @@ -1,131 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/docs/docbook/dbsgml/ent/ISOnum b/docs/docbook/dbsgml/ent/ISOnum deleted file mode 100644 index d7b41c33ae..0000000000 --- a/docs/docbook/dbsgml/ent/ISOnum +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/docs/docbook/dbsgml/ent/ISOpub b/docs/docbook/dbsgml/ent/ISOpub deleted file mode 100644 index c184973cfd..0000000000 --- a/docs/docbook/dbsgml/ent/ISOpub +++ /dev/null @@ -1,100 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/docs/docbook/dbsgml/ent/ISOtech b/docs/docbook/dbsgml/ent/ISOtech deleted file mode 100644 index cbda344869..0000000000 --- a/docs/docbook/dbsgml/ent/ISOtech +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/docs/docbook/dbsgml/readme.txt b/docs/docbook/dbsgml/readme.txt deleted file mode 100644 index 52d3f9f4aa..0000000000 --- a/docs/docbook/dbsgml/readme.txt +++ /dev/null @@ -1,12 +0,0 @@ -README for DocBook V4.1 - -This is DocBook V4.1, released 19 June 2000. - -See 40chg.txt for information about what has changed since DocBook 3.1. - -For more information about DocBook, please see - - http://www.oasis-open.org/docbook/ - -Please send all questions, comments, concerns, and bug reports to the -DocBook mailing list: docbook@lists.oasis-open.org diff --git a/docs/docbook/manpages/pdbedit.8.sgml b/docs/docbook/manpages/pdbedit.8.sgml index eeb1fb0d2c..213275b7cc 100644 --- a/docs/docbook/manpages/pdbedit.8.sgml +++ b/docs/docbook/manpages/pdbedit.8.sgml @@ -27,7 +27,10 @@ -a -m -x - -i file + -i passdb-backend + -e passdb-backend + -b passdb-backend + -D debuglevel @@ -233,18 +236,35 @@ - -i file - This command is used to import a smbpasswd - file into the database. + -i passdb-backend + Use a different passdb backend to retrieve users than the one specified in smb.conf. Can be used to import data into your + local user database. - This option will ease migration from the plain smbpasswd - file database to more powerful backend databases like tdb and - ldap. + This option will ease migration from one passdb backend to another. + - Example: pdbedit -i /etc/smbpasswd.old + Example: pdbedit -i smbpasswd:/etc/smbpasswd.old + + + -e passdb-backend + Export all currently available users to the specified password database backend. + + This option will ease migration from one passdb backend to another and will ease backupping + + Example: pdbedit -e smbpasswd:/root/samba-users.backup + + + + + -b passdb-backend + Use a different default passdb backend. + + Example: pdbedit -b xml:/root/pdb-backup.xml -l + + diff --git a/docs/docbook/projdoc/OS2-Client-HOWTO.sgml b/docs/docbook/projdoc/OS2-Client-HOWTO.sgml deleted file mode 100644 index ca7ad6a754..0000000000 --- a/docs/docbook/projdoc/OS2-Client-HOWTO.sgml +++ /dev/null @@ -1,142 +0,0 @@ - - - - - - JimMcDonough - - IBM -
- jerry@samba.org -
- - - - - 5 Mar 2001 - - -OS2 Client HOWTO - - - FAQs - - - How can I configure OS/2 Warp Connect or - OS/2 Warp 4 as a client for Samba? - - A more complete answer to this question can be - found on - http://carol.wins.uva.nl/~leeuw/samba/warp.html. - - Basically, you need three components: - - - The File and Print Client ('IBM Peer') - - TCP/IP ('Internet support') - - The "NetBIOS over TCP/IP" driver ('TCPBEUI') - - - - Installing the first two together with the base operating - system on a blank system is explained in the Warp manual. If Warp - has already been installed, but you now want to install the - networking support, use the "Selective Install for Networking" - object in the "System Setup" folder. - - Adding the "NetBIOS over TCP/IP" driver is not described - in the manual and just barely in the online documentation. Start - MPTS.EXE, click on OK, click on "Configure LAPS" and click - on "IBM OS/2 NETBIOS OVER TCP/IP" in 'Protocols'. This line - is then moved to 'Current Configuration'. Select that line, - click on "Change number" and increase it from 0 to 1. Save this - configuration. - - If the Samba server(s) is not on your local subnet, you - can optionally add IP names and addresses of these servers - to the "Names List", or specify a WINS server ('NetBIOS - Nameserver' in IBM and RFC terminology). For Warp Connect you - may need to download an update for 'IBM Peer' to bring it on - the same level as Warp 4. See the webpage mentioned above. - - - - How can I configure OS/2 Warp 3 (not Connect), - OS/2 1.2, 1.3 or 2.x for Samba? - - You can use the free Microsoft LAN Manager 2.2c Client - for OS/2 from - - ftp://ftp.microsoft.com/BusSys/Clients/LANMAN.OS2/. - See - http://carol.wins.uva.nl/~leeuw/lanman.html for - more information on how to install and use this client. In - a nutshell, edit the file \OS2VER in the root directory of - the OS/2 boot partition and add the lines: - - - 20=setup.exe - 20=netwksta.sys - 20=netvdd.sys - - - before you install the client. Also, don't use the - included NE2000 driver because it is buggy. Try the NE2000 - or NS2000 driver from - - ftp://ftp.cdrom.com/pub/os2/network/ndis/ instead. - - - - - Are there any other issues when OS/2 (any version) - is used as a client? - - When you do a NET VIEW or use the "File and Print - Client Resource Browser", no Samba servers show up. This can - be fixed by a patch from - http://carol.wins.uva.nl/~leeuw/samba/fix.html. - The patch will be included in a later version of Samba. It also - fixes a couple of other problems, such as preserving long - filenames when objects are dragged from the Workplace Shell - to the Samba server. - - - - How do I get printer driver download working - for OS/2 clients? - - First, create a share called [PRINTDRV] that is - world-readable. Copy your OS/2 driver files there. Note - that the .EA_ files must still be separate, so you will need - to use the original install files, and not copy an installed - driver from an OS/2 system. - - Install the NT driver first for that printer. Then, - add to your smb.conf a parameter, "os2 driver map = - filename". Then, in the file - specified by filename, map the - name of the NT driver name to the OS/2 driver name as - follows: - - <nt driver name> = <os2 driver - name>.<device name>, e.g.: - HP LaserJet 5L = LASERJET.HP LaserJet 5L - - You can have multiple drivers mapped in this file. - - If you only specify the OS/2 driver name, and not the - device name, the first attempt to download the driver will - actually download the files, but the OS/2 client will tell - you the driver is not available. On the second attempt, it - will work. This is fixed simply by adding the device name - to the mapping, after which it will work on the first attempt. - - - - - - diff --git a/docs/docbook/projdoc/Printing.sgml b/docs/docbook/projdoc/Printing.sgml index cb7e5cdfb7..ce9f40e88b 100644 --- a/docs/docbook/projdoc/Printing.sgml +++ b/docs/docbook/projdoc/Printing.sgml @@ -1,4 +1,4 @@ - + PatrickPowell diff --git a/docs/docbook/projdoc/Samba-BDC-HOWTO.sgml b/docs/docbook/projdoc/Samba-BDC-HOWTO.sgml index 08cdc3a668..7653e3d1c0 100644 --- a/docs/docbook/projdoc/Samba-BDC-HOWTO.sgml +++ b/docs/docbook/projdoc/Samba-BDC-HOWTO.sgml @@ -64,13 +64,9 @@ parameters in the [global]-section of the smb.conf have to be set: -[global] - workgroup = SAMBA - domain master = yes - domain logons = yes - encrypt passwords = yes - security = user - .... +workgroup = SAMBA +domain master = yes +domain logons = yes @@ -160,48 +156,42 @@ Several things have to be done: - - The file private/MACHINE.SID identifies the domain. When a samba - server is first started, it is created on the fly and must never be - changed again. This file has to be the same on the PDC and the BDC, - so the MACHINE.SID has to be copied from the PDC to the BDC. Note that in the - latest Samba 2.2.x releases, the machine SID (and therefore domain SID) is stored - in the private/secrets.tdb database. This file cannot just - be copied because Samba looks under the key SECRETS/SID/DOMAIN. - where DOMAIN is the machine's netbios name. Since this name has - to be unique for each SAMBA server, this lookup will fail. - - A new option has been added to the smbpasswd(8) - command to help ease this problem. When running smbpasswd -S as the root user, - the domain SID will be retrieved from a domain controller matching the value of the - workgroup parameter in smb.conf and stored as the - new Samba server's machine SID. See the smbpasswd(8) - man page for more details on this functionality. - - - - The Unix user database has to be synchronized from the PDC to the - BDC. This means that both the /etc/passwd and /etc/group have to be - replicated from the PDC to the BDC. This can be done manually - whenever changes are made, or the PDC is set up as a NIS master - server and the BDC as a NIS slave server. To set up the BDC as a - mere NIS client would not be enough, as the BDC would not be able to - access its user database in case of a PDC failure. LDAP is also a - potential vehicle for sharing this information. - - - - The Samba password database in the file private/smbpasswd - has to be replicated from the PDC to the BDC. This is a bit tricky, see the - next section. - - - - Any netlogon share has to be replicated from the PDC to the - BDC. This can be done manually whenever login scripts are changed, - or it can be done automatically together with the smbpasswd - synchronization. - + +The domain SID has to be the same on the PDC and the BDC. This used to +be stored in the file private/MACHINE.SID. This file is not created +anymore since Samba 2.2.5 or even earlier. Nowadays the domain SID is +stored in the file private/secrets.tdb. Simply copying the secrets.tdb +from the PDC to the BDC does not work, as the BDC would +generate a new SID for itself and override the domain SID with this +new BDC SID. + + +To retrieve the domain SID from the PDC or an existing BDC and store it in the +secrets.tdb, execute 'net rpc getsid' on the BDC. + + + +The Unix user database has to be synchronized from the PDC to the +BDC. This means that both the /etc/passwd and /etc/group have to be +replicated from the PDC to the BDC. This can be done manually +whenever changes are made, or the PDC is set up as a NIS master +server and the BDC as a NIS slave server. To set up the BDC as a +mere NIS client would not be enough, as the BDC would not be able to +access its user database in case of a PDC failure. + + + +The Samba password database in the file private/smbpasswd has to be +replicated from the PDC to the BDC. This is a bit tricky, see the +next section. + + + +Any netlogon share has to be replicated from the PDC to the +BDC. This can be done manually whenever login scripts are changed, +or it can be done automatically together with the smbpasswd +synchronization. + @@ -211,13 +201,9 @@ by setting -[global] - workgroup = SAMBA - domain master = yes - domain logons = yes - encrypt passwords = yes - security = user - .... +workgroup = samba +domain master = no +domain logons = yes @@ -234,9 +220,8 @@ name is reserved for the Primary Domain Controller. Replication of the smbpasswd file is sensitive. It has to be done -whenever changes to the SAM are made. Every user's password change -(including machine trust account password changes) is done in the -smbpasswd file and has to be replicated to the BDC. So +whenever changes to the SAM are made. Every user's password change is +done in the smbpasswd file and has to be replicated to the BDC. So replicating the smbpasswd file very often is necessary. @@ -244,18 +229,11 @@ replicating the smbpasswd file very often is necessary. As the smbpasswd file contains plain text password equivalents, it must not be sent unencrypted over the wire. The best way to set up smbpasswd replication from the PDC to the BDC is to use the utility -rsync(1). rsync can use -ssh(1) as a transport. ssh itself -can be set up to accept only rsync transfer without requiring the user to -type a password. Refer to the man pages for these two tools for more details. +rsync. rsync can use ssh as a transport. ssh itself can be set up to +accept *only* rsync transfer without requiring the user to type a +password. - -Another solution with high potential is to use Samba's --with-ldapsam -for sharing and/or replicating the list of sambaAccount entries. -This can all be done over SSL to ensure security. See the Samba-LDAP-HOWTO -for more details. - diff --git a/docs/docbook/projdoc/Samba-LDAP-HOWTO.sgml b/docs/docbook/projdoc/Samba-LDAP-HOWTO.sgml index 6b153af6fe..a66df0c767 100644 --- a/docs/docbook/projdoc/Samba-LDAP-HOWTO.sgml +++ b/docs/docbook/projdoc/Samba-LDAP-HOWTO.sgml @@ -15,7 +15,7 @@ - (16 Jun 2002) + (13 Jan 2002) Storing Samba's User/Machine Account information in an LDAP Directory @@ -39,7 +39,7 @@ on LDAP architectures and Directories, please refer to the following sites. Note that O'Reilly Publishing is working on a guide to LDAP for System Administrators which has a planned release date of -late 2002. +early summer, 2002. @@ -51,8 +51,7 @@ Two additional Samba resources which may prove to be helpful are maintained by Ignacio Coupeau. The NT migration scripts from IDEALX that are - geared to manage users and group in such a Samba-LDAP Domain Controller configuration. These scripts can - be found in the Samba 2.2.5 release in the examples/LDAP/smbldap-tools/ directory. + geared to manage users and group in such a Samba-LDAP Domain Controller configuration. @@ -76,7 +75,7 @@ in the thousands). The first is that all lookups must be performed sequentially. Given that there are approximately two lookups per domain logon (one for a normal session connection such as when mapping a network drive or printer), this -is a performance bottleneck for large sites. What is needed is an indexed approach +is a performance bottleneck for lareg sites. What is needed is an indexed approach such as is used in databases. @@ -97,7 +96,7 @@ Identified (RID). As a result of these defeciencies, a more robust means of storing user attributes -used by smbd was developed. The API which defines access to user accounts +used by smbd was developed. The API which defines access to user accounts is commonly referred to as the samdb interface (previously this was called the passdb API, and is still so named in the CVS trees). In Samba 2.2.3, enabling support for a samdb backend (e.g. --with-ldapsam or @@ -106,7 +105,7 @@ for a samdb backend (e.g. --with-ldapsam or When compiling Samba to include the --with-ldapsam autoconf -option, smbd (and associated tools) will store and lookup user accounts in +option, smbd (and associated tools) will store and lookup user accounts in an LDAP directory. In reality, this is very easy to understand. If you are comfortable with using an smbpasswd file, simply replace "smbpasswd" with "LDAP directory" in all the documentation. @@ -163,7 +162,7 @@ in 2.2.2). The sambaAccount objectclass is given here: -objectclass ( 1.3.1.5.1.4.1.7165.2.2.3 NAME 'sambaAccount' SUP top AUXILARY +objectclass ( 1.3.1.5.1.4.1.7165.2.2.2 NAME 'sambaAccount' SUP top STRUCTURAL DESC 'Samba Account' MUST ( uid $ rid ) MAY ( cn $ lmPassword $ ntPassword $ pwdLastSet $ logonTime $ @@ -173,45 +172,29 @@ objectclass ( 1.3.1.5.1.4.1.7165.2.2.3 NAME 'sambaAccount' SUP top AUXILARY -The samba.schema file has been formatted for OpenLDAP 2.0 & 2.1. The OID's are +The samba.schema file has been formatted for OpenLDAP 2.0. The OID's are owned by the Samba Team and as such is legal to be openly published. If you translate the schema to be used with Netscape DS, please -submit the modified schema file as a patch to jerry@samba.org - - - -Since the original release, schema files for - - - - IBM's SecureWay Server - Netscape Directory Server version 4.x and 5.x - - - -have been submitted and included in the Samba source distribution. I cannot -personally comment on the integration of these commercial directory servers since -I have not had the oppotinuity to work with them. +submit the modified schema file as a patch to jerry@samba.org Just as the smbpasswd file is mean to store information which supplements a user's /etc/passwd entry, so is the sambaAccount object -meant to supplement the UNIX user account information. A sambaAccount is now an -AUXILARY objectclass so it can be stored alongside -a posixAccount or person objectclass in the directory. Note that there are -several fields (e.g. uid) which overlap with the posixAccount objectclass -outlined in RFC2307. This is by design. The move from a STRUCTURAL objectclass -to an AUXILIARY one was compliance with the LDAP data model which states that -an entry can contain only one STRUCTURAL objectclass per entry. This is now -enforced by the OpenLDAP 2.1 server. +meant to supplement the UNIX user account information. A sambaAccount is a +STRUCTURAL objectclass so it can be stored individually +in the directory. However, there are several fields (e.g. uid) which overlap +with the posixAccount objectclass outlined in RFC2307. This is by design. + In order to store all user account information (UNIX and Samba) in the directory, it is necessary to use the sambaAccount and posixAccount objectclasses in -combination. However, smbd will still obtain the user's UNIX account +combination. However, smbd will still obtain the user's UNIX account information via the standard C library calls (e.g. getpwnam(), et. al.). This means that the Samba server must also have the LDAP NSS library installed and functioning correctly. This division of information makes it possible to @@ -271,9 +254,9 @@ like in the following example, to speed up searches made on sambaAccount objectc ## required by OpenLDAP 2.0 index objectclass eq -## support pbb_getsampwnam() +## support pb_getsampwnam() index uid pres,eq -## support pdb_getsampwrid() +## support pdb_getsambapwrid() index rid eq ## uncomment these if you are storing posixAccount and @@ -343,44 +326,14 @@ use with an LDAP directory could appear as ldap suffix = "ou=people,dc=samba,dc=org" # generally the default ldap search filter is ok - # ldap filter = "(&(uid=%u)(objectclass=sambaAccount))" + # ldap filter = "(&(uid=%u)(objectclass=sambaAccount))" - - - - -Importing <filename>smbpasswd</filename> entries - - -Import existing user entries from an smbpasswd can be trivially done using -a Perl script named import_smbpasswd.pl included in the -examples/LDAP/ directory of the Samba source distribution. There are -two main requirements of this script: - - - - All users to be imported to the directory must have a valid uid on the - local system. This can be a problem if using a machinej different from the Samba server - to import the file. - - The local system must have a working installation of the Net::LDAP perl - module which can be obtained from with http://search.cpan.org/ - by searching for perl-ldap or directly from http://perl-ldap.sf.net/. - - - - -Please refer to the documentation in the same directory as the script for more details. - - - Accounts and Groups management @@ -629,7 +582,7 @@ ntPassword: 878D8014606CDA29677A44EFA1353FC7 Please mail all comments regarding this HOWTO to jerry@samba.org. This documents was -last updated to reflect the Samba 2.2.5 release. +last updated to reflect the Samba 2.2.3 release. diff --git a/docs/docbook/projdoc/cups.sgml b/docs/docbook/projdoc/cups.sgml deleted file mode 100644 index 57a12843a8..0000000000 --- a/docs/docbook/projdoc/cups.sgml +++ /dev/null @@ -1,445 +0,0 @@ - - - - - - KurtPfeifle - -
- kpfeifle@danka.de -
- - - - - (24 May 2002) - - -Printing with CUPS in Samba 2.2.x - - - -Printing with CUPS in Samba 2.2.x - - -CUPS is a newcomer in -the UNIX printing scene, which has convinced many people upon first trial -already. However, it has quite a few new features, which make it different -from other, more traditional printing systems. - - - - - -Configuring <filename>smb.conf</filename> for CUPS - - -Printing with CUPS in the most basic smb.conf -setup in Samba 2.2.x only needs two settings: printing = cups and -printcap = cups. While CUPS itself doesn't need a printcap -anymore, the cupsd.conf configuration file knows two directives -(example: Printcap /etc/printcap and PrintcapFormat -BSD), which control if such a file should be created for the -convenience of third party applications. Make sure it is set! For details see -man cupsd.conf and other CUPS-related documentation. - - - -If SAMBA is compiled against libcups, then printcap = -cups uses the CUPS API to list printers, submit jobs, etc. Otherwise it -maps to the System V commands with an additional -oraw -option for printing. On a Linux system, you can use the ldd command to -find out details (ldd may not be present on other OS platforms, or its -function may be embodied by a different command): - - - -transmeta:/home/kurt # ldd `which smbd` - libssl.so.0.9.6 => /usr/lib/libssl.so.0.9.6 (0x4002d000) - libcrypto.so.0.9.6 => /usr/lib/libcrypto.so.0.9.6 (0x4005a000) - libcups.so.2 => /usr/lib/libcups.so.2 (0x40123000) - libdl.so.2 => /lib/libdl.so.2 (0x401e8000) - libnsl.so.1 => /lib/libnsl.so.1 (0x401ec000) - libpam.so.0 => /lib/libpam.so.0 (0x40202000) - libc.so.6 => /lib/libc.so.6 (0x4020b000) - /lib/ld-linux.so.2 => /lib/ld-linux.so.2 (0x40000000) - - - -The line "libcups.so.2 => /usr/lib/libcups.so.2 -(0x40123000)" shows there is CUPS support compiled into this version of -Samba. If this is the case, and printing = cups is set, then any -otherwise manually set print command in smb.conf is ignored. - - - - - - - -Using CUPS as a mere spooling print server -- "raw" -printing with vendor drivers download - - -You can setup Samba and your Windows clients to use the -CUPS print subsystem just as you would with any of the more traditional print -subsystems: that means the use of vendor provided, native Windows printer -drivers for each target printer. If you setup the [print$] share to -download these drivers to the clients, their GDI system (Graphical Device -Interface) will output the Wndows EMF (Enhanced MetaFile) and -convert it -- with the help of the printer driver -- locally into the format -the printer is expecting. Samba and the CUPS print subsystem will have to -treat these files as raw print files -- they are already in the -shape to be digestable for the printer. This is the same traditional setup -for Unix print servers handling Windows client jobs. It does not take much -CPU power to handle this kind of task efficiently. - - - - - - - -CUPS as a network PostScript RIP -- CUPS drivers working on server, Adobe -PostScript driver with CUPS-PPDs downloaded to clients - - - -CUPS is perfectly able to use PPD files (PostScript -Printer Descriptions). PPDs can control all print device options. They -are usually provided by the manufacturer -- if you own a PostSript printer, -that is. PPD files are always a component of PostScript printer drivers on MS -Windows or Apple Mac OS systems. They are ASCII files containing -user-selectable print options, mapped to appropriate PostScript, PCL or PJL -commands for the target printer. Printer driver GUI dialogs translate these -options "on-the-fly" into buttons and drop-down lists for the user to -select. - - - -CUPS can load, without any conversions, the PPD file from -any Windows (NT is recommended) PostScript driver and handle the options. -There is a web browser interface to the print options (select -http://localhost:631/printers/ and click on one "Configure Printer" button -to see it), a commandline interface (see man lpoptions or -try if you have lphelp on your system) plus some different GUI frontends on Linux -UNIX, which can present PPD options to the users. PPD options are normally -meant to become evaluated by the PostScript RIP on the real PostScript -printer. - - - -CUPS doesn't stop at "real" PostScript printers in its -usage of PPDs. The CUPS developers have extended the PPD concept, to also -describe available device and driver options for non-PostScript printers -through CUPS-PPDs. - - - -This is logical, as CUPS includes a fully featured -PostScript interpreter (RIP). This RIP is based on Ghostscript. It can -process all received PostScript (and additionally many other file formats) -from clients. All CUPS-PPDs geared to non-PostScript printers contain an -additional line, starting with the keyword *cupsFilter. -This line -tells the CUPS print system which printer-specific filter to use for the -interpretation of the accompanying PostScript. Thus CUPS lets all its -printers appear as PostScript devices to its clients, because it can act as a -PostScript RIP for those printers, processing the received PostScript code -into a proper raster print format. - - - -CUPS-PPDs can also be used on Windows-Clients, on top of a -PostScript driver (recommended is the Adobe one). - - - -This feature enables CUPS to do a few tricks no other -spooler can do: - - - - act as a networked PostScript RIP (Raster Image Processor), handling - printfiles from all client platforms in a uniform way; - act as a central accounting and billing server, as all files are passed - through the pstops Filter and are therefor logged in - the CUPS page_log. - NOTE: this - can not happen with "raw" print jobs, which always remain unfiltered - per definition; - enable clients to consolidate on a single PostScript driver, even for - many different target printers. - - - - - - -Windows Terminal Servers (WTS) as CUPS clients - - -This setup may be of special interest to people -experiencing major problems in WTS environments. WTS need often a multitude -of non-PostScript drivers installed to run their clients' variety of -different printer models. This often imposes the price of much increased -instability. In many cases, in an attempt to overcome this problem, site -administrators have resorted to restrict the allowed drivers installed on -their WTS to one generic PCL- and one PostScript driver. This however -restricts the clients in the amount of printer options available for them -- -often they can't get out more then simplex prints from one standard paper -tray, while their devices could do much better, if driven by a different -driver! - - - -Using an Adobe PostScript driver, enabled with a CUPS-PPD, -seems to be a very elegant way to overcome all these shortcomings. The -PostScript driver is not known to cause major stability problems on WTS (even -if used with many different PPDs). The clients will be able to (again) chose -paper trays, duplex printing and other settings. However, there is a certain -price for this too: a CUPS server acting as a PostScript RIP for its clients -requires more CPU and RAM than just to act as a "raw spooling" device. Plus, -this setup is not yet widely tested, although the first feedbacks look very -promising... - - - - - -Setting up CUPS for driver download - - -The cupsadsmb utility (shipped with all current -CUPS versions) makes the sharing of any (or all) installed CUPS printers very -easy. Prior to using it, you need the following settings in smb.conf: - - -[global] - load printers = yes - printing = cups - printcap name = cups - -[printers] - comment = All Printers - path = /var/spool/samba - browseable = no - public = yes - guest ok = yes - writable = no - printable = yes - printer admin = root - -[print$] - comment = Printer Drivers - path = /etc/samba/drivers - browseable = yes - guest ok = no - read only = yes - write list = root - - - -For licensing reasons the necessary files of the Adobe -Postscript driver can not be distributed with either Samba or CUPS. You need -to download them yourself from the Adobe website. Once extracted, create a -drivers directory in the CUPS data directory (usually -/usr/share/cups/). Copy the Adobe files using -UPPERCASE filenames, to this directory as follows: - - - - ADFONTS.MFM - ADOBEPS4.DRV - ADOBEPS4.HLP - ADOBEPS5.DLL - ADOBEPSU.DLL - ADOBEPSU.HLP - DEFPRTR2.PPD - ICONLIB.DLL - - - -Users of the ESP Print Pro software are able to install -their "Samba Drivers" package for this purpose with no problem. - - - - - - -Sources of CUPS drivers / PPDs - - -On the internet you can find now many thousand CUPS-PPD -files (with their companion filters), in many national languages, -supporting more than 1.000 non-PostScript models. - - - - ESP PrintPro - (http://wwwl.easysw.com/printpro/) - (commercial, non-Free) is packaged with more than 3.000 PPDs, ready for - successful usage "out of the box" on Linux, IBM-AIX, HP-UX, Sun-Solaris, - SGI-IRIX, Compaq Tru64, Digital Unix and some more commercial Unices (it - is written by the CUPS developers themselves and its sales help finance - the further development of CUPS, as they feed their creators) - the Gimp-Print-Project - (http://gimp-print.sourceforge.net/) - (GPL, Free Software) provides around 120 PPDs (supporting nearly 300 - printers, many driven to photo quality output), to be used alongside the - Gimp-Print CUPS filters; - TurboPrint - (http://www.turboprint.com/) - (Shareware, non-Freee) supports roughly the same amount of printers in - excellent quality; - OMNI - (http://www-124.ibm.com/developerworks/oss/linux/projects/omni/) - (LPGL, Free) is a package made by IBM, now containing support for more - than 400 printers, stemming from the inheritance of IBM OS/2 KnowHow - ported over to Linux (CUPS support is in a Beta-stage at present); - HPIJS - (http://hpinkjet.sourceforge.net/) - (BSD-style licnes, Free) supports around 120 of HP's own printers and is - also providing excellent print quality now; - Foomatic/cupsomatic (http://www.linuxprinting.org/) - (LPGL, Free) from Linuxprinting.org are providing PPDs for practically every - Ghostscript filter known to the world, now usable with CUPS. - - - -NOTE: the cupsomatic trick from Linuxprinting.org is -working different from the other drivers. While the other drivers take the -generic CUPS raster (produced by CUPS' own pstoraster PostScript RIP) as -their input, cupsomatic "kidnaps" the PostScript inside CUPS, before -RIP-ping, deviates it to an external Ghostscript installation (which now -becomes the RIP) and gives it back to a CUPS backend once Ghostscript is -finished. -- CUPS versions from 1.1.15 and later will provide their pstoraster -PostScript RIP function again inside a system-wide Ghostscript -installation rather than in "their own" pstoraster filter. (This -CUPS-enabling Ghostscript version may be installed either as a -patch to GNU or AFPL Ghostscript, or as a complete ESP Ghostscript package). -However, this will not change the cupsomatic approach of guiding the printjob -along a different path through the filtering system than the standard CUPS -way... - - - -Once you installed a printer inside CUPS with one of the -recommended methods (the lpadmin command, the web browser interface or one of -the available GUI wizards), you can use cupsaddsmb to share the -printer via Samba. cupsaddsmb prepares the driver files for -comfortable client download and installation upon their first contact with -this printer share. - - - - - -<command>cupsaddsmb</command> - - - -The cupsaddsmb command copies the needed files -for convenient Windows client installations from the previously prepared CUPS -data directory to your [print$] share. Additionally, the PPD -associated with this printer is copied from /etc/cups/ppd/ to -[print$]. - - - -root# cupsaddsmb -U root infotec_IS2027 -Password for root required to access localhost via SAMBA: [type in password 'secret'] - - - -To share all printers and drivers, use the -a -parameter instead of a printer name. - - - - -Probably you want to see what's going on. Use the --v parameter to get a more verbose output: - - - -root# cupsaddsmb -v -U root infotec_IS2027 - Password for root required to access localhost via SAMBA: - Running command: smbclient //localhost/print\$ -N -U'root%secret' -c 'mkdir W32X86;put /var/spool/cups/tmp/3cd1cc66376c0 W32X86/infotec_IS2027.PPD;put /usr/share/cups/drivers/ADOBEPS5.DLL W32X86/ADOBEPS5.DLL;put /usr/share/cups/drivers/ADOBEPSU.DLL W32X86/ADOBEPSU.DLL;put /usr/share/cups/drivers/ADOBEPSU.HLP W32X86/ADOBEPSU.HLP' - added interface ip=10.160.16.45 bcast=10.160.31.255 nmask=255.255.240.0 - added interface ip=192.168.182.1 bcast=192.168.182.255 nmask=255.255.255.0 - added interface ip=172.16.200.1 bcast=172.16.200.255 nmask=255.255.255.0 - Domain=[TUX-NET] OS=[Unix] Server=[Samba 2.2.3a.200204262025cvs] - NT_STATUS_OBJECT_NAME_COLLISION making remote directory \W32X86 - putting file /var/spool/cups/tmp/3cd1cc66376c0 as \W32X86/infotec_IS2027.PPD (17394.6 kb/s) (average 17395.2 kb/s) - putting file /usr/share/cups/drivers/ADOBEPS5.DLL as \W32X86/ADOBEPS5.DLL (10877.4 kb/s) (average 11343.0 kb/s) - putting file /usr/share/cups/drivers/ADOBEPSU.DLL as \W32X86/ADOBEPSU.DLL (5095.2 kb/s) (average 9260.4 kb/s) - putting file /usr/share/cups/drivers/ADOBEPSU.HLP as \W32X86/ADOBEPSU.HLP (8828.7 kb/s) (average 9247.1 kb/s) - - Running command: smbclient //localhost/print\$ -N -U'root%secret' -c 'mkdir WIN40;put /var/spool/cups/tmp/3cd1cc66376c0 WIN40/infotec_IS2027.PPD;put /usr/share/cups/drivers/ADFONTS.MFM WIN40/ADFONTS.MFM;put /usr/share/cups/drivers/ADOBEPS4.DRV WIN40/ADOBEPS4.DRV;put /usr/share/cups/drivers/ADOBEPS4.HLP WIN40/ADOBEPS4.HLP;put /usr/share/cups/drivers/DEFPRTR2.PPD WIN40/DEFPRTR2.PPD;put /usr/share/cups/drivers/ICONLIB.DLL WIN40/ICONLIB.DLL;put /usr/share/cups/drivers/PSMON.DLL WIN40/PSMON.DLL;' - added interface ip=10.160.16.45 bcast=10.160.31.255 nmask=255.255.240.0 - added interface ip=192.168.182.1 bcast=192.168.182.255 nmask=255.255.255.0 - added interface ip=172.16.200.1 bcast=172.16.200.255 nmask=255.255.255.0 - Domain=[TUX-NET] OS=[Unix] Server=[Samba 2.2.3a.200204262025cvs] - NT_STATUS_OBJECT_NAME_COLLISION making remote directory \WIN40 - putting file /var/spool/cups/tmp/3cd1cc66376c0 as \WIN40/infotec_IS2027.PPD (26091.5 kb/s) (average 26092.8 kb/s) - putting file /usr/share/cups/drivers/ADFONTS.MFM as \WIN40/ADFONTS.MFM (11241.6 kb/s) (average 11812.9 kb/s) - putting file /usr/share/cups/drivers/ADOBEPS4.DRV as \WIN40/ADOBEPS4.DRV (16640.6 kb/s) (average 14679.3 kb/s) - putting file /usr/share/cups/drivers/ADOBEPS4.HLP as \WIN40/ADOBEPS4.HLP (11285.6 kb/s) (average 14281.5 kb/s) - putting file /usr/share/cups/drivers/DEFPRTR2.PPD as \WIN40/DEFPRTR2.PPD (823.5 kb/s) (average 12944.0 kb/s) - putting file /usr/share/cups/drivers/ICONLIB.DLL as \WIN40/ICONLIB.DLL (19226.2 kb/s) (average 13169.7 kb/s) - putting file /usr/share/cups/drivers/PSMON.DLL as \WIN40/PSMON.DLL (18666.1 kb/s) (average 13266.7 kb/s) - - Running command: rpcclient localhost -N -U'root%secret' -c 'adddriver "Windows NT x86" "infotec_IS2027:ADOBEPS5.DLL:infotec_IS2027.PPD:ADOBEPSU.DLL:ADOBEPSU.HLP:NULL:RAW:NULL"' - cmd = adddriver "Windows NT x86" "infotec_IS2027:ADOBEPS5.DLL:infotec_IS2027.PPD:ADOBEPSU.DLL:ADOBEPSU.HLP:NULL:RAW:NULL" - Printer Driver infotec_IS2027 successfully installed. - - Running command: rpcclient localhost -N -U'root%secret' -c 'adddriver "Windows 4.0" "infotec_IS2027:ADOBEPS4.DRV:infotec_IS2027.PPD:NULL:ADOBEPS4.HLP:PSMON.DLL:RAW:ADFONTS.MFM,DEFPRTR2.PPD,ICONLIB.DLL"' - cmd = adddriver "Windows 4.0" "infotec_IS2027:ADOBEPS4.DRV:infotec_IS2027.PPD:NULL:ADOBEPS4.HLP:PSMON.DLL:RAW:ADFONTS.MFM,DEFPRTR2.PPD,ICONLIB.DLL" - Printer Driver infotec_IS2027 successfully installed. - - Running command: rpcclient localhost -N -U'root%secret' -c 'setdriver infotec_IS2027 infotec_IS2027' - cmd = setdriver infotec_IS2027 infotec_IS2027 - Succesfully set infotec_IS2027 to driver infotec_IS2027. - - root# - - - -If you look closely, you'll discover your root password -was transfered unencrypted over the wire, so beware! Also, if you look -further her, you'll discover error messages like -NT_STATUS_OBJECT_NAME_COLLISION in between. They occur, because -the directories WIN40 and W32X86 already -existed in the [print$] driver download share (from a previous driver -installation). They are harmless here. - - - -Now your printer is prepared for the clients to use. From -a client, browse to the CUPS/Samba server, open the "Printers" -share, right-click on this printer and select "Install..." or -"Connect..." (depending on the Windows version you use). Now their -should be a new printer in your client's local "Printers" folder, -named (in my case) "infotec_IS2027 on kdebitshop" - - - -NOTE: -cupsaddsmb will only reliably work i -with CUPS version 1.1.15 or higher -and Samba from 2.2.4. If it doesn't work, or if the automatic printer -driver download to the clients doesn't succeed, you can still manually -install the CUPS printer PPD on top of the Adobe PostScript driver on -clients and then point the client's printer queue to the Samba printer -share for connection, should you desire to use the CUPS networked -PostScript RIP functions. - - - - - - diff --git a/docs/docbook/projdoc/security_level.sgml b/docs/docbook/projdoc/security_level.sgml index 46a2ad7fe4..efe2b6eaf3 100644 --- a/docs/docbook/projdoc/security_level.sgml +++ b/docs/docbook/projdoc/security_level.sgml @@ -1,4 +1,4 @@ - + AndrewTridgell diff --git a/docs/docbook/scripts/README.ldp_print b/docs/docbook/scripts/README.ldp_print deleted file mode 100644 index 8d61a85534..0000000000 --- a/docs/docbook/scripts/README.ldp_print +++ /dev/null @@ -1,60 +0,0 @@ - -###################################################################### - ldp_print - print tool/script for DocBook SGML/XML documents -###################################################################### - -This process/script is used in the production environment for the -LDP. It relies on the HTMLDOC software package (GPL'ed) which can be -obtained from the Easy Software Products (c) web site: - - http://www.easysw.com/htmldoc/ - -This process creates a PDF variant from the single-file HTML -representation of a DocBook SGML (or XML) instance. The simple -wrapper script (ldp_print) assumes that the file was created using -{open}jade in a manner similar to: - - jade -t sgml -i html -V nochunks -d $style $fname > $fname.html - -Give the script the filename as an argument. It will then parse the -file into 'title.html' and 'body.html' and send each to htmldoc (as -the corresponding title page and body of the document). - - -CAVEATS -======= - -o Assumes perl is in /usr/bin; adjust if necessary - -o You may need to specify where the htmldoc executable resides. - The script assumes it's within your $PATH. - -o If you want Postscript as an output variant, uncomment the - appropriate lines (see below). - -o Relies on output from a DocBook instance created via DSSSL/{open}jade! - -o Cleans up (removes) the intermediate files it creates (but not the - PDF or Postscript files, obviously!) - -o Works silently; PDF (PostScript) will be created in the same directory - as was specified for the input (single-file HTML) file. - -o Provided without warranty or support! - -o I ran into a problem with htmldoc v1.8.8 which required a source - code change (I was getting a core dump from the htmldoc process). - Here is the change required: - - htmldoc/ps-pdf.cxx : - 3662,3665d3661 - < /* gjf = 11Oct2000 */ - < if( temprow == NULL ) - < break; - < - - -==== -gferg (at) sgi.com / Ferg -11 Jan 2000 - diff --git a/docs/docbook/scripts/collateindex.pl b/docs/docbook/scripts/collateindex.pl deleted file mode 100644 index fd757edb32..0000000000 --- a/docs/docbook/scripts/collateindex.pl +++ /dev/null @@ -1,595 +0,0 @@ -# -*- Perl -*- -# - -use Getopt::Std; - -$usage = "Usage: $0 file -Where are: - -p Link to points in the document. The default is to link - to the closest containing section. - -g Group terms with IndexDiv based on the first letter - of the term (or its sortas attribute). - (This probably doesn't handle i10n particularly well) - -s name Name the IndexDiv that contains symbols. The default - is 'Symbols'. Meaningless if -g is not used. - -t name Title for the index. - -P file Read a preamble from file. The content of file will - be inserted before the tag. - -i id The ID for the tag. - -o file Output to file. Defaults to stdout. - -S scope Scope of the index, must be 'all', 'local', or 'global'. - If unspecified, 'all' is assumed. - -I scope The implied scope, must be 'all', 'local', or 'global'. - IndexTerms which do not specify a scope will have the - implied scope. If unspecified, 'all' is assumed. - -x Make a SetIndex. - -f Force the output file to be written, even if it appears - to have been edited by hand. - -N New index (generates an empty index file). - file The file containing index data generated by Jade - with the DocBook HTML Stylesheet.\n"; - -die $usage if ! getopts('Dfgi:NpP:s:o:S:I:t:x'); - -$linkpoints = $opt_p; -$lettergroups = $opt_g; -$symbolsname = $opt_s || "Symbols"; -$title = $opt_t; -$preamble = $opt_P; -$outfile = $opt_o || '-'; -$indexid = $opt_i; -$scope = uc($opt_S) || 'ALL'; -$impliedscope = uc($opt_I) || 'ALL'; -$setindex = $opt_x; -$forceoutput = $opt_f; -$newindex = $opt_N; -$debug = $opt_D; - -$indextag = $setindex ? 'setindex' : 'index'; - -if ($newindex) { - safe_open(*OUT, $outfile); - if ($indexid) { - print OUT "<$indextag id='$indexid'>\n\n"; - } else { - print OUT "<$indextag>\n\n"; - } - - print OUT "\n"; - print OUT "\n"; - - print OUT "\n"; - exit 0; -} - -$dat = shift @ARGV || die $usage; -die "$0: cannot find $dat.\n" if ! -f $dat; - -%legal_scopes = ('ALL' => 1, 'LOCAL' => 1, 'GLOBAL' => 1); -if ($scope && !$legal_scopes{$scope}) { - die "Invalid scope.\n$usage\n"; -} -if ($impliedscope && !$legal_scopes{$impliedscope}) { - die "Invalid implied scope.\n$usage\n"; -} - -@term = (); -%id = (); - -$termcount = 0; - -print STDERR "Processing $dat...\n"; - -# Read the index file, creating an array of objects. Each object -# represents and indexterm and has fields for the content of the -# indexterm - -open (F, $dat); -while () { - chop; - - if (/^\/indexterm/i) { - push (@term, $idx); - next; - } - - if (/^indexterm (.*)$/i) { - $termcount++; - $idx = {}; - $idx->{'zone'} = {}; - $idx->{'href'} = $1; - $idx->{'count'} = $termcount; - $idx->{'scope'} = $impliedscope; - next; - } - - if (/^indexpoint (.*)$/i) { - $idx->{'hrefpoint'} = $1; - next; - } - - if (/^title (.*)$/i) { - $idx->{'title'} = $1; - next; - } - - if (/^primary[\[ ](.*)$/i) { - if (/^primary\[(.*?)\] (.*)$/i) { - $idx->{'psortas'} = $1; - $idx->{'primary'} = $2; - } else { - $idx->{'psortas'} = $1; - $idx->{'primary'} = $1; - } - next; - } - - if (/^secondary[\[ ](.*)$/i) { - if (/^secondary\[(.*?)\] (.*)$/i) { - $idx->{'ssortas'} = $1; - $idx->{'secondary'} = $2; - } else { - $idx->{'ssortas'} = $1; - $idx->{'secondary'} = $1; - } - next; - } - - if (/^tertiary[\[ ](.*)$/i) { - if (/^tertiary\[(.*?)\] (.*)$/i) { - $idx->{'tsortas'} = $1; - $idx->{'tertiary'} = $2; - } else { - $idx->{'tsortas'} = $1; - $idx->{'tertiary'} = $1; - } - next; - } - - if (/^see (.*)$/i) { - $idx->{'see'} = $1; - next; - } - - if (/^seealso (.*)$/i) { - $idx->{'seealso'} = $1; - next; - } - - if (/^significance (.*)$/i) { - $idx->{'significance'} = $1; - next; - } - - if (/^class (.*)$/i) { - $idx->{'class'} = $1; - next; - } - - if (/^scope (.*)$/i) { - $idx->{'scope'} = uc($1); - next; - } - - if (/^startref (.*)$/i) { - $idx->{'startref'} = $1; - next; - } - - if (/^id (.*)$/i) { - $idx->{'id'} = $1; - $id{$1} = $idx; - next; - } - - if (/^zone (.*)$/i) { - my($href) = $1; - $_ = scalar(); - chop; - die "Bad zone: $_\n" if !/^title (.*)$/i; - $idx->{'zone'}->{$href} = $1; - next; - } - - die "Unrecognized: $_\n"; -} -close (F); - -print STDERR "$termcount entries loaded...\n"; - -# Fixup the startrefs... -# In DocBook, STARTREF is a #CONREF attribute; support this by copying -# all of the fields from the indexterm with the id specified by STARTREF -# to the indexterm that has the STARTREF. -foreach $idx (@term) { - my($ididx, $field); - if ($idx->{'startref'}) { - $ididx = $id{$idx->{'startref'}}; - foreach $field ('primary', 'secondary', 'tertiary', 'see', 'seealso', - 'psortas', 'ssortas', 'tsortas', 'significance', - 'class', 'scope') { - $idx->{$field} = $ididx->{$field}; - } - } -} - -# Sort the index terms -@term = sort termsort @term; - -# Move all of the non-alphabetic entries to the front of the index. -@term = sortsymbols(@term); - -safe_open(*OUT, $outfile); - -# Write the index... -if ($indexid) { - print OUT "<$indextag id='$indexid'>\n\n"; -} else { - print OUT "<$indextag>\n\n"; -} - -print OUT "\n"; -print OUT "\n"; - -print OUT "\n\n"; - -print OUT "$title\n\n" if $title; - -$last = {}; # the last indexterm we processed -$first = 1; # this is the first one -$group = ""; # we're not in a group yet -$lastout = ""; # we've not put anything out yet - -foreach $idx (@term) { - next if $idx->{'startref'}; # no way to represent spans... - next if ($idx->{'scope'} eq 'LOCAL') && ($scope eq 'GLOBAL'); - next if ($idx->{'scope'} eq 'GLOBAL') && ($scope eq 'LOCAL'); - next if &same($idx, $last); # suppress duplicates - - $termcount--; - - # If primary changes, output a whole new index term, otherwise just - # output another secondary or tertiary, as appropriate. We know from - # sorting that the terms will always be in the right order. - if (!&tsame($last, $idx, 'primary')) { - print "DIFF PRIM\n" if $debug; - &end_entry() if not $first; - - if ($lettergroups) { - # If we're grouping, make the right indexdivs - $letter = $idx->{'psortas'}; - $letter = $idx->{'primary'} if !$letter; - $letter = uc(substr($letter, 0, 1)); - - # symbols are a special case - if (($letter lt 'A') || ($letter gt 'Z')) { - if (($group eq '') - || (($group ge 'A') && ($group le 'Z'))) { - print OUT "\n" if !$first; - print OUT "$symbolsname\n\n"; - $group = $letter; - } - } elsif (($group eq '') || ($group ne $letter)) { - print OUT "\n" if !$first; - print OUT "$letter\n\n"; - $group = $letter; - } - } - - $first = 0; # there can only be on first ;-) - - print OUT "\n"; - print OUT " ", $idx->{'primary'}; - $lastout = "primaryie"; - - if ($idx->{'secondary'}) { - print OUT "\n \n"; - print OUT " ", $idx->{'secondary'}; - $lastout = "secondaryie"; - }; - - if ($idx->{'tertiary'}) { - print OUT "\n \n"; - print OUT " ", $idx->{'tertiary'}; - $lastout = "tertiaryie"; - } - } elsif (!&tsame($last, $idx, 'secondary')) { - print "DIFF SEC\n" if $debug; - - print OUT "\n \n" if $lastout; - - print OUT " ", $idx->{'secondary'}; - $lastout = "secondaryie"; - if ($idx->{'tertiary'}) { - print OUT "\n \n"; - print OUT " ", $idx->{'tertiary'}; - $lastout = "tertiaryie"; - } - } elsif (!&tsame($last, $idx, 'tertiary')) { - print "DIFF TERT\n" if $debug; - - print OUT "\n \n" if $lastout; - - if ($idx->{'tertiary'}) { - print OUT " ", $idx->{'tertiary'}; - $lastout = "tertiaryie"; - } - } - - &print_term($idx); - - $last = $idx; -} - -# Termcount is > 0 iff some entries were skipped. -print STDERR "$termcount entries ignored...\n"; - -&end_entry(); - -print OUT "\n" if $lettergroups; -print OUT "\n"; - -close (OUT); - -print STDERR "Done.\n"; - -sub same { - my($a) = shift; - my($b) = shift; - - my($aP) = $a->{'psortas'} || $a->{'primary'}; - my($aS) = $a->{'ssortas'} || $a->{'secondary'}; - my($aT) = $a->{'tsortas'} || $a->{'tertiary'}; - - my($bP) = $b->{'psortas'} || $b->{'primary'}; - my($bS) = $b->{'ssortas'} || $b->{'secondary'}; - my($bT) = $b->{'tsortas'} || $b->{'tertiary'}; - - my($same); - - $aP =~ s/^\s*//; $aP =~ s/\s*$//; $aP = uc($aP); - $aS =~ s/^\s*//; $aS =~ s/\s*$//; $aS = uc($aS); - $aT =~ s/^\s*//; $aT =~ s/\s*$//; $aT = uc($aT); - $bP =~ s/^\s*//; $bP =~ s/\s*$//; $bP = uc($bP); - $bS =~ s/^\s*//; $bS =~ s/\s*$//; $bS = uc($bS); - $bT =~ s/^\s*//; $bT =~ s/\s*$//; $bT = uc($bT); - -# print "[$aP]=[$bP]\n"; -# print "[$aS]=[$bS]\n"; -# print "[$aT]=[$bT]\n"; - - # Two index terms are the same if: - # 1. the primary, secondary, and tertiary entries are the same - # (or have the same SORTAS) - # AND - # 2. They occur in the same titled section - # AND - # 3. They point to the same place - # - # Notes: Scope is used to suppress some entries, but can't be used - # for comparing duplicates. - # Interpretation of "the same place" depends on whether or - # not $linkpoints is true. - - $same = (($aP eq $bP) - && ($aS eq $bS) - && ($aT eq $bT) - && ($a->{'title'} eq $b->{'title'}) - && ($a->{'href'} eq $b->{'href'})); - - # If we're linking to points, they're only the same if they link - # to exactly the same spot. (surely this is redundant?) - $same = $same && ($a->{'hrefpoint'} eq $b->{'hrefpoint'}) - if $linkpoints; - - $same; -} - -sub tsame { - # Unlike same(), tsame only compares a single term - my($a) = shift; - my($b) = shift; - my($term) = shift; - my($sterm) = substr($term, 0, 1) . "sortas"; - my($A, $B); - - $A = $a->{$sterm} || $a->{$term}; - $B = $b->{$sterm} || $b->{$term}; - - $A =~ s/^\s*//; $A =~ s/\s*$//; $A = uc($A); - $B =~ s/^\s*//; $B =~ s/\s*$//; $B = uc($B); - - return $A eq $B; -} - -sub end_entry { - # End any open elements... - print OUT "\n \n" if $lastout; - print OUT "\n\n"; - $lastout = ""; -} - -sub print_term { - # Print out the links for an indexterm. There can be more than - # one if the term has a ZONE that points to more than one place. - # (do we do the right thing in that case?) - my($idx) = shift; - my($key, $indent, @hrefs); - my(%href) = (); - my(%phref) = (); - - $indent = " "; - - if ($idx->{'see'}) { - # it'd be nice to make this a link... - if ($lastout) { - print OUT "\n \n"; - $lastout = ""; - } - print OUT $indent, "", $idx->{'see'}, "\n"; - return; - } - - if ($idx->{'seealso'}) { - # it'd be nice to make this a link... - if ($lastout) { - print OUT "\n \n"; - $lastout = ""; - } - print OUT $indent, "", $idx->{'seealso'}, "\n"; - return; - } - - if (keys %{$idx->{'zone'}}) { - foreach $key (keys %{$idx->{'zone'}}) { - $href{$key} = $idx->{'zone'}->{$key}; - $phref{$key} = $idx->{'zone'}->{$key}; - } - } else { - $href{$idx->{'href'}} = $idx->{'title'}; - $phref{$idx->{'href'}} = $idx->{'hrefpoint'}; - } - - # We can't use because we don't know the ID of the term in the - # original source (and, in fact, it might not have one). - print OUT ",\n"; - @hrefs = keys %href; - while (@hrefs) { - my($linkend) = ""; - my($role) = ""; - $key = shift @hrefs; - if ($linkpoints) { - $linkend = $phref{$key}; - } else { - $linkend = $key; - } - - $role = $linkend; - $role = $1 if $role =~ /\#(.*)$/; - - print OUT $indent; - print OUT ""; - print OUT "" if ($idx->{'significance'} eq 'PREFERRED'); - print OUT $href{$key}; - print OUT "" if ($idx->{'significance'} eq 'PREFERRED'); - print OUT ""; - } -} - -sub termsort { - my($aP) = $a->{'psortas'} || $a->{'primary'}; - my($aS) = $a->{'ssortas'} || $a->{'secondary'}; - my($aT) = $a->{'tsortas'} || $a->{'tertiary'}; - my($ap) = $a->{'count'}; - - my($bP) = $b->{'psortas'} || $b->{'primary'}; - my($bS) = $b->{'ssortas'} || $b->{'secondary'}; - my($bT) = $b->{'tsortas'} || $b->{'tertiary'}; - my($bp) = $b->{'count'}; - - $aP =~ s/^\s*//; $aP =~ s/\s*$//; $aP = uc($aP); - $aS =~ s/^\s*//; $aS =~ s/\s*$//; $aS = uc($aS); - $aT =~ s/^\s*//; $aT =~ s/\s*$//; $aT = uc($aT); - $bP =~ s/^\s*//; $bP =~ s/\s*$//; $bP = uc($bP); - $bS =~ s/^\s*//; $bS =~ s/\s*$//; $bS = uc($bS); - $bT =~ s/^\s*//; $bT =~ s/\s*$//; $bT = uc($bT); - - if ($aP eq $bP) { - if ($aS eq $bS) { - if ($aT eq $bT) { - # make sure seealso's always sort to the bottom - return 1 if ($a->{'seealso'}); - return -1 if ($b->{'seealso'}); - # if everything else is the same, keep these elements - # in document order (so the index links are in the right - # order) - return $ap <=> $bp; - } else { - return $aT cmp $bT; - } - } else { - return $aS cmp $bS; - } - } else { - return $aP cmp $bP; - } -} - -sub sortsymbols { - my(@term) = @_; - my(@new) = (); - my(@sym) = (); - my($letter); - my($idx); - - # Move the non-letter things to the front. Should digits be thier - # own group? Maybe... - foreach $idx (@term) { - $letter = $idx->{'psortas'}; - $letter = $idx->{'primary'} if !$letter; - $letter = uc(substr($letter, 0, 1)); - - if (($letter lt 'A') || ($letter gt 'Z')) { - push (@sym, $idx); - } else { - push (@new, $idx); - } - } - - return (@sym, @new); -} - -sub safe_open { - local(*OUT) = shift; - local(*F, $_); - - if (($outfile ne '-') && (!$forceoutput)) { - my($handedit) = 1; - if (open (OUT, $outfile)) { - while () { - if (//){ - $handedit = 0; - last; - } - } - close (OUT); - } else { - $handedit = 0; - } - - if ($handedit) { - print "\n$outfile appears to have been edited by hand; use -f or\n"; - print " change the output file.\n"; - exit 1; - } - } - - open (OUT, ">$outfile") || die "$usage\nCannot write to $outfile.\n"; - - if ($preamble) { - # Copy the preamble - if (open(F, $preamble)) { - while () { - print OUT $_; - } - close(F); - } else { - warn "$0: cannot open preamble $preamble.\n"; - } - } -} diff --git a/docs/docbook/scripts/fix_print_html.lib b/docs/docbook/scripts/fix_print_html.lib deleted file mode 100644 index e8a9aaa4c7..0000000000 --- a/docs/docbook/scripts/fix_print_html.lib +++ /dev/null @@ -1,172 +0,0 @@ -# -# fix_print_html.lib -# -# Dan Scott / -# Ferg / -# -# Used to prepare single-file HTML variant for PDF/Postscript creation -# thru htmldoc. -# -# log: -# 16Oct2000 - initial entry -# 03Apr2001 - fix for -# -# - -sub fix_print_html { - - my($in,$out,$ttl) = @_; - - open(IN_FILE, "< $in") || do { - print "fix_print_html: cannot open $in: $!\n"; - return 0; - }; - - my($buf,$ttl_buf) = ''; - my($indx) = -1; - my($is_article) = 0; - while() { - - if( $indx == 1 ) { - - # ignore everything until we see the chapter or sect - # - if( $_ =~ /CLASS="CHAP/i || $_ =~ /CLASS="PREF/i ) { - - $buf .= $_; - $indx++; - - } elsif( $_ =~ /CLASS="SECT/ || $_ =~ /CLASS="sect/ ) { - - $buf .= $_; - $indx++; - $is_article = 1; - - } else { - next; - } - - } elsif( $indx == 0 ) { - - # write out the title page file - # - if( $_ =~ /CLASS="TOC"/ ) { - - $ttl_buf .= ">\n\n\n"; - $ttl_buf =~ s/<\/H1\n/<\/H1\n>


$ttl") || do { - print "fix_print_html: cannot open $ttl: $!\n"; - close(IN_FILE); - return 0; - }; - print TOC_FILE $ttl_buf; - close(TOC_FILE); - $ttl_buf = ''; - $indx++; - - } else { - $ttl_buf .= $_; - } - - } elsif( $indx < 0 ) { - - # up to this point, both buffers get the line - # - if( $_ =~ /CLASS="TITLEPAGE"/ ) { - - $ttl_buf .= $_ . ">\n

\n



\n<\/P\n"; - $indx++; - - } else { - $buf .= $_; - $ttl_buf .= $_; - } - - } else { - - $buf .= $_; - } - } - close(IN_FILE); - - open(OUT_FILE, "> $out") || do { - print "fix_print_html: cannot open $out: $!\n"; - return 0; - }; - - - # make these corrections and write out the file - # - - $buf =~ s/(\n>/$1$2\n/gms; - $buf =~ s/(\n>/$1$2\n/gms; - $buf =~ s/(\n>/$1$2\n/gms; - if( $is_article == 0 ) { - $buf =~ s/(\nCLASS="SECT[TION\d]+"\n>)

) -1 ) { - $buf = substr($buf, 0, $indx); - $buf .= "\n<\/BODY>\n<\/HTML>\n\n"; - } elsif( ($indx = rindex($buf, " -1 ) { - $buf = substr($buf, 0, $indx); - $buf .= "\n<\/BODY>\n<\/HTML>\n\n"; - } - $buf =~ s/\&\#13;//g; - $buf =~ s/\&\#60;/\</g; - $buf =~ s/\&\#62;/\>/g; - $buf =~ s/\&\#8211;/\-/g; - $buf =~ s/WIDTH=\"\d\"//g; - $buf =~ s/><[\/]*TBODY//g; - $buf =~ s/><[\/]*THEAD//g; - $buf =~ s/TYPE=\"1\"\n//gim; - - if( $is_article == 0 ) { - - # for books...decrement the headers by 1 and then re-set the - # chapter level only to H1... - # - my($cnt,$j) = 0; - for($cnt=5; $cnt > 0; $cnt--) { - $j = $cnt + 1; - $buf =~ s/<\/DIV\n//gms; - $buf =~ s/(>(<\/LI\n)/$1$2$3/gms; - - print OUT_FILE $buf; - close(OUT_FILE); - - return 1; -} - -# Return true from package include -# -1; - diff --git a/docs/docbook/scripts/ldp_print b/docs/docbook/scripts/ldp_print deleted file mode 100755 index 70bb801def..0000000000 --- a/docs/docbook/scripts/ldp_print +++ /dev/null @@ -1,71 +0,0 @@ -#!/usr/bin/perl -w -# -# usage: ldp_print -# -# Creates a PDF variant of a single-file HTML representation of a -# DocBook SGML (or XML) instance. This simple wrapper assumes that -# the file was created using {open}jade in a manner similar to: -# -# jade -t sgml -i html -V nochunks -d $style $fname > $fname.html -# -# Give this script the filename as an argument. It will then parse -# the file into 'title.html' and 'body.html' and send each to -# htmldoc (as the corresponding title page and body of the document). -# -# -# CAVEATS: -# -# Assumes perl is in /usr/bin; adjust if necessary -# -# You may need to specify where the htmldoc executable resides. -# The script assumes it's within your $PATH. -# -# If you want Postscript as an output variant, uncomment the -# appropriate lines (see below). -# -# Relies on output from a DocBook instance created via DSSSL/{open}jade! -# -# Cleans up (removes) the intermediate files it creates (but not the -# PDF or Postscript files, obviously!) -# -# Works silently; PDF (PostScript) will be created in the same directory -# as was specified for the input (single-file HTML) file. -# -# Provided without warranty or support! -# -# gferg@sgi.com / Ferg (used as part of the LDP production env) -# - -use strict; -push(@INC, "./"); -require 'fix_print_html.lib'; - -if( $ARGV[0] eq '' || !(-r $ARGV[0]) ) { - die "\nusage: ldp_print \n\n"; -} - -my($fname_wo_ext) = $ARGV[0]; -$fname_wo_ext =~ s/\.[\w]+$//; - - -# create new files from single HTML file to use for print -# -&fix_print_html($ARGV[0], 'body.html', 'title.html'); - -my($cmd) = "htmldoc --size universal -t pdf -f ${fname_wo_ext}.pdf " . - "--firstpage p1 --titlefile title.html body.html"; - -# For postscript output; append onto the above cmd string: -# -# "; htmldoc --size universal -t ps -f -f ${fname_wo_ext}.ps " . -# "--firstpage p1 --titlefile title.html body.html"; -# -system($cmd); -die "\nldp_print: could not create ${fname_wo_ext}.pdf ($!)\n" if ($?); - -# cleanup -# -system("rm -f body.html title.html"); - -exit(0); - diff --git a/docs/docbook/scripts/make-article.pl b/docs/docbook/scripts/make-article.pl deleted file mode 100644 index d1f8c66832..0000000000 --- a/docs/docbook/scripts/make-article.pl +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/perl - -$ignore = 0; - -print "\n"; - -while () { - - $_ =~ s/') { - $ignore = 1; - } - - if ( $_ =~ '') { - $ignore = 0; - $_ = ""; - } - - - if (! $ignore) { print "$_"; } - - -} diff --git a/docs/docbook/stylesheets/ldp.dsl.in b/docs/docbook/stylesheets/ldp.dsl.in deleted file mode 100644 index d6e06f4b6d..0000000000 --- a/docs/docbook/stylesheets/ldp.dsl.in +++ /dev/null @@ -1,256 +0,0 @@ - - - -]]> - - -]]> -]> - - - - - - -;; ============================== -;; customize the print stylesheet -;; ============================== - -(declare-characteristic preserve-sdata? - ;; this is necessary because right now jadetex does not understand - ;; symbolic entities, whereas things work well with numeric entities. - "UNREGISTERED::James Clark//Characteristic::preserve-sdata?" - #f) - -(define %generate-article-toc% - ;; Should a Table of Contents be produced for Articles? - #t) - -(define (toc-depth nd) - 2) - -(define %generate-article-titlepage-on-separate-page% - ;; Should the article title page be on a separate page? - #t) - -(define %section-autolabel% - ;; Are sections enumerated? - #t) - -(define %footnote-ulinks% - ;; Generate footnotes for ULinks? - #f) - -(define %bop-footnotes% - ;; Make "bottom-of-page" footnotes? - #f) - -(define %body-start-indent% - ;; Default indent of body text - 0pi) - -(define %para-indent-firstpara% - ;; First line start-indent for the first paragraph - 0pt) - -(define %para-indent% - ;; First line start-indent for paragraphs (other than the first) - 0pt) - -(define %block-start-indent% - ;; Extra start-indent for block-elements - 0pt) - -(define formal-object-float - ;; Do formal objects float? - #t) - -(define %hyphenation% - ;; Allow automatic hyphenation? - #t) - -(define %admon-graphics% - ;; Use graphics in admonitions? - #f) - - - - - - - - - - -(declare-characteristic preserve-sdata? - ;; this is necessary because right now jadetex does not understand - ;; symbolic entities, whereas things work well with numeric entities. - "UNREGISTERED::James Clark//Characteristic::preserve-sdata?" - #f) - -(define %generate-legalnotice-link% - ;; put the legal notice in a separate file - #t) - -(define %admon-graphics-path% - ;; use graphics in admonitions, set their - "../images/") - -(define %admon-graphics% - #f) - -(define %funcsynopsis-decoration% - ;; make funcsynopsis look pretty - #t) - -(define %html-ext% - ;; when producing HTML files, use this extension - ".html") - -(define %generate-book-toc% - ;; Should a Table of Contents be produced for books? - #t) - -(define %generate-article-toc% - ;; Should a Table of Contents be produced for articles? - #t) - -(define %generate-part-toc% - ;; Should a Table of Contents be produced for parts? - #t) - -(define %generate-book-titlepage% - ;; produce a title page for books - #t) - -(define %generate-article-titlepage% - ;; produce a title page for articles - #t) - -(define (chunk-skip-first-element-list) - ;; forces the Table of Contents on separate page - '()) - -(define (list-element-list) - ;; fixes bug in Table of Contents generation - '()) - -(define %root-filename% - ;; The filename of the root HTML document (e.g, "index"). - "index") - -(define %shade-verbatim% - ;; verbatim sections will be shaded if t(rue) - #t) - -(define %use-id-as-filename% - ;; Use ID attributes as name for component HTML files? - #t) - -(define %graphic-extensions% - ;; graphic extensions allowed - '("gif" "png" "jpg" "jpeg" "tif" "tiff" "eps" "epsf" )) - -(define %graphic-default-extension% - "gif") - -(define %section-autolabel% - ;; For enumerated sections (1.1, 1.1.1, 1.2, etc.) - #t) - -(define (toc-depth nd) - ;; more depth (2 levels) to toc; instead of flat hierarchy - ;; 2) - 4) - -(element emphasis - ;; make role=strong equate to bold for emphasis tag - (if (equal? (attribute-string "role") "strong") - (make element gi: "STRONG" (process-children)) - (make element gi: "EM" (process-children)))) - -(define (book-titlepage-recto-elements) - ;; elements on a book's titlepage - ;; note: added revhistory to the default list - (list (normalize "title") - (normalize "subtitle") - (normalize "graphic") - (normalize "mediaobject") - (normalize "corpauthor") - (normalize "authorgroup") - (normalize "author") - (normalize "editor") - (normalize "copyright") - (normalize "revhistory") - (normalize "abstract") - (normalize "legalnotice"))) - -(define (article-titlepage-recto-elements) - ;; elements on an article's titlepage - ;; note: added othercredit to the default list - (list (normalize "title") - (normalize "subtitle") - (normalize "authorgroup") - (normalize "author") - (normalize "othercredit") - (normalize "releaseinfo") - (normalize "copyright") - (normalize "pubdate") - (normalize "revhistory") - (normalize "abstract"))) - -(mode article-titlepage-recto-mode - - (element contrib - ;; print out with othercredit information; for translators, etc. - (make sequence - (make element gi: "SPAN" - attributes: (list (list "CLASS" (gi))) - (process-children)))) - - (element othercredit - ;; print out othercredit information; for translators, etc. - (let ((author-name (author-string)) - (author-contrib (select-elements (children (current-node)) - (normalize "contrib")))) - (make element gi: "P" - attributes: (list (list "CLASS" (gi))) - (make element gi: "B" - (literal author-name) - (literal " - ")) - (process-node-list author-contrib)))) -) - -(define (article-title nd) - (let* ((artchild (children nd)) - (artheader (select-elements artchild (normalize "artheader"))) - (artinfo (select-elements artchild (normalize "articleinfo"))) - (ahdr (if (node-list-empty? artheader) - artinfo - artheader)) - (ahtitles (select-elements (children ahdr) - (normalize "title"))) - (artitles (select-elements artchild (normalize "title"))) - (titles (if (node-list-empty? artitles) - ahtitles - artitles))) - (if (node-list-empty? titles) - "" - (node-list-first titles)))) - - - - - - - - - -- cgit