summaryrefslogtreecommitdiff
path: root/prog_guide4.txt
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-09-18 20:29:05 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-09-18 20:29:05 +0200
commit729ffbae086309992d7433a296fca64f6800f8fa (patch)
tree6c133d2b91ab9313da11bf8bad15f497e1b5c61f /prog_guide4.txt
parent88ad1a936ccd2451d6dbf542a0a746ad71a3e968 (diff)
parentfc7050e54c69919d754ca0adf3f2f741a501fec4 (diff)
downloadsamba-729ffbae086309992d7433a296fca64f6800f8fa.tar.gz
samba-729ffbae086309992d7433a296fca64f6800f8fa.tar.bz2
samba-729ffbae086309992d7433a296fca64f6800f8fa.zip
Merge branch 'master' of ssh://git.samba.org/data/git/samba into noejs
Conflicts: source4/main.mk
Diffstat (limited to 'prog_guide4.txt')
-rw-r--r--prog_guide4.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/prog_guide4.txt b/prog_guide4.txt
index bba58b31b3..2f5be5f791 100644
--- a/prog_guide4.txt
+++ b/prog_guide4.txt
@@ -194,7 +194,7 @@ in the data and bss columns in "size" anyway (it will be included in
How to use talloc
-----------------
-Please see the separate document, source/lib/talloc/talloc_guide.txt
+Please see the separate document, lib/talloc/talloc_guide.txt
You _must_ read this if you want to program in Samba4.
@@ -646,7 +646,7 @@ file cannot be deleted until you reboot
trans2 qpathinfo doesn't see the delete_pending flag correctly, but
qfileinfo does!
-get rid of pstring, fstring, strtok
+get rid of strtok
add programming documentation note about lp_set_cmdline()