From: James Troup Date: Wed, 17 May 2006 18:42:32 +0000 (-0500) Subject: Convert away from silly names X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5709024d25da3b89d53e278724691b1b1767ea5e;p=dak Convert away from silly names --- diff --git a/docs/Makefile b/docs/Makefile deleted file mode 100644 index feaa9442..00000000 --- a/docs/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/make -f - -# TODO: alyson andrea claire fernanda jenna neve rene shania tea ziyi - -SGMLMANPAGES = catherine.1.sgml charisma.1.sgml cindy.1.sgml heidi.1.sgml julia.1.sgml kelly.1.sgml lisa.1.sgml madison.1.sgml melanie.1.sgml natalie.1.sgml rhona.1.sgml alicia.1.sgml - -MANPAGES = $(patsubst %.sgml, %, $(SGMLMANPAGES)) - - -all: $(MANPAGES) - -%: %.sgml - docbook2man $< > /dev/null - -clean: - rm -f $(MANPAGES) manpage.lings manpage.log manpage.refs diff --git a/docs/manpages/Makefile b/docs/manpages/Makefile new file mode 100644 index 00000000..75cf3cc0 --- /dev/null +++ b/docs/manpages/Makefile @@ -0,0 +1,14 @@ +#!/usr/bin/make -f + +SGMLMANPAGES = check-overrides.1.sgml clean-suites.1.sgml control-overrides.1.sgml control-suite.1.sgml import-users-from-passwd.1.sgml ls.1.sgml make-maintainers.1.sgml override.1.sgml poolize.1.sgml process-accepted.1.sgml process-new.1.sgml rm.1.sgml + +MANPAGES = $(patsubst %.sgml, dak_%, $(SGMLMANPAGES)) + + +all: $(MANPAGES) + +dak_%: %.sgml + docbook2man $< > /dev/null + +clean: + rm -f $(MANPAGES) manpage.links manpage.log manpage.refs diff --git a/docs/cindy.1.sgml b/docs/manpages/check-overrides.1.sgml similarity index 55% rename from docs/cindy.1.sgml rename to docs/manpages/check-overrides.1.sgml index 44b98a21..a4a7c146 100644 --- a/docs/cindy.1.sgml +++ b/docs/manpages/check-overrides.1.sgml @@ -1,36 +1,36 @@ -%katieent; + +%dakent; ]> - &katie-docinfo; + &dak-docinfo; - cindy + dak_check-overrides 1 - cindy + dak check-overrides Utility to alter or display the contents of a suite - cindy + dak check-overrides Description</> <para> - <command>cindy</command> is a cruft checker for overrides. + <command>dak check-overrides</command> is a cruft checker for overrides. </PARA> </REFSECT1> @@ -48,11 +48,11 @@ <RefSect1><Title>Notes</> - <Para>cindy is not a good idea with New Incoming as she doesn't take into account queue/accepted. You can minimize the impact of this by running her immediately after kelly but that's still racy because lisa doesn't lock with elly. A better long term fix is the evil plan for accepted to be in the DB.</> + <Para>dak check-overrides is not a good idea with New Incoming as it doesn't take into account queue/accepted. You can minimize the impact of this by running it immediately after 'dak process-accepted' but that's still racy because 'dak process-new' doesn't lock with 'dak process-accepted'. A better long term fix is the evil plan for accepted to be in the DB.</> <RefSect1><Title>Diagnostics</> <para> - <command>cindy</command> returns zero on normal operation, non-zero on error. + <command>dak check-overrides</command> returns zero on normal operation, non-zero on error. </PARA> </RefSect1> diff --git a/docs/rhona.1.sgml b/docs/manpages/clean-suites.1.sgml similarity index 57% rename from docs/rhona.1.sgml rename to docs/manpages/clean-suites.1.sgml index 00dd432d..0691f5ac 100644 --- a/docs/rhona.1.sgml +++ b/docs/manpages/clean-suites.1.sgml @@ -1,36 +1,36 @@ <!-- -*- mode: sgml; mode: fold -*- --> <!doctype refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [ -<!ENTITY % katieent SYSTEM "katie.ent"> -%katieent; +<!ENTITY % dakent SYSTEM "dak.ent"> +%dakent; ]> <refentry> - &katie-docinfo; + &dak-docinfo; <refmeta> - <refentrytitle>rhona</> + <refentrytitle>dak_clean-suites</> <manvolnum>1</> </refmeta> <!-- Man page title --> <refnamediv> - <refname>rhona</> + <refname>dak clean-suites</> <refpurpose>Utility to clean out old packages</> </refnamediv> <!-- Arguments --> <refsynopsisdiv> <cmdsynopsis> - <command>rhona</> + <command>dak clean-suites</> <arg><option><replaceable>options</replaceable></></arg> </cmdsynopsis> </refsynopsisdiv> <RefSect1><Title>Description</> <para> - <command>rhona</command> is a utility clean out old packages. It will clean out any binary packages not referenced by a suite and any source packages not referenced by a suite and not referenced by any binary packages. Cleaning is not actual deletion, but rather, removal of packages from the pool to a 'morgue' directory. The 'morgue' directory is split into dated sub-directories to keep things sane in big archives. + <command>dak clean-suites</command> is a utility clean out old packages. It will clean out any binary packages not referenced by a suite and any source packages not referenced by a suite and not referenced by any binary packages. Cleaning is not actual deletion, but rather, removal of packages from the pool to a 'morgue' directory. The 'morgue' directory is split into dated sub-directories to keep things sane in big archives. </PARA> </REFSECT1> @@ -54,16 +54,16 @@ <refsect1> <title>Configuration - rhona uses katie's configuration file. It follows the typical ISC configuration format as seen in ISC tools like bind 8 and dhcpd. Apart from being able to alter the defaults for command line options, the following configuration items are used: + dak clean-suites uses dak's configuration file. It follows the typical ISC configuration format as seen in ISC tools like bind 8 and dhcpd. Apart from being able to alter the defaults for command line options, the following configuration items are used: - Rhona::StayOfExecution + Clean-Suites::StayOfExecution This is the number of seconds unreferenced packages are left before being cleaned. - Rhona::MorgueSubDir + Clean-Suites::MorgueSubDir If not blank, this is the subdirectory in the morgue used to hold removed packages. @@ -73,7 +73,7 @@ Diagnostics</> <para> - <command>rhona</command> returns zero on normal operation, non-zero on error. + <command>dak clean-suites</command> returns zero on normal operation, non-zero on error. </PARA> </RefSect1> diff --git a/docs/natalie.1.sgml b/docs/manpages/control-overrides.1.sgml similarity index 84% rename from docs/natalie.1.sgml rename to docs/manpages/control-overrides.1.sgml index 67447d25..26440ad4 100644 --- a/docs/natalie.1.sgml +++ b/docs/manpages/control-overrides.1.sgml @@ -1,36 +1,36 @@ <!-- -*- mode: sgml; mode: fold -*- --> <!doctype refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [ -<!ENTITY % katieent SYSTEM "katie.ent"> -%katieent; +<!ENTITY % dakent SYSTEM "dak.ent"> +%dakent; ]> <refentry> - &katie-docinfo; + &dak-docinfo; <refmeta> - <refentrytitle>natalie</> + <refentrytitle>dak_control-overrides</> <manvolnum>1</> </refmeta> <!-- Man page title --> <refnamediv> - <refname>natalie</> + <refname>dak control-overrides</> <refpurpose>Utility to manipulate the packages overrides</> </refnamediv> <!-- Arguments --> <refsynopsisdiv> <cmdsynopsis> - <command>natalie</> + <command>dak control-overrides</> <arg><option><replaceable>options</replaceable></option></arg> </cmdsynopsis> </refsynopsisdiv> <RefSect1><Title>Description</> <para> - <command>natalie</command> is the command line tool to handle override files. Override files can be listed or updated. + <command>dak control-overrides</command> is the command line tool to handle override files. Override files can be listed or updated. </para> </refsect1> <RefSect1><Title>Options</> @@ -89,7 +89,7 @@ <RefSect1><Title>Diagnostics</> <para> - <command>natalie</command> returns zero on normal operation, non-zero on error. + <command>dak control-overrides</command> returns zero on normal operation, non-zero on error. </para> </RefSect1> diff --git a/docs/heidi.1.sgml b/docs/manpages/control-suite.1.sgml similarity index 72% rename from docs/heidi.1.sgml rename to docs/manpages/control-suite.1.sgml index 8ff32df4..12c89c5a 100644 --- a/docs/heidi.1.sgml +++ b/docs/manpages/control-suite.1.sgml @@ -1,29 +1,29 @@ <!-- -*- mode: sgml; mode: fold -*- --> <!doctype refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [ -<!ENTITY % katieent SYSTEM "katie.ent"> -%katieent; +<!ENTITY % dakent SYSTEM "dak.ent"> +%dakent; ]> <refentry> - &katie-docinfo; + &dak-docinfo; <refmeta> - <refentrytitle>heidi</> + <refentrytitle>dak_control-suite</> <manvolnum>1</> </refmeta> <!-- Man page title --> <refnamediv> - <refname>heidi</> + <refname>dak control-suite</> <refpurpose>Utility to alter or display the contents of a suite</> </refnamediv> <!-- Arguments --> <refsynopsisdiv> <cmdsynopsis> - <command>heidi</> + <command>dak control-suite</> <arg><option><replaceable>options</replaceable></></arg> <arg choice="plain"><replaceable>file...</replaceable></arg> </cmdsynopsis> @@ -31,7 +31,7 @@ <RefSect1><Title>Description</> <para> - <command>heidi</command> is a utility to alter or display the contents of a suite. Input for alterations is taken either from filename(s) supplied or stdin. The format for both input and output is lines each with a whitespace separated list of: <literal>package</literal>, <literal>version</literal> and <literal>architecture</literal>. + <command>dak control-suite</command> is a utility to alter or display the contents of a suite. Input for alterations is taken either from filename(s) supplied or stdin. The format for both input and output is lines each with a whitespace separated list of: <literal>package</literal>, <literal>version</literal> and <literal>architecture</literal>. </PARA> </REFSECT1> @@ -73,7 +73,7 @@ <RefSect1><Title>Diagnostics</> <para> - <command>heidi</command> returns zero on normal operation, non-zero on error. + <command>dak control-suite</command> returns zero on normal operation, non-zero on error. </PARA> </RefSect1> diff --git a/docs/katie.ent b/docs/manpages/dak.ent similarity index 83% rename from docs/katie.ent rename to docs/manpages/dak.ent index 2c352299..1860e8e5 100644 --- a/docs/katie.ent +++ b/docs/manpages/dak.ent @@ -1,7 +1,7 @@ <!-- -*- mode: sgml; mode: fold -*- --> <!-- Boiler plate docinfo section --> -<!ENTITY katie-docinfo " +<!ENTITY dak-docinfo " <docinfo> <address><email>james@nocrew.org</email></address> <author><firstname>James</firstname> <surname>Troup</surname></author> @@ -14,7 +14,7 @@ <!ENTITY manauthor " <RefSect1><Title>Author - katie was written by James Troup james@nocrew.org. + dak was written by James Troup james@nocrew.org. "> diff --git a/docs/julia.1.sgml b/docs/manpages/import-users-from-passwd.1.sgml similarity index 63% rename from docs/julia.1.sgml rename to docs/manpages/import-users-from-passwd.1.sgml index ca35fa68..0fd48511 100644 --- a/docs/julia.1.sgml +++ b/docs/manpages/import-users-from-passwd.1.sgml @@ -1,36 +1,36 @@ -%katieent; + +%dakent; ]> - &katie-docinfo; + &dak-docinfo; - julia + dak_import-users-from-passwd 1 - julia + dak import-users-from-passwd Utility to sync PostgreSQL users with system users - julia + dak import-users-from-passwd Description</> <para> - <command>julia</command> is a utility to sync PostgreSQL's user database with the system's users. It is designed to allow the use of 'peer sameuser' authentication. It simply adds any users in the password file into PostgreSQL's pg_user table if they are already not there. It will also warn you about users who are in the pg_user table but not in the password file. + <command>dak import-users-from-passwd</command> is a utility to sync PostgreSQL's user database with the system's users. It is designed to allow the use of 'peer sameuser' authentication. It simply adds any users in the password file into PostgreSQL's pg_user table if they are already not there. It will also warn you about users who are in the pg_user table but not in the password file. </PARA> </REFSECT1> @@ -66,16 +66,16 @@ <refsect1> <title>Configuration - julia uses katie's configuration file. It follows the typical ISC configuration format as seen in ISC tools like bind 8 and dhcpd. Apart from being able to alter the defaults for command line options, the following configuration items are used: + dak import-users-from-passwd uses dak's configuration file. It follows the typical ISC configuration format as seen in ISC tools like bind 8 and dhcpd. Apart from being able to alter the defaults for command line options, the following configuration items are used: - Julia::ValidGID + Import-Users-From-Passwd::ValidGID Each user's primary GID is compared with this, if it's not blank. If they match, the user will be processed, if they don't, the user will be skipped. - Julia::KnownPostgresUsers + Import-Users-From-Passwd::KnownPostgresUsers This is a comma-separated list of users who are in PostgreSQL's pg_user table but are not in the password file. @@ -85,7 +85,7 @@ Diagnostics</> <para> - <command>julia</command> returns zero on normal operation, non-zero on error. + <command>dak import-users-from-passwd</command> returns zero on normal operation, non-zero on error. </PARA> </RefSect1> diff --git a/docs/madison.1.sgml b/docs/manpages/ls.1.sgml similarity index 88% rename from docs/madison.1.sgml rename to docs/manpages/ls.1.sgml index 7ebd6f36..c7c4f29a 100644 --- a/docs/madison.1.sgml +++ b/docs/manpages/ls.1.sgml @@ -1,29 +1,29 @@ <!-- -*- mode: sgml; mode: fold -*- --> <!doctype refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [ -<!ENTITY % katieent SYSTEM "katie.ent"> -%katieent; +<!ENTITY % dakent SYSTEM "dak.ent"> +%dakent; ]> <refentry> - &katie-docinfo; + &dak-docinfo; <refmeta> - <refentrytitle>madison</> + <refentrytitle>dak_ls</> <manvolnum>1</> </refmeta> <!-- Man page title --> <refnamediv> - <refname>madison</> + <refname>dak ls</> <refpurpose>Utility to display information about packages</> </refnamediv> <!-- Arguments --> <refsynopsisdiv> <cmdsynopsis> - <command>madison</> + <command>dak ls</> <arg><option><replaceable>options</replaceable></></arg> <arg choice="plain"><replaceable>package</replaceable></arg> </cmdsynopsis> @@ -31,7 +31,7 @@ <RefSect1><Title>Description</> <para> - <command>madison</command> is a utility to display information about packages, specificaly what suites they are in and for which architectures. + <command>dak ls</command> is a utility to display information about packages, specificaly what suites they are in and for which architectures. </PARA> </REFSECT1> @@ -95,7 +95,7 @@ <RefSect1><Title>Diagnostics</> <para> - <command>madison</command> returns zero on normal operation, non-zero on error. + <command>dak ls</command> returns zero on normal operation, non-zero on error. </PARA> </RefSect1> diff --git a/docs/charisma.1.sgml b/docs/manpages/make-maintainers.1.sgml similarity index 56% rename from docs/charisma.1.sgml rename to docs/manpages/make-maintainers.1.sgml index 6c5bbf19..8cc324ce 100644 --- a/docs/charisma.1.sgml +++ b/docs/manpages/make-maintainers.1.sgml @@ -1,29 +1,29 @@ <!-- -*- mode: sgml; mode: fold -*- --> <!doctype refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [ -<!ENTITY % katieent SYSTEM "katie.ent"> -%katieent; +<!ENTITY % dakent SYSTEM "dak.ent"> +%dakent; ]> <refentry> - &katie-docinfo; + &dak-docinfo; <refmeta> - <refentrytitle>charisma</> + <refentrytitle>dak_make-maintainers</> <manvolnum>1</> </refmeta> <!-- Man page title --> <refnamediv> - <refname>charisma</> + <refname>dak make-maintainers</> <refpurpose>Utility to generate an index of package's maintainers</> </refnamediv> <!-- Arguments --> <refsynopsisdiv> <cmdsynopsis> - <command>charisma</> + <command>dak make-maintainers</> <arg><option><replaceable>options</replaceable></></arg> <arg choice="plain"><replaceable>extra file...</replaceable></arg> </cmdsynopsis> @@ -31,14 +31,14 @@ <RefSect1><Title>Description</> <para> - <command>charisma</command> is a utility to generate an index of package's maintainers. The output format is: + <command>dak make-maintainers</command> is a utility to generate an index of package's maintainers. The output format is: <literallayout>package~version maintainer</literallayout> The input format of extra files can either be in this form or in the old style which is similar, but lacking the version number, i.e.: <literallayout>package maintainer</literallayout> - Charisma will auto-detect the type of layout of the extra file. If the extra file is in the old style format the records in it are assumed to supersed any that were seen earlier (i.e. either from earlier extra files or generated from the SQL). + dak Make-Maintainers will auto-detect the type of layout of the extra file. If the extra file is in the old style format the records in it are assumed to supersed any that were seen earlier (i.e. either from earlier extra files or generated from the SQL). </Para> <para> - Charisma determines the maintainer of a package by comparing suite priority (see 'Configuration') and then version number. + dak Make-Maintainers determines the maintainer of a package by comparing suite priority (see 'Configuration') and then version number. </PARA> </REFSECT1> @@ -56,12 +56,12 @@ <refsect1> <title>Configuration - charisma uses katie's configuration file. It follows the typical ISC configuration format as seen in ISC tools like bind 8 and dhcpd. Apart from being able to alter the defaults for command line options, the following configuration items are used: + dak make-maintainers uses dak's configuration file. It follows the typical ISC configuration format as seen in ISC tools like bind 8 and dhcpd. Apart from being able to alter the defaults for command line options, the following configuration items are used: Suite::<SUITE>::Priority - Suite priority overrides the version checks charisma does. A package in higher priority suite overrides versions in lower priority suites even if the version number in the higher priority suite is older. + Suite priority overrides the version checks dak make-maintainers does. A package in higher priority suite overrides versions in lower priority suites even if the version number in the higher priority suite is older. @@ -76,7 +76,7 @@ Diagnostics</> <para> - <command>charisma</command> returns zero on normal operation, non-zero on error. + <command>dak make-maintainers</command> returns zero on normal operation, non-zero on error. </PARA> </RefSect1> diff --git a/docs/alicia.1.sgml b/docs/manpages/override.1.sgml similarity index 61% rename from docs/alicia.1.sgml rename to docs/manpages/override.1.sgml index 7661e540..12afac55 100644 --- a/docs/alicia.1.sgml +++ b/docs/manpages/override.1.sgml @@ -1,29 +1,29 @@ <!-- -*- mode: sgml -*- --> <!doctype refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [ -<!ENTITY % katieent SYSTEM "katie.ent"> -%katieent; +<!ENTITY % dakent SYSTEM "dak.ent"> +%dakent; ]> <refentry> - &katie-docinfo; + &dak-docinfo; <refmeta> - <refentrytitle>alicia</> + <refentrytitle>dak_override</> <manvolnum>1</> </refmeta> <!-- Man page title --> <refnamediv> - <refname>alicia</> + <refname>dak override</> <refpurpose>Make micromodifications or queries to the overrides table</> </refnamediv> <!-- Arguments --> <refsynopsisdiv> <cmdsynopsis> - <command>alicia</> + <command>dak override</> <arg><option><replaceable>options</replaceable></></arg> <arg choice="plain"><replaceable>package</replaceable></arg> <arg><option><replaceable>section</replaceable></></arg> @@ -33,7 +33,7 @@ <RefSect1><Title>Description</> <para> - <command>alicia</command> makes micromodifications and queries the overrides. + <command>dak override</command> makes micromodifications and queries the overrides. </PARA> </REFSECT1> @@ -52,7 +52,7 @@ </VarListEntry> <VarListEntry><term><option>-n/--no-action</option></> <ListItem> - <Para>Show what alicia would do but make no changes</PARA> + <Para>Show what dak override would do but make no changes</PARA> </LISTITEM> </VarListEntry> <VarListEntry><term><option>-s/--suite=<replaceable>suite</replaceable></option></> @@ -66,19 +66,19 @@ <RefSect1><Title>Common use</> <para> - <command>alicia</command> when invoked with only a package name will tell you what section and priority the given package has. + <command>dak override</command> when invoked with only a package name will tell you what section and priority the given package has. </PARA> <para> - <command>alicia</command> when invoked with a package and one or two other values will set the section and/or priority to the values given. You may use a single period ('.') to represent "do not change" or you can ommit the value you do not want to change. + <command>dak override</command> when invoked with a package and one or two other values will set the section and/or priority to the values given. You may use a single period ('.') to represent "do not change" or you can ommit the value you do not want to change. </PARA> </RefSect1> <RefSect1><Title>Notes</> - <Para>alicia essentially lets you do what natalie does only on the microscopic scale rather than the macroscopic scale of natalie. Use with care.</> + <Para><command>dak override</command> essentially lets you do what <command>dak control-overrides</command> does only on the microscopic scale rather than the macroscopic scale of <command>dak control-overrides</command>. Use with care.</> <RefSect1><Title>Diagnostics</> <para> - <command>alicia</command> returns zero on normal operation, non-zero on error. + <command>dak override</command> returns zero on normal operation, non-zero on error. </PARA> </RefSect1> diff --git a/docs/catherine.1.sgml b/docs/manpages/poolize.1.sgml similarity index 75% rename from docs/catherine.1.sgml rename to docs/manpages/poolize.1.sgml index fa2317fd..6d54d902 100644 --- a/docs/catherine.1.sgml +++ b/docs/manpages/poolize.1.sgml @@ -1,36 +1,36 @@ <!-- -*- mode: sgml; mode: fold -*- --> <!doctype refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [ -<!ENTITY % katieent SYSTEM "katie.ent"> -%katieent; +<!ENTITY % dakent SYSTEM "dak.ent"> +%dakent; ]> <refentry> - &katie-docinfo; + &dak-docinfo; <refmeta> - <refentrytitle>catherine</> + <refentrytitle>dak_poolize</> <manvolnum>1</> </refmeta> <!-- Man page title --> <refnamediv> - <refname>catherine</> + <refname>dak poolize</> <refpurpose>Utility to poolize files (move them from legacy to pool location)</> </refnamediv> <!-- Arguments --> <refsynopsisdiv> <cmdsynopsis> - <command>catherine</> + <command>dak poolize</> <arg><option><replaceable>options</replaceable></></arg> </cmdsynopsis> </refsynopsisdiv> <RefSect1><Title>Description</> <para> - <command>catherine</command> is the command line tool to poolize files; i.e. move files from legacy locations to their corresponding pool locations. + <command>dak poolize</command> is the command line tool to poolize files; i.e. move files from legacy locations to their corresponding pool locations. </PARA> </REFSECT1> @@ -54,7 +54,7 @@ <RefSect1><Title>Diagnostics</> <para> - <command>catherine</command> returns zero on normal operation, non-zero on error. + <command>dak poolize</command> returns zero on normal operation, non-zero on error. </PARA> </RefSect1> diff --git a/docs/kelly.1.sgml b/docs/manpages/process-accepted.1.sgml similarity index 79% rename from docs/kelly.1.sgml rename to docs/manpages/process-accepted.1.sgml index f2a06b4c..1f3cf4e6 100644 --- a/docs/kelly.1.sgml +++ b/docs/manpages/process-accepted.1.sgml @@ -1,29 +1,29 @@ <!-- -*- mode: sgml; mode: fold -*- --> <!doctype refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [ -<!ENTITY % katieent SYSTEM "katie.ent"> -%katieent; +<!ENTITY % dakent SYSTEM "dak.ent"> +%dakent; ]> <refentry> - &katie-docinfo; + &dak-docinfo; <refmeta> - <refentrytitle>kelly</> + <refentrytitle>dak_process-accepted</> <manvolnum>1</> </refmeta> <!-- Man page title --> <refnamediv> - <refname>kelly</> + <refname>dak process-accepted</> <refpurpose>Installs packages from accepted</> </refnamediv> <!-- Arguments --> <refsynopsisdiv> <cmdsynopsis> - <command>kelly</> + <command>dak process-accepted</> <arg><option><replaceable>options</replaceable></></arg> <arg choice="plain"><replaceable>changes_file</replaceable></arg> <arg><option><replaceable>...</replaceable></option></arg> @@ -32,7 +32,7 @@ <RefSect1><Title>Description</> <para> - <command>kelly</command> is the program which installs packages from the accepted directory into the distribution. + <command>dak process-accepted</command> is the program which installs packages from the accepted directory into the distribution. </PARA></REFSECT1> <RefSect1><Title>Options</> @@ -86,13 +86,13 @@ <RefSect1><Title>Diagnostics</> <para> - <command>kelly</command> returns zero on normal operation, non-zero on error. + <command>dak process-accepted</command> returns zero on normal operation, non-zero on error. </PARA> </RefSect1> <refsect1> <title>Acknowledgements - kelly is based very heavily on dinstall, written by Guy Maor maor@debian.org; in fact it started out life as a dinstall clone. + dak process-accepted is based very heavily on dinstall, written by Guy Maor maor@debian.org; in fact it started out life as a dinstall clone. &manauthor; diff --git a/docs/lisa.1.sgml b/docs/manpages/process-new.1.sgml similarity index 85% rename from docs/lisa.1.sgml rename to docs/manpages/process-new.1.sgml index a89234ec..f99c6cfc 100644 --- a/docs/lisa.1.sgml +++ b/docs/manpages/process-new.1.sgml @@ -1,29 +1,29 @@ -%katieent; + +%dakent; ]> - &katie-docinfo; + &dak-docinfo; - lisa + dak_process-new 1 - lisa + dak process-new Processes BYHAND and NEW packages - lisa + dak process-new changes_file @@ -32,7 +32,7 @@ Description</> <para> - <command>lisa</command> is the program which installs packages from the accepted directory into the distribution. + <command>dak process-new</command> is the program which installs packages from the accepted directory into the distribution. </PARA></REFSECT1> <RefSect1><Title>Options</> @@ -86,7 +86,7 @@ <RefSect1><Title>Diagnostics</> <para> - <command>lisa</command> returns zero on normal operation, non-zero on error. + <command>dak process-new</command> returns zero on normal operation, non-zero on error. </PARA> </RefSect1> diff --git a/docs/melanie.1.sgml b/docs/manpages/rm.1.sgml similarity index 83% rename from docs/melanie.1.sgml rename to docs/manpages/rm.1.sgml index 79ec89af..5b2eaf93 100644 --- a/docs/melanie.1.sgml +++ b/docs/manpages/rm.1.sgml @@ -1,29 +1,29 @@ <!-- -*- mode: sgml; mode: fold -*- --> <!doctype refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [ -<!ENTITY % katieent SYSTEM "katie.ent"> -%katieent; +<!ENTITY % dakent SYSTEM "dak.ent"> +%dakent; ]> <refentry> - &katie-docinfo; + &dak-docinfo; <refmeta> - <refentrytitle>melanie</> + <refentrytitle>dak_rm</> <manvolnum>1</> </refmeta> <!-- Man page title --> <refnamediv> - <refname>melanie</> + <refname>dak rm</> <refpurpose>Utility to remove/add packages from suites</> </refnamediv> <!-- Arguments --> <refsynopsisdiv> <cmdsynopsis> - <command>melanie</> + <command>dak rm</> <arg><option><replaceable>options</replaceable></></arg> <arg choice="plain"><replaceable>package</replaceable></arg> <arg><option><replaceable>...</replaceable></option></arg> @@ -32,7 +32,7 @@ <RefSect1><Title>Description</> <para> - <command>melanie</command> is the command line tool to add and remove package sets from suites with enforced logging, optional bug closing and override updates. + <command>dak rm</command> is the command line tool to add and remove package sets from suites with enforced logging, optional bug closing and override updates. </PARA> </REFSECT1> @@ -100,7 +100,7 @@ <VarListEntry><term><option>-R/--rdep-check</option></> <ListItem> - <Para>Check the reverse dependencies (and build-dependencies) of the packages that are to be removed and warn if anything will break.</literal></PARA> + <Para>Check the reverse dependencies (and build-dependencies) of the packages that are to be removed and warn if anything will break.</PARA> </LISTITEM> </VarListEntry> @@ -125,7 +125,7 @@ <itemizedlist> <listitem> <para>Source + Binaries. (default)</para> - <para>In this mode <command>melanie</command> will assume each of the package(s) passed as arguments are source packages and will also remove any binary packages built from these source packages.</para> + <para>In this mode <command>dak rm</command> will assume each of the package(s) passed as arguments are source packages and will also remove any binary packages built from these source packages.</para> </listitem> <listitem> <para>Binary only.</para> @@ -141,18 +141,18 @@ <refsect1> <title>Configuration - melanie uses katie's configuration file. It follows the typical ISC configuration format as seen in ISC tools like bind 8 and dhcpd. Apart from being able to alter the defaults for command line options, the following configuration items are used: + dak rm uses dak's configuration file. It follows the typical ISC configuration format as seen in ISC tools like bind 8 and dhcpd. Apart from being able to alter the defaults for command line options, the following configuration items are used: - Melanie::MyEmailAddress + Rm::MyEmailAddress This is used as the From: line for bug closing mails as per the -d/--done command line switch. It, obviously, must be a RFC-822 valid email address. - Melanie::LogFile + Rm::LogFile - This is the (absolute) file name of the logfile that melanie unconditionally writes too. This can not be empty or an invalid file. + This is the (absolute) file name of the logfile that dak rm unconditionally writes too. This can not be empty or an invalid file. @@ -163,7 +163,7 @@ The first example is of a source+binaries package removal. -troup@auric| ~ $melanie -d 68136 -m "Requested by tbm@; confirmed with maintainer. Superseded by libgmp2" gmp1 +$ dak rm -d 68136 -m "Requested by tbm@; confirmed with maintainer. Superseded by libgmp2" gmp1 Working... done. Will remove the following packages from unstable: @@ -177,13 +177,13 @@ Requested by tbm@; confirmed with maintainer. Superseded by libgmp2 Continue (y/N)? y Deleting... done. -troup@auric| ~ $ +$ The second example is of a binary-only multi-package removal. -troup@auric| ~ $melanie -d 82562 -m "Requested by paul@; NBS." -b libgtkextra{5,9,10} +$ dak rm -d 82562 -m "Requested by paul@; NBS." -b libgtkextra{5,9,10} Working... done. Will remove the following packages from unstable: @@ -199,14 +199,14 @@ Requested by paul@; NBS. Continue (y/N)? y Deleting... done. -troup@auric| ~ $ +$ Diagnostics</> <para> - <command>melanie</command> returns zero on normal operation, non-zero on error. + <command>dak rm</command> returns zero on normal operation, non-zero on error. </PARA> </RefSect1>