GNOME.org
 

Re: [Fwd: bonobo-activation docs update]

Hi All,

On Thu, 2003-01-30 at 11:46, Gustavo J. A. M. Carneiro wrote:
>   You know, you should really update your email in MAINTAINERS of
> bonobo-activation...

I don't think I should be considered a maintainer anymore... Someone
probably should remove me from this list. Even though I keep on reading
this list and a few others, I am not active anymore.

regards,
Mathieu

> 
> -- 
> Gustavo Joćo Alves Marques Carneiro
> <gjc inescporto pt> <gustavo users sourceforge net>
> 
> ----
> 

> From: Gustavo J. A. M.  Carneiro <gjc inescporto pt>
> To: Mathieu Lacage <mathieu eazel com>
> Cc: Michael Meeks <michael ximian com>
> Subject: bonobo-activation docs update
> Date: 29 Jan 2003 16:41:20 +0000
> 
>   Hi!
>   Michael asked look into bug #104130. Since I no longer have jade or
> docbook 3.x or dsssl, I decided to convert to XML/Docbook 4.1.2.
>   Can I commit this patch?
> 
>   Michael, with this patch and with the docbook 4.1.2 files properly
> installed, make dist works and includes the html docs, so I guess that
> #104130 is fixed, though I suspect that there was no problem before--
> probably who made 'make dist' didn't have all the required files to
> generate html docs with jade; in this case, jade simply dumps all text
> to stdout and keeps going.
> 
> -- 
> Gustavo Joćo Alves Marques Carneiro
> <gjc inescporto pt> <gustavo users sourceforge net>
> 
> ----
> 

> Index: ChangeLog
> ===================================================================
> RCS file: /cvs/gnome/bonobo-activation/ChangeLog,v
> retrieving revision 1.346
> diff -u -r1.346 ChangeLog
> --- ChangeLog	21 Jan 2003 17:30:47 -0000	1.346
> +++ ChangeLog	29 Jan 2003 16:30:34 -0000
> @@ -1,3 +1,15 @@
> +2003-01-29  Gustavo J. A. M. Carneiro  <gustavo users sourceforge net>
> +
> +	* configure.in: Require gtk-doc >= 0.10.
> +
> +	* api-docs/Makefile.am: Minor tweaks to use XML/XSLT mode of
> +	gtk-doc instead of SGML/Jade.
> +
> +	* api-docs/bonobo-activation.sgml, api-docs/architecture.sgml,
> +	* api-docs/bonobo-activation.sgml, api-docs/query-langage.sgml,
> +	* api-docs/server-xml-reference.sgml, api-docs/tutorial.sgml:
> +	Convert to XML / Docbook 4.1.2.
> +
>  2003-01-21  Christian Rose  <menthos menthos com>
>  
>  	* configure.in: Added "mn" to ALL_LINGUAS.
> Index: configure.in
> ===================================================================
> RCS file: /cvs/gnome/bonobo-activation/configure.in,v
> retrieving revision 1.132
> diff -u -r1.132 configure.in
> --- configure.in	21 Jan 2003 17:30:47 -0000	1.132
> +++ configure.in	29 Jan 2003 16:30:34 -0000
> @@ -111,7 +111,7 @@
>  
>  AC_CHECK_PROG(GTKDOC, gtkdoc-mkdb, true, false)
>  
> -gtk_doc_min_version=0.6
> +gtk_doc_min_version=0.10
>  if $GTKDOC ; then 
>      gtk_doc_version=`gtkdoc-mkdb --version`
>      AC_MSG_CHECKING([gtk-doc version ($gtk_doc_version) >= $gtk_doc_min_version])
> Index: api-docs/.cvsignore
> ===================================================================
> RCS file: /cvs/gnome/bonobo-activation/api-docs/.cvsignore,v
> retrieving revision 1.5
> diff -u -r1.5 .cvsignore
> --- api-docs/.cvsignore	16 Nov 2002 01:01:26 -0000	1.5
> +++ api-docs/.cvsignore	29 Jan 2003 16:30:34 -0000
> @@ -12,3 +12,6 @@
>  bonobo-activation-decl.txt
>  bonobo-activation-docs.sgml
>  *.stamp
> +bonobo-activation.interfaces
> +bonobo-activation.prerequisites
> +xml
> Index: api-docs/Makefile.am
> ===================================================================
> RCS file: /cvs/gnome/bonobo-activation/api-docs/Makefile.am,v
> retrieving revision 1.14
> diff -u -r1.14 Makefile.am
> --- api-docs/Makefile.am	16 Nov 2002 01:01:26 -0000	1.14
> +++ api-docs/Makefile.am	29 Jan 2003 16:30:34 -0000
> @@ -12,10 +12,10 @@
>  DOC_SOURCE_DIR=../bonobo-activation
>  
>  # Extra options to supply to gtkdoc-scan
> -SCAN_OPTIONS=
> +SCAN_OPTIONS=--deprecated-guards="BONOBO_DISABLE_DEPRECATED"
>  
>  # Extra options to supply to gtkdoc-mkdb
> -MKDB_OPTIONS=--sgml-mode
> +MKDB_OPTIONS=--sgml-mode --output-format=xml
>  
>  # Extra options to supply to gtkdoc-fixref
>  FIXXREF_OPTIONS=
> @@ -48,7 +48,6 @@
>  	configuring.sgml		\
>  	query-langage.sgml		\
>  	architecture.sgml		\
> -	bonobo-activation.sgml		\
>  	fdl.sgml			\
>  	$(NULL)
>  
> @@ -71,6 +70,11 @@
>  #	  test -f $$f && cp -p $$f $(distdir)/TEXT; \
>  #	done
>  
> +# If you need to override some of the declarations, place them in the
> +# $(DOC_MODULE)-overrides.txt file and uncomment the second line here.
> +DOC_OVERRIDES =
> +#DOC_OVERRIDES = $(DOC_MODULE)-overrides.txt
> +
>  
>  ####################################
>  # Everything below here is generic #
> @@ -100,6 +104,8 @@
>  SCANOBJ_FILES = 		\
>  	$(DOC_MODULE).args 	\
>  	$(DOC_MODULE).hierarchy \
> +	$(DOC_MODULE).interfaces \
> +	$(DOC_MODULE).prerequisites \
>  	$(DOC_MODULE).signals
>  
>  if ENABLE_GTK_DOC
> @@ -164,7 +170,7 @@
>  	rm -f *~ *.bak $(SCANOBJ_FILES) *-unused.txt $(DOC_STAMPS)
>  
>  maintainer-clean-local: clean
> -	cd $(srcdir) && rm -rf sgml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
> +	cd $(srcdir) && rm -rf xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
>  
>  install-data-local:
>  	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
> @@ -193,10 +199,10 @@
>  
>  dist-hook: dist-check-gtkdoc dist-hook-local
>  	mkdir $(distdir)/tmpl
> -	mkdir $(distdir)/sgml
> +	mkdir $(distdir)/xml
>  	mkdir $(distdir)/html
>  	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
> -	-cp $(srcdir)/sgml/*.sgml $(distdir)/sgml
> +	-cp $(srcdir)/xml/*.xml $(distdir)/xml
>  	-cp $(srcdir)/html/* $(distdir)/html
>  
>  .PHONY : dist-hook-local
> Index: api-docs/architecture.sgml
> ===================================================================
> RCS file: /cvs/gnome/bonobo-activation/api-docs/architecture.sgml,v
> retrieving revision 1.5
> diff -u -r1.5 architecture.sgml
> --- api-docs/architecture.sgml	11 Dec 2001 00:28:39 -0000	1.5
> +++ api-docs/architecture.sgml	29 Jan 2003 16:30:34 -0000
> @@ -77,10 +77,22 @@
>  As a result of this architecture, activation requests should go to the 
>  <classname>ActivationContext</classname> and
>  registrations to the <classname>ObjectDirectory</classname>.
> -	<figure>
> -	<title>OAF architecture</title>
> -	<graphic fileref="oaf.png" scale="50"></graphic>
> -      </figure>
> +
> +<figure id="architecture-diagram">
> +    <title>The Bonobo Activation architecture</title>
> +    <mediaobject>
> +	<imageobject>
> +	    <imagedata fileref="bonobo-activation.png"
> +		       format="PNG"/>
> +	</imageobject>
> +    </mediaobject>
> +</figure>
> +
> +<!-- 	<figure> -->
> +<!-- 	<title>OAF architecture</title> -->
> +<!-- 	<graphic fileref="oaf.png" scale="50"></graphic> -->
> +<!--       </figure> -->
> +
>  The idea behind this is that when you make a request on the ActivationContext (like query),
>  it will:
>  <itemizedlist>
> Index: api-docs/bonobo-activation.sgml
> ===================================================================
> RCS file: /cvs/gnome/bonobo-activation/api-docs/bonobo-activation.sgml,v
> retrieving revision 1.8
> diff -u -r1.8 bonobo-activation.sgml
> --- api-docs/bonobo-activation.sgml	1 Feb 2002 21:25:29 -0000	1.8
> +++ api-docs/bonobo-activation.sgml	29 Jan 2003 16:30:34 -0000
> @@ -1,17 +1,19 @@
> -<!doctype book PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
> -<!entity init SYSTEM "sgml/initialization.sgml">
> -<!entity debugging SYSTEM "sgml/debugging.sgml">
> -<!entity registration SYSTEM "sgml/registration.sgml">
> -<!entity activation SYSTEM "sgml/query.sgml">
> -<!entity utils SYSTEM "sgml/utilities.sgml">
> -<!entity compiling SYSTEM "compiling.sgml">
> -<!entity configuring SYSTEM "configuring.sgml">
> -<!entity query-langage SYSTEM "query-langage.sgml">
> -<!entity architecture SYSTEM "architecture.sgml">
> -<!entity server-xml-reference SYSTEM "server-xml-reference.sgml">
> -<!entity tutorial SYSTEM "tutorial.sgml">
> -<!entity migrating SYSTEM "migrating.sgml">
> -<!entity FDL SYSTEM "fdl.sgml">
> +<?xml version="1.0"?>
> +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
> +    "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"; [
> +<!ENTITY init SYSTEM "xml/initialization.xml">
> +<!ENTITY debugging SYSTEM "xml/debugging.xml">
> +<!ENTITY registration SYSTEM "xml/registration.xml">
> +<!ENTITY activation SYSTEM "xml/query.xml">
> +<!ENTITY utils SYSTEM "xml/utilities.xml">
> +<!ENTITY compiling SYSTEM "compiling.sgml">
> +<!ENTITY configuring SYSTEM "configuring.sgml">
> +<!ENTITY query-langage SYSTEM "query-langage.sgml">
> +<!ENTITY architecture SYSTEM "architecture.sgml">
> +<!ENTITY server-xml-reference SYSTEM "server-xml-reference.sgml">
> +<!ENTITY tutorial SYSTEM "tutorial.sgml">
> +<!ENTITY migrating SYSTEM "migrating.sgml">
> +<!ENTITY FDL SYSTEM "fdl.sgml">
>  ]>
>  
>  <book id="index">
> Index: api-docs/query-langage.sgml
> ===================================================================
> RCS file: /cvs/gnome/bonobo-activation/api-docs/query-langage.sgml,v
> retrieving revision 1.3
> diff -u -r1.3 query-langage.sgml
> --- api-docs/query-langage.sgml	15 May 2001 19:53:13 -0000	1.3
> +++ api-docs/query-langage.sgml	29 Jan 2003 16:30:34 -0000
> @@ -160,8 +160,8 @@
>  	<table frame="all">
>  	<title>Binary relational operators.</title>
>  	<tgroup cols="2">
> -	<colspec colwidth="*" colnum="1" align="left">
> -	<colspec colwidth="2*" colnum="2" align="left">
> +	<colspec colwidth="*" colnum="1" align="left"/>
> +	<colspec colwidth="2*" colnum="2" align="left"/>
>  	<thead>
>  		<row>
>  		<entry>Operator</entry>
> @@ -200,8 +200,8 @@
>  	<table frame="all">
>  	<title>Binary boolean operators.</title>
>  	<tgroup cols="2">
> -	<colspec colwidth="*" colnum="1" align="left">
> -	<colspec colwidth="2*" colnum="2" align="left">
> +	<colspec colwidth="*" colnum="1" align="left"/>
> +	<colspec colwidth="2*" colnum="2" align="left"/>
>  	<thead>
>  		<row>
>  		<entry>Operator</entry>
> @@ -210,7 +210,7 @@
>  	</thead>
>  		<tbody>
>  		  <row>
> -		    <entry>&& or AND</entry>
> +		    <entry>&amp;&amp; or AND</entry>
>  		    <entry>and</entry>
>  		  </row>
>  		  <row>
> @@ -228,8 +228,8 @@
>  	<table frame="all">
>  	<title>Unary boolean operators.</title>
>  	<tgroup cols="2">
> -	<colspec colwidth="*" colnum="1" align="left">
> -	<colspec colwidth="2*" colnum="2" align="left">
> +	<colspec colwidth="*" colnum="1" align="left"/>
> +	<colspec colwidth="2*" colnum="2" align="left"/>
>  	<thead>
>  		<row>
>  		<entry>Operator</entry>
> @@ -248,8 +248,8 @@
>  	<table frame="all">
>  	<title>Binary arithmetic operators.</title>
>  	<tgroup cols="2">
> -	<colspec colwidth="*" colnum="1" align="left">
> -	<colspec colwidth="2*" colnum="2" align="left">
> +	<colspec colwidth="*" colnum="1" align="left"/>
> +	<colspec colwidth="2*" colnum="2" align="left"/>
>  	<thead>
>  		<row>
>  		<entry>Operator</entry>
> @@ -280,8 +280,8 @@
>  	<table frame="all">
>  	<title>Unary arithmetic operators.</title>
>  	<tgroup cols="2">
> -	<colspec colwidth="*" colnum="1" align="left">
> -	<colspec colwidth="2*" colnum="2" align="left">
> +	<colspec colwidth="*" colnum="1" align="left"/>
> +	<colspec colwidth="2*" colnum="2" align="left"/>
>  	<thead>
>  		<row>
>  		<entry>Operator</entry>
> Index: api-docs/server-xml-reference.sgml
> ===================================================================
> RCS file: /cvs/gnome/bonobo-activation/api-docs/server-xml-reference.sgml,v
> retrieving revision 1.4
> diff -u -r1.4 server-xml-reference.sgml
> --- api-docs/server-xml-reference.sgml	1 Jan 2003 19:03:21 -0000	1.4
> +++ api-docs/server-xml-reference.sgml	29 Jan 2003 16:30:34 -0000
> @@ -85,7 +85,7 @@
>  </programlisting>
>  Each oaf_server entry defines a set of attributes. 
>  Each attribute has a given name, type and value. The types of the attributes are those defined in the 
> -OAF query langage reference (<xref linkend="oaf-query-ref-types">). Type name should
> +OAF query langage reference (<xref linkend="oaf-query-ref-types"/>). Type name should
>  be non-caps.
>  </para>
>  
> @@ -107,10 +107,10 @@
>  	<table frame="all">
>  	<title>Normalized attributes</title>
>  	<tgroup cols="4">
> -	<colspec colwidth="3*" colnum="1" align="left">
> -	<colspec colwidth="*" colnum="2" align="left">
> -	<colspec colwidth="10*" colnum="3" align="left">
> -	<colspec colwidth="*" colnum="4" align="left">
> +	<colspec colwidth="3*" colnum="1" align="left"/>
> +	<colspec colwidth="*" colnum="2" align="left"/>
> +	<colspec colwidth="10*" colnum="3" align="left"/>
> +	<colspec colwidth="*" colnum="4" align="left"/>
>  	<thead>
>  		<row>
>  		<entry>Attribute name</entry>
> Index: api-docs/tutorial.sgml
> ===================================================================
> RCS file: /cvs/gnome/bonobo-activation/api-docs/tutorial.sgml,v
> retrieving revision 1.5
> diff -u -r1.5 tutorial.sgml
> --- api-docs/tutorial.sgml	11 Dec 2001 00:28:39 -0000	1.5
> +++ api-docs/tutorial.sgml	29 Jan 2003 16:30:34 -0000
> @@ -49,9 +49,9 @@
>  
>        <para>
>        Bonobo Activation was designed to address these issues. The remote issue is completely solved
> -      by the Bonobo Activation daemon (see <xref linkend="architecture">), the evil hacks regarding X are
> +      by the Bonobo Activation daemon (see <xref linkend="architecture"/>), the evil hacks regarding X are
>        part of our past and the grand <emphasis>OAF query langage</emphasis> (see 
> -      <xref linkend="query-langage">) gives you the ability to perform arbitrary queries
> +      <xref linkend="query-langage"/>) gives you the ability to perform arbitrary queries
>        on the database of CORBA servers.
>        </para>
>  
> @@ -84,7 +84,7 @@
>        Here follows a very simple-stupid example of what you can do with Bonobo Activation.
>        The complete API description of bonobo activation, the OAF query langage reference and the
>        <filename>.server</filename> file format reference are included in this 
> -      document and are recommended readings. Reading <xref linkend="architecture"> is
> +      document and are recommended readings. Reading <xref linkend="architecture"/> is
>        also a good idea.
>        </para>  
>  

-- 
Mathieu Lacage <mathieu_lacage realmagic fr>
#p: +33 1 69 19 61 97
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]