From c5dacee928da62ba18ff9f8a478c31802fc2e3b0 Mon Sep 17 00:00:00 2001
From: Justin-chi <chigang@huawei.com>
Date: Fri, 22 Jan 2016 17:31:30 +0800
Subject: Document update for Brahmaputra release(WIP)

Add Network configuration for deploy

Change-Id: Ief7863b3c4764949f31bca9e1a4c8aaea5306f8f
Signed-off-by: Justin-chi <chigang@huawei.com>
(cherry picked from commit c3f89eca0c74f587f833c5884aa7f1b3d96827c3)
---
 docs/FAQ/FAQ.rst | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 90 insertions(+)

(limited to 'docs/FAQ')

diff --git a/docs/FAQ/FAQ.rst b/docs/FAQ/FAQ.rst
index e32bd503..b5ea05f8 100644
--- a/docs/FAQ/FAQ.rst
+++ b/docs/FAQ/FAQ.rst
@@ -31,10 +31,100 @@ Version history
 | **Date**           | **Ver.**           | **Author**         | **Comment**               |
 |                    |                    |                    |                           |
 +--------------------+--------------------+--------------------+---------------------------+
+| 2016-01-25         | 0.0.2              | Justin Chi         | Add template              |
+|                    |                    | (HUAWEI)           |                           |
++--------------------+--------------------+--------------------+---------------------------+
 | 2016-01-17         | 0.0.1              | Justin Chi         | First draft               |
 |                    |                    | (HUAWEI)           |                           |
 +--------------------+--------------------+--------------------+---------------------------+
 
+General Remarks
+===============
+
+
+New Features
+============
+
+Ubuntu 14.04 support
+--------------------
+
+Compass4nfv for Brahmaputra release uses Ubuntu 14.04 as its target OPNFV system base OS.
+
+Openstack Liberty release support
+---------------------------------
+
+Ceph Infernalis release support
+-------------------------------
+
+OpenDaylight Lithium release support
+------------------------------------
+
+ONOS Emu release support
+------------------------
+
+Opencontrail release support
+----------------------------
+
+High-availability for OpenStack
+-------------------------------
+
+
+Improvements/Enhancements
+=========================
+
+
+Performance Improvements/Enhancements
+-------------------------------------
+
+<First release, none at this time>
+
+
+Other Improvements/Enhancements
+-------------------------------
+
+<First release, none at this time>
+
+
+Removed/Retired Features
+========================
+
+<First release, none at this time>
+
+
+Bug Fixes
+=========
+
+
+Known Issues
+============
+
+
+Installation Information
+========================
+
+
+Installation instructions can be found at:
+
+`Here <http://artifacts.opnfv.org/compass4nfv/docs/Brahmaputra_installation-instructions/index.html>`_
+
+
+Frequently Asked Questions
+==========================
+
+Frequently asked questions can be found at:
+
+`Here <http://artifacts.opnfv.org/compass4nfv/docs/Brahmaputra_FAQ/FAQ.html>`_
+
+
+Stay informed
+=============
+
+You are encouraged to subscribe to the OPNFV announcement mailing list to receive important
+notifications such as product updates and security patches.
+
+To get support you can send an email to:  opnfv-users@lists.opnfv.org.
+
+
 
 :Authors: Justin Chi (HUAWEI)
 :Version: 0.0.1
-- 
cgit 1.2.3-korg