Kelven Yang
							
						 
					 | 
					
						
						
						
						
							
						
						
							8f70ee08e0
							
						
					 | 
					
						
						
							
							Fix the unsolved conflicts for doc build
						
						
						
						
						
						
					 | 
					
						2013-02-01 17:22:51 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Kelven Yang
							
						 
					 | 
					
						
						
						
						
							
						
						
							5fee891162
							
						
					 | 
					
						
						
							
							merge from master
						
						
						
						
						
						
					 | 
					
						2012-10-11 17:42:25 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gavin Lee
							
						 
					 | 
					
						
						
						
						
							
						
						
							b6fb19f2cd
							
						
					 | 
					
						
						
							
							docbook for adding primary and secondary storage
						
						
						
						
						
						
						
						Signed-off-by: Gavin Lee <gavin.lxh@gmail.com>
Signed-off-by: Mice Xia <mice_xia@tcloudcomputing.com> 
						
						
					 | 
					
						2012-09-24 17:48:40 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Nalley
							
						 
					 | 
					
						
						
						
						
							
						
						
							6089c33f68
							
						
					 | 
					
						
						
							
							Revert "Feature Documentation for s2svpn interVlan and Autoscale"
						
						
						
						
						
						
						
						This reverts commit 4a8bb9dfc70a1d0b1b855b10d821a54ed51a0ba6. 
						
						
					 | 
					
						2012-09-13 12:03:55 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Radhika Puthiyetath
							
						 
					 | 
					
						
						
						
						
							
						
						
							a28fd66b46
							
						
					 | 
					
						
						
							
							Feature Documentation for s2svpn interVlan and Autoscale
						
						
						
						
						
						
					 | 
					
						2012-09-11 17:38:12 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Radhika Puthiyetath
							
						 
					 | 
					
						
						
						
						
							
						
						
							4a8bb9dfc7
							
						
					 | 
					
						
						
							
							Feature Documentation for s2svpn interVlan and Autoscale
						
						
						
						
						
						
					 | 
					
						2012-09-11 14:23:59 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Wido den Hollander
							
						 
					 | 
					
						
						
						
						
							
						
						
							dcfa5a50b7
							
						
					 | 
					
						
						
							
							docs: Fix indentation according to coding convention
						
						
						
						
						
						
						
						The coding convention requires:
* 4 spaces, no tabs
* Unix line endings 
						
						
					 | 
					
						2012-08-11 22:43:26 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Joe Brockmeier
							
						 
					 | 
					
						
						
						
						
							
						
						
							cf5c7bd88f
							
						
					 | 
					
						
						
							
							fixing licenses for p doc files
						
						
						
						
						
						
					 | 
					
						2012-08-11 11:40:03 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Nalley
							
						 
					 | 
					
						
						
						
						
							
						
						
							e874fdb24c
							
						
					 | 
					
						
						
							
							adding docs
						
						
						
						
						
						
					 | 
					
						2012-07-16 15:43:58 -04:00 | 
					
					
						
						
							
							
							
						
					 |