Skip to content

Commit

Permalink
need a second $ for git status in release-candidate
Browse files Browse the repository at this point in the history
(cherry picked from commit a0d3d93)

rst fixes

(cherry picked from commit bb020fa)
  • Loading branch information
tkelman committed Dec 25, 2014
1 parent 6fd6803 commit 3758b81
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ release-candidate: release test
@$(MAKE) -C doc helpdb.jl #Rebuild Julia online documentation for help(), apropos(), etc...

@# Check to see if the above make invocations changed anything important
@if [ -n "$(git status --porcelain)" ]; then \
@if [ -n "$$(git status --porcelain)" ]; then \
echo "Git repository dirty; Verify and commit changes to the repository, then retry"; \
exit 1; \
fi
Expand Down
6 changes: 3 additions & 3 deletions doc/manual/faq.rst
Original file line number Diff line number Diff line change
Expand Up @@ -134,11 +134,11 @@ what makes the ``...`` operator confusing is that it means two different things
depending on context.

``...`` combines many arguments into one argument in function definitions
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

In the context of function definitions, the ``...`` operator is used to combine
many different arguments into a single argument. This use of ``...`` for
combining many different arguments into a single argument is called slurping:
combining many different arguments into a single argument is called slurping::

julia> function printargs(args...)
@printf("%s\n", typeof(args))
Expand All @@ -164,7 +164,7 @@ In contrast to the use of the ``...`` operator to denote slurping many
different arguments into one argument when defining a function, the ``...``
operator is also used to cause a single function argument to be split apart
into many different arguments when used in the context of a function call. This
use of ``...`` is called splatting:
use of ``...`` is called splatting::

julia> function threeargs(a, b, c)
@printf("a = %s::%s\n", a, typeof(a))
Expand Down

0 comments on commit 3758b81

Please sign in to comment.