Updates to presence documentation

doc/presence/biblio.xml

@@ -3,7 +3,7 @@
 <!DOCTYPE bibliography PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" 
    "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
-<!--********************** BILBIOGRAPHY ***************************-->
+<!--********************** BIBLIOGRAPHY ***************************-->
 
 <bibliography id="pres_biblio">
 <note><para>There might be new versions of internet drafts and thus links to
@@ -12,21 +12,21 @@ draft on <ulink url="http://www.ietf.org">IETF</ulink> by name.</para></note>
 
 <bibliodiv><title>XCAP</title>
 
-<biblioentry id="pres_draft_xcap">
+<biblioentry id="pres_rfc_xcap">
 <abbrev>xcap</abbrev>
-<title><ulink url="http://www.ietf.org/internet-drafts/draft-ietf-simple-xcap-12.txt"
->draft-ietf-simple-xcap-12.txt</ulink> - XCAP specification</title></biblioentry>
+<title><ulink url="http://tools.ietf.org/html/rfc4825"
+>RFC 4825</ulink> - The XCAP specification - The XML Configuration Access Protocol</title></biblioentry>
 
 <biblioentry id="pres_draft_xcap_change">
 <abbrev>xcap_diff</abbrev>
-<title><ulink url="http://www.ietf.org/internet-drafts/draft-ietf-simple-xcap-diff-01.txt"
->draft-ietf-simple-xcap-diff-01.txt</ulink> - XCAP changes notifications format</title>
+<title><ulink url="http://tools.ietf.org/html/draft-ietf-simple-xcap-diff"
+>draft-ietf-simple-xcap-diff-13.txt</ulink> - XCAP changes notifications format</title>
 </biblioentry>
 
 <biblioentry id="pres_draft_xcap_profiles">
 <abbrev>xcap_profiles</abbrev>
-<title><ulink url="http://www.ietf.org/internet-drafts/draft-ietf-sipping-config-framework-07.txt"
->draft-ietf-sipping-config-framework-07.txt</ulink> -XCAP user profiles</title>
+<title><ulink url="http://tools.ietf.org/html/draft-ietf-sipping-config-framework-16"
+>draft-ietf-sipping-config-framework-16.txt</ulink> -XCAP user profiles</title>
 </biblioentry>
 
 </bibliodiv>
@@ -85,14 +85,14 @@ info</ulink></title>
 <biblioentry id="pres_draft_common_auth">
 <abbrev>common auth</abbrev>
 <title><ulink
-url="http://www.ietf.org/internet-drafts/draft-ietf-geopriv-common-policy-05.txt"
->draft-ietf-geopriv-common-policy-05.txt</ulink></title>
+url="http://tools.ietf.org/html/rfc4745"
+>RFC 4745: Common Policy: A Document Format for Expressing Privacy Preferences</ulink></title>
 </biblioentry>
 
 <biblioentry id="pres_draft_auth">
 <abbrev>presence auth</abbrev>
-<title><ulink url="http://www.ietf.org/internet-drafts/draft-ietf-simple-presence-rules-03.txt"
->draft-ietf-simple-presence-rules-03.txt</ulink> - presence authorization XML based data format 
+<title><ulink url="http://tools.ietf.org/html/rfc5025"
+>RFC 5025</ulink> - Presence authorization rules
 and usage with XCAP</title>
 </biblioentry>
 </bibliodiv>
@@ -101,15 +101,14 @@ and usage with XCAP</title>
 
 <biblioentry id="pres_draft_rls">
 <abbrev>rls</abbrev>
-<title><ulink url="http://www.ietf.org/internet-drafts/draft-ietf-simple-xcap-list-usage-05.txt"
->draft-ietf-simple-xcap-list-usage-05.txt</ulink> - XML formats for representing resource 
-lists</title>
+<title><ulink url="http://tools.ietf.org/html/rfc4826"
+>RFC 4826</ulink> - XML formats for representing resource lists</title>
 </biblioentry>
 
 <biblioentry id="pres_draft_rls_sip">
 <abbrev>sip rls</abbrev>
-<title><ulink url="http://www.ietf.org/internet-drafts/draft-ietf-simple-event-list-07.txt"
->draft-ietf-simple-event-list-07.txt</ulink> - Event Notification Extension for Resource 
+<title><ulink url="http://tools.ietf.org/html/rfc4662"
+>RFC 4662</ulink> - SIP  Event Notification Extension for Resource 
 Lists</title>
 </biblioentry>
 

doc/presence/cfg/full_ps.cfg

@@ -10,7 +10,7 @@ dns=no           # (cmd. line: -r)
 rev_dns=no      # (cmd. line: -R)
 port=5060
 children=2
-alias="test-domain.com"
+alias="example.com"
 alias="t-online.de"
 
 #user=ser
@@ -65,7 +65,7 @@ loadmodule "/usr/lib/ser/modules/msilo.so"
 
 # ----------------- setting module-specific parameters ---------------
 
-# modparam("msilo","registrar","sip:registrar@test-domain.com")
+# modparam("msilo","registrar","sip:registrar@example.com")
 modparam("msilo","use_contact",0)
 modparam("msilo","expire_time",7200)
 
@@ -124,7 +124,7 @@ modparam("pa", "ignore_408_on_notify", 1)
 #modparam("pa", "pres_rules_file", "presence-rules.xml")
 #experimental:
 #modparam("pa", "subscribe_to_users", 1);
-#modparam("pa", "pa_subscription_uri", "sip:presence-server@test-domain.com");
+#modparam("pa", "pa_subscription_uri", "sip:presence-server@example.com");
 
 
 # route for generated SUBSCRIBE requests for presence
@@ -323,8 +323,8 @@ route{
 				}
 			
 				# uncomment this if you want to authenticate first SUBSCRIBE request to resource list
-#					if (!proxy_authenticate("test-domain.com", "credentials")) {
-#						proxy_challenge( "test-domain.com", "0");
+#					if (!proxy_authenticate("example.com", "credentials")) {
+#						proxy_challenge( "example.com", "0");
 #						break;
 #					};	
 				
@@ -468,8 +468,8 @@ route{
 	
 	if (method=="REGISTER") {
 		# uncomment this if you want to authenticate REGISTER request
-#			if (!www_authenticate("test-domain.com", "credentials")) {
-#				www_challenge( "test-domain.com", "0");
+#			if (!www_authenticate("example.com", "credentials")) {
+#				www_challenge( "example.com", "0");
 #				break;
 #			};
 	

doc/presence/cfg/ps.cfg

@@ -2,15 +2,15 @@
 # $Id$
 #
 
-# First start SER sample config script with:
+# First start SIP-router sample config script with:
 #   database, accounting, authentication, multi-domain support
 #   PSTN GW section, named flags, named routes, global-,
 #   domain- and user-preferences with AVPs
 # Several of these features are only here for demonstration purpose
-# what can be achieved with the SER config script language.
+# what can be achieved with the SIP-router config script language.
 #
 # If you look for a simpler version with a lot less dependencies
-# please refer to the ser-basic.cfg file in your SER distribution.
+# please refer to the ser-basic.cfg file in your SIP-router distribution.
 
 # To get this config running you need to execute the following commands
 # with the new serctl (the capital word are just place holders)

doc/presence/draft_iptel_im_rules.xml

@@ -5,8 +5,8 @@
 <article lang="en" id="im_rules"><title>MESSAGE authorization rules</title>
 <articleinfo><author><firstname>Vaclav</firstname><surname>Kubart</surname></author>
 </articleinfo>
-<abstract><para>This document folows specification of authorization documents
-suggested by <xref linkend="common_auth"/> and defines document format for
+<abstract><para>This document follows specification of authorization documents
+suggested by <xref linkend="common_auth"/> and defines a document format for
 storing rules for authorization of instant messages.
 </para></abstract>
 
@@ -31,21 +31,21 @@ storing rules for authorization of instant messages.
 <!-- ******************** Documents ********************* -->
 <section id="docs"><title>Instant message authorization documents</title>
 <para>Instant message authorization document is XML document formated according
-to schema defined in <xref linkend="common_auth"/>. It inherits MIME
+to the schema defined in <xref linkend="common_auth"/>. It inherits the MIME
 type of common policy documents defined there - application/auth-policy+xml.
 </para>
 
-<para>All XML elements designed in this document belong to 
+<para>All XML elements designed in this document belong to the
 <quote>urn:iptel:xml:ns:im-rules</quote> namespace.
 <note>
 <para>This namespace breaks conventions mentioned in the document which was used
-as source but it will stay here due to compatibility reasons if there will be no
+as a source but it will stay here due to compatibility reasons if there will be no
 problems with it.</para>
 </note>
 </para>
 
 <section><title>Conditions</title>
-<para>Conditions are processed according specification in <xref linkend="common_auth"/>.
+<para>Conditions are processed according to the specification in <xref linkend="common_auth"/>.
 </para>
 
 <!--<section><title>Identity representation by URI</title>
@@ -55,9 +55,9 @@ problems with it.</para>
 
 <section><title>Sphere</title>
 <para>If the "instant messaging server" (proxy) trying to resolve authorization
-rules is bound together with presence server it can take the sphere value from
-presence server as defined in <xref linkend="pres_auth"/>, otherwise is sphere
-value considered undefined in terms of common policy processing.</para>
+rules is bound together with the presence server it can take the sphere value from the
+presence server as defined in <xref linkend="pres_auth"/>, otherwise sphere
+value is considered undefined in terms of common policy processing.</para>
 
 <!-- <para>This sphere
 handling is due to near relation between presence and instant messaging.
@@ -75,7 +75,7 @@ linkend="pres_auth"/>). Possible values are:</para>
 <varlistentry>
 	<term>block (value 0)</term>
 	<listitem><para>The message should not be delivered to the user and should
-	be rejected with 403 Forbidden result code. This is the dafault value of
+	be rejected with a 403 Forbidden result code. This is the dafault value of
 	im-handling.
 	</para></listitem>
 </varlistentry>
@@ -87,7 +87,7 @@ linkend="pres_auth"/>). Possible values are:</para>
 </variablelist>
 
 
-<para>In the future may these values change.</para>
+<para>In the future these values may change.</para>
 <para>If there are more matching rules, the resulting action will be the maximum
 of their &lt;im-handling&gt; values.
 </para>
@@ -112,10 +112,10 @@ xmlns:im="urn:iptel:xml:ns:im-rules">
   <rule id="whitelist">
     <conditions>
       <identity>
-        <id>sip:jan@test-domain.com</id>
-        <id>sip:pavel@test-domain.com</id>
-        <id>sip:vasek@test-domain.com</id>
-        <id>sip:ja@test-domain.com</id>
+        <id>sip:jan@example.com</id>
+        <id>sip:pavel@example.com</id>
+        <id>sip:vasek@example.com</id>
+        <id>sip:ja@example.com</id>
       </identity>
     </conditions>
     <actions>
@@ -126,7 +126,7 @@ xmlns:im="urn:iptel:xml:ns:im-rules">
   <rule id="blacklist">
     <conditions>
       <identity>
-        <id>sip:smith@test-domain.com</id>
+        <id>sip:smith@example.com</id>
       </identity>
     </conditions>
     <actions>

doc/presence/examples.xml

@@ -21,9 +21,8 @@ configurations. It has to be re-tested with Ottendorf and de-uglyfied. (TBD soon
 </section>
 
 <section><title>Presence server with no authorization and without RLS</title>
-<para>Following config file is based on demo config file installed with SER
-(Ottendorf). It
-is not finished yet. I recommend to use a variant of the config file above right
+<para>Following config file is based on demo config file installed with SIP-router
+It is not finished yet. I recommend to use a variant of the config file above right
 now.</para>
 <para><ulink url="cfg/ps.cfg">cfg/ps.cfg</ulink></para>
 </section>

doc/presence/install.xml

@@ -6,13 +6,13 @@
 
 <section><title>Installation and running</title>
 
-<para>Presence modules use some dynamic libraries distributed with SER and the
+<para>Presence modules use some dynamic libraries distributed with SIP-router and the
 compilation procedure and running is a bit more difficult than usual. For detailed
 description of libraries see their separate documentation (stored in
-<filename>lib/doc</filename> subdirectory of main SER directory).</para>
+<filename>lib/doc</filename> subdirectory of main SIP-router directory).</para>
 
 <section><title>Incompatibility</title>
-<para>XCAP module needed for authorization is not working with TLS module. Fro
+<para>XCAP module needed for authorization is not working with TLS module. For
 more information see <xref linkend="pres.known_problems"/>.
 </para>
 </section>
@@ -41,11 +41,11 @@ on common libraries which have their own dependencies as mentioned below.
 </section>
 
 <section><title>Installation from CVS</title>
-<para>There is an example of steps which need to be done while installing SER
+<para>There is an example of steps which need to be done while installing SIP-router
 with shared libraries into directory /base/ser/directory (if no directory specified - 
 no prefix parameter given - default value is used: /usr/local/)
 <orderedlist>
-	<listitem><para>Download current SER sources:</para>
+	<listitem><para>Download current SIP-router sources:</para>
 	<para><userinput>cvs -d :pserver:[email protected]:/cvsroot/ser checkout sip_router</userinput>
 	</para></listitem>
 	
@@ -55,7 +55,7 @@ no prefix parameter given - default value is used: /usr/local/)
 	<para><userinput>cvs -d :pserver:[email protected]:/cvsroot/ser checkout serctl</userinput>
 	</para></listitem>
 
-	<listitem><para>Compile and install SER with presence modules. Common
+	<listitem><para>Compile and install SIP-router with presence modules. Common
 	libraries should be compiled automaticaly - it may fail in the case of
 	unsatisfied library dependencies. You need to install all external libraries
 	introduced in <xref linkend="pres.dependencies"/></para>
@@ -69,31 +69,31 @@ no prefix parameter given - default value is used: /usr/local/)
 <section><title>Presence snapshots</title>
 <para>In past there were published <quote>presence snapshots</quote> with stable
 and tested code and up to date documentation. This will change - tested and
-documented stable features will be probably imported into stable SER branch
+documented stable features will be probably imported into stable SIP-router branch
 (Ottendorf) and unstable ones will remain in CVS head.
 </para>
 </section> <!-- snapshots -->
 
-<section><title>Running SER</title>
+<section><title>Running SIP-router</title>
 <para>Linker used for dynamic linking must know, where to find these libraries.
 This may be done by setting <varname>LD_LIBRARY_PATH</varname> before
 startup.</para>
 <para><userinput>export LD_LIBRARY_PATH=/base/ser/directory/lib/ser</userinput></para>
 <para><userinput>/base/ser/directory/sbin/ser -f /base/ser/directory/etc/ser/ser.cfg</userinput></para> 
 
-<warning>If you want to run SER under sudo like <quote>sudo /base/ser/directory/sbin/ser -f
+<warning>If you want to run SIP-router under sudo like <quote>sudo /base/ser/directory/sbin/ser -f
 /base/ser/directory/etc/ser/ser.cfg</quote> it need not work - it is possible
 that LD_LIBRARY_PATH will not be propagated in this case!</warning>
-</section> <!-- running SER -->
+</section> <!-- running SIP-router -->
 
 <section><title>Database initialization</title>
 <warning>
 <para>This paragraph can be out-of-dated by changes in DB init scripts or in
 ser_ctl. It has only informative value!</para>
 </warning>
-<para>It is very handy to use SER together with database - at least domains and
+<para>It is very handy to use SIP-router together with database - at least domains and
 users with attributes can be stored there. First must be database created -
-there are scripts to do this in SER's source tree in directory scripts; for
+there are scripts to do this in SIP-router's source tree in directory scripts; for
 example "scripts/mysql/ser_mysql.sh create" will create the database for MySQL.
 <note><para>Later MySQL versions can complain with current script, if so, you
 can try to remove qotes around $PW in script to get it into work.</para></note>

doc/presence/intro.xml

@@ -5,7 +5,7 @@
 ]>
 	
 <section><title>Introduction</title>
-<para>This document describes usage of SIP Express Router as a presence server.
+<para>This document describes usage of SIP Router as a presence server.
 <!-- TODO: What is presence, ... (use doc from PIC-SE wiki?) -->
 </para>
 
@@ -20,14 +20,14 @@
 </para>
 </section>
 		
-<section><title>SER presence basics</title>
+<section><title>SIP-router presence basics</title>
 
-<para>Presence is one of quite important components of SER. It allows users to
+<para>Presence is one of quite important components of SIP-router. It allows users to
 watch presence state of other users, process lists of them and manipulate one's 
 own presence state.</para>
 
 <para>Configuration data can be stored on a XCAP server <xref
-linkend="pres_draft_xcap"/> by user's client software and processed by SER. This
+linkend="pres_rfc_xcap"/> by user's client software and processed by SIP-router. This
 may be useful for lists of watched users (resource lists) and for authorization
 rules.</para>
 
@@ -58,13 +58,13 @@ rules.</para>
 </itemizedlist>
 </para>
 
-<para>All <quote>presence</quote> modules share common code stored in SER
+<para>All <quote>presence</quote> modules share common code stored in SIP-router
 libraries. Their interface is described in standalone documents.
 </para>
 
 <section><title>Persistence</title>
 <para>Modules can store their status (working data) into database. This data is
-automatically reloaded on startup, so it is possible to restart SER and
+automatically reloaded on startup, so it is possible to restart SIP-router and
 clients don't note it. Established SIP dialogs are stored in database too.</para>
 <para>Details about database storage are described for each module separately in
 module documentation.
@@ -85,10 +85,9 @@ rules may be found in <xref linkend="pres_draft_common_auth"/> and
 <para>Only XCAP storage of authorization rules is supported at this moment. It is 
 <emphasis>not fully implemented</emphasis> now - only basic rule conditions, no sphere 
 and time conditions. Transformations defined in <xref linkend="pres_draft_auth"/> are 
-ignored.
-May be, that in the
-future will be possible to use other variants like webdav or storing
-authorization rules in SER's own database.</para>
+ignored.  Maybe, that in the
+future it will be possible to use other variants like webdav or storing
+authorization rules in SIP-router's own database.</para>
 
 <!-- TODO: XCAP module and authorization ? at least link into XCAP doc? -->
 

doc/presence/presence_book.xml

@@ -9,7 +9,7 @@ http://www.sagehill.net/docbookxsl/ValidXinclude.htm -->
 
 
 <article>
-	<title>SER presence handbook (v. Ottendorf.pre1) </title>
+	<title>SIP-router presence handbook </title>
 	
 	<include xmlns="http://www.w3.org/2001/XInclude" href="intro.xml"/>
 	<include xmlns="http://www.w3.org/2001/XInclude" href="install.xml"/>

doc/presence/trouble.xml

@@ -16,19 +16,19 @@
 	(sent a NOTIFY request) and AVPs are not returned correctly to previous
 	one.</para></listitem>
 
-	<listitem><para>There are some standard
-	incompliances in presence modules, often caused by standard ambiguity
-	or contradiction or by partial implementation only. Please refer to specific
+	<listitem><para>There are some standard incompliances in presence modules, 
+	often caused by standard ambiguity or contradiction or by partial 
+	implementation only. Please refer to specific
 	module documentation in such situations.</para></listitem>
 	<listitem><para>SIP clients often use broken data, not corresponding with
-	data format specification. Look into specification in such cases (for
+	the data format specification. Look into the specification in such cases (for
 	example <xref linkend="pres_rfc_pidf"/>).</para></listitem>
 
-	<listitem><para>XCAP module is incompatible with TLS module due to openssl
+	<listitem><para>The XCAP module is incompatible with TLS module due to Openssl
 	initialization!</para>
-	<para>XCAP module uses libcurl for HTTP comunication and libcurl is using
-	libopenssl internaly. But TLS module needs some extra openssl initialization which
-	is not working when libcurl initializes openssl by itself.</para>
+	<para>XCAP module uses libcurl for HTTP communication and libcurl is using
+	libopenssl internaly. But the TLS module needs some extra openssl initialization which
+	is not working when libcurl initializes Openssl by itself.</para>
 	<para>Thanks Samuel ([email protected]) for pointing this out.</para></listitem>
 
 </itemizedlist>
@@ -40,28 +40,27 @@
 to do this or that, you can: 
 <itemizedlist>
 	<listitem><para>Try to search for similar problem in mailing lists on
-	<ulink url="http://www.iptel.org/listsearch">iptel's page</ulink> or in
-	<ulink url="http://lists.iptel.org/">list archives</ulink>.
+	<ulink url="http://www.sip-router.org/">SIP-router's main page</ulink> or in
+	<ulink url="http://lists.sip-router.org/cgi-bin/mailman/listinfo/">list archives</ulink>.
 	</para></listitem>
 
-	<listitem><para>Send and email to <ulink
-	url="mailto:s[email protected]">[email protected].org</ulink> for
+	<listitem><para>Send an email to <ulink
+	url="mailto:s[email protected]">[email protected].org</ulink> for
 	user related problem or
-	<ulink url="mailto:s[email protected]">[email protected].org</ulink>
+	<ulink url="mailto:s[email protected]">[email protected].org</ulink>
 	for development related things. There are lots of interesting people on
-	these lists with
-	lots of experiences with SIP related stuff ;-).
+	these lists with lots of experiences with SIP related stuff ;-).
 	</para></listitem>
 
 	<listitem><para>For presence-only related things you can send me an email
 	directly to [email protected], but I highly prefer to use one of
 	mailing lists above because many people may be interested in the same
-	problem you have.</para></listitem>
+	problem as you have.</para></listitem>
 </itemizedlist>
 </para>
 
 <para>If you find a bug, please report it to our <ulink
-url="http://tracker.iptel.org/browse/SER">bug tracker</ulink>
+url="http://sip-router.org/tracker/">bug tracker</ulink>
 or send an email to lists mentioned above or directly to me (email above).</para>
 
 </section>
@@ -79,13 +78,13 @@ implemented or at least discussed.
 
 <section><title>Searching a problem</title>
 <para>Most of presence modules have <quote>trace</quote> method which can be
-invoked through SER's XML-RPC interface. Such method often dumps current status,
+invoked through SIP-router's management interface. Such methods often dumps current status,
 existing subscriptions etc.
 </para>
 
-<para>For calling XML-RPC methods you can simply use set of
-<application>ser_ctl</application> utilities (don't mess with deprecated serctl
-utility which is from unknown reason still installed with SER) or
+<para>For calling management methods you can simply use set of
+<application>sercmd</application> utilities (don't mess with deprecated serctl
+utility which is from unknown reason still installed with SIP-router) or
 <application>binrpc</application> which uses more effective binary
 protocol.</para>
 
@@ -98,7 +97,7 @@ protocol.</para>
 | value                                                                                                                  |
 +------------------------------------------------------------------------------------------------------------------------+
 | registrar                                                                                                              |
-| * sip:parf@test-domain.com (uid=parf)                                                                                  |
+| * sip:parf@example.com (uid=parf)                                                                                      |
 |  - tuples:                                                                                                             |
 |     6574y1y45d334fay6e9d7c60 contact='sip:[email protected]:6198;transport=udp' exp=976014034 status=0 published=0 (id=) |
 |       notes:                                                                                                           |
@@ -107,14 +106,14 @@ protocol.</para>
 |                                                                                                                        |
 |  - watchers:                                                                                                           |
 |  - winfo watchers:                                                                                                     |
-|     sip:parf@test-domain.com status=1 exp=3545                                                                         |
+|     sip:parf@example.com status=1 exp=3545                                                                             |
 |  - internal watchers:                                                                                                  |
 |  - notes:                                                                                                              |
 |  - extension elements:                                                                                                 |
-| * sip:gozner@test-domain.com (uid=gozner)                                                                              |
+| * sip:gozner@example.com (uid=gozner)                                                                                  |
 |  - tuples:                                                                                                             |
 |  - watchers:                                                                                                           |
-|     sip:parf@test-domain.com status=1 exp=3562                                                                         |
+|     sip:parf@example.com status=1 exp=3562                                                                             |
 |  - winfo watchers:                                                                                                     |
 |  - internal watchers:                                                                                                  |
 |  - notes:                                                                                                              |

doc/presence/xcap.xml

@@ -7,13 +7,13 @@
 <section><title>Introduction</title>
 
 <para>XCAP is a HTTP based protocol for access remote configuration data. Data
-is stored in XML format and XCAP protocol allows to query, modify or delete
+is stored in XML format and the XCAP protocol allows to query, modify or delete
 parts of such data. This is in detail described in <xref
-linkend="pres_draft_xcap"/>. XCAP server is server able to handle XCAP requests.
+linkend="pres_rfc_xcap"/>. The XCAP server is server able to handle XCAP requests.
 </para>
 
-<para>XCAP server may be used for storing <quote>presence interesting</quote>
-data. From the SER's point of view are interesting:
+<para>The XCAP server may be used for storing <quote>presence interesting</quote>
+data. From the SIP_ROUTER's point of view these items are interesting:
 <itemizedlist>
 	<listitem><para>authorization data</para></listitem>
 	<listitem><para><quote>buddy lists</quote></para></listitem>
@@ -23,7 +23,7 @@ data. From the SER's point of view are interesting:
 <section><title>XCAP authorization</title>
 <para>Definition of authorization documents and theirs usage is specified in <xref 
 linkend="pres_draft_common_auth"/> and especially for presence purposes in <xref 
-linkend="pres_draft_auth"/>. Both documents are quite common and in SER's
+linkend="pres_draft_auth"/>. Both documents are quite common and in SIP_ROUTER's
 presence modules implemented only partialy. For more information about XCAP
 authorization see details in <xref linkend="pa.xcap"/>.</para>
 </section> <!-- XCAP authorization -->
@@ -56,7 +56,7 @@ linkend="rls.xcap"/>.</para>
 <para>Manipulating with XCAP documents is quite simple because XCAP uses
 standard HTTP methods like GET, PUT or DELETE. Every web browser may be
 used to read XCAP data and it is quite simple to write utility to write data
-to XCAP server. These features allow to use XCAP with SER although there are is 
+to XCAP server. These features allow to use XCAP with SIP_ROUTER although there are is 
 not much client software supporting it.
 </para>
 </section> <!-- manipulating documents -->
@@ -277,7 +277,7 @@ demonstration or testing purposes.
 <para>Depending on your needs you can
 <itemizedlist>
 	<listitem><para>create hierarchical directory structure of XML documents according to
-	<xref linkend="pres_draft_xcap"/></para></listitem>
+	<xref linkend="pres_rfc_xcap"/></para></listitem>
 	<listitem><para>allow upload (handle HTTP PUT method) which stores documents into the 
 	directory structure</para></listitem>
 	<listitem><para>improve upload to validate documents according to schema
@@ -354,7 +354,7 @@ demonstration or testing purposes.
 </para>
 </section> <!-- directory structure -->
 
-<section><title>Usage with SER</title>
+<section><title>Usage with SIP_ROUTER</title>
 <para>You don't need a full XCAP server for presence authorization documents -
 these are read as standalone documents from directories of standalone users.
 </para>
@@ -386,7 +386,7 @@ Alias /xcap-root /var/simulated-xcap-root
 </Directory>
 ...
 ]]></programlisting>
-<para>If apache is running on machine with SER, you can use as xcap-root
+<para>If apache is running on machine with SIP_ROUTER, you can use as xcap-root
 <literal>http://localhost/xcap-root</literal>.
 </para>
 </example>