[Asterisk-doc] docs NOTES,1.4,1.5 installation.xml,1.2,1.3 words.list,1.4,1.5

blitzrage asterisk-doc@lists.digium.com
Tue, 13 Jan 2004 16:36:34 +0000


Comments:
Update of /cvsroot/asterisk/docs
In directory sc8-pr-cvs1:/tmp/cvs-serv21118/docs

Modified Files:
	NOTES installation.xml words.list 
Log Message:
blitzrage
- remove some <para>blah</para> stuff that was bugging me
- Make some changes to CVS update information - someone please verify
- Add an <example> example in NOTES
- Add a couple more words to words.list

Basically someone just needs to go through my changes and verify them.
Index: NOTES
===================================================================
RCS file: /cvsroot/asterisk/docs/NOTES,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** NOTES	2 Jan 2004 04:36:36 -0000	1.4
--- NOTES	13 Jan 2004 16:36:22 -0000	1.5
***************
*** 82,85 ****
--- 82,92 ----
  			</screen>
  
+ 	example:	<example>
+ 			<title>This is an example</title>
+ 			<programlisting>
+ 			This is a program listing
+ 			</programlisting>
+ 			</example>
+ 
  Used outside of <para></para>
  -----------------------------
Index: installation.xml
===================================================================
RCS file: /cvsroot/asterisk/docs/installation.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** installation.xml	12 Jan 2004 06:21:44 -0000	1.2
--- installation.xml	13 Jan 2004 16:36:23 -0000	1.3
***************
*** 9,29 ****
  			<sect3>
  				<title>SOHO/Residential System</title>
! 				<para>blah</para>
  			</sect3>
  			<sect3>
  				<title>Small Business System</title>
! 				<para>blah</para>
  			</sect3>
  			<sect3>
  				<title>Medium Business/Small Call-center System</title>
! 				<para>blah</para>
  			</sect3>
  			<sect3>
  				<title>Enterprise System</title>
! 				<para>blah</para>
  			</sect3>
  			<sect3>
  				<title>VoIP Carrier System</title>
! 				<para>blah</para>
  			</sect3>
  		</sect2>
--- 9,29 ----
  			<sect3>
  				<title>SOHO/Residential System</title>
! 				<para/>
  			</sect3>
  			<sect3>
  				<title>Small Business System</title>
! 				<para/>
  			</sect3>
  			<sect3>
  				<title>Medium Business/Small Call-center System</title>
! 				<para/>
  			</sect3>
  			<sect3>
  				<title>Enterprise System</title>
! 				<para/>
  			</sect3>
  			<sect3>
  				<title>VoIP Carrier System</title>
! 				<para/>
  			</sect3>
  		</sect2>
***************
*** 141,182 ****
  				are stable release builds every once in a while, but they become outdated quite quickly.  
  				Your best bet is to get Asterisk from the Digium CVS server and compile it 
! 				on your box.  Before you start compiling, make sure that your system has 
! 				these packages:
! 			</para>
! 			<para>
! 			[Didn't we already cover these earlier, under required packages?]
! 			[Also, why are we being distribution specific in here?]
! 			</para>
! 			<para>
! 				<simplelist>
! 				<member>OpenSSL and OpenSSL development packages</member>
! 				<member>Linux kernel 2.4.x and the Linux Kernel Source package</member>
! 				</simplelist>
! 			</para>
! 			<para>
! 				If you are using a RedHat based system, when you install, just select the 
! 				Development packages and it should pretty much give you everything you need to 
! 				compile software with.  You are also going to need CVS installed, but again, it 
! 				is part of the development packages.
! 			</para>
! 			<para>
! 				If you are using Debian simply install the required packages with
! 				<command>apt-get install libssl-dev</command> .
! 			</para>
! 			<para>
! 				Now we can get the files from the CVS server.
  			</para>
  			<para>
  			<literallayout>
  				<command>cd /usr/src</command>
! 				<command>export CVSROOT=:pserver:anoncvs@cvs.digium.com:/usr/cvsroot</command>
! 				<command>cvs login</command>		- the password is anoncvs
! 				<command>cvs checkout zaptel libpri asterisk</command>
  			</literallayout>
  			</para>
  			<para>
  				Your server will download all the appropriate files from the CVS server 
! 				and place them in their respective directories (the top ones being zaptel, 
! 				libpri and asterisk).
  			</para>
  		</sect2>
--- 141,161 ----
  				are stable release builds every once in a while, but they become outdated quite quickly.  
  				Your best bet is to get Asterisk from the Digium CVS server and compile it 
! 				on your box.
  			</para>
+ 			<!-- removed distribution specific stuff -->
+ 		</sect2>
+ 		<sect2>
+ 			<title>Getting the files from CVS</title>
  			<para>
  			<literallayout>
  				<command>cd /usr/src</command>
! 				<command>cvs -z3 -d:pserver:anoncvs@cvs.digium.com:/usr/cvsroot login</command>
! 				The password is <emphasis>anoncvs</emphasis>
! 				<command>cvs -z3 -d:pserver:anoncvs@cvs.digium.com:/usr/cvsroot checkout zaptel libpri asterisk</command>
  			</literallayout>
  			</para>
  			<para>
  				Your server will download all the appropriate files from the CVS server 
! 				and place them in their respective directories.
  			</para>
  		</sect2>
***************
*** 184,189 ****
  			<title>Updates</title>
  			<para>
! 			[Explain how to do a CVS update (if they're using CVS)]
  			</para>
  		</sect2>
  	</sect1>
--- 163,192 ----
  			<title>Updates</title>
  			<para>
! 			To update your packages from CVS is relatively straight forward.  One note however
! 			is that the asterisk directory has a script to automatically update from CVS, compile
! 			and install for you.  The only problem is that it doesn't do zaptel and libpri for you,
! 			so those will need to be done manually.
  			</para>
+ 			<sect3>
+ 				<title>Updating zaptel and libpri</title>
+ 				<para>
+ 				<literallayout>
+ 				<command>cd /usr/src/</command>
+ 				<command>cvs -z3 -d:pserver:anoncvs@cvs.digium.com:/usr/cvsroot login</command>
+ 				The password is <emphasis>anoncvs</emphasis>
+ 				<command>cvs -z3 -d:pserver:anoncvs@cvs.digium.com:/usr/cvsroot update zaptel libpri</command>
+ 				[say how to unload the modules and recompile]
+ 				</literallayout>
+ 				</para>
+ 			</sect3>
+ 			<sect3>
+ 				<title>Updating asterisk with make update</title>
+ 				<para>
+ 				Updating Asterisk is actually very simple.  All you need to do is a <command>make update</command>
+ 				in the <filename class='directory'>/usr/src/asterisk/</filename> directory.  This will
+ 				update Asterisk from the CVS server, compile and install for you.  After that is done, simply
+ 				restart Asterisk for the new changes to take effect.
+ 				</para>
+ 			</sect3>
  		</sect2>
  	</sect1>
***************
*** 192,218 ****
  		<sect2>
  			<title>Using "make"</title>
!                         <para>Now we need to compile Asterisk as root :
! 			<!-- We may need to clean up this section a bit as the way it is laid out is a little weird -->
! 			[Take this out... it's explained below under "Compiling the software"]
! 			</para>
!                         <para>
!                         	<literallayout>
!                                 <command>cd zaptel</command>
!                                 <command>make clean ; make install</command>
!                                 <command>cd ../libpri</command>
!                                 <command>make clean ; make install</command>
!                                 <command>cd ../asterisk</command>
!                                 <command>make clean ; make install</command>
!                         	</literallayout>
!                         </para>
! 			<para>
! 				Depending on how fast your machine is, this will 
! 				take a few minutes.  At the end 
! 				of the configuration it will ask you if you want to 
! 				make samples, don't bother with that, as we are going 
! 				to make all the files we need from scratch (it's easier 
! 				then trying to move stuff around in the sample files to 
! 				fit our system)
! 			</para>
  		</sect2>
  		<sect2>
--- 195,199 ----
  		<sect2>
  			<title>Using "make"</title>
! 			<para/>
  		</sect2>
  		<sect2>
***************
*** 221,233 ****
  			<sect3>
  				<title>Zaptel</title>
! 				<para/>
  			</sect3>
  			<sect3>
  				<title>Libpri</title>
! 				<para/>
  			</sect3>
  			<sect3>
  				<title>Asterisk</title>
! 				<para/>
  			</sect3>
  		</sect2>
--- 202,232 ----
  			<sect3>
  				<title>Zaptel</title>
! 				<para>
! 					<literallayout>
! 					<command>cd /usr/src/zaptel/</command>
! 					<command>make clean</command>
! 					<command>make install</command>
! 					</literallayout>
! 				</para>
  			</sect3>
  			<sect3>
  				<title>Libpri</title>
! 				<para>
! 					<literallayout>
! 					<command>cd /usr/src/libpri</command>
! 					<command>make clean</command>
! 					<command>make install</command>
! 					</literallayout>
! 				</para>
  			</sect3>
  			<sect3>
  				<title>Asterisk</title>
! 				<para>
! 					<literallayout>
! 					<command>cd /usr/src/asterisk</command>
! 					<command>make clean</command>
! 					<command>make install</command>
! 					</literallayout>
! 				</para>
  			</sect3>
  		</sect2>
***************
*** 322,326 ****
  				</para>
  				<para>
! 					<command>load =&gt; chan_capi.so</command>
  				</para>
  				<para>
--- 321,325 ----
  				</para>
  				<para>
! 					<command>load =&gt; chan_ca-pi.so</command>
  				</para>
  				<para>
***************
*** 368,371 ****
--- 367,371 ----
  			<title>Manually starting Asterisk and the CLI</title>
  			<para>
+ 				<literallayout>
  				To start asterisk in the background; <command>/usr/sbin/asterisk</command>
  				To start asterisk in console mode: <command>/usr/sbin/asterisk -c</command>
***************
*** 373,376 ****
--- 373,377 ----
  				To start asterisk in console mode, verbose and in debug mode: <command>/usr/sbin/asterisk -cvvvd</command>
  				To start asterisk in console mode, verbose, debug and dump cores: <command>/usr/sbin/asterisk -cvvvgd</command>
+ 				</literallayout>
  			</para>
  		</sect2>
***************
*** 390,400 ****
  		<sect2>
  			<title>Accessing the CLI when Asterisk is running</title>
  			<para>
! 				If your asterisk is already running, you can reattach with the <command>-r</command> 
! 				switch.
  			</para>
  			<para>
  			[Please, let's be more specific here.  And maybe give an example.]
! </para>
  		</sect2>
  		<sect2>
--- 391,409 ----
  		<sect2>
  			<title>Accessing the CLI when Asterisk is running</title>
+ 			<!-- tried to be more specific and add an example -->
  			<para>
! 			If you ever need to re-attach to the Asterisk CLI for any reason,
! 			we can use the <command>-r</command> switch.
! 			
! 			<example>
! 			<title>Re-attach to the Asterisk CLI</title>
! 			<literallayout>
! 			<command>/usr/sbin/asterisk -r</command>
! 			</literallayout>
! 			</example>
  			</para>
  			<para>
  			[Please, let's be more specific here.  And maybe give an example.]
! 			</para>
  		</sect2>
  		<sect2>
Index: words.list
===================================================================
RCS file: /cvsroot/asterisk/docs/words.list,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** words.list	13 Jan 2004 15:25:55 -0000	1.4
--- words.list	13 Jan 2004 16:36:23 -0000	1.5
***************
*** 1,3 ****
! personal_ws-1.1 en 283
  SendImage
  conf
--- 1,3 ----
! personal_ws-1.1 en 285
  SendImage
  conf
***************
*** 13,16 ****
--- 13,17 ----
  Manousos
  Telecom
+ Gentoo
  Baig
  AgentCallbackLogin
***************
*** 37,40 ****
--- 38,42 ----
  codec
  wcfxs
+ literallayout
  DOCTYPE
  astkey
***************
*** 138,144 ****
  VoiceMail
  DBput
  Sokol
  SQL
- devel
  Rollyson
  libreadline
--- 140,146 ----
  VoiceMail
  DBput
+ devel
  Sokol
  SQL
  Rollyson
  libreadline
***************
*** 170,176 ****
  LineJack
  FQDN
- Cisco
- tmp
  SetVar
  AbsoluteTimeout
  zttool
--- 172,178 ----
  LineJack
  FQDN
  SetVar
+ tmp
+ Cisco
  AbsoluteTimeout
  zttool