doc.userguide.pidgin: d032538a: A lot of updates here. Still needs a LO...
rekkanoryo at pidgin.im
rekkanoryo at pidgin.im
Sun Apr 12 01:25:36 EDT 2009
-----------------------------------------------------------------
Revision: d032538a4a94a3742788099a0fc5188ac0d91dec
Ancestor: 3549d6e4aa536c636939ce43793a88daf4806e4e
Author: rekkanoryo at pidgin.im
Date: 2008-09-09T04:58:58
Branch: im.pidgin.doc.userguide.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/d032538a4a94a3742788099a0fc5188ac0d91dec
Renamed entries:
images to src/images
xml to src
Modified files:
Makefile.am configure.ac src/Makefile.am src/aimaccount.xml
src/book.xml src/gettingstarted.xml src/gfdl.xml
ChangeLog:
A lot of updates here. Still needs a LOT of work.
-------------- next part --------------
============================================================
--- Makefile.am 0a0de55fe59de980e80e53480ba062e1709599bf
+++ Makefile.am 706463baba849b8f1035ae3c4626d7f5964d1728
@@ -1,4 +1,4 @@
-SUBDIRS = images xml
+SUBDIRS = src
clean-local:
rm -rf $(OUTPUT)
============================================================
--- configure.ac bbb9293cfcbc17a979c82458e93f84d539b89b61
+++ configure.ac 1ea12d3be155311f6541025a08f082c5a040c190
@@ -6,8 +6,8 @@ AC_OUTPUT([
AC_OUTPUT([
Makefile
- images/Makefile
- xml/Makefile
- xml/custom.xsl
+ src/custom.xsl
+ src/Makefile
+ src/images/Makefile
])
============================================================
--- src/Makefile.am 160985b75bdcc58745addfdd94d7d7bcf5687e62
+++ src/Makefile.am 2c7177d4aa6f57439883a5b8fb954156d59ba512
@@ -1,9 +1,15 @@
+SUBDIRS = images
+
SOURCES = \
+ addingaccounts.xml \
aimaccount.xml \
+ bonjouraccount.xml \
book.xml \
custom.xsl \
gettingstarted.xml \
- gfdl.xml
+ gfdl.xml \
+ xmppaccount.xml \
+ yahooaccount.xml
EXTRA_DIST = $(SOURCES)
============================================================
--- src/aimaccount.xml 5bc2d9056da9d0305eadb9eaeac942346b0aca81
+++ src/aimaccount.xml bcb518cd46b3f4f2f09bd60b1c1683f88499671d
@@ -1,13 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
-<chapter id="aimaccount">
+<sect1 id="aimaccount">
<title>Adding an AIM account</title>
+ <para><emphasis role="bold">About AIM</emphasis></para>
+
<para>
+ AIM, the AOL Instant Messenger, is one of the older public IM networks,
+ and in our experience one of the most reliable. It's the first protocol
+ Pidgin ever supported. AOL users can talk on the AIM network, but
+ AIM-only users far outnumber them. AIM also supports interoperability
+ with ICQ, including messaging and adding ICQ users to the AIM buddy
+ list.
+ </para>
+
+ <para>
+ AIM uses the OSCAR protocol, which has recently been opened to those IM
+ client developers who agree to the terms of use surrounding the API and
+ documentation made available. ICQ shares the OSCAR protocol with AIM,
+ as well as overlapping servers, which is the basis of the cross-service
+ interoperability just mentioned. We show two protocol entries, one for
+ AIM and one for ICQ, as a matter of convenience, as few people would
+ understand what OSCAR meant if we listed that instead. :)
+ </para>
+
+ <para><emphasis role="bold">Adding an AIM account</emphasis></para>
+
+ <para>
To add an AIM account, click "Add" on the "Accounts"
window. The following appears:
<figure>
<title>Add Account Dialog</title>
- <graphic fileref="../images/addaccountdialog.png"/>
+ <graphic fileref="../src/images/addaimaccount.png"/>
</figure>
</para>
@@ -82,11 +105,17 @@
</para>
<para>
+ You probably noticed that there is an "Advanced" tab on this
+ window. You can safely ignore this for now. We'll come back to it and
+ explain more later.
+ </para>
+
+ <para>
Now that we've gone over the basics, let's see what a typical AIM account
might look like:
<figure>
<title>A Configured AIM Account</title>
- <graphic fileref="../images/populatedaimaccount.png"/>
+ <graphic fileref="../src/images/populatedaimaccount.png"/>
</figure>
</para>
-</chapter>
+</sect1>
============================================================
--- src/book.xml a88ee0d0c7efb7997e4a9e98c05f963d09f64a5a
+++ src/book.xml 08552e34de162ba0a24a32397225dddf8251f119
@@ -20,11 +20,6 @@
<ulink url="mailto:devel at pidgin.im">devel at pidgin.im</ulink>.
</para>
- <!--
- Show that this "book" is licensed under the GFDL, as required
- by said license
- -->
-
<para><emphasis role="bold">License</emphasis></para>
<para>
@@ -41,12 +36,7 @@
</sect1>
<xi:include href="gettingstarted.xml"/>
- <xi:include href="aimaccount.xml"/>
- <xi:include href="bonjouraccount.xml"/>
+ <xi:include href="addingaccounts.xml"/>
- <!--
- Include the GFDL as the last chapter - the license requires that its
- text appear as part of the work
- -->
<xi:include href="gfdl.xml"/>
</book>
============================================================
--- src/gettingstarted.xml 266c480e501078e1d6f74f6c8b180b9c326ee6d3
+++ src/gettingstarted.xml 0e3187b033c1628989894d248fd118fe21fb6b52
@@ -130,7 +130,6 @@
<para>
As the window says, you need to configure accounts. We'll cover that
- in the next several chapters by creating a Pidgin account for each
- protocol.
+ in the next chapter by creating a Pidgin account for each protocol.
</para>
</chapter>
============================================================
--- src/gfdl.xml a2e7cff7c18b83eb4732a1aa8bd1007d09392a76
+++ src/gfdl.xml 16006ff2cfe7fa38e2f5af960e37cc442ad45f5f
@@ -1,8 +1,7 @@
<chapter id="gfdl">
<title>The GNU Free Documentation License</title>
- <para>
- <code>
+ <literallayout class="monospaced">
GNU Free Documentation License
Version 1.2, November 2002
@@ -365,11 +364,10 @@ License "or any later version" applies t
Each version of the License is given a distinguishing version number.
If the Document specifies that a particular numbered version of this
License "or any later version" applies to it, you have the option of
-following the terms and conditions either of that specified version or
+FOLLOWING THE TERMs and conditions either of that specified version or
of any later version that has been published (not as a draft) by the
Free Software Foundation. If the Document does not specify a version
number of this License, you may choose any version ever published (not
as a draft) by the Free Software Foundation.
- </code>
- </para>
+ </literallayout>
</chapter>
More information about the Commits
mailing list