summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG1
-rw-r--r--docs/cobbler.pod2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index bf979d2..ed82f19 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@ Cobbler CHANGELOG
- Wed Jun 03 2008 - 1.0.3
- Fix error message output from failed kickstart rendering
+- manpage edits
- Tue Jun 03 2008 - 1.0.1
- Fix misformatted warning in "check"
diff --git a/docs/cobbler.pod b/docs/cobbler.pod
index c42781f..72279dd 100644
--- a/docs/cobbler.pod
+++ b/docs/cobbler.pod
@@ -175,7 +175,7 @@ This is an advanced feature.
Profiles may inherit from other profiles in lieu of specifing --distro. Inherited profiles will override any settings specified in their parent, with the exception of --ksmeta (templating) and --kopts (kernel options), which will be blended together.
-Example: If profile A has --kopts="x=7 y=2", B inherits from A, and B has --kopts="x=9 z=2", the actual kernel options that will be used for B are "x=7 y=2 z=2".
+Example: If profile A has --kopts="x=7 y=2", B inherits from A, and B has --kopts="x=9 z=2", the actual kernel options that will be used for B are "x=9 y=2 z=2".
Example: If profile B has --virt-ram=256 and A has --virt-ram of 512, profile B will use the value 256.
Example: If profile A has a --virt-file-size of 5 and B does not specify a size, B will use the value from A.