From: Marcin Siodelski Date: Tue, 13 Sep 2016 08:39:44 +0000 (+0200) Subject: [3684] Updated configuration examples per second round of review. X-Git-Tag: trac5006_base~8^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1fe02beb422ea60aefe407615fc308b457f21f46;p=thirdparty%2Fkea.git [3684] Updated configuration examples per second round of review. --- diff --git a/doc/examples/kea4/backends.json b/doc/examples/kea4/backends.json index b52b6fade8..6f1d19cff6 100644 --- a/doc/examples/kea4/backends.json +++ b/doc/examples/kea4/backends.json @@ -68,7 +68,7 @@ # "contact_points": "192.0.2.1,192.0.2.2,192.0.2.3" # }, -# Addresses will be assigned with valid lifetimes being 4000. +# Addresses will be assigned with a lifetime of 4000 seconds. "valid-lifetime": 4000, # Renew and rebind timers are commented out. This implies that options @@ -90,7 +90,7 @@ }, # The following configures logging. It assumes that messages with at least -# informational level (info, warn, error) will will be logged to stdout. +# informational level (info, warn, error and fatal) should be logged to stdout. "Logging": { "loggers": [ { diff --git a/doc/examples/kea4/classify.json b/doc/examples/kea4/classify.json index 760f584fd5..e4766f0960 100644 --- a/doc/examples/kea4/classify.json +++ b/doc/examples/kea4/classify.json @@ -83,7 +83,7 @@ }, # The following configures logging. It assumes that messages with at least -# informational level (info, warn, error) will will be logged to stdout. +# informational level (info, warn, error and fatal) should be logged to stdout. "Logging": { "loggers": [ { diff --git a/doc/examples/kea4/leases-expiration.json b/doc/examples/kea4/leases-expiration.json index e66f094cca..d5f0188860 100644 --- a/doc/examples/kea4/leases-expiration.json +++ b/doc/examples/kea4/leases-expiration.json @@ -35,7 +35,7 @@ "unwarned-reclaim-cycles": 10 }, -# Addresses will be assigned with valid lifetimes being 4000. +# Addresses will be assigned with a lifetime of 4000 seconds. "valid-lifetime": 4000, # The following list defines subnets. We have only one subnet @@ -50,7 +50,7 @@ }, # The following configures logging. It assumes that messages with at least -# informational level (info, warn, error) will will be logged to stdout. +# informational level (info, warn, error and fatal) should be logged to stdout. "Logging": { "loggers": [ { diff --git a/doc/examples/kea4/multiple-options.json b/doc/examples/kea4/multiple-options.json index ab07ff5fee..940c448547 100644 --- a/doc/examples/kea4/multiple-options.json +++ b/doc/examples/kea4/multiple-options.json @@ -17,7 +17,7 @@ "type": "memfile" }, -# Addresses will be assigned with valid lifetimes being 4000. +# Addresses will be assigned with a lifetime of 4000 seconds. "valid-lifetime": 4000, # Renew and rebind timers are commented out. This implies that options @@ -55,7 +55,7 @@ }, # The following configures logging. It assumes that messages with at least -# informational level (info, warn, error) will will be logged to stdout. +# informational level (info, warn, error and fatal) should be logged to stdout. "Logging": { "loggers": [ { diff --git a/doc/examples/kea4/mysql-reservations.json b/doc/examples/kea4/mysql-reservations.json index 8bb1ae0530..e1722073a9 100644 --- a/doc/examples/kea4/mysql-reservations.json +++ b/doc/examples/kea4/mysql-reservations.json @@ -19,7 +19,7 @@ "type": "memfile" }, -# Addresses will be assigned with valid lifetimes being 4000. +# Addresses will be assigned with a lifetime of 4000 seconds. "valid-lifetime": 4000, # Renew and rebind timers are commented out. This implies that options @@ -76,7 +76,7 @@ }, # The following configures logging. It assumes that messages with at least -# informational level (info, warn, error) will will be logged to stdout. +# informational level (info, warn, error and fatal) should be logged to stdout. "Logging": { "loggers": [ { diff --git a/doc/examples/kea4/pgsql-reservations.json b/doc/examples/kea4/pgsql-reservations.json index 3f6b91b8b7..ab89f6bdab 100644 --- a/doc/examples/kea4/pgsql-reservations.json +++ b/doc/examples/kea4/pgsql-reservations.json @@ -19,7 +19,7 @@ "type": "memfile" }, -# Addresses will be assigned with valid lifetimes being 4000. +# Addresses will be assigned with a lifetime of 4000 seconds. "valid-lifetime": 4000, # Renew and rebind timers are commented out. This implies that options @@ -76,7 +76,7 @@ }, # The following configures logging. It assumes that messages with at least -# informational level (info, warn, error) will will be logged to stdout. +# informational level (info, warn, error and fatal) should be logged to stdout. "Logging": { "loggers": [ { diff --git a/doc/examples/kea4/reservations.json b/doc/examples/kea4/reservations.json index 328a6b3511..17c8ceb5e0 100644 --- a/doc/examples/kea4/reservations.json +++ b/doc/examples/kea4/reservations.json @@ -17,7 +17,7 @@ "type": "memfile" }, -# Addresses will be assigned with valid lifetimes being 4000. +# Addresses will be assigned with a lifetime of 4000 seconds. "valid-lifetime": 4000, # Renew and rebind timers are commented out. This implies that options @@ -113,7 +113,7 @@ }, # The following configures logging. It assumes that messages with at least -# informational level (info, warn, error) will will be logged to stdout. +# informational level (info, warn, error and fatal) should be logged to stdout. "Logging": { "loggers": [ { diff --git a/doc/examples/kea4/several-subnets.json b/doc/examples/kea4/several-subnets.json index f33892a352..79606f9184 100644 --- a/doc/examples/kea4/several-subnets.json +++ b/doc/examples/kea4/several-subnets.json @@ -18,9 +18,9 @@ "type": "memfile" }, -# Addresses will be assigned with the valid lifetimes being 4000. -# Client is told to start renewing after 1000 seconds. If the server -# does not respond after 2000 seconds since the lease was granted, client +# Addresses will be assigned with a lifetime of 4000 seconds. +# The client is told to start renewing after 1000 seconds. If the server +# does not respond within 2000 seconds of the lease being granted, client # is supposed to start REBIND procedure (emergency renewal that allows # switching to a different server). "valid-lifetime": 4000, @@ -39,7 +39,7 @@ }, # The following configures logging. It assumes that messages with at least -# informational level (info, warn, error) will will be logged to stdout. +# informational level (info, warn, error and fatal) should be logged to stdout. "Logging": { "loggers": [ { diff --git a/doc/examples/kea4/single-subnet.json b/doc/examples/kea4/single-subnet.json index c3793db668..7ffa8b9495 100644 --- a/doc/examples/kea4/single-subnet.json +++ b/doc/examples/kea4/single-subnet.json @@ -18,7 +18,7 @@ "type": "memfile" }, -# Addresses will be assigned with valid lifetimes being 4000. +# Addresses will be assigned with a lifetime of 4000 seconds. "valid-lifetime": 4000, # Renew and rebind timers are commented out. This implies that options @@ -40,7 +40,7 @@ }, # The following configures logging. It assumes that messages with at least -# informational level (info, warn, error) will will be logged to stdout. +# informational level (info, warn, error and fatal) should be logged to stdout. "Logging": { "loggers": [ { diff --git a/doc/examples/kea6/advanced.json b/doc/examples/kea6/advanced.json index 4ecd8f32dc..3daca911fc 100644 --- a/doc/examples/kea6/advanced.json +++ b/doc/examples/kea6/advanced.json @@ -73,7 +73,7 @@ }, # The following configures logging. It assumes that messages with at least -# informational level (info, warn, error) will will be logged to stdout. +# informational level (info, warn, error and fatal) should be logged to stdout. "Logging": { "loggers": [ { diff --git a/doc/examples/kea6/backends.json b/doc/examples/kea6/backends.json index 8a71510461..4841c63c09 100644 --- a/doc/examples/kea6/backends.json +++ b/doc/examples/kea6/backends.json @@ -91,7 +91,7 @@ }, # The following configures logging. It assumes that messages with at least -# informational level (info, warn, error) will will be logged to stdout. +# informational level (info, warn, error and fatal) should be logged to stdout. "Logging": { "loggers": [ { diff --git a/doc/examples/kea6/classify.json b/doc/examples/kea6/classify.json index 020f5ed2d8..7b8c61fcb6 100644 --- a/doc/examples/kea6/classify.json +++ b/doc/examples/kea6/classify.json @@ -67,7 +67,7 @@ }, # The following configures logging. It assumes that messages with at least -# informational level (info, warn, error) will will be logged to stdout. +# informational level (info, warn, error and fatal) should be logged to stdout. "Logging": { "loggers": [ { diff --git a/doc/examples/kea6/leases-expiration.json b/doc/examples/kea6/leases-expiration.json index 0ec34df109..03b3d6b71b 100644 --- a/doc/examples/kea6/leases-expiration.json +++ b/doc/examples/kea6/leases-expiration.json @@ -58,7 +58,7 @@ }, # The following configures logging. It assumes that messages with at least -# informational level (info, warn, error) will will be logged to stdout. +# informational level (info, warn, error and fatal) should be logged to stdout. "Logging": { "loggers": [ { diff --git a/doc/examples/kea6/multiple-options.json b/doc/examples/kea6/multiple-options.json index 498f718a4d..bf7984c511 100644 --- a/doc/examples/kea6/multiple-options.json +++ b/doc/examples/kea6/multiple-options.json @@ -51,7 +51,7 @@ }, # The following configures logging. It assumes that messages with at least -# informational level (info, warn, error) will will be logged to stdout. +# informational level (info, warn, error and fatal) should be logged to stdout. "Logging": { "loggers": [ { diff --git a/doc/examples/kea6/mysql-reservations.json b/doc/examples/kea6/mysql-reservations.json index e1f791c575..2574cf9eb2 100644 --- a/doc/examples/kea6/mysql-reservations.json +++ b/doc/examples/kea6/mysql-reservations.json @@ -73,7 +73,7 @@ }, # The following configures logging. It assumes that messages with at least -# informational level (info, warn, error) will will be logged to stdout. +# informational level (info, warn, error and fatal) should be logged to stdout. "Logging": { "loggers": [ { diff --git a/doc/examples/kea6/pgsql-reservations.json b/doc/examples/kea6/pgsql-reservations.json index a75d21a057..6f7da55139 100644 --- a/doc/examples/kea6/pgsql-reservations.json +++ b/doc/examples/kea6/pgsql-reservations.json @@ -73,7 +73,7 @@ }, # The following configures logging. It assumes that messages with at least -# informational level (info, warn, error) will will be logged to stdout. +# informational level (info, warn, error and fatal) should be logged to stdout. "Logging": { "loggers": [ { diff --git a/doc/examples/kea6/reservations.json b/doc/examples/kea6/reservations.json index abf73f91a2..9ec546e272 100644 --- a/doc/examples/kea6/reservations.json +++ b/doc/examples/kea6/reservations.json @@ -111,7 +111,7 @@ }, # The following configures logging. It assumes that messages with at least -# informational level (info, warn, error) will will be logged to stdout. +# informational level (info, warn, error and fatal) should be logged to stdout. "Logging": { "loggers": [ { diff --git a/doc/examples/kea6/several-subnets.json b/doc/examples/kea6/several-subnets.json index 48d0bdb5b4..3dc74b6d41 100644 --- a/doc/examples/kea6/several-subnets.json +++ b/doc/examples/kea6/several-subnets.json @@ -43,7 +43,7 @@ }, # The following configures logging. It assumes that messages with at least -# informational level (info, warn, error) will will be logged to stdout. +# informational level (info, warn, error and fatal) should be logged to stdout. "Logging": { "loggers": [ { diff --git a/doc/examples/kea6/simple.json b/doc/examples/kea6/simple.json index f7a77008cf..5c7da6310b 100644 --- a/doc/examples/kea6/simple.json +++ b/doc/examples/kea6/simple.json @@ -42,7 +42,7 @@ }, # The following configures logging. It assumes that messages with at least -# informational level (info, warn, error) will will be logged to stdout. +# informational level (info, warn, error and fatal) should be logged to stdout. "Logging": { "loggers": [ {