|
|
The branch, v4-0-test has been updated
via 7e90cc197c4fb2884f368cd72f391d0d8016fb96 (commit)
via 6f5b4ef1d0380d265ce27c882072c759ce19c7c3 (commit)
from dc2847c0acb0adaede4db72a7517046b93221162 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit 7e90cc197c4fb2884f368cd72f391d0d8016fb96
Merge: 6f5b4ef1d0380d265ce27c882072c759ce19c7c3
dc2847c0acb0adaede4db72a7517046b93221162
Author: Jelmer Vernooij <jelmer@xxxxxxxxx>
Date: Sun Jul 27 19:57:27 2008 +0200
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into manpage
commit 6f5b4ef1d0380d265ce27c882072c759ce19c7c3
Author: Jelmer Vernooij <jelmer@xxxxxxxxx>
Date: Sun Jul 27 19:56:20 2008 +0200
Fix location of manpages.
-----------------------------------------------------------------------
Summary of changes:
source/utils/ad2oLschema.1.xml | 87 ---------------------
source/{lib/ldb => utils}/man/ad2oLschema.1.xml | 0
source/{lib/ldb => utils}/man/oLschema2ldif.1.xml | 0
source/utils/oLschema2ldif.1.xml | 79 -------------------
4 files changed, 0 insertions(+), 166 deletions(-)
delete mode 100644 source/utils/ad2oLschema.1.xml
copy source/{lib/ldb => utils}/man/ad2oLschema.1.xml (100%)
copy source/{lib/ldb => utils}/man/oLschema2ldif.1.xml (100%)
delete mode 100644 source/utils/oLschema2ldif.1.xml
Changeset truncated at 500 lines:
diff --git a/source/utils/ad2oLschema.1.xml b/source/utils/ad2oLschema.1.xml
deleted file mode 100644
index 6ae8996..0000000
--- a/source/utils/ad2oLschema.1.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd";>
-<refentry id="ad2oLschema.1">
-
-<refmeta>
- <refentrytitle>ad2oLschema</refentrytitle>
- <manvolnum>1</manvolnum>
-</refmeta>
-
-
-<refnamediv>
- <refname>ad2oLschema</refname>
- <refpurpose>Converts AC-like LDAP schemas to OpenLDAP
- compatible schema files</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
- <cmdsynopsis>
- <command>ad2oLschema</command>
- <arg choice="opt">-I INPUT-FILE</arg>
- <arg choice="opt">-O OUTPUT-FILE</arg>
- </cmdsynopsis>
-</refsynopsisdiv>
-
-<refsect1>
- <title>DESCRIPTION</title>
-
- <para>ad2oLschema is a simple tool that converts AD-like LDIF
- schema files into OpenLDAP schema files.</para>
-</refsect1>
-
-
-<refsect1>
- <title>OPTIONS</title>
-
- <variablelist>
- <varlistentry>
- <term>-H url</term>
- <listitem><para>URL to an LDB or LDAP server with an AD schema
to read. </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>-I input-file</term> <listitem><para>AD schema
- to read. If neither this nor -H is specified, the
- schema file will be read from standard input.
- </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>-O output-file</term>
- <listitem><para>File to write OpenLDAP version of schema to.
- </para></listitem>
- </varlistentry>
- </variablelist>
-</refsect1>
-
-<refsect1>
- <title>VERSION</title>
-
- <para>This man page is correct for version 4.0 of the Samba
suite.</para>
-</refsect1>
-
-<refsect1>
- <title>SEE ALSO</title>
-
- <para>ldb(7), ldbmodify, ldbdel, ldif(5)</para>
-
-</refsect1>
-
-<refsect1>
- <title>AUTHOR</title>
-
- <para> ldb was written by
- <ulink url="http://samba.org/~tridge/";>Andrew Tridgell</ulink>.
- ad2oLschema was written by <ulink
- url="http://samba.org/~abartlet/";>Andrew Bartlett</ulink>.
- </para>
-
- <para>
-If you wish to report a problem or make a suggestion then please see
-the <ulink url="http://ldb.samba.org/"/> web site for
-current contact and maintainer information.
- </para>
-
-</refsect1>
-
-</refentry>
diff --git a/source/lib/ldb/man/ad2oLschema.1.xml
b/source/utils/man/ad2oLschema.1.xml
similarity index 100%
copy from source/lib/ldb/man/ad2oLschema.1.xml
copy to source/utils/man/ad2oLschema.1.xml
diff --git a/source/lib/ldb/man/oLschema2ldif.1.xml
b/source/utils/man/oLschema2ldif.1.xml
similarity index 100%
copy from source/lib/ldb/man/oLschema2ldif.1.xml
copy to source/utils/man/oLschema2ldif.1.xml
diff --git a/source/utils/oLschema2ldif.1.xml b/source/utils/oLschema2ldif.1.xml
deleted file mode 100644
index b1e681b..0000000
--- a/source/utils/oLschema2ldif.1.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd";>
-<refentry id="oLschema2ldif.1">
-
-<refmeta>
- <refentrytitle>oLschema2ldif</refentrytitle>
- <manvolnum>1</manvolnum>
-</refmeta>
-
-
-<refnamediv>
- <refname>oLschema2ldif</refname>
- <refpurpose>Converts LDAP schema's to LDB-compatible LDIF</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
- <cmdsynopsis>
- <command>oLschema2ldif</command>
- <arg choice="opt">-I INPUT-FILE</arg>
- <arg choice="opt">-O OUTPUT-FILE</arg>
- </cmdsynopsis>
-</refsynopsisdiv>
-
-<refsect1>
- <title>DESCRIPTION</title>
-
- <para>oLschema2ldif is a simple tool that converts standard OpenLDAP
schema files to a LDIF format that is understood by LDB.</para>
-</refsect1>
-
-
-<refsect1>
- <title>OPTIONS</title>
-
- <variablelist>
- <varlistentry>
- <term>-I input-file</term>
- <listitem><para>OpenLDAP schema to read. If none are specified,
-the schema file will be read from standard input.
- </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>-O output-file</term>
- <listitem><para>File to write ldif version of schema to.
- </para></listitem>
- </varlistentry>
- </variablelist>
-</refsect1>
-
-<refsect1>
- <title>VERSION</title>
-
- <para>This man page is correct for version 4.0 of the Samba
suite.</para>
-</refsect1>
-
-<refsect1>
- <title>SEE ALSO</title>
-
- <para>ldb(7), ldbmodify, ldbdel, ldif(5)</para>
-
-</refsect1>
-
-<refsect1>
- <title>AUTHOR</title>
-
- <para> ldb was written by
- <ulink url="http://samba.org/~tridge/";>Andrew Tridgell</ulink>.
- oLschema2ldif was written by <ulink
url="mailto:idra@xxxxxxxxx";>Simo Sorce</ulink>.
- </para>
-
- <para>
-If you wish to report a problem or make a suggestion then please see
-the <ulink url="http://ldb.samba.org/"/> web site for
-current contact and maintainer information.
- </para>
-
-</refsect1>
-
-</refentry>
--
Samba Shared Repository
|
|