On Wed, 2007-05-02 at 14:29 +0200, Robert Staudinger wrote:
> Hey Marc,
>
> please hold back svn migration, it looks like a number of docs have
> been committed with merge conflict artifacts. A quick grep suggests
> the docs in question are
>
> ABW/en-US/index.abw
> ABW/en-US/introduction.abw
> ABW/en-US/plugins/index.abw
> ABW/en-US/problems/problemsfaq.abw
> ABW/en-US/problems/problemshelp.abw
> ABW/en-US/tutorial/index.abw
> ABW/en-US/tutorial/intro.abw
Nice catch, will fix. Iirc they have been there for some time now?
Marc
> - Rob
>
>
> On 5/1/07, cvs@abisource.com <cvs@abisource.com> wrote:
> >
> > Update of /cvsroot/abiword-docs/ABW/en-US/plugins
> > In directory abiword.snt.utwente.nl:/tmp/cvs-serv22695/ABW/en-US/plugins
> >
> > Modified Files:
> > index.abw
> > Log Message:
> > Remove dos line endings
> >
> >
> >
> > Index: index.abw
> > ===================================================================
> > RCS file: /cvsroot/abiword-docs/ABW/en-US/plugins/index.abw,v
> > retrieving revision 1.5
> > retrieving revision 1.6
> > diff -u -d -r1.5 -r1.6
> > --- index.abw 27 Mar 2004 02:58:25 -0000 1.5
> > +++ index.abw 1 May 2007 17:13:40 -0000 1.6
> > @@ -12,8 +12,13 @@
> > <m key="dc.format">application/x-abiword</m>
> > <m key="abiword.generator">AbiWord</m>
> > <m key="dc.title">AbiWord Help: Plug-ins</m>
> > +<<<<<<< index.abw
> > +<m key="abiword.date_last_changed">Thu Mar 11 21:04:05 2004</m>
> > +<m key="dc.creator">Copyright (C) 2002 David Chart</m>
> > +=======
> > <m key="abiword.date_last_changed">Thu Mar 11 21:04:05 2004</m>
> > <m key="dc.creator">Copyright (C) 2002 David Chart; Copyright (C) 2004 Mark Gilbert</m>
> > +>>>>>>> 1.5
> > </metadata>
> > <styles>
> > <s type="P" name="Heading 1" basedon="Normal" followedby="Normal" props="font-family:Arial; margin-top:24pt; font-style:normal; font-weight:bold; lang:en-GB; text-indent:0.00cm; text-align:center; keep-with-next:1; bgcolor:transparent; margin-bottom:12pt; font-size:24pt; field-font:NULL"/>
> > @@ -22,8 +27,14 @@
> > <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
> > <section props="page-margin-footer:0.0000in; page-margin-header:0.0000in; page-margin-right:1.0000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
> > <p style="Heading 1">AbiWord Plug-ins</p>
> > +<<<<<<< index.abw
> > +<p style="Normal">AbiWord can be enhanced in various ways by plug-ins. This means that functions which are very important to a few users, but not to most, can be made available without making the program enormously large. There are already a large number of plug-ins available, and this section of the help details those distributed from the AbiSource web site.</p>
> > +<p style="Normal">There is an AbiWord plug-in matrix at the wiki, or community-edited documentation page, and while it is not frequently maintained, it may give a good idea as to what can be accomplished with plug-ins, and what you can expect. See <a xlink:href="http://www.abisource.com/twiki/bin/view/Abiword/PluginMatrix">http://www.abisource.com/twiki/bin/view/Abiword/PluginMatrix</a> for that.</p>
> > +<p style="Normal">Note that the AbiWord "plug-in package" includes the most commonly used import, export, and document editing plug-ins, and is highly recommended.</p>
> > +=======
> > <p style="Normal">AbiWord can be enhanced in various ways by plug-ins. This means that functions which are very important to a few users, but not to most, can be made available without making the program enormously large. There are already a large number of plug-ins available, and this section of the help details those distributed from the AbiSource web site.</p>
> > <p style="Normal">There is an AbiWord plug-in matrix at the wiki, or community-edited documentation page, and while it is not well maintained, it may give a decent idea as to what can be accomplished with plug-ins, and what you can expect. See <a xlink:href="http://www.abisource.com/twiki/bin/view/Abiword/PluginMatrix">http://www.abisource.com/twiki/bin/view/Abiword/PluginMatrix</a> for that.</p>
> > <p style="Normal">Note that the most commonly used (and easily installed) plugins are often packaged as bundles for your convenience. One bundle is comprised of import and export plugins, which read and write various file and component formats, and the other bundle is comprised of tools and utilities that perform various helpful tasks from within AbiWord. These plugins are highly recommended.</p>
> > +>>>>>>> 1.5
> > </section>
> > </abiword>
> >
> > -----------------------------------------------
> > To unsubscribe from this list, send a message to
> > abisource-cvs-commit-request@abisource.com with the word
> > unsubscribe in the message body.
> >
Received on Wed May 2 15:40:25 2007
This archive was generated by hypermail 2.1.8 : Wed May 02 2007 - 15:40:25 CEST