[Drbd-dev] Trivial User's Guide fixes

[Drbd-dev] Trivial User's Guide fixes

[Florian Haas]

Lars,

here are the patches from the User's Guide patchset from last
November, minus those that Phil and I agreed to drop by offlist
email. Martin's and my primary blog locations have changed since
November, so I've tacked the new URLs on as well.  Feel free to take
or drop whatever you consider appropriate. This supersedes my pull
request from Nov 28
(http://lists.linbit.com/pipermail/drbd-dev/2011-November/002004.html).

These patches are against the current state of the tree at
git.drbd.org.

In summary, the following changes since commit
5c4c8eb62387f64ab1ce503323cea55011159c82:

  User's Guide: Added proper op monitor intervals for both Master and Slave roles. (2011-11-14 11:03:52 +0100)

are available in the git repository at:
  git://github.com/fghaas/drbd-documentation master

Florian Haas (3):
      User's Guide: Fix incorrect configuration syntax for c-plan-ahead and friends
      User's Guide: update blog links in "more info" section
      User's Guide: correct blog locations for Florian and Martin

 users-guide/administration.txt |    2 +-
 users-guide/more-info.txt      |    9 ++++-----
 users-guide/recent-changes.txt |    2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

Hope this is useful.

Cheers,
Florian

[Drbd-dev] [PATCH 1/3] User's Guide: Fix incorrect configuration syntax for c-plan-ahead and friends

[Florian Haas]

It's a disk option, not net. Which may be confusing, but
we certainly don't alleviate that confusion by documenting
it incorrectly here.
---
 users-guide/administration.txt |    2 +-
 users-guide/recent-changes.txt |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/users-guide/administration.txt b/users-guide/administration.txt
index 6d383bf..9c36bad 100644
--- a/users-guide/administration.txt
+++ b/users-guide/administration.txt
@@ -739,7 +739,7 @@ a deployment in conjunction with DRBD Proxy) is provided below:
 [source,drbd]
 ----------------------------
 resource <resource> {
-  net {
+  disk {
     c-plan-ahead 200;
     c-max-rate 10M;
     c-fill-target 15M;
diff --git a/users-guide/recent-changes.txt b/users-guide/recent-changes.txt
index f1a9765..3132fc6 100644
--- a/users-guide/recent-changes.txt
+++ b/users-guide/recent-changes.txt
@@ -366,7 +366,7 @@ following configuration options:
 [source,drbd]
 ----------------------------
 resource test {
-  net {
+  disk {
     c-plan-ahead 20;
     c-fill-target 50k;
     c-min-rate 250k;
-- 
1.7.5.4

[Drbd-dev] [PATCH 2/3] User's Guide: update blog links in "more info" section

[Florian Haas]

---
 users-guide/more-info.txt |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/users-guide/more-info.txt b/users-guide/more-info.txt
index 7ba0d27..f941c05 100644
--- a/users-guide/more-info.txt
+++ b/users-guide/more-info.txt
@@ -35,12 +35,11 @@ improvements in DRBD, and having developer level discussions.
 === Blogs
 
 * Florian Haas, one of the co-authors of this guide, maintains
-  http://blogs.linbit.com/florian[a technical blog].
+  http://fghaas.wordpress.com/[a technical blog].
 
-* Martin Loschwitz a.k.a. +madkiss+, another
-  http://www.linbit.com[LINBIT] employee and co-maintainer of the
+* Martin Loschwitz a.k.a. +madkiss+, co-maintainer of the
   http://www.debian.org[Debian] DRBD packages, keeps
-  http://blogs.linbit.com/martin[a personal blog] in German.
+  http://martinloschwitz.wordpress.com[a personal blog] in German.
 
 * http://www.planet-ha.org/[Planet HA] is an aggregated feed
   centralizing blog posts from a number of high availability
-- 
1.7.5.4

[Drbd-dev] [PATCH 3/3] User's Guide: correct blog locations for Florian and Martin

[Florian Haas]

---
 users-guide/more-info.txt |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/users-guide/more-info.txt b/users-guide/more-info.txt
index f941c05..754d64c 100644
--- a/users-guide/more-info.txt
+++ b/users-guide/more-info.txt
@@ -35,11 +35,11 @@ improvements in DRBD, and having developer level discussions.
 === Blogs
 
 * Florian Haas, one of the co-authors of this guide, maintains
-  http://fghaas.wordpress.com/[a technical blog].
+  http://www.hastexo.com/blogs/florian[a technical blog].
 
 * Martin Loschwitz a.k.a. +madkiss+, co-maintainer of the
-  http://www.debian.org[Debian] DRBD packages, keeps
-  http://martinloschwitz.wordpress.com[a personal blog] in German.
+  http://www.debian.org[Debian] DRBD packages, also keeps
+  http://www.hastexo.com/blogs/martin[a blog].
 
 * http://www.planet-ha.org/[Planet HA] is an aggregated feed
   centralizing blog posts from a number of high availability
-- 
1.7.5.4

Re: [Drbd-dev] [PATCH 1/3] User's Guide: Fix incorrect configuration syntax for c-plan-ahead and friends

[Lars Ellenberg]

On Thu, Mar 22, 2012 at 01:30:17PM +0100, Florian Haas wrote:
> It's a disk option, not net. Which may be confusing, but
> we certainly don't alleviate that confusion by documenting
> it incorrectly here.

Is that so. :-/
Ok.

> ---
>  users-guide/administration.txt |    2 +-
>  users-guide/recent-changes.txt |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/users-guide/administration.txt b/users-guide/administration.txt
> index 6d383bf..9c36bad 100644
> --- a/users-guide/administration.txt
> +++ b/users-guide/administration.txt
> @@ -739,7 +739,7 @@ a deployment in conjunction with DRBD Proxy) is provided below:
>  [source,drbd]
>  ----------------------------
>  resource <resource> {
> -  net {
> +  disk {
>      c-plan-ahead 200;
>      c-max-rate 10M;
>      c-fill-target 15M;
> diff --git a/users-guide/recent-changes.txt b/users-guide/recent-changes.txt
> index f1a9765..3132fc6 100644
> --- a/users-guide/recent-changes.txt
> +++ b/users-guide/recent-changes.txt
> @@ -366,7 +366,7 @@ following configuration options:
>  [source,drbd]
>  ----------------------------
>  resource test {
> -  net {
> +  disk {
>      c-plan-ahead 20;
>      c-fill-target 50k;
>      c-min-rate 250k;
> -- 
> 1.7.5.4
> 
> _______________________________________________
> drbd-dev mailing list
> drbd-dev@lists.linbit.com
> http://lists.linbit.com/mailman/listinfo/drbd-dev

-- 
: Lars Ellenberg
: LINBIT | Your Way to High Availability
: DRBD/HA support and consulting http://www.linbit.com

DRBD® and LINBIT® are registered trademarks of LINBIT, Austria.

Re: [Drbd-dev] [PATCH 2/3] User's Guide: update blog links in "more info" section

[Lars Ellenberg]

On Thu, Mar 22, 2012 at 01:30:18PM +0100, Florian Haas wrote:
> ---
>  users-guide/more-info.txt |    7 +++----
>  1 files changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/users-guide/more-info.txt b/users-guide/more-info.txt
> index 7ba0d27..f941c05 100644
> --- a/users-guide/more-info.txt
> +++ b/users-guide/more-info.txt
> @@ -35,12 +35,11 @@ improvements in DRBD, and having developer level discussions.
>  === Blogs

Blog section has been dropped completely, I think.

-- 
: Lars Ellenberg
: LINBIT | Your Way to High Availability
: DRBD/HA support and consulting http://www.linbit.com

DRBD® and LINBIT® are registered trademarks of LINBIT, Austria.

Re: [Drbd-dev] [PATCH 2/3] User's Guide: update blog links in "more info" section

[Florian Haas]

On Fri, Mar 23, 2012 at 10:36 AM, Lars Ellenberg
<lars.ellenberg@linbit.com> wrote:
> On Thu, Mar 22, 2012 at 01:30:18PM +0100, Florian Haas wrote:
>> ---
>>  users-guide/more-info.txt |    7 +++----
>>  1 files changed, 3 insertions(+), 4 deletions(-)
>>
>> diff --git a/users-guide/more-info.txt b/users-guide/more-info.txt
>> index 7ba0d27..f941c05 100644
>> --- a/users-guide/more-info.txt
>> +++ b/users-guide/more-info.txt
>> @@ -35,12 +35,11 @@ improvements in DRBD, and having developer level discussions.
>>  === Blogs
>
> Blog section has been dropped completely, I think.

I wonder why, as I do think having blog links in there (including that
to your own corporate one) would be helpful. Funny that that change
doesn't show in the git repo though. Push more frequently?

Florian

-- 
Need help with High Availability?
http://www.hastexo.com/now

Re: [Drbd-dev] [PATCH 1/3] User's Guide: Fix incorrect configuration syntax for c-plan-ahead and friends

[Philipp Marek]

applied, thanks.


-- 
: Ing. Philipp Marek
: LINBIT | Your Way to High Availability
: DRBD/HA support and consulting                 http://www.linbit.com :

DRBD® and LINBIT® are registered trademarks of LINBIT, Austria.