[Asterisk-doc] docs glossary.xml,1.3,1.4

[websmith]

Comments:
Update of /cvsroot/asterisk/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2099

Modified Files:
	glossary.xml 
Log Message:
Add new definitions for FXO and FXS provided by Scott Edwards on the mailing
list on 30 May 2004.
Index: glossary.xml
===================================================================
RCS file: /cvsroot/asterisk/docs/glossary.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** glossary.xml	2 Jan 2004 05:50:44 -0000	1.3
--- glossary.xml	31 May 2004 03:20:58 -0000	1.4
***************
*** 6,19 ****
  			<para>Foreign eXchange Office</para>
  			<para>
! 				When a customer receives phone service from a central office other than the 
! 				one that would normally serve them, the line between the customer and the 
! 				"Foreign" office is called a "Foreign Exchange" line and FXS (Foreign eXchange Station) 
! 				is the station end. FXO (Foreign eXchange Office) is the office end of the line.  
! 				FXO is also used to refer to the type of interface on phone equipment. An FXO 
! 				interface receives power and ring signals.   An FXS interface provides power 
! 				and and ring signals.If you want to connect your phone line to your computer so 
! 				that it can make and answer calls, you need to add an FXO interface to your 
! 				computer.  If you want to connect an ordinary telephone to a computer, you 
! 				need a card in the computer with an FXS interface. 
  			</para>
  		</glossdef>
--- 6,21 ----
  			<para>Foreign eXchange Office</para>
  			<para>
! An FXO device can be an analog phone, answering machine, fax, or anything 
! that handles a call from the telephone company like one.  They should also 
! operate the same way when connected to an FXS interface.
! 			</para>
! 
! 			<para>
! An FXO interface will accept calls from FXS or PSTN interfaces.  All countries 
! and regions have their own standards.
! 			</para>
! 
! 			<para>
! FXO is complimentary to FXS (and the PSTN).
  			</para>
  		</glossdef>
***************
*** 24,28 ****
  			<para>Foreign eXchange Station</para>
  			<para>
! 				See FXO 
  			</para>
  		</glossdef>
--- 26,40 ----
  			<para>Foreign eXchange Station</para>
  			<para>
! An FXS device has hardware to generate the ring signal an FXO extension 
! (usually an analog phone).
! 			</para>
! 
! 			<para>
! An FXS device will allow any FXO device to operate as if it were connected to 
! the phone company.  This makes your PBX the POTS+PSTN for the phone.
! 			</para>
! 
! 			<para>
! The FXS Interface connects to FXO devices (by an FXO interface, of course).
  			</para>
  		</glossdef>