From 29755f8b0c2c2ea007eb912b915ec97b715b8b6c Mon Sep 17 00:00:00 2001 From: jfb8856606 Date: Tue, 25 Jun 2019 20:07:52 +0800 Subject: [PATCH] merge doc. --- README.md | 4 ---- doc/F-Stack_API_Reference.md | 4 ---- doc/F-Stack_Quick_Start_Guide.md | 4 ---- 3 files changed, 12 deletions(-) diff --git a/README.md b/README.md index 80a291c7..5ede09dc 100644 --- a/README.md +++ b/README.md @@ -31,11 +31,7 @@ Currently, besides authorized DNS server of DNSPod, there are various products i ## Quick Start # clone F-Stack -<<<<<<< HEAD mkdir -p /data/f-stack -======= - mkdir /data/f-stack ->>>>>>> aca62ecc5596c6283719465d643b88198182810f git clone https://github.com/F-Stack/f-stack.git /data/f-stack # install libnuma-dev diff --git a/doc/F-Stack_API_Reference.md b/doc/F-Stack_API_Reference.md index 5dff5745..637b1204 100644 --- a/doc/F-Stack_API_Reference.md +++ b/doc/F-Stack_API_Reference.md @@ -23,11 +23,7 @@ Initialize F-Stack，including DPDK/FreeBSD network stack, etc. #### ff_run void ff_run(loop_func_t loop, void *arg); -<<<<<<< HEAD loop is a callback function，the service logic is implemented by the user, and called by each poll of F-Stack . -======= -loop is a callbask function，the service logic is implemented by the user, and called by each poll of F-Stack . ->>>>>>> aca62ecc5596c6283719465d643b88198182810f ### Control API diff --git a/doc/F-Stack_Quick_Start_Guide.md b/doc/F-Stack_Quick_Start_Guide.md index 6440a54b..42078bd2 100644 --- a/doc/F-Stack_Quick_Start_Guide.md +++ b/doc/F-Stack_Quick_Start_Guide.md @@ -75,9 +75,5 @@ The mount point can be made permanent across reboots, by adding the following li # run with start.sh ./start.sh -b ./redis-server -o /path/to/redis.conf # or run like this: -<<<<<<< HEAD #./redis-server --conf config.ini --proc-type=primary --proc-id=0 /path/to/redis.conf -======= - #./redis-server --conf=config.ini --proc-type=primary --proc-id=0 /path/to/redis.conf ->>>>>>> aca62ecc5596c6283719465d643b88198182810f