[gentoo-commits] proj/netifrc:master commit in: /, doc/

[gentoo-commits] proj/netifrc:master commit in: /, doc/

[Robin H. Johnson]

commit:     8ff6a388b098ed4c170b653681eebd9918d15817
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 24 19:28:00 2013 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Aug 24 19:29:06 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/netifrc.git;a=commit;h=8ff6a388

Merge README files.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

---
 README     | 15 ++++++++++++++-
 doc/README | 12 ------------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/README b/README
index e7d8a94..d5e1fbb 100644
--- a/README
+++ b/README
@@ -1,6 +1,19 @@
 netifrc README
 
-You should probably go and read the OpenRC README.
+This package provides a system of modules to manage and configure network
+interfaces via individual per-interface scripts in /etc/init.d.  Provided
+is the parent script "/etc/init.d/net.lo", which should be symlinked to
+create additional scripts for each interface to be configured:
+
+	ln -s /etc/init.d/net.{lo,eth0}
+
+Configuration is handled in "/etc/conf.d/net".  A default (empty or missing)
+/etc/conf.d/net automatically uses DHCP to configure any network interfaces 
+started by these scripts.  To create a more complete configuration, please 
+review net.example* in the doc directory and save your configuration 
+in /etc/conf.d/net.
+
+You should also probably go and read the OpenRC README.
 
 netifrc is what was previously called 'oldnet' in OpenRC, and was the only
 networking system in Baselayout 1.x. This system has been around a very long

diff --git a/doc/README b/doc/README
deleted file mode 100644
index 70288f1..0000000
--- a/doc/README
+++ /dev/null
@@ -1,12 +0,0 @@
-This package provides a system of modules to manage and configure network
-interfaces via individual per-interface scripts in /etc/init.d.  Provided
-is the parent script "/etc/init.d/net.lo", which should be symlinked to
-create additional scripts for each interface to be configured:
-
-	ln -s /etc/init.d/net.{lo,eth0}
-
-Configuration is handled in "/etc/conf.d/net".  A default (empty or missing)
-/etc/conf.d/net automatically uses DHCP to configure any network interfaces 
-started by these scripts.  To create a more complete configuration, please 
-review net.example* in this directory and save your configuration 
-in /etc/conf.d/net.