updated changelog

[nepi.git] / doc / user_manual / supported_resources.tex

diff --git a/doc/user_manual/supported_resources.tex b/doc/user_manual/supported_resources.tex
index d9fc8ad..d69ddef 100644 (file)
--- a/doc/user_manual/supported_resources.tex
+++ b/doc/user_manual/supported_resources.tex
@@ -1,12 +1,11 @@
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 %    NEPI, a framework to manage network experiments
 %    Copyright (C) 2013 INRIA
 %
 %    This program is free software: you can redistribute it and/or modify
-%    it under the terms of the GNU General Public License as published by
-%    the Free Software Foundation, either version 3 of the License, or
-%    (at your option) any later version.
+%    it under the terms of the GNU General Public License version 2 as
+%    published by the Free Software Foundation;
 %
 %    This program is distributed in the hope that it will be useful,
 %    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -23,10 +22,9 @@
 \section{Linux resources}
 
 \begin{itemize}
+  \item Linux Node (Clean home, etc)
   \item SSH
   \item The directory structure
-  \item Linux Node (Clean home, etc)
-  \item The api (run, exceute, x11, etc)
   \item Traces and collection
   \item Linux Application
   \item LinuxPing, LinuxTraceroute, etc
@@ -35,19 +33,8 @@
 
 \section{Planetlab resources}
 
-\begin{itemize}
- \item how to get an account
- \item The vsys system
- \item python-vsys
- \item TAP/TUN/TUNNEL
- \item Note on PL inestability
- \item differences between PLE and PLC
-\end{itemize}
+\input{planetlab_resources.tex}
 
 \section{OMF resources}
 
-\begin{itemize}
-  \item available OMF testbeds
-  \item how to get an account
-  \item the concept of resource reservation
-\end{itemize}
+\input{omf_resources.tex}