From: itraviv <itraviv@cisco.com>
Date: Sun, 31 Jul 2016 13:51:05 +0000 (+0300)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=a5a63f0228414f90beba2f36313913c706b859ad;p=trex.git

Merge remote-tracking branch 'origin/master'
---

a5a63f0228414f90beba2f36313913c706b859ad
diff --cc trex_rpc_server_spec.asciidoc
index b6a20450,4bd0949c..9e81c53e
--- a/trex_rpc_server_spec.asciidoc
+++ b/trex_rpc_server_spec.asciidoc
@@@ -5,22 -5,11 +5,11 @@@ The TRex RPC Serve
  :revnumber: 1.1
  :quotes.++:
  :numbered:
 -:web_server_url: http://trex-tgn.cisco.com/trex
 +:web_server_url: https://trex-tgn.cisco.com/trex
  :local_web_server_url: csi-wiki-01:8181/trex
- :toclevels: 4
+ :toclevels: 7
  
- ++++
- <script>
-   (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-   (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-   m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-   })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
- 
-   ga('create', 'UA-75220362-1', 'auto');
-   ga('send', 'pageview');
- 
- </script>
- ++++
+ include::trex_ga.asciidoc[]
  
  == Change log
  
diff --cc ws_main.py
index 188a3275,c9094ccf..7b32409b
mode 100644,100755..100755
--- a/ws_main.py
+++ b/ws_main.py
@@@ -281,13 -918,7 +918,10 @@@ def build(bld)
  
      bld(rule='${ASCIIDOC}   -a stylesheet=${SRC[1].abspath()} -a  icons=true -a toc2 -a max-width=55em  -o ${TGT} ${SRC[0].abspath()}',
          source='packet_builder_yaml.asciidoc waf.css', target='packet_builder_yaml.html', scan=ascii_doc_scan)
-         
-     bld(rule='${ASCIIDOC}   -a stylesheet=${SRC[1].abspath()} -a  icons=true -a toc2 -a max-width=55em  -o ${TGT} ${SRC[0].abspath()}',
-         source='trex_rpc_server_spec.asciidoc waf.css', target='trex_rpc_server_spec.html', scan=ascii_doc_scan)
  
 +    bld(rule='${ASCIIDOC}   -a stylesheet=${SRC[1].abspath()} -a  icons=true -a toc2 -a max-width=55em  -o ${TGT} ${SRC[0].abspath()}',
 +        source='trex_scapy_rpc_server.asciidoc waf.css', target='trex_scapy_rpc_server.html', scan=ascii_doc_scan)
 +
      bld(rule='${ASCIIDOC}   -a stylesheet=${SRC[1].abspath()} -a  icons=true -a toc2 -a max-width=55em  -o ${TGT} ${SRC[0].abspath()}',
          source='trex_control_plane_design_phase1.asciidoc waf.css', target='trex_control_plane_design_phase1.html', scan=ascii_doc_scan)
          
@@@ -377,7 -1015,15 +1018,16 @@@ def publish_test(bld)
  
  
  
+ def publish_both(bld):
+     publish(bld)
+     publish_ext(bld)
+ 
           
-                
+ def test(bld):
+     # copy all the files to our web server 
+     toc_fixup_file ('build/trex_stateless.tmp',
+                     'build/trex_stateless.html',
+                     'trex_stateless.json')
+ 
  
 +