Skip to content

Commit b974921

Browse files
committed
Convert documentation and README do asciidoc
... and place symlinks to avoid arguing with automake :-/
1 parent ce67c55 commit b974921

File tree

11 files changed

+1057
-1081
lines changed

11 files changed

+1057
-1081
lines changed

AUTHORS

Lines changed: 0 additions & 17 deletions
This file was deleted.

AUTHORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
AUTHORS.adoc

AUTHORS.adoc

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
Copyright © 2004 - 2013 LINBIT Information Technologies GmbH +
2+
Copyright © 2008 - 2018 https://www.linbit.com[LINBIT HA Solutions GmbH]
3+
4+
Original csync2 author, no longer involved with the project:
5+
2004, 2005 Clifford Wolf
6+
7+
Most development 1.34 to 2.0:
8+
2010 Johannes Thoma
9+
10+
Coordination, fixes and maintenance, ongoing:
11+
Lars Ellenberg <lars@linbit.com>
12+
13+
Major contributions:
14+
2010 Dennis Schafroth,
15+
2008 Art -kwaak- van Breemen
16+
17+
And others; for details see the git log.

ChangeLog

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Please see git for a complete changelog:
2-
http://git.linbit.com/csync2.git/
2+
https://github.com/LINBIT/csync2/
33

4-
git clone git://git.linbit.com/csync2.git
4+
git clone https://github.com/LINBIT/csync2/
55
cd csync2 && git log

Makefile.am

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ csync2_SOURCES = action.c cfgfile_parser.y cfgfile_scanner.l check.c \
2727
db_api.c db_sqlite.c db_sqlite2.c db_mysql.c db_postgres.c \
2828
csync2.h db_api.h db_mysql.h db_postgres.h db_sqlite.h db_sqlite2.h dl.h \
2929
csync2-compare \
30-
csync2.1 doc/csync2_paper.tex \
30+
csync2.1 \
3131
csync2.spec
3232

3333
EXTRA_DIST = csync2.cfg csync2.xinetd
@@ -40,24 +40,7 @@ CLEANFILES = cfgfile_parser.c cfgfile_parser.h cfgfile_scanner.c \
4040

4141
DISTCLEANFILES = config.status config.h .deps/*.Po stamp-h1 Makefile Makefile.in configure
4242

43-
docfiles = ChangeLog README AUTHORS
44-
45-
if HAVE_PDFLATEX
46-
47-
MANNAME = doc/csync2_paper
48-
MANTEXSRC = $(MANNAME).tex
49-
MANAUX = $(MANNAME).aux
50-
MANPDF = $(MANNAME).pdf
51-
52-
docfiles += $(MANPDF)
53-
54-
CLEANFILES += $(MANPDF) $(MANAUX) $(MANNAME).log $(MANNAME).idx $(MANNAME).out $(MANNAME).toc
55-
56-
$(MANPDF): $(MANTEXSRC)
57-
$(PDFLATEX) -interaction=batchmode -output-directory doc $< >/dev/null
58-
$(PDFLATEX) -interaction=batchmode -output-directory doc $< >/dev/null
59-
60-
endif
43+
docfiles = ChangeLog README.adoc AUTHORS.adoc doc/csync2.adoc
6144

6245
doc_DATA = $(docfiles)
6346
dist_doc_DATA = $(docfiles)

README

Lines changed: 0 additions & 74 deletions
This file was deleted.

README

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
README.adoc

README.adoc

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
2+
About csync2
3+
------------
4+
5+
Csync2 is a cluster synchronization tool. It can be used to keep files on
6+
multiple hosts in a cluster in sync. Csync2 can handle complex setups with
7+
much more than just 2 hosts, handle file deletions and can detect conflicts.
8+
9+
It is expedient for HA-clusters, HPC-clusters, COWs and server farms. If
10+
you are looking for a tool to sync your laptop with your workstation, you
11+
better have a look at Unison (http://www.cis.upenn.edu/~bcpierce/unison/)
12+
too.
13+
14+
The csync2 git tree can be found at https://github.com/LINBIT/csync2/.
15+
16+
Copyright
17+
---------
18+
19+
csync2 - cluster synchronization tool, 2nd generation +
20+
Copyright © 2004 - 2013 LINBIT Information Technologies GmbH +
21+
Copyright © 2008 - 2018 https://www.linbit.com[LINBIT HA Solutions GmbH] +
22+
see also <<AUTHORS#,AUTHORS>>
23+
24+
License
25+
-------
26+
SPDX-License-Identifier: GPL-2.0-or-later
27+
28+
Documentation
29+
-------------
30+
31+
You should definitely read the documentation before trying to setup csync2, +
32+
see <<doc/csync2#>>
33+
34+
Mailing List
35+
------------
36+
37+
There is a csync2 mailing list:
38+
39+
http://lists.linbit.com/mailman/listinfo/csync2
40+
41+
It is recommended to subscribe to this list if you are using csync2 in
42+
production environments.
43+

csync2.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,10 @@ void help(char *cmd)
100100
printf(
101101
"\n"
102102
PACKAGE_STRING " - cluster synchronization tool, 2nd generation\n"
103-
"Copyright (C) 2004 - 2015 LINBIT Information Technologies GmbH\n"
104-
" http://www.linbit.com\n"
105-
"See also: http://git.linbit.com/csync2.git/?a=blob;f=AUTHORS\n"
103+
"Copyright (C) 2004 - 2013 LINBIT Information Technologies GmbH\n"
104+
"Copyright (C) 2008 - 2018 LINBIT HA Solutions GmbH\n"
105+
" https://www.linbit.com\n"
106+
"See also: https://github.com/LINBIT/csync2/\n"
106107
"\n"
107108
"Version: " CSYNC2_VERSION "\n"
108109
"\n"

csync2.spec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d
6363
%makeinstall
6464

6565
install -m 644 csync2.xinetd $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/csync2
66-
install -m 644 doc/csync2_paper.pdf $RPM_BUILD_ROOT%{_docdir}/csync2/csync2_paper.pdf
66+
install -m 644 doc/csync2.adoc $RPM_BUILD_ROOT%{_docdir}/csync2/csync2.adoc
6767

6868
%clean
6969
[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT
@@ -80,7 +80,7 @@ fi
8080
%{_sbindir}/csync2-compare
8181
%{_var}/lib/csync2
8282
%doc %{_mandir}/man1/csync2.1.gz
83-
%doc %{_docdir}/csync2/csync2_paper.pdf
83+
%doc %{_docdir}/csync2/csync2.adoc
8484
%doc %{_docdir}/csync2/ChangeLog
8585
%doc %{_docdir}/csync2/README
8686
%doc %{_docdir}/csync2/AUTHORS

0 commit comments

Comments
 (0)