document basic configuration: .e2/e2version, e2/syntax, .e2/extensions

Signed-off-by: Gordon Hecker <gh@emlix.com>

diff --git a/README.extensions b/README.extensions
index 0c761f017a0504986122341af1acd3a27ac8fc4d..0d19f31958db5b8859c73f3e4464d8ea34dabee8 100644 (file)
--- a/README.extensions
+++ b/README.extensions
@@ -14,6 +14,5 @@ extensions can provide a local and a global part. The requirements are
  * Either part may be empty (i.e. build and install nothing). In other words:
    Extensions may provide code for local install or code for global install
    or both.
- * extensions are configured in .e2/extensions, this config file replaces
-   .e2/e2version in versions of e2factory with extension support.
+ * extensions are configured in .e2/extensions
  * It is planned to provide a plugin interface

diff --git a/doc/manual/Makefile b/doc/manual/Makefile
index 87a6de24ba573c9ead8971e1d6217bc185864a86..8d520155fe23cd5600386d66abd56273d54519e2 100644 (file)
--- a/doc/manual/Makefile
+++ b/doc/manual/Makefile
@@ -32,7 +32,7 @@ include $(TOPLEVEL)/make.vars
 
 HTML = manual.html \
        basic-concepts.html buildid.html \
-       environment.html project.html chroot.html licences.html \
+       basic.html environment.html project.html chroot.html licences.html \
        sources.html results.html release.html migration.html \
        faq.html
 

diff --git a/doc/manual/basic.text b/doc/manual/basic.text
new file mode 100644 (file)
index 0000000..53d1273
--- /dev/null
+++ b/doc/manual/basic.text
@@ -0,0 +1,40 @@
+Basic configuration
+-------------------
+
+
+*e2factory* requires some basic settings in configuration files in the
+project:
+
+*   .e2/e2version configures the version of e2factory to be used with
+    the project (the local tools)
+*   .e2/syntax holds the syntax version the project requires
+*   .e2/extensions lists zero or more extensions to be installed with
+    e2factory (local tools)
+
+.e2/e2version holds a single line specifying a branch and a tag.
+e2factory (the e2-install-e2 tool) installs the version according to the
+tag unless the special tag '^' is used.
+
+Example:
+
+    master e2factory-2.3.1
+
+.e2/syntax holds a single line specifying the required syntax version
+
+Example:
+
+    2_3_0
+
+.e2/extensions holds a table specifying a list of extensions.
+
+Example:
+
+    extensions {
+      {
+        name="e2factory-extension",
+        ref="refs/tags/e2factory-extension-2.3.1",
+      },
+    }
+
+prev [buildid](buildid.html)
+next [environment](environment.html)

diff --git a/doc/manual/buildid.text b/doc/manual/buildid.text
index 606d1f02946b859e8b5b2d01ca804e3638c1cb5b..6206f5f9a8ff5d954db7105c8d4f71a54369c9f5 100644 (file)
--- a/doc/manual/buildid.text
+++ b/doc/manual/buildid.text
@@ -23,4 +23,4 @@ The picture shows a quick overview of how the buildid is composed:
 ![buildid.png](buildid.png "buildid calculation")
 
 prev [basic-concepts](basic-concepts.html)
-next [environment](environment.html)
+next [basic](basic.html)

diff --git a/doc/manual/environment.text b/doc/manual/environment.text
index 88aba2a344298000485fc0bd95316910f8459849..98c1184bd16fa43405d7f922f4e511b7197af180 100644 (file)
--- a/doc/manual/environment.text
+++ b/doc/manual/environment.text
@@ -35,5 +35,5 @@ Examples:
 
     env "proj/more.env"
 
-prev [buildid](buildid.html)
+prev [basic](basic.html)
 next [project](project.html)

diff --git a/doc/manual/manual.text b/doc/manual/manual.text
index b6c73903008f56c8b9eeb8bf234fa9250d940566..44c777a54a64548a2eb539251f21b433f0266cdd 100644 (file)
--- a/doc/manual/manual.text
+++ b/doc/manual/manual.text
@@ -7,6 +7,7 @@ Content
 
 +   Configuration
 
+ *   [basic](basic.html)
  *   [environment](environment.html)
  *   [project](project.html)
  *   [chroot](chroot.html)