Mark Griffiths 6b75a4593b Merge remote-tracking branch 'upstream/master' into documentation-update ...

Conflicts (resolved):
	doc_src/design.hdr - \c changed to backticks

2014-09-08 07:05:53 +01:00

..

alias.txt

Make line length, wrapping and spacing consistent

2014-09-03 14:43:26 +01:00

and.txt

Make line length, wrapping and spacing consistent

2014-09-03 14:43:26 +01:00

ascii_fish.png

Addition of 'ascii fish' logo

2014-09-03 14:43:27 +01:00

begin.txt

Make line length, wrapping and spacing consistent

2014-09-03 14:43:26 +01:00

bg.txt

Make line length, wrapping and spacing consistent

2014-09-03 14:43:26 +01:00

bind.txt

Consistency fixes

2014-09-03 14:43:27 +01:00

block.txt

Make line length, wrapping and spacing consistent

2014-09-03 14:43:26 +01:00

break.txt

Make line length, wrapping and spacing consistent

2014-09-03 14:43:26 +01:00

breakpoint.txt

Make line length, wrapping and spacing consistent

2014-09-03 14:43:26 +01:00

builtin.txt

Make line length, wrapping and spacing consistent

2014-09-03 14:43:26 +01:00

case.txt

Make line length, wrapping and spacing consistent

2014-09-03 14:43:26 +01:00

cd.txt

Make line length, wrapping and spacing consistent

2014-09-03 14:43:26 +01:00

command.txt

Rebase documentation changes

2014-09-03 15:10:53 +01:00

commandline.txt

Make line length, wrapping and spacing consistent

2014-09-03 14:43:26 +01:00

commands.hdr.in

Update menus for consistency

2014-09-07 17:35:19 +01:00

complete.txt

Rebase documentation changes

2014-09-03 15:10:53 +01:00

contains.txt

Various additions and fixes

2014-09-03 14:43:27 +01:00

continue.txt

Make line length, wrapping and spacing consistent

2014-09-03 14:43:26 +01:00

count.txt

Various additions and fixes

2014-09-03 14:43:27 +01:00

design.hdr

Merge remote-tracking branch 'upstream/master' into documentation-update

2014-09-08 07:05:53 +01:00

dirh.txt

Make line length, wrapping and spacing consistent

2014-09-03 14:43:26 +01:00

dirs.txt

Make line length, wrapping and spacing consistent

2014-09-03 14:43:26 +01:00

echo.txt

Various additions and fixes

2014-09-03 14:43:27 +01:00

else.txt

Make line length, wrapping and spacing consistent

2014-09-03 14:43:26 +01:00

emit.txt

Make line length, wrapping and spacing consistent

2014-09-03 14:43:26 +01:00

end.txt

Make line length, wrapping and spacing consistent

2014-09-03 14:43:26 +01:00

eval.txt

Make line length, wrapping and spacing consistent

2014-09-03 14:43:26 +01:00

exec.txt

Make line length, wrapping and spacing consistent

2014-09-03 14:43:26 +01:00

exit.txt

Make line length, wrapping and spacing consistent

2014-09-03 14:43:26 +01:00

faq.hdr

Update menus for consistency

2014-09-07 17:35:19 +01:00

fg.txt

Make line length, wrapping and spacing consistent

2014-09-03 14:43:26 +01:00

fish_config.txt

Make line length, wrapping and spacing consistent

2014-09-03 14:43:26 +01:00

fish_indent.txt

Various additions and fixes

2014-09-03 14:43:27 +01:00

fish_prompt.txt

Make line length, wrapping and spacing consistent

2014-09-03 14:43:26 +01:00

fish_right_prompt.txt

Make line length, wrapping and spacing consistent

2014-09-03 14:43:26 +01:00

fish_update_completions.txt

Documentation update

2014-09-03 14:43:24 +01:00

fish.txt

Various additions and fixes

2014-09-03 14:43:27 +01:00

for.txt

Make line length, wrapping and spacing consistent

2014-09-03 14:43:26 +01:00

FORMATTING.md

Fixed a couple of typos

2014-09-07 17:43:58 +01:00

funced.txt

Make line length, wrapping and spacing consistent

2014-09-03 14:43:26 +01:00

funcsave.txt

Make line length, wrapping and spacing consistent

2014-09-03 14:43:26 +01:00

function.txt

Rebase documentation changes

2014-09-03 15:10:53 +01:00

functions.txt

Various additions and fixes

2014-09-03 14:43:27 +01:00

help.txt

Make line length, wrapping and spacing consistent

2014-09-03 14:43:26 +01:00

history.txt

Rebase documentation changes

2014-09-03 15:10:53 +01:00

if.txt

Make line length, wrapping and spacing consistent

2014-09-03 14:43:26 +01:00

index.hdr.in

Fix Doxygen unresolved link error

2014-09-04 10:32:13 +01:00

isatty.txt

Make line length, wrapping and spacing consistent

2014-09-03 14:43:26 +01:00

jobs.txt

Various additions and fixes

2014-09-03 14:43:27 +01:00

license.hdr

Rebase documentation changes

2014-09-03 15:10:53 +01:00

math.txt

Make line length, wrapping and spacing consistent

2014-09-03 14:43:26 +01:00

mimedb.txt

Various additions and fixes

2014-09-03 14:43:27 +01:00

nextd.txt

Consistency fixes

2014-09-03 14:43:27 +01:00

not.txt

Make line length, wrapping and spacing consistent

2014-09-03 14:43:26 +01:00

open.txt

Make line length, wrapping and spacing consistent

2014-09-03 14:43:26 +01:00

or.txt

Make line length, wrapping and spacing consistent

2014-09-03 14:43:26 +01:00

popd.txt

Make line length, wrapping and spacing consistent

2014-09-03 14:43:26 +01:00

prevd.txt

Make line length, wrapping and spacing consistent

2014-09-03 14:43:26 +01:00

psub.txt

Consistency fixes

2014-09-03 14:43:27 +01:00

pushd.txt

Make line length, wrapping and spacing consistent

2014-09-03 14:43:26 +01:00

pwd.txt

Simplify styling

2014-09-03 14:43:25 +01:00

random.txt

Make line length, wrapping and spacing consistent

2014-09-03 14:43:26 +01:00

read.txt

Merge branch 'master' into documentation-update

2014-09-04 10:00:52 +01:00

return.txt

Make line length, wrapping and spacing consistent

2014-09-03 14:43:26 +01:00

set_color.txt

Various additions and fixes

2014-09-03 14:43:27 +01:00

set.txt

Consistency fixes

2014-09-03 14:43:27 +01:00

source.txt

Make line length, wrapping and spacing consistent

2014-09-03 14:43:26 +01:00

status.txt

Various additions and fixes

2014-09-03 14:43:27 +01:00

switch.txt

Make line length, wrapping and spacing consistent

2014-09-03 14:43:26 +01:00

test.txt

Rebase documentation changes

2014-09-03 15:10:53 +01:00

trap.txt

Various additions and fixes

2014-09-03 14:43:27 +01:00

tutorial.hdr

Addition of 'ascii fish' logo

2014-09-03 14:43:27 +01:00

type.txt

Rebase documentation changes

2014-09-03 15:10:53 +01:00

ulimit.txt

Various additions and fixes

2014-09-03 14:43:27 +01:00

umask.txt

Make line length, wrapping and spacing consistent

2014-09-03 14:43:26 +01:00

user_doc.css

Update menus for consistency

2014-09-07 17:35:19 +01:00

user_doc.footer.html

Documentation update

2014-09-03 14:43:24 +01:00

user_doc.header.html

Documentation update

2014-09-03 14:43:24 +01:00

vared.txt

Make line length, wrapping and spacing consistent

2014-09-03 14:43:26 +01:00

while.txt

Make line length, wrapping and spacing consistent

2014-09-03 14:43:26 +01:00